has-bit-field 0.3.2 → 1.0.0

data/Gemfile

@@ -1,5 +1,4 @@
 source "http://rubygems.org"
 
-gem "activerecord"
-gem "jeweler"
-gem "sqlite3-ruby"
+# Specify your gem's dependencies in has-bit-field.gemspec
+gemspec

data/Gemfile.lock

@@ -0,0 +1,20 @@
+PATH
+  remote: .
+  specs:
+    has-bit-field (1.0.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activerecord (2.3.10)
+      activesupport (= 2.3.10)
+    activesupport (2.3.10)
+    sqlite3-ruby (1.3.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 2.3.5)
+  has-bit-field!
+  sqlite3-ruby

data/Rakefile

@@ -1,20 +1,7 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "has-bit-field"
-    gem.summary = %Q{Provides an easy way for dealing with bit fields and active record}
-    gem.email = "mail@paulbarry.com"
-    gem.homepage = "http://github.com/pjb3/has-bit-field"
-    gem.authors = ["Paul Barry"]
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
+require 'rake'
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
@@ -22,34 +9,4 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/*_test.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-
 task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION.yml')
-    config = YAML.load(File.read('VERSION.yml'))
-    version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
-  else
-    version = ""
-  end
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "has-bit-field #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-

data/has-bit-field.gemspec

@@ -1,53 +1,23 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "has-bit-field/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{has-bit-field}
-  s.version = "0.3.2"
+  s.name        = "has-bit-field"
+  s.version     = Has::Bit::Field::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Paul Barry"]
+  s.email       = ["mail@paulbarry.com"]
+  s.homepage    = "http://github.com/pjb3/has-bit-field"
+  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.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Paul Barry"]
-  s.date = %q{2010-08-03}
-  s.email = %q{mail@paulbarry.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.md"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     ".rvmrc",
-     "Gemfile",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "has-bit-field.gemspec",
-     "lib/has-bit-field.rb",
-     "rails/init.rb",
-     "test/has-bit-field_test.rb",
-     "test/test_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/pjb3/has-bit-field}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Provides an easy way for dealing with bit fields and active record}
-  s.test_files = [
-    "test/has-bit-field_test.rb",
-     "test/test_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.rubyforge_project = "has-bit-field"
+  s.add_development_dependency "sqlite3-ruby"
+  s.add_development_dependency "activerecord", "~> 2.3.5"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 end
-

data/lib/has-bit-field.rb

@@ -5,31 +5,47 @@ module HasBitField
   # which will be the name of each flag in the bit field
   def has_bit_field(bit_field_attribute, *args)
     args.each_with_index do |field,i|
-      (class << self; self end).send(:define_method, "#{field}_bit") do
-        (1 << i)
-      end
-      define_method(field) do
-        (send(bit_field_attribute).to_i & self.class.send("#{field}_bit")) != 0
-      end
-      define_method("#{field}?") do
-        send(field)
-      end
-      define_method("#{field}=") do |v|
-        if v.to_s == "true" || v.to_s == "1"
-          send("#{bit_field_attribute}=", ((send(bit_field_attribute) || 0) | self.class.send("#{field}_bit")))
-        else
-          send("#{bit_field_attribute}=", ((send(bit_field_attribute) || 0) & ~self.class.send("#{field}_bit")))
+      class_eval %{
+        class << self
+          def #{field}_bit
+            (1 << #{i})
+          end
         end
-      end
-      define_method("#{field}_was") do
-        (send("#{bit_field_attribute}_was") & self.class.send("#{field}_bit")) != 0
-      end
-      define_method("#{field}_changed?") do
-        send(field) != send("#{field}_was")
-      end
+
+        def #{field}
+          (#{bit_field_attribute} & self.class.#{field}_bit) != 0
+        end
+
+        alias #{field}? #{field}
+
+        def #{field}=(v)
+          if v.to_s == "true" || v.to_s == "1"
+            self.#{bit_field_attribute} = (#{bit_field_attribute} || 0) | self.class.#{field}_bit
+          else
+            self.#{bit_field_attribute} = (#{bit_field_attribute} || 0) & ~self.class.#{field}_bit
+          end
+        end
+
+        def #{field}_was
+          (#{bit_field_attribute}_was & self.class.#{field}_bit) != 0
+        end
+
+        def #{field}_changed?
+          #{field} != #{field}_was
+        end
+      }
       if(respond_to?(:named_scope))
-        named_scope field, :conditions => ["#{table_name}.#{bit_field_attribute} IS NOT NULL AND (#{table_name}.#{bit_field_attribute} & ?) != 0", send("#{field}_bit")]
-        named_scope "not_#{field}", :conditions => ["#{table_name}.#{bit_field_attribute} IS NULL OR (#{table_name}.#{bit_field_attribute} & ?) = 0", send("#{field}_bit")]
+        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
       end
     end
   end

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

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

data/test/has-bit-field_test.rb

@@ -8,7 +8,7 @@ ActiveRecord::Base.establish_connection(
 #ActiveRecord::Base.logger = Logger.new(STDOUT)
 
 ActiveRecord::Base.connection.create_table(:people) do |t|
-  t.integer :bit_field
+  t.integer :bit_field, :null => true
 end
 
 class Person < ActiveRecord::Base
@@ -19,8 +19,8 @@ end
 
 
 ActiveRecord::Base.connection.create_table(:skills) do |t|
-  t.integer :outdoor_bit_field, :default => 0
-  t.integer :indoor_bit_field, :default => 0
+  t.integer :outdoor_bit_field, :default => 0, :null => false
+  t.integer :indoor_bit_field, :default => 0, :null => false
 end
 
 class Skill < ActiveRecord::Base
@@ -89,7 +89,7 @@ class HasBitFieldTest < Test::Unit::TestCase
     assert !p.reads_books?
   end
 
-  def test_named_scopes
+  def test_named_scopes_on_nullable_column
     Person.delete_all
     a = Person.new
     a.plays_golf = true
@@ -101,9 +101,9 @@ class HasBitFieldTest < Test::Unit::TestCase
     b.watches_tv = true
     assert b.save
 
-    c = Person.create!
+    c = Person.create! :bit_field => 0
 
-    assert_equal [b], Person.likes_ice_cream.all(:order => "id")    
+    assert_equal [b], Person.likes_ice_cream.all(:order => "id")
     assert_equal [a,c], Person.not_likes_ice_cream.all(:order => "id")
 
     assert_equal [a], Person.plays_golf.all(:order => "id")
@@ -116,6 +116,32 @@ class HasBitFieldTest < Test::Unit::TestCase
     assert_equal [b,c], Person.not_reads_books.all(:order => "id")
   end
 
+  def test_named_scopes_on_non_nullable_column
+    Skill.delete_all
+    a = Skill.new
+    a.plays_piano = true
+    a.chops_trees = true
+    a.mops_floors = true
+    assert a.save, a.errors.full_messages.join(", ")
+
+    b = Skill.new
+    b.plays_piano = true
+    b.chops_trees = true
+    b.makes_soup = true
+    assert b.save, b.errors.full_messages.join(", ")
+
+    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], Skill.mops_floors.all(:order => "id")
+    assert_equal [b,c], Skill.not_mops_floors.all(:order => "id")
+
+    assert_equal [b], Skill.makes_soup.all(:order => "id")
+    assert_equal [a,c], Skill.not_makes_soup.all(:order => "id")
+  end
+
   def test_dirty_attributes
     Person.delete_all
     a = Person.new
@@ -142,17 +168,17 @@ class HasBitFieldTest < Test::Unit::TestCase
     assert !s.cuts_hedges
 
     assert !s.valid?
-    assert s.errors.on(:chops_trees)
+    assert s.errors[:chops_trees]
 
     s.chops_trees = false
     assert !s.chops_trees?
     assert !s.valid?
-    assert s.errors.on(:chops_trees)
+    assert s.errors[:chops_trees]
 
     s.chops_trees = true
     assert s.chops_trees?
     assert s.valid?
-    assert !s.errors.on(:chops_trees)
+    assert !s.errors[:chops_trees]
     assert s.save
   end
 
@@ -166,17 +192,17 @@ class HasBitFieldTest < Test::Unit::TestCase
     assert !s.makes_soup
 
     assert !s.valid?
-    assert s.errors.on(:plays_piano)
+    assert s.errors[:plays_piano]
 
     s.plays_piano = false
     assert !s.plays_piano?
     assert !s.valid?
-    assert s.errors.on(:plays_piano)
+    assert s.errors[:plays_piano]
 
     s.plays_piano = true
     assert s.plays_piano?
     assert s.valid?
-    assert !s.errors.on(:plays_piano)
+    assert !s.errors[:plays_piano]
     assert s.save
   end
 

data/test/test_helper.rb

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

metadata

@@ -4,10 +4,10 @@ version: !ruby/object:Gem::Version
   hash: 23
   prerelease: false
   segments: 
+  - 1
   - 0
-  - 3
-  - 2
-  version: 0.3.2
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Paul Barry
@@ -15,30 +15,60 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-03 00:00:00 -04:00
+date: 2010-11-23 00:00:00 -05:00
 default_executable: 
-dependencies: []
-
-description: 
-email: mail@paulbarry.com
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 3
+        - 5
+        version: 2.3.5
+  type: :development
+  version_requirements: *id002
+description: Provides an easy way to work with bit fields in active record
+email: 
+- mail@paulbarry.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.md
+extra_rdoc_files: []
+
 files: 
 - .document
 - .gitignore
 - .rvmrc
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
-- VERSION
 - has-bit-field.gemspec
 - lib/has-bit-field.rb
+- lib/has-bit-field/version.rb
 - rails/init.rb
 - test/has-bit-field_test.rb
 - test/test_helper.rb
@@ -47,8 +77,8 @@ homepage: http://github.com/pjb3/has-bit-field
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -71,11 +101,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: has-bit-field
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Provides an easy way for dealing with bit fields and active record
+summary: Provides an easy way to work with bit fields in active record
 test_files: 
 - test/has-bit-field_test.rb
 - test/test_helper.rb

data/VERSION

@@ -1 +0,0 @@
-0.3.2