Browse Source

Refactor db connection

master
Dylan Baker 4 years ago
parent
commit
66120b429b
4 changed files with 14 additions and 4 deletions
  1. 8
    0
      db/connect.rb
  2. 3
    2
      db/migrate.rb
  3. 2
    1
      db/scrape.rb
  4. 1
    1
      lib/search.rb

+ 8
- 0
db/connect.rb View File

@@ -0,0 +1,8 @@
1
+def connect
2
+  Sequel.connect(
3
+    adapter: :postgres,
4
+    database: ENV['DB_DATABASE'],
5
+    user: ENV['DB_USERNAME'],
6
+    password: ENV['DB_PASSWORD'],
7
+  )
8
+end

+ 3
- 2
db/migrate.rb View File

@@ -1,8 +1,9 @@
1 1
 require 'sequel'
2 2
 
3
-def migrate
4
-  db = Sequel.connect(adapter: :postgres, database: 'vlv2')
3
+require_relative 'connect'
5 4
 
5
+def migrate
6
+  db = connect
6 7
   db.create_table :threads do
7 8
     primary_key :id
8 9
     String :title

+ 2
- 1
db/scrape.rb View File

@@ -3,6 +3,7 @@ require 'net/http'
3 3
 require 'nokogiri'
4 4
 require 'sequel'
5 5
 
6
+require_relative '../db/connect'
6 7
 require_relative '../lib/auth'
7 8
 
8 9
 def fetch_page(page_number, cookie)
@@ -75,7 +76,7 @@ end
75 76
 
76 77
 def scrape(first: 0, last: 0)
77 78
   cookie = login(ENV['VLV_USERNAME'], ENV['VLV_PASSWORD'])
78
-  db = Sequel.connect(adapter: :postgres, database: ENV['DB_DATABASE'])
79
+  db = connect
79 80
 
80 81
   (first..last).each do |page_number|
81 82
     page = fetch_page(page_number, cookie)

+ 1
- 1
lib/search.rb View File

@@ -1,7 +1,7 @@
1 1
 require 'sequel'
2 2
 
3 3
 def search(params)
4
-  db = Sequel.connect(adapter: :postgres, database: ENV['DB_DATABASE'])
4
+  db = connect
5 5
   query = params[:q].strip
6 6
   offset = (params[:page] - 1) * 10
7 7
   username = params[:username].strip

Loading…
Cancel
Save