bitmask_attributes 0.1.1 → 0.2.1

data/.gitignore

@@ -5,3 +5,4 @@ rdoc
 pkg
 \#*
 .#*
+*.gem

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bitmask_attributes (0.1.0)
+    bitmask_attributes (0.1.1)
       activerecord (~> 3.0)
 
 GEM

data/README.md

@@ -65,11 +65,8 @@ A couple useful named scopes are also generated when you use
     # => (all editors)
     User.with_roles(:editor, :writer)
     # => (all users who are BOTH editors and writers)
-
-Later we'll support an `or` boolean; for now, do something like:
-
-    User.with_roles(:editor) + User.with_roles(:writer)
-    # => (all users who are EITHER editors and writers)
+    User.with_any_roles(:editor, :writer)
+    # => (all users who are editors OR writers)
 
 Find records without any bitmask set:
 

data/lib/bitmask_attributes/definition.rb

@@ -110,11 +110,24 @@ module BitmaskAttributes
             }
           scope :without_#{attribute}, :conditions => "#{attribute} = 0 OR #{attribute} IS NULL"
           scope :no_#{attribute},      :conditions => "#{attribute} = 0 OR #{attribute} IS NULL"
+          
+          scope :with_any_#{attribute},
+            proc { |*values|
+              if values.blank?
+                {:conditions => '#{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 ')}
+              end
+            }
         )
         values.each do |value|
           model.class_eval %(
             scope :#{attribute}_for_#{value},
-                        :conditions => ['#{attribute} & ? <> 0', #{model}.bitmask_for_#{attribute}(:#{value})]
+                  :conditions => ['#{attribute} & ? <> 0', #{model}.bitmask_for_#{attribute}(:#{value})]
           )
         end      
       end

data/lib/bitmask_attributes/version.rb

@@ -1,3 +1,3 @@
 module BitmaskAttributes
-  VERSION = "0.1.1"
+  VERSION = "0.2.1"
 end

data/test/bitmask_attributes_test.rb

@@ -137,6 +137,10 @@ class BitmaskAttributesTest < ActiveSupport::TestCase
         assert_equal [@campaign1], @company.campaigns.with_medium(:print)
       end
       
+      should "support retrieval by any matching value (OR)" do
+        assert_equal [@campaign1, @campaign3], @company.campaigns.with_any_medium(:print, :email)
+      end
+      
       should "support retrieval by all matching values" do
         assert_equal [@campaign1], @company.campaigns.with_medium(:web, :print)
         assert_equal [@campaign3], @company.campaigns.with_medium(:web, :email)
@@ -149,11 +153,9 @@ class BitmaskAttributesTest < ActiveSupport::TestCase
 
     should "can check if at least one value is set" do
       campaign = Campaign.new(:medium => [:web, :print])
-      
       assert campaign.medium?
       
       campaign = Campaign.new
-      
       assert !campaign.medium?
     end
 

metadata

@@ -1,38 +1,34 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bitmask_attributes
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.1
   prerelease: 
-  version: 0.1.1
 platform: ruby
-authors: 
+authors:
 - Joel Moss
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-05 00:00:00 +01:00
+date: 2011-07-25 00:00:00.000000000 +01:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2151792720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *2151792720
 description: Simple bitmask attribute support for ActiveRecord
 email: joel@developwithstyle.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .document
 - .gitignore
 - .rvmrc
@@ -41,7 +37,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- VERSION
 - bitmask_attributes.gemspec
 - lib/bitmask_attributes.rb
 - lib/bitmask_attributes/definition.rb
@@ -54,32 +49,29 @@ files:
 has_rdoc: true
 homepage: http://github.com/joelmoss/bitmask_attributes
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.9.1
+rubygems_version: 1.3.9.2
 signing_key: 
 specification_version: 3
 summary: Simple bitmask attribute support for ActiveRecord
-test_files: 
+test_files:
 - test/bitmask_attributes_test.rb
 - test/support/helpers.rb
 - test/support/models.rb

data/VERSION

@@ -1 +0,0 @@
-1.1.0