ardb 0.28.2 → 0.28.3

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA512: 
-  metadata.gz: f4a5484485c36474860b31db1f64cd6c2d50bfa9dbfc885b38ac248a79fe6022f34915085a842b3cbee868ac8bbe7de5bc03b80d84600185a7154be93675a0dd
-  data.tar.gz: c52b82f4e6277afeac490fae8e3c80b4f71f8b0c73b8fa3170a7a42bf1d88894d4ad6b005961177976e6b68cc6533d965400cfe020fcf8378fea84755ad2d14f
 SHA1: 
-  metadata.gz: e44fd7cb818b602d49e0e5db5fd6a63ae9c23cfa
-  data.tar.gz: 4e687f31400cf5c08a32e29b1153261a7b2c026a
+  data.tar.gz: 352c1dc50e3ac2567d5f74cc148ba572d4fa8f3d
+  metadata.gz: 0a5e57adec591aaa7273bade002b3f873caef819
+SHA512: 
+  data.tar.gz: c16e759ea474b84490ebb450825b44e11725960d847ff82cfec5e5840dd00b853a4278cc92f49989da04f6f04196b61aa428f4ba7f151f7562cd3d562ead9015
+  metadata.gz: f61b9a4df10d7d2b5b4520d8f601c1e3f9d3e1155a306d9b477cecf63d9021546bf9123adcdfddd9747f1348a905a388d564ef4babbde667c97fd732b355e213

data/lib/ardb.rb

@@ -15,14 +15,19 @@ module Ardb
     self.config.tap(&block)
   end
 
-  def self.adapter; @adapter; end
+  def self.adapter
+    @adapter || raise(NotInitializedError.new(caller))
+  end
+
+  def self.reset_adapter; @adapter = nil; end
 
   def self.init(establish_connection = true)
     require 'ardb/require_autoloaded_active_record_files'
     begin
       require_db_file
     rescue InvalidDBFileError => exception
-      raise exception.tap{ |e| e.set_backtrace(caller) }
+      exception.set_backtrace(caller)
+      raise exception
     end
 
     self.config.validate!
@@ -35,6 +40,9 @@ module Ardb
 
   def self.escape_like_pattern(pattern, escape_char = nil)
     self.adapter.escape_like_pattern(pattern, escape_char)
+  rescue NotInitializedError => exception
+    exception.set_backtrace(caller)
+    raise exception
   end
 
   private
@@ -122,10 +130,10 @@ module Ardb
     def ==(other)
       if other.kind_of?(self.class)
         self.activerecord_connect_hash == other.activerecord_connect_hash &&
-        self.logger                    == other.logger           &&
-        self.root_path                 == other.root_path        &&
-        self.schema_format             == other.schema_format    &&
-        self.migrations_path           == other.migrations_path  &&
+        self.logger                    == other.logger                    &&
+        self.root_path                 == other.root_path                 &&
+        self.schema_format             == other.schema_format             &&
+        self.migrations_path           == other.migrations_path           &&
         self.schema_path               == other.schema_path
       else
         super
@@ -179,4 +187,11 @@ module Ardb
   ConfigurationError  = Class.new(ArgumentError)
   InvalidAdapterError = Class.new(RuntimeError)
 
+  class NotInitializedError < RuntimeError
+    def initialize(backtrace)
+      super("ardb hasn't been initialized yet, run `Ardb.init`")
+      set_backtrace(backtrace)
+    end
+  end
+
 end

data/lib/ardb/version.rb

@@ -1,3 +1,3 @@
 module Ardb
-  VERSION = "0.28.2"
+  VERSION = "0.28.3"
 end

data/test/support/postgresql/setup_test_db.rb

@@ -31,6 +31,7 @@ class PostgresqlDbTests < Assert::Context
     Ardb.adapter.connect_db
   end
   teardown do
+    Ardb.reset_adapter
     ActiveRecord::Base.logger = @orig_ar_logger
     ENV['ARDB_DB_FILE']       = @orig_env_ardb_db_file
   end

data/test/unit/ardb_tests.rb

@@ -14,10 +14,13 @@ module Ardb
     setup do
       @module = Ardb
     end
+    teardown do
+      @module.reset_adapter
+    end
     subject{ @module }
 
-    should have_imeths :config, :configure, :adapter, :init
-    should have_imeths :escape_like_pattern
+    should have_imeths :config, :configure, :adapter, :reset_adapter
+    should have_imeths :init, :escape_like_pattern
 
     should "default the db file env var" do
       assert_equal 'config/db', ENV['ARDB_DB_FILE']
@@ -122,6 +125,16 @@ module Ardb
       assert_equal 2, @ardb_adapter.connect_db_called_count
     end
 
+    should "raise a not initialized error using its adapter before init" do
+      subject.reset_adapter
+      assert_raises(NotInitializedError){ subject.adapter }
+      assert_raises(NotInitializedError){ subject.escape_like_pattern(Factory.string) }
+
+      subject.init
+      assert_nothing_raised{ subject.adapter }
+      assert_nothing_raised{ subject.escape_like_pattern(Factory.string) }
+    end
+
   end
 
   class InitTests < InitMethodSetupTests

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ardb
 version: !ruby/object:Gem::Version 
-  version: 0.28.2
+  version: 0.28.3
 platform: ruby
 authors: 
 - Kelly Redding
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-06-13 00:00:00 Z
+date: 2016-08-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: assert