has-bit-field 1.0.0 → 1.1.0

data/.rvmrc

@@ -1,2 +1 @@
-rvm_gemset_create_on_use_flag=1
-rvm gemset use has-bit-field
+rvm ree@has-bit-field --create

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    has-bit-field (1.0.0)
+    has-bit-field (1.1.0)
 
 GEM
   remote: http://rubygems.org/

data/README.md

@@ -3,13 +3,22 @@ has-bit-field
 
 has-bit-field allows you to use one attribute of an object to store a bit field which stores the boolean state for multiple flags.
 
+**Rails 3.0.x**
+
+Add the gem to your Gemfile. 
+
+    gem 'has-bit-field'
+
+**Rails 2.3.x**
+
 To use this with Active Record, you would first require this gem in `config/environment.rb`:
 
-    config.gem "pjb3-has-bit-field", :lib => "has-bit-field", :source => "http://gems.github.com"
+    config.gem "has-bit-field"
 
 Now in one of your models, you define a bit field like this:
 
     class Person < ActiveRecord::Base
+      extend HasBitField
       has_bit_field :bit_field, :likes_ice_cream, :plays_golf, :watches_tv, :reads_books
     end
 
@@ -39,6 +48,7 @@ This means that your database will have an integer column called `bit_field` whi
 One of the great advantages of this approach is that it is easy to add additional flags as your application evolves without the overhead of adding new table columns since a single integer will be able to store at least 31 boolean flags.  A simple amendment to the model will create the new flag on the existing integer column 'on-the-fly'.  However, the order of the flags is vitally important and you should only ever add new flags on the end.
 
     class Person < ActiveRecord::Base
+      extend HasBitField
       has_bit_field :bit_field, :likes_ice_cream, :plays_golf, :watches_tv, :reads_books, :nut_allergy
     end
 
@@ -47,6 +57,7 @@ The new flag will be evaluated as false for existing rows on the database table
 Another gotcha to be aware of is when combining a bit field with Active Record's `validates_acceptance_of`.  When you call `validates_acceptance_of`, if there is no database column, Active Record will define an `attr_accessor` for that boolean field.  If you have already defined the bit field, this will clobber those methods.  Also, you need to set the value it's looking for to `true` instead of the default of `"1"`.  So here's an example of how to use it:
 
     class Person < ActiveRecord::Base
+      extend HasBitField
       validates_acceptance_of :read_books, :message => "You must agree to read", :accept => true
       has_bit_field :bit_field, :likes_ice_cream, :plays_golf, :watches_tv, :reads_books
     end

data/lib/has-bit-field.rb

@@ -34,19 +34,21 @@ module HasBitField
           #{field} != #{field}_was
         end
       }
-      if(respond_to?(:named_scope))
-        if columns_hash[bit_field_attribute.to_s].null
-          class_eval %{
-            named_scope :#{field}, :conditions => ["#{table_name}.#{bit_field_attribute} IS NOT NULL AND (#{table_name}.#{bit_field_attribute} & ?) != 0", #{field}_bit]
-            named_scope :not_#{field}, :conditions => ["#{table_name}.#{bit_field_attribute} IS NULL OR (#{table_name}.#{bit_field_attribute} & ?) = 0", #{field}_bit]          
-          }
-        else
-          class_eval %{
-            named_scope :#{field}, :conditions => ["(#{table_name}.#{bit_field_attribute} & ?) != 0", #{field}_bit]
-            named_scope :not_#{field}, :conditions => ["(#{table_name}.#{bit_field_attribute} & ?) = 0", #{field}_bit]
-          }
-        end
+
+      scope_sym = respond_to?(:validates) ? :scope : :named_scope
+
+      if columns_hash[bit_field_attribute.to_s].null
+        class_eval %{
+          send scope_sym, :#{field}, :conditions => ["#{table_name}.#{bit_field_attribute} IS NOT NULL AND (#{table_name}.#{bit_field_attribute} & ?) != 0", #{field}_bit]
+          send scope_sym, :not_#{field}, :conditions => ["#{table_name}.#{bit_field_attribute} IS NULL OR (#{table_name}.#{bit_field_attribute} & ?) = 0", #{field}_bit]          
+        }
+      else
+        class_eval %{
+          send scope_sym, :#{field}, :conditions => ["(#{table_name}.#{bit_field_attribute} & ?) != 0", #{field}_bit]
+          send scope_sym, :not_#{field}, :conditions => ["(#{table_name}.#{bit_field_attribute} & ?) = 0", #{field}_bit]
+        }
       end
+
     end
   end
 end

data/lib/has-bit-field/version.rb

@@ -1,7 +1,7 @@
 module Has
   module Bit
     module Field
-      VERSION = "1.0.0"
+      VERSION = "1.1.0"
     end
   end
 end

data/test/has-bit-field_test.rb

@@ -178,7 +178,7 @@ class HasBitFieldTest < Test::Unit::TestCase
     s.chops_trees = true
     assert s.chops_trees?
     assert s.valid?
-    assert !s.errors[:chops_trees]
+    assert s.errors[:chops_trees].blank?
     assert s.save
   end
 
@@ -202,7 +202,7 @@ class HasBitFieldTest < Test::Unit::TestCase
     s.plays_piano = true
     assert s.plays_piano?
     assert s.valid?
-    assert !s.errors[:plays_piano]
+    assert s.errors[:plays_piano].blank?
     assert s.save
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has-bit-field
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Paul Barry
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-23 00:00:00 -05:00
-default_executable: 
+date: 2012-05-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
@@ -72,7 +71,6 @@ files:
 - rails/init.rb
 - test/has-bit-field_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://github.com/pjb3/has-bit-field
 licenses: []
 
@@ -102,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: has-bit-field
-rubygems_version: 1.3.7
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Provides an easy way to work with bit fields in active record