Use DB constant and sequel models

db/connect.rb

@@ -2,11 +2,10 @@ require 'dotenv'
 
 Dotenv.load(File.expand_path('../.env'))
 
-def connect
+DB =
   Sequel.connect(
     adapter: :postgres,
     database: ENV['DB_DATABASE'],
     user: ENV['DB_USERNAME'],
-    password: ENV['DB_PASSWORD'],
+    password: ENV['DB_PASSWORD']
   )
-end

db/scrape.rb

@@ -4,8 +4,9 @@ require 'sequel'
 require_relative '../db/connect'
 require_relative '../lib/auth'
 require_relative '../lib/fetch'
-require_relative '../lib/insert'
 require_relative '../lib/parse'
+require_relative '../lib/models/post'
+require_relative '../lib/models/thread'
 
 class Scraper
   def initialize(first: 0, last: 0, log: false)
@@ -13,7 +14,6 @@ class Scraper
     @last = last
     @log = log
     @cookie = login(ENV['VLV_USERNAME'], ENV['VLV_PASSWORD'])
-    @db = connect
   end
 
   def scrape
@@ -41,9 +41,9 @@ class Scraper
 
     t[:created_at] = Parse.thread_created_at(first_post)
 
-    thread = @db.from(:threads).first(remote_id: t[:remote_id])
+    thread = DB.from(:threads).first(remote_id: t[:remote_id])
     if thread.nil?
-      thread = Insert.thread(t, @db)
+      thread = VLV::Thread.create(t.delete_if { |k| k == :is_sticky })
       log '  Inserting thread'
     end
 
@@ -53,7 +53,7 @@ class Scraper
   def scrape_posts(thread, page)
     posts = Parse.posts(thread, page)
     last_post = posts.last
-    unless @db.from(:posts).first(remote_id: last_post[:remote_id]).nil?
+    unless DB.from(:posts).first(remote_id: last_post[:remote_id]).nil?
       log '  No new posts'
       return true
     end
@@ -62,8 +62,8 @@ class Scraper
     posts.each_with_index do |p, index|
       msg = "  Inserting post #{index + 1}/#{posts_count}"
       print msg if @log
-      if @db.from(:posts).first(remote_id: p[:remote_id]).nil?
-        Insert.post(p, @db)
+      if DB.from(:posts).first(remote_id: p[:remote_id]).nil?
+        VLV::Post.create(p)
       end
       print "\b" * msg.size unless index == posts_count - 1 if @log
     end

lib/insert.rb

@@ -1,21 +0,0 @@
-module Insert
-  def self.post(post, db)
-    db.from(:posts).insert(
-      body: post[:body],
-      created_at: post[:created_at],
-      creator: post[:creator],
-      thread_id: post[:thread_id],
-      remote_id: post[:remote_id],
-    )
-  end
-
-  def self.thread(thread, db)
-    id = db.from(:threads).insert(
-      title: thread[:title],
-      creator: thread[:creator],
-      remote_id: thread[:remote_id],
-      created_at: thread[:created_at]
-    )
-    thread.merge(id: id)
-  end
-end

lib/models/post.rb

@@ -0,0 +1,5 @@
+module VLV
+  class Post < Sequel::Model
+    many_to_one :thread
+  end
+end

lib/models/thread.rb

@@ -0,0 +1,5 @@
+module VLV
+  class Thread < Sequel::Model
+    one_to_many :posts
+  end
+end