flag_shih_tzu 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f3864c6fe734d0dc27d87b88a46085d57beed02
-  data.tar.gz: ea62d27e9fdf6749183a2720345b02efe34048a5
+  metadata.gz: 3c9ecb9654411ac0213bcc2e6c0942dcc12142c1
+  data.tar.gz: 29cb7d8958165e9fb98929e71a658ed8fdbf338b
 SHA512:
-  metadata.gz: 0334d4da71237808fe90c033212b9c6dbc107b0a8ea6f63f79e02607ab8bdf76c667d11f0ff015c68007eefabf508d50e568143defb0e50e794f899f3c65b14e
-  data.tar.gz: 0145457f64fea344bbb589df30c537e178f5f4fc59e993522d3d2d8289ad677b4fb11f74bcea80a61a59ffe4261c9c5b74027392cbddbc852c79ed6357060b2e
+  metadata.gz: 28d35a352d8668e8bdcf8c0d1397b1c5052ae3262aaddc01d85f8f51e650fdee25c4d5928411d85bac44be4267e9619f36fa3369a309ce230641049681527657
+  data.tar.gz: ee18826fd3dabd765164a8dbfeeb36bab661d62bcbecc6615a297f5b5dd7cb751bca7c9744276105c344ac8cd1d4ab8dbb43b00fc00d3fba5d46ca6e784ad7fa

data/lib/flag_shih_tzu.rb

@@ -208,12 +208,13 @@ module FlagShihTzu
 
     private
 
-      def max_flag_value_for_column(colmn)
-        flag_mapping[colmn].values.max
+      def flag_value_range_for_column(colmn)
+        max = flag_mapping[colmn].values.max
+        Range.new(0, (2 * max) - 1)
       end
 
       def chained_flags_values(colmn, *args)
-        val = (1..(2 * max_flag_value_for_column(colmn))).to_a
+        val = flag_value_range_for_column(colmn).to_a
         args.each do |flag|
           neg = false
           if flag.to_s.match /^not_/
@@ -296,8 +297,7 @@ module FlagShihTzu
       # returns an array of integers suitable for a SQL IN statement.
       def sql_in_for_flag(flag, colmn)
         val = flag_mapping[colmn][flag]
-        num = 2 * max_flag_value_for_column(colmn)
-        (1..num).select {|i| i & val == val}
+        flag_value_range_for_column(colmn).select {|i| i & val == val}
       end
 
       def sql_set_for_flag(flag, colmn, enabled = true, custom_table_name = self.table_name)

data/lib/flag_shih_tzu/version.rb

@@ -1,3 +1,3 @@
 module FlagShihTzu
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

data/test/flag_shih_tzu_test.rb

@@ -396,11 +396,15 @@ class FlagShihTzuClassMethodsTest < Test::Unit::TestCase
     spaceship_3.enable_flag(:shields)
     spaceship_3.save!
     spaceship_3.reload
+    spaceship_4 = Spaceship.new
+    spaceship_4.save!
+    spaceship_4.reload
     assert_equal 2, Spaceship.chained_flags_with("flags", :warpdrive).count
     assert_equal 1, Spaceship.chained_flags_with("flags", :warpdrive, :shields).count
     assert_equal 1, Spaceship.chained_flags_with("flags", :warpdrive, :not_shields).count
     assert_equal 0, Spaceship.chained_flags_with("flags", :not_warpdrive, :shields, :electrolytes).count
     assert_equal 1, Spaceship.chained_flags_with("flags", :not_warpdrive, :shields, :not_electrolytes).count
+    assert_equal 1, Spaceship.chained_flags_with("flags", :not_warpdrive, :not_shields, :not_electrolytes).count
   end
 
   def test_should_not_define_named_scopes_if_not_wanted

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flag_shih_tzu
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Peter Boling
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2013-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord