bitmask_attributes 0.2.2 → 0.2.3

data/.rvmrc

@@ -1 +1 @@
-rvm use 1.9.2@bitmask_attributes --create --install
+rvm use 1.9.3@bitmask_attributes --create --install

data/Gemfile

@@ -6,6 +6,7 @@ if RUBY_VERSION < '1.9'
   gem "ruby-debug", ">= 0.10.3"
 end
 
+gem 'rake'
 gem 'shoulda'
-gem 'sqlite3'
+gem 'sqlite3', '>=1.3.4'
 gem 'turn'

data/Gemfile.lock

@@ -1,37 +1,41 @@
 PATH
   remote: .
   specs:
-    bitmask_attributes (0.2.1)
+    bitmask_attributes (0.2.2)
       activerecord (~> 3.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.9)
+    activemodel (3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activesupport (3.1.1)
+      multi_json (~> 1.0)
     ansi (1.3.0)
-    arel (2.0.10)
-    builder (2.1.2)
-    i18n (0.5.0)
+    arel (2.2.1)
+    builder (3.0.0)
+    i18n (0.6.0)
+    multi_json (1.0.3)
+    rake (0.9.2.2)
     shoulda (2.11.3)
-    sqlite3 (1.3.3)
+    sqlite3 (1.3.4)
     turn (0.8.2)
       ansi (>= 1.2.2)
-    tzinfo (0.3.29)
+    tzinfo (0.3.30)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bitmask_attributes!
+  rake
   shoulda
-  sqlite3
+  sqlite3 (>= 1.3.4)
   turn

data/README.md

@@ -77,8 +77,15 @@ Find records without any bitmask set:
 
     User.without_roles
     # => (all users without a role)
+    User.no_roles
+    # => (all users without a role)
+
+Find records without a specific attribute.
+
+    User.without_roles(:editor)
+    # => (all users who are not editors)
 
-Later we'll support finding records without a specific bitmask.
+Note that "without_" only supports a single attribute argument, and the "no_" method does not support arguments.
 
 Adding Methods
 --------------

data/lib/bitmask_attributes/definition.rb

@@ -109,35 +109,44 @@ module BitmaskAttributes
           scope :with_#{attribute},
             proc { |*values|
               if values.blank?
-                {:conditions => '#{attribute} > 0 OR #{attribute} IS NOT NULL'}
+                where('#{attribute} > 0 OR #{attribute} IS NOT NULL')
               else
                 sets = values.map do |value|
                   mask = #{model}.bitmask_for_#{attribute}(value)
                   "#{attribute} & \#{mask} <> 0"
                 end
-                {:conditions => sets.join(' AND ')}
+                where(sets.join(' AND '))
               end
             }
-          scope :without_#{attribute}, :conditions => "#{attribute} = 0 OR #{attribute} IS NULL"
-          scope :no_#{attribute},      :conditions => "#{attribute} = 0 OR #{attribute} IS NULL"
+          scope :without_#{attribute}, 
+            proc { |value| 
+              if value
+                mask = #{model}.bitmask_for_#{attribute}(value)
+                where("#{attribute} IS NULL OR #{attribute} & ? = 0", mask)
+              else
+                where("#{attribute} IS NULL OR #{attribute} = 0")
+              end              
+              }                    
+          
+          scope :no_#{attribute}, where("#{attribute} = 0 OR #{attribute} IS NULL")
           
           scope :with_any_#{attribute},
             proc { |*values|
               if values.blank?
-                {:conditions => '#{attribute} > 0 OR #{attribute} IS NOT NULL'}
+                where('#{attribute} > 0 OR #{attribute} IS NOT NULL')
               else
                 sets = values.map do |value|
                   mask = #{model}.bitmask_for_#{attribute}(value)
                   "#{attribute} & \#{mask} <> 0"
                 end
-                {:conditions => sets.join(' OR ')}
+                where(sets.join(' OR '))
               end
             }
         )
         values.each do |value|
           model.class_eval %(
             scope :#{attribute}_for_#{value},
-                  :conditions => ['#{attribute} & ? <> 0', #{model}.bitmask_for_#{attribute}(:#{value})]
+                  where('#{attribute} & ? <> 0', #{model}.bitmask_for_#{attribute}(:#{value}))
           )
         end      
       end

data/lib/bitmask_attributes/value_proxy.rb

@@ -13,6 +13,7 @@ module BitmaskAttributes
     # = OVERRIDE TO SERIALIZE =
     # =========================
     
+    alias_method :orig_replace, :replace
     %w(push << delete replace reject! select!).each do |override|
       class_eval(<<-EOEVAL)
         def #{override}(*args)
@@ -39,8 +40,13 @@ module BitmaskAttributes
         end
       end
     
+      def symbolize!
+        orig_replace(map(&:to_sym))
+      end
+
       def updated!
         validate!
+        symbolize!
         uniq!
         serialize!
       end

data/lib/bitmask_attributes/version.rb

@@ -1,3 +1,3 @@
 module BitmaskAttributes
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/test/bitmask_attributes_test.rb

@@ -34,7 +34,10 @@ class BitmaskAttributesTest < ActiveSupport::TestCase
       assert_stored campaign, :web, :print, :phone
       campaign.medium << :phone
       assert_stored campaign, :web, :print, :phone
+      campaign.medium << "phone"
+      assert_stored campaign, :web, :print, :phone
       assert_equal 1, campaign.medium.select { |value| value == :phone }.size
+      assert_equal 0, campaign.medium.select { |value| value == "phone" }.size
     end
 
     should "can assign new values at once to bitmask" do
@@ -152,6 +155,11 @@ class BitmaskAttributesTest < ActiveSupport::TestCase
 
       should "support retrieval for no values" do
         assert_equal [@campaign2], @company.campaigns.without_medium
+        assert_equal [@campaign2], @company.campaigns.no_medium
+      end
+      
+      should "support retrieval without a specific value" do
+        assert_equal [@campaign2, @campaign3], @company.campaigns.without_medium(:print)
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitmask_attributes
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-04 00:00:00.000000000Z
+date: 2011-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2153477300 !ruby/object:Gem::Requirement
+  requirement: &70135687914640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153477300
+  version_requirements: *70135687914640
 description: Simple bitmask attribute support for ActiveRecord
 email: joel@developwithstyle.com
 executables: []
@@ -65,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Simple bitmask attribute support for ActiveRecord