Parcourir la source

Refactor db connection

master
Dylan Baker il y a 4 ans
Parent
révision
66120b429b
4 fichiers modifiés avec 14 ajouts et 4 suppressions
  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 Voir le fichier

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 Voir le fichier

1
 require 'sequel'
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
   db.create_table :threads do
7
   db.create_table :threads do
7
     primary_key :id
8
     primary_key :id
8
     String :title
9
     String :title

+ 2
- 1
db/scrape.rb Voir le fichier

3
 require 'nokogiri'
3
 require 'nokogiri'
4
 require 'sequel'
4
 require 'sequel'
5
 
5
 
6
+require_relative '../db/connect'
6
 require_relative '../lib/auth'
7
 require_relative '../lib/auth'
7
 
8
 
8
 def fetch_page(page_number, cookie)
9
 def fetch_page(page_number, cookie)
75
 
76
 
76
 def scrape(first: 0, last: 0)
77
 def scrape(first: 0, last: 0)
77
   cookie = login(ENV['VLV_USERNAME'], ENV['VLV_PASSWORD'])
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
   (first..last).each do |page_number|
81
   (first..last).each do |page_number|
81
     page = fetch_page(page_number, cookie)
82
     page = fetch_page(page_number, cookie)

+ 1
- 1
lib/search.rb Voir le fichier

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

Chargement…
Annuler
Enregistrer