mandrews-has-bit-field 1.1.1 → 1.1.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mandrews-has-bit-field (1.1.1)
+    mandrews-has-bit-field (1.1.2)
 
 GEM
   remote: http://rubygems.org/
@@ -21,6 +21,7 @@ GEM
     builder (3.0.0)
     i18n (0.6.0)
     multi_json (1.0.3)
+    rake (10.0.2)
     sqlite3 (1.3.4)
     tzinfo (0.3.30)
 
@@ -30,4 +31,5 @@ PLATFORMS
 DEPENDENCIES
   activerecord (~> 3.0)
   mandrews-has-bit-field!
+  rake
   sqlite3

data/has-bit-field.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "mandrews-has-bit-field"
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "activerecord", "~> 3.0"
+  s.add_development_dependency "rake"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

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

@@ -1,7 +1,7 @@
 module Has
   module Bit
     module Field
-      VERSION = "1.1.1"
+      VERSION = "1.1.2"
     end
   end
 end

data/lib/has-bit-field.rb

@@ -39,13 +39,13 @@ module HasBitField
       if(respond_to?(:scope))
         if table_exists? && columns_hash.has_key?(bit_field_attribute.to_s) && columns_hash[bit_field_attribute.to_s].null
           class_eval %{
-            scope :#{field}, where("#{table_name}.#{bit_field_attribute} IS NOT NULL AND (#{table_name}.#{bit_field_attribute} & ?) != 0", #{field}_bit)
-            scope :not_#{field}, where("#{table_name}.#{bit_field_attribute} IS NULL OR (#{table_name}.#{bit_field_attribute} & ?) = 0", #{field}_bit)
+            scope :#{field}, lambda { where("#{table_name}.#{bit_field_attribute} IS NOT NULL AND (#{table_name}.#{bit_field_attribute} & ?) != 0", #{field}_bit) }
+            scope :not_#{field}, lambda { where("#{table_name}.#{bit_field_attribute} IS NULL OR (#{table_name}.#{bit_field_attribute} & ?) = 0", #{field}_bit) }
           }
         else
           class_eval %{
-            scope :#{field}, where("(#{table_name}.#{bit_field_attribute} & ?) != 0", #{field}_bit)
-            scope :not_#{field}, where("(#{table_name}.#{bit_field_attribute} & ?) = 0", #{field}_bit)
+            scope :#{field}, lambda { where("(#{table_name}.#{bit_field_attribute} & ?) != 0", #{field}_bit) }
+            scope :not_#{field}, lambda { where("(#{table_name}.#{bit_field_attribute} & ?) = 0", #{field}_bit) }
           }
         end
       end

data/test/has-bit-field_test.rb

@@ -103,17 +103,17 @@ class HasBitFieldTest < Test::Unit::TestCase
 
     c = Person.create! :bit_field => 0
 
-    assert_equal [b], Person.likes_ice_cream.all(:order => "id")
-    assert_equal [a,c], Person.not_likes_ice_cream.all(:order => "id")
+    assert_equal [b], Person.likes_ice_cream.order("id").to_a
+    assert_equal [a,c], Person.not_likes_ice_cream.order(:id).to_a
 
-    assert_equal [a], Person.plays_golf.all(:order => "id")
-    assert_equal [b,c], Person.not_plays_golf.all(:order => "id")
+    assert_equal [a], Person.plays_golf.order(:id).to_a
+    assert_equal [b,c], Person.not_plays_golf.order(:id).to_a
 
-    assert_equal [b], Person.watches_tv.all(:order => "id")
-    assert_equal [a,c], Person.not_watches_tv.all(:order => "id")
+    assert_equal [b], Person.watches_tv.order(:id).to_a
+    assert_equal [a,c], Person.not_watches_tv.order(:id).to_a
 
-    assert_equal [a], Person.reads_books.all(:order => "id")
-    assert_equal [b,c], Person.not_reads_books.all(:order => "id")
+    assert_equal [a], Person.reads_books.order(:id).to_a
+    assert_equal [b,c], Person.not_reads_books.order(:id).to_a
   end
 
   def test_named_scopes_on_non_nullable_column
@@ -132,14 +132,14 @@ class HasBitFieldTest < Test::Unit::TestCase
 
     c = Skill.create! :plays_piano => true, :chops_trees => true
 
-    assert_equal [a,b,c], Skill.plays_piano.all(:order => "id")
-    assert_equal [], Skill.not_plays_piano.all(:order => "id")
+    assert_equal [a,b,c], Skill.plays_piano.order(:id).to_a
+    assert_equal [], Skill.not_plays_piano.order(:id).to_a
 
-    assert_equal [a], Skill.mops_floors.all(:order => "id")
-    assert_equal [b,c], Skill.not_mops_floors.all(:order => "id")
+    assert_equal [a], Skill.mops_floors.order(:id).to_a
+    assert_equal [b,c], Skill.not_mops_floors.order(:id).to_a
 
-    assert_equal [b], Skill.makes_soup.all(:order => "id")
-    assert_equal [a,c], Skill.not_makes_soup.all(:order => "id")
+    assert_equal [b], Skill.makes_soup.order(:id).to_a
+    assert_equal [a,c], Skill.not_makes_soup.order(:id).to_a
   end
 
   def test_dirty_attributes

metadata

@@ -1,63 +1,72 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mandrews-has-bit-field
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 1.1.2
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 1
-  version: 1.1.1
 platform: ruby
-authors: 
+authors:
 - Paul Barry
 - Michael Andrews
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-24 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-05-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sqlite3
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Provides an easy way to work with bit fields in active record
-email: 
+email:
 - mail@paulbarry.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .document
 - .gitignore
 - .rvmrc
@@ -72,40 +81,36 @@ files:
 - lib/has-bit-field/version.rb
 - test/has-bit-field_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://github.com/mandrews/has-bit-field
 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 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 4413358208785628949
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 4413358208785628949
 requirements: []
-
 rubyforge_project: mandrews-has-bit-field
-rubygems_version: 1.4.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Provides an easy way to work with bit fields in active record
-test_files: 
+test_files:
 - test/has-bit-field_test.rb
 - test/test_helper.rb