bitfields 0.4.2 → 0.4.3

data/.travis.yml

@@ -1,4 +1,19 @@
 rvm:
-  - ree
-  - 1.9.2
+  - 1.8.7
   - 1.9.3
+  - 2.0.0
+gemfile:
+  - gemfiles/activerecord_2.3.gemfile
+  - gemfiles/activerecord_3.0.gemfile
+  - gemfiles/activerecord_3.1.gemfile
+  - gemfiles/activerecord_3.2.gemfile
+  - gemfiles/activerecord_4.0.gemfile
+matrix:
+  exclude:
+    - rvm: 1.8.7
+      gemfile: gemfiles/activerecord_4.0.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/activerecord_2.3.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/activerecord_3.0.gemfile
+script: rake spec

data/Appraisals

@@ -3,3 +3,7 @@
     gem "activerecord", "~> #{version}.0"
   end
 end
+
+appraise "activerecord_4.0" do
+  gem "activerecord", "~> 4.0.0.rc"
+end

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source "https://rubygems.org"
 gemspec
 
 gem 'appraisal'

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    bitfields (0.4.2)
+    bitfields (0.4.3)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     activemodel (3.2.11)
       activesupport (= 3.2.11)

data/Readme.md

@@ -13,7 +13,7 @@ user.stupid? == false
 user.my_bits == 3
 ```
 
- - records changes `user.chamges == {:seller => [false, true]}`
+ - records changes `user.changes == {:seller => [false, true]}`
  - adds scopes `User.seller.stupid.first` (deactivate with `bitfield ..., :scopes => false`)
  - builds sql `User.bitfield_sql(:insane => true, :stupid => false) == '(users.my_bits & 3) = 1'`
  - builds index-using sql with `bitfield ... ,:query_mode => :in_list` and `User.bitfield_sql(:insane => true, :stupid => false) == 'users.my_bits IN (2, 3)'` (2 and 1+2), often slower than :bit_operator sql especially for high number of bits
@@ -59,6 +59,7 @@ TIPS
  - bit_operator is faster in most cases, use :query_mode => :in_list sparingly
  - Standard mysql integer is 4 byte -> 32 bitfields
  - If you are lazy or bad at math you can also do `bitfields :bits, :foo, :bar, :baz`
+ - If you are want more readability and reduce clutter you can do `bitfields 2**0 => :foo, 2**1 => :bar, 2**32 => :baz`
 
 Query-mode Benchmark
 =========
@@ -90,6 +91,7 @@ Authors
  - [Hellekin O. Wolf](https://github.com/hellekin)
  - [John Wilkinson](https://github.com/jcwilk)
  - [PeppyHeppy](https://github.com/peppyheppy)
+ - [kmcbride](https://github.com/kmcbride)
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>

data/gemfiles/activerecord_2.3.gemfile

@@ -1,6 +1,6 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
 gem "appraisal"
 gem "sqlite3"

data/gemfiles/activerecord_2.3.gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: /Users/mgrosser/code/tools/bitfields
   specs:
-    bitfields (0.4.1)
+    bitfields (0.4.2)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     activerecord (2.3.15)
       activesupport (= 2.3.15)

data/gemfiles/activerecord_3.0.gemfile

@@ -1,6 +1,6 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
 gem "appraisal"
 gem "sqlite3"

data/gemfiles/activerecord_3.0.gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: /Users/mgrosser/code/tools/bitfields
   specs:
-    bitfields (0.4.1)
+    bitfields (0.4.2)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     activemodel (3.0.19)
       activesupport (= 3.0.19)

data/gemfiles/activerecord_3.1.gemfile

@@ -1,6 +1,6 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
 gem "appraisal"
 gem "sqlite3"

data/gemfiles/activerecord_3.1.gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: /Users/mgrosser/code/tools/bitfields
   specs:
-    bitfields (0.4.1)
+    bitfields (0.4.2)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     activemodel (3.1.8)
       activesupport (= 3.1.8)

data/gemfiles/activerecord_3.2.gemfile

@@ -1,6 +1,6 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
 gem "appraisal"
 gem "sqlite3"

data/gemfiles/activerecord_3.2.gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: /Users/mgrosser/code/tools/bitfields
   specs:
-    bitfields (0.4.1)
+    bitfields (0.4.2)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     activemodel (3.2.11)
       activesupport (= 3.2.11)

data/gemfiles/activerecord_4.0.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "sqlite3"
+gem "rake"
+gem "rspec", "~>2"
+gem "bump"
+gem "activerecord", "~> 4.0.0.rc"
+
+gemspec :path=>"../"

data/gemfiles/activerecord_4.0.gemfile.lock

@@ -0,0 +1,59 @@
+PATH
+  remote: /Users/mgrosser/code/tools/bitfields
+  specs:
+    bitfields (0.4.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (4.0.0.rc1)
+      activesupport (= 4.0.0.rc1)
+      builder (~> 3.1.0)
+    activerecord (4.0.0.rc1)
+      activemodel (= 4.0.0.rc1)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.0.rc1)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.2)
+    activesupport (4.0.0.rc1)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    appraisal (0.5.2)
+      bundler
+      rake
+    arel (4.0.0)
+    atomic (1.1.9)
+    builder (3.1.4)
+    bump (0.4.1)
+    diff-lcs (1.2.4)
+    i18n (0.6.4)
+    minitest (4.7.4)
+    multi_json (1.7.3)
+    rake (10.0.4)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    sqlite3 (1.3.7)
+    thread_safe (0.1.0)
+      atomic
+    tzinfo (0.3.37)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 4.0.0.rc)
+  appraisal
+  bitfields!
+  bump
+  rake
+  rspec (~> 2)
+  sqlite3

data/lib/bitfields.rb

@@ -9,7 +9,7 @@ module Bitfields
   def self.included(base)
     class << base
       attr_accessor :bitfields, :bitfield_options, :bitfield_args
-      
+
       # all the args passed into .bitfield so children can initialize from parents
       def bitfield_args
         @bitfield_args ||= []
@@ -38,9 +38,13 @@ module Bitfields
     bitfields
   end
 
+  def self.ar_3?
+    defined?(ActiveRecord::VERSION::MAJOR) and ActiveRecord::VERSION::MAJOR >= 3
+  end
+
   # AR 3+ -> :scope, below :named_scope
   def self.ar_scoping_method
-    if defined?(ActiveRecord::VERSION::MAJOR) and ActiveRecord::VERSION::MAJOR >= 3
+    if ar_3?
       :scope
     else
       :named_scope
@@ -96,14 +100,24 @@ module Bitfields
 
         if options[:scopes] != false
           scoping_method = Bitfields.ar_scoping_method
-          send scoping_method, bit_name, :conditions => bitfield_sql(bit_name => true)
-          send scoping_method, "not_#{bit_name}", :conditions => bitfield_sql(bit_name => false)
+          send scoping_method, bit_name, bitfield_scope_options(bit_name => true)
+          send scoping_method, "not_#{bit_name}", bitfield_scope_options(bit_name => false)
         end
       end
 
       include Bitfields::InstanceMethods
     end
 
+    def bitfield_scope_options(bit_values)
+      sql = bitfield_sql(bit_values)
+
+      if Bitfields.ar_3?
+        lambda { where(sql) }
+      else
+        {:conditions => sql}
+      end
+    end
+
     def bitfield_sql_by_column(column, bit_values, options={})
       mode = options[:query_mode] || (bitfield_options[column][:query_mode] || :bit_operator)
       case mode

data/lib/bitfields/version.rb

@@ -1,3 +1,3 @@
 module Bitfields
-  Version = VERSION = "0.4.2"
+  Version = VERSION = "0.4.3"
 end

data/spec/bitfields_spec.rb

@@ -248,7 +248,13 @@ describe Bitfields do
       u1 = MultiBitUser.create!(:seller => true, :one => true)
       u2 = MultiBitUser.create!(:seller => true, :one => false)
       u3 = MultiBitUser.create!(:seller => false, :one => false)
-      MultiBitUser.all(:conditions => MultiBitUser.bitfield_sql({:seller => true, :one => false}, :query_mode => :in_list)).should == [u2]
+      conditions = MultiBitUser.bitfield_sql({:seller => true, :one => false}, :query_mode => :in_list)
+      result = if Bitfields.ar_3?
+        MultiBitUser.where(conditions)
+      else
+        MultiBitUser.all(:conditions => conditions)
+      end
+      result.should == [u2]
     end
 
     describe 'with bit operator mode' do
@@ -264,7 +270,14 @@ describe Bitfields do
         u1 = BitOperatorMode.create!(:seller => true, :insane => true)
         u2 = BitOperatorMode.create!(:seller => true, :insane => false)
         u3 = BitOperatorMode.create!(:seller => false, :insane => false)
-        BitOperatorMode.all(:conditions => MultiBitUser.bitfield_sql(:seller => true, :insane => false)).should == [u2]
+
+        conditions = MultiBitUser.bitfield_sql(:seller => true, :insane => false)
+        result = if Bitfields.ar_3?
+          BitOperatorMode.where(conditions)
+        else
+          BitOperatorMode.all(:conditions => conditions)
+        end
+        result.should == [u2]
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitfields
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-26 00:00:00.000000000 Z
+date: 2013-05-14 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -33,6 +33,8 @@ files:
 - gemfiles/activerecord_3.1.gemfile.lock
 - gemfiles/activerecord_3.2.gemfile
 - gemfiles/activerecord_3.2.gemfile.lock
+- gemfiles/activerecord_4.0.gemfile
+- gemfiles/activerecord_4.0.gemfile.lock
 - lib/bitfields.rb
 - lib/bitfields/rspec.rb
 - lib/bitfields/version.rb
@@ -54,7 +56,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1657995972263548143
+      hash: 950427918472941761
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -63,10 +65,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1657995972263548143
+      hash: 950427918472941761
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Save migrations and columns by storing multiple booleans in a single integer