ardb 0.3.0 → 0.4.0

data/lib/ardb.rb

@@ -20,25 +20,28 @@ module Ardb
     end
   end
 
-  def self.init(connection=true)
+  def self.init(establish_connection=true)
     validate!
     Adapter.init
 
     # setup AR
     ActiveRecord::Base.logger = self.config.logger
-    ActiveRecord::Base.establish_connection(self.config.db.to_hash) if connection
+    if establish_connection
+      ActiveRecord::Base.establish_connection(self.config.db_settings)
+    end
   end
 
   class Config
     include NsOptions::Proxy
 
     namespace :db do
-      option :adapter,  String, :required => true
-      option :database, String, :required => true
-      option :encoding, String, :required => false
-      option :url,      String, :required => false
-      option :username, String, :required => false
-      option :password, String, :required => false
+      option :adapter,  String,  :required => true
+      option :database, String,  :required => true
+      option :encoding, String,  :required => false
+      option :host,     String,  :required => false
+      option :port,     Integer, :required => false
+      option :username, String,  :required => false
+      option :password, String,  :required => false
     end
 
     option :root_path,       Pathname, :required => true
@@ -46,6 +49,13 @@ module Ardb
     option :migrations_path, RootPath, :default => proc{ "db/migrations" }
     option :schema_path,     RootPath, :default => proc{ "db/schema.rb" }
 
+    def self.db_settings
+      db.to_hash.inject({}) do |settings, (k, v)|
+        settings[k.to_s] = v if !v.nil?
+        settings
+      end
+    end
+
   end
 
   class Adapter

data/lib/ardb/adapter/base.rb

@@ -5,7 +5,7 @@ class Ardb::Adapter::Base
   attr_reader :config_settings, :database
 
   def initialize
-    @config_settings = Ardb.config.db.to_hash
+    @config_settings = Ardb.config.db_settings
     @database = Ardb.config.db.database
   end
 

data/lib/ardb/runner/connect_command.rb

@@ -5,13 +5,14 @@ class Ardb::Runner::ConnectCommand
   def run
     begin
       Ardb.init
+      ActiveRecord::Base.connection
       $stdout.puts "connected to #{Ardb.config.db.adapter} db `#{Ardb.config.db.database}`"
     rescue Ardb::Runner::CmdError => e
       raise e
     rescue Exception => e
       $stderr.puts e, *e.backtrace
       $stderr.puts "error connecting to #{Ardb.config.db.database.inspect} database"\
-                   " with #{Ardb.config.db.to_hash.inspect}"
+                   " with #{Ardb.config.db_settings.inspect}"
       raise Ardb::Runner::CmdFail
     end
   end

data/lib/ardb/version.rb

@@ -1,3 +1,3 @@
 module Ardb
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/test/unit/adapter/base_tests.rb

@@ -15,7 +15,7 @@ class Ardb::Adapter::Base
     should have_imeths :create_db, :drop_db
 
     should "use the config's db settings " do
-      assert_equal Ardb.config.db.to_hash, subject.config_settings
+      assert_equal Ardb.config.db_settings, subject.config_settings
     end
 
     should "use the config's database" do

data/test/unit/config_tests.rb

@@ -13,6 +13,7 @@ class Ardb::Config
     should have_option  :root_path, Pathname, :required => true
     should have_option  :logger, :required => true
     should have_options :migrations_path, :schema_path
+    should have_imeth   :db_settings
 
     should "should use `db/migrations` as the default migrations path" do
       exp_path = Pathname.new(TESTDB_PATH).join("db/migrations").to_s
@@ -24,18 +25,28 @@ class Ardb::Config
       assert_equal exp_path, subject.schema_path
     end
 
+    should "build the db connection settings from the db configs" do
+      # returns only non-nil values with string keys
+      exp = {
+        'adapter'  => "postgresql",
+        'database' => "ardbtest"
+      }
+      assert_equal exp, subject.db_settings
+    end
+
   end
 
   class DbTests < BaseTests
     desc "db namespace"
     subject{ Ardb::Config.db }
 
-    should have_option :adapter,  String, :required => true
-    should have_option :database, String, :required => true
-    should have_option :encoding, String, :required => false
-    should have_option :url,      String, :required => false
-    should have_option :username, String, :required => false
-    should have_option :password, String, :required => false
+    should have_option :adapter,  String,  :required => true
+    should have_option :database, String,  :required => true
+    should have_option :encoding, String,  :required => false
+    should have_option :host,     String,  :required => false
+    should have_option :port,     Integer, :required => false
+    should have_option :username, String,  :required => false
+    should have_option :password, String,  :required => false
 
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ardb
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Kelly Redding