wd_sinatra_sequel 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 878e150cac3a9efc347eb8d0476dee987242e226
-  data.tar.gz: e3dd5d0920e9316f8fc22198bf9a2d2c68fbed48
+  metadata.gz: af844175ad819319e4f37249a5eb71ffce6e4e6b
+  data.tar.gz: 301364bba13599d29ef028a81b4e2aeab6da588a
 SHA512:
-  metadata.gz: 12f9ec2348d8429baf884dadcf5614723ec5f37abac2f654b03a5a257a8c90c330659b921749119cb009e80d36fa68efa1497ae4c6efeefcd0f9345700884a74
-  data.tar.gz: 58b3db04db89a04682f8bb99e117c3e99ce445231e2c8f592407913681c9ed6c5ecea72b9cbee5adc0e9883165f52c3997df54cf1bf7129749d963819b37efa9
+  metadata.gz: d21cad413f7331d1682af3cf5127adea0f9b9c7681f63ebe1b82bd7968c52cefdadeefa37442a75d24de0eedc8bb157c63646728c6a424ba026285ff01225496
+  data.tar.gz: a221269be0b96cff95a87034f389e6eb302c626a85d93fb048919445635ed79899944c3f2abafefed1feea5a0aa32d5cf9923bd3a64e536a1e9675d5a30af0e6

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.0.4
+* refactor the db file and loading of db config
+
 ## 0.0.3
 * require yaml for loading config
 

data/README.md

@@ -36,12 +36,13 @@ Add an Sequel `database.yml` file in your config folder and then require this
 gem in your `app.rb` file and connect to the DB:
 
     require 'wd_sinatra_sequel'
-    DB = WdSinatraSequel::DBConnector.set_db_connection
+    WdSinatraSequel::DBConnector.set_db_connection
+    WdSinatraSequel::DBConnector.connect_to_db
 
 
 The DB settings can be accessed via:
 
-    DBConnector::DB_CONFIG[RACK_ENV]
+    WdSinatraSequel::DBConnector::DB_CONFIG[RACK_ENV]
 
 ## Rake tasks
 

data/lib/wd_sinatra_sequel.rb

@@ -19,7 +19,8 @@ module WdSinatraSequel
 
   ##### DB Connection ########
   module DBConnector
-    DB_CONFIG = YAML.load_file(File.join(WDSinatra::AppLoader.root_path, "config", "database.yml"))
+    DB_FILE = File.join(WDSinatra::AppLoader.root_path, "config", "database.yml")
+    DB_CONFIG = YAML.load_file(DB_FILE)
 
     module_function
 
@@ -33,11 +34,9 @@ module WdSinatraSequel
       end
 
       # Establish the DB connection
-      db_file = File.join(WDSinatra::AppLoader.root_path, "config", "database.yml")
-      if File.exist?(db_file)
-        hash_settings = YAML.load_file(db_file)
-        if hash_settings && hash_settings[env]
-          @db_configurations = hash_settings
+      if File.exist?(DB_FILE)
+        if DB_CONFIG && DB_CONFIG[env]
+          @db_configurations = DB_CONFIG
           @db_configuration = @db_configurations[env]
           # add loggers
           @db_configuration['loggers'] ||= []
@@ -49,10 +48,10 @@ module WdSinatraSequel
           end
           connect_to_db unless ENV['DONT_CONNECT']
         else
-          raise "#{db_file} doesn't have an entry for the #{env} environment"
+          raise "#{DB_FILE} doesn't have an entry for the #{env} environment"
         end
       else
-        raise "#{db_file} file missing, can't connect to the DB"
+        raise "#{DB_FILE} file missing, can't connect to the DB"
       end
     end
 

data/lib/wd_sinatra_sequel/version.rb

@@ -1,3 +1,3 @@
 module WdSinatraSequel
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wd_sinatra_sequel
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Jack Chu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2013-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry