mandrews-has-bit-field 1.0.1 → 1.1.1

data/Gemfile.lock

@@ -1,20 +1,33 @@
 PATH
   remote: .
   specs:
-    has-bit-field (1.0.0)
+    mandrews-has-bit-field (1.1.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activerecord (2.3.10)
-      activesupport (= 2.3.10)
-    activesupport (2.3.10)
-    sqlite3-ruby (1.3.2)
+    activemodel (3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activesupport (3.1.1)
+      multi_json (~> 1.0)
+    arel (2.2.1)
+    builder (3.0.0)
+    i18n (0.6.0)
+    multi_json (1.0.3)
+    sqlite3 (1.3.4)
+    tzinfo (0.3.30)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 2.3.5)
-  has-bit-field!
-  sqlite3-ruby
+  activerecord (~> 3.0)
+  mandrews-has-bit-field!
+  sqlite3

data/has-bit-field.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
   s.summary     = "Provides an easy way to work with bit fields in active record"
   s.description = "Provides an easy way to work with bit fields in active record"
 
-  s.rubyforge_project = "has-bit-field"
-  s.add_development_dependency "sqlite3-ruby"
-  s.add_development_dependency "activerecord", "~> 2.3.5"
+  s.rubyforge_project = "mandrews-has-bit-field"
+  s.add_development_dependency "sqlite3"
+  s.add_development_dependency "activerecord", "~> 3.0"
 
   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.0.1"
+      VERSION = "1.1.1"
     end
   end
 end

data/lib/has-bit-field.rb

@@ -36,16 +36,16 @@ module HasBitField
           #{field} != #{field}_was
         end
       }
-      if(respond_to?(:named_scope))
+      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 %{
-            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]          
+            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)
           }
         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]
+            scope :#{field}, where("(#{table_name}.#{bit_field_attribute} & ?) != 0", #{field}_bit)
+            scope :not_#{field}, where("(#{table_name}.#{bit_field_attribute} & ?) = 0", #{field}_bit)
           }
         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
 

data/test/test_helper.rb

@@ -7,7 +7,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'test/unit'
 require 'active_record'
-require File.join(File.dirname(__FILE__), "../rails/init")
+require File.join(File.dirname(__FILE__), "../init")
 require 'has-bit-field'
 
 #ActiveRecord::Base.logger = Logger.new($stdout)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mandrews-has-bit-field
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 17
   prerelease: 
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Paul Barry
@@ -16,11 +16,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-30 00:00:00 -07:00
+date: 2011-10-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
+  name: sqlite3
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -41,12 +41,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 7
         segments: 
-        - 2
         - 3
-        - 5
-        version: 2.3.5
+        - 0
+        version: "3.0"
   type: :development
   version_requirements: *id002
 description: Provides an easy way to work with bit fields in active record
@@ -68,9 +67,9 @@ files:
 - README.md
 - Rakefile
 - has-bit-field.gemspec
+- init.rb
 - lib/has-bit-field.rb
 - lib/has-bit-field/version.rb
-- rails/init.rb
 - test/has-bit-field_test.rb
 - test/test_helper.rb
 has_rdoc: true
@@ -102,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: has-bit-field
+rubyforge_project: mandrews-has-bit-field
 rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3