flag_shih_tzu 0.3.22 → 0.3.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e43199789d6c30b71d15139ed647229e02f49116c45c4f4b7780b1d8a37f8b2
-  data.tar.gz: 7d5616a0535b314704e7d71420d2bbd3f3075e1aafd9a0ee9a77f8ab7974a425
+  metadata.gz: 73b78e54263e309fa419f5f889f07c9c9facae95452a46af2fffbccfba1184e7
+  data.tar.gz: 0455055c99358352e6815729f0db5333f5d576cdb9171c5b4f2dd99aa43a0597
 SHA512:
-  metadata.gz: b7e2245c742d73eaa3b9099fee558f276d18507e65f079b951a23d170ded6128564b72a1a94aaa89556b5b34241891128f6bd702f41e05b8ea1b36de6f44d239
-  data.tar.gz: 4dd8a47b5730c3ace7e6ae611efeaad46e4a983d4d7a0e01fe94c35e41fc945e09244fef47d15a49ca64ab8ce0b8cf5983c8055e577c8d13697ff7989c56adab
+  metadata.gz: e5d7d736d8e0b40393a9950b3e21e8d24528ed8317fed223aa812475e2caee2192c03b125ecb02c2c99a5a5782b953e32100bcac445b62cb21cb6a1c76339ab0
+  data.tar.gz: 4a755282353388f95875bea8208879fe8961cab100204437b0054de955c84379dcd856226f317bf1945cdf9cc7930752d8f9bd68f040194d8d128faeb915315d

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 * Work merged into master branch goes here until it is released.
 
+# Version 0.3.23 - NOV.30.2018
+
+* Avoid establishing a database connection unless necessary by Jonathan del Strother
+
 # Version 0.3.22 - SEP.18.2018
 
 * When #selected_flags= passed with nil it clears flag bits, by xpol

data/lib/flag_shih_tzu.rb

@@ -22,14 +22,6 @@ module FlagShihTzu
 
   module ClassMethods
     def has_flags(*args)
-      if ActiveRecord::VERSION::STRING >= "4.1."
-        begin
-          connection
-        rescue ActiveRecord::NoDatabaseError
-          return
-        end
-      end
-
       flag_hash, opts = parse_flag_options(*args)
       opts =
         {
@@ -404,6 +396,15 @@ To turn off this warning set check_for_column: false in has_flags definition her
       end
 
       true
+
+      # Quietly ignore NoDatabaseErrors - presumably we're being run during, eg, `rails db:create`.
+      # NoDatabaseError was only introduced in Rails 4.1, which is why this error-handling is a bit convoluted.
+    rescue StandardError => e
+      if defined?(ActiveRecord::NoDatabaseError) && e.is_a?(ActiveRecord::NoDatabaseError)
+        true
+      else
+        raise
+      end
     end
 
     def sql_condition_for_flag(flag, colmn, enabled = true, custom_table_name = table_name)

data/lib/flag_shih_tzu/version.rb

@@ -1,3 +1,3 @@
 module FlagShihTzu
-  VERSION = "0.3.22"
+  VERSION = "0.3.23"
 end

data/test/flag_shih_tzu_test.rb

@@ -1226,6 +1226,53 @@ class FlagShihTzuInstanceMethodsTest < Test::Unit::TestCase
     assert SpaceshipWithNonIntegerColumn3.method_defined?(:warpdrive)
   end
 
+  if ActiveRecord::VERSION::STRING >= "4.1."
+    def test_should_ignore_database_missing_errors
+      assert_nothing_raised do
+        eval(<<-EOF
+          class SpaceshipWithoutDatabaseConnection < ActiveRecord::Base
+            def self.connection
+              raise ActiveRecord::NoDatabaseError.new("Unknown database")
+            end
+            self.table_name ="spaceships"
+            include FlagShihTzu
+
+            has_flags 1 => :warpdrive,
+                      2 => :shields,
+                      3 => :electrolytes
+          end
+        EOF
+        )
+      end
+      assert SpaceshipWithoutDatabaseConnection.method_defined?(:warpdrive)
+    end
+  end
+
+  def test_shouldnt_establish_a_connection_if_check_for_column_is_false
+    assert_nothing_raised do
+      eval(<<-EOF
+        class SpaceshipWithoutColumnCheck < ActiveRecord::Base
+          cattr_accessor :connection_established
+          def self.connection
+            self.connection_established = true
+            super
+          end
+          self.table_name ="spaceships"
+          include FlagShihTzu
+
+          has_flags({
+            1 => :warpdrive,
+            2 => :shields,
+            3 => :electrolytes
+          }, check_for_column: false)
+        end
+      EOF
+      )
+    end
+    assert SpaceshipWithoutColumnCheck.method_defined?(:warpdrive)
+    assert !SpaceshipWithoutColumnCheck.connection_established
+  end
+
   def test_column_guessing_for_default_column_2
     assert_equal "flags",
                  @spaceship.class.determine_flag_colmn_for(:warpdrive)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flag_shih_tzu
 version: !ruby/object:Gem::Version
-  version: 0.3.22
+  version: 0.3.23
 platform: ruby
 authors:
 - Peter Boling
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-18 00:00:00.000000000 Z
+date: 2018-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -110,7 +110,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".DS_Store"
 - ".coveralls.yml"
 - ".gitignore"
 - ".travis.yml"
@@ -159,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Bit fields for ActiveRecord