has-bit-field 1.1.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d034fe72970e551a8353183549dd8cf92269792
-  data.tar.gz: 50819ec9369f0fe9c0bc209ee689bc1255858e8e
+  metadata.gz: a96b5f28841290a879e97c9221cf6c082fe9ca1b
+  data.tar.gz: 8d2bbaa533f544bd63ea3a2f8ebc08fe46aae943
 SHA512:
-  metadata.gz: c816a11939309384ba5849a4e7e117f9124880a0a87ef0aa4222741d1eb3d8cad8464cef30ea0927106d9a9ee3093b92600f2f670de4ec518fabe2085ea3453b
-  data.tar.gz: b1cb839609aabfe996e387480b02b887e7343a7d4d208e457f64337648fb29c81e8b51b41e7ad7f5bf49bd3214d66638ac90cc35216fffe733c065a125e748fa
+  metadata.gz: e7e93b3644141de4d0321dd026948eda410fe94028e8c4dcec321b0b9bc99685bcf1463419f88fff5acf756d1ca49f0eb7f8fa26757dc51cea81abf5875eb059
+  data.tar.gz: d7e7028d4e4a0602388fb32670ae1ad72a25882512b5587e45751fac3997887e423f7e9e3ca9fcb10de071307ecf91e8965003d100bb5196b6957c929b05dc65

data/Gemfile.lock

@@ -1,33 +1,41 @@
 PATH
   remote: .
   specs:
-    has-bit-field (1.1.0)
+    has-bit-field (2.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.11)
-      activesupport (= 3.2.11)
-      builder (~> 3.0.0)
-    activerecord (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.11)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    builder (3.0.4)
-    i18n (0.6.1)
-    multi_json (1.5.0)
+    activemodel (4.0.2)
+      activesupport (= 4.0.2)
+      builder (~> 3.1.0)
+    activerecord (4.0.2)
+      activemodel (= 4.0.2)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.2)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.2)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    arel (4.0.1)
+    atomic (1.1.14)
+    builder (3.1.4)
+    i18n (0.6.9)
+    minitest (4.7.5)
+    multi_json (1.8.4)
     sqlite3 (1.3.7)
-    tzinfo (0.3.35)
+    thread_safe (0.1.3)
+      atomic
+    tzinfo (0.3.38)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 3.0)
+  activerecord (~> 4.0)
   has-bit-field!
   sqlite3

data/README.md

@@ -1,20 +1,13 @@
-has-bit-field
-=============
+# 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.
+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. Requires Rails 3.0 or greater.
 
-**Rails 3.0.x**
+## Usage
 
 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 "has-bit-field"
-
 Now in one of your models, you define a bit field like this:
 
     class Person < ActiveRecord::Base
@@ -24,9 +17,8 @@ Now in one of your models, you define a bit field like this:
 
 This means that your database will have an integer column called `bit_field` which will hold the actual bit field.  This will generate getter and setter methods for each of the fields.  It will also generate a method that has `_bit` as a suffix which will give you the decimal value of the bit that that field is represented by in the bit field.  Also there will be a named scope for that field, as well as a named scope prefixed with `not_`, if class you are adding the bit field to responds to `named_scope`.  You can use it like this:
 
-    $ script/console 
-    Loading development environment (Rails 2.3.2)
-    p =>> p = Person.new
+    $ rails c
+    >> p = Person.new
     => #<Person id: nil, bit_field: nil, created_at: nil, updated_at: nil>
     >> p.likes_ice_cream = "true"
     => "true"
@@ -62,7 +54,6 @@ Another gotcha to be aware of is when combining a bit field with Active Record's
       has_bit_field :bit_field, :likes_ice_cream, :plays_golf, :watches_tv, :reads_books
     end
       
-Copyright
----------
+## Copyright
 
 Copyright (c) 2009 Paul Barry. See LICENSE for details.

data/has-bit-field.gemspec

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

data/lib/has-bit-field.rb

@@ -43,17 +43,21 @@ module HasBitField
         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]          
+        scope field, lambda {
+          where(arel_table[bit_field_attribute].not_eq(nil).
+                and(Arel::Nodes::InfixOperation.new(:&, arel_table[bit_field_attribute], 1<<i).not_eq(0)))
+        }
+        scope "not_#{field}", lambda {
+          where(arel_table[bit_field_attribute].eq(nil).
+                or(Arel::Nodes::InfixOperation.new(:&, arel_table[bit_field_attribute], 1<<i).eq(0)))
         }
       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]
+        scope field, lambda {
+          where(Arel::Nodes::InfixOperation.new(:&, arel_table[bit_field_attribute], 1<<i).not_eq(0))
+        }
+        scope "not_#{field}", lambda {
+          where(Arel::Nodes::InfixOperation.new(:&, arel_table[bit_field_attribute], 1<<i).eq(0))
         }
       end
 

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

@@ -1,7 +1,7 @@
 module Has
   module Bit
     module Field
-      VERSION = "1.1.2"
+      VERSION = "2.0.0"
     end
   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

data/test/test_helper.rb

@@ -11,3 +11,4 @@ require File.join(File.dirname(__FILE__), "../rails/init")
 require 'has-bit-field'
 
 #ActiveRecord::Base.logger = Logger.new($stdout)
+I18n.enforce_available_locales = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has-bit-field
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Paul Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-22 00:00:00.000000000 Z
+date: 2014-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 description: Provides an easy way to work with bit fields in active record
 email:
 - mail@paulbarry.com
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: has-bit-field
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Provides an easy way to work with bit fields in active record