bitfields 0.3.0 → 0.4.0

data/Gemfile

@@ -0,0 +1,9 @@
+source :rubygems
+
+group :dev do
+  gem 'activerecord', ENV['AR']
+  gem 'sqlite3'
+  gem 'rake'
+  gem 'rspec', '~>2'
+  gem 'jeweler'
+end

data/Gemfile.lock

@@ -0,0 +1,47 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.1.0.rc4)
+      activesupport (= 3.1.0.rc4)
+      bcrypt-ruby (~> 2.1.4)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.0.rc4)
+      activemodel (= 3.1.0.rc4)
+      activesupport (= 3.1.0.rc4)
+      arel (~> 2.1.1)
+      tzinfo (~> 0.3.27)
+    activesupport (3.1.0.rc4)
+      multi_json (~> 1.0)
+    arel (2.1.1)
+    bcrypt-ruby (2.1.4)
+    builder (3.0.0)
+    diff-lcs (1.1.2)
+    git (1.2.5)
+    i18n (0.6.0)
+    jeweler (1.6.2)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+    multi_json (1.0.3)
+    rake (0.9.2)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    sqlite3 (1.3.3)
+    tzinfo (0.3.28)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord
+  jeweler
+  rake
+  rspec (~> 2)
+  sqlite3

data/Rakefile

@@ -1,12 +1,11 @@
-require "rspec/core/rake_task"
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = '--backtrace --color'
+task :default do
+  sh "rspec spec"
 end
 
-task :default do
-  [2,3].each do |version|
-    sh "VERSION='~>#{version}' rake spec" rescue nil
-  end
+task :all do
+  sh "AR=2.3.12 bundle && bundle exec rake"
+  sh "AR=3.0.8 bundle && bundle exec rake"
+  sh "AR=3.1.0.rc4 bundle && bundle exec rake"
 end
 
 begin

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/bitfields.gemspec

@@ -5,13 +5,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bitfields}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-02-22}
+  s.date = %q{2011-06-21}
   s.email = %q{grosser.michael@gmail.com}
   s.files = [
+    "Gemfile",
+    "Gemfile.lock",
     "Rakefile",
     "Readme.md",
     "VERSION",
@@ -24,13 +26,8 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/grosser/bitfields}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Save migrations and columns by storing multiple booleans in a single integer.}
-  s.test_files = [
-    "spec/bitfields_spec.rb",
-    "spec/database.rb",
-    "spec/spec_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/bitfields.rb

@@ -1,4 +1,5 @@
 require 'active_support'
+require 'active_support/version'
 
 module Bitfields
   VERSION = File.read( File.join(File.dirname(__FILE__),'..','VERSION') ).strip
@@ -6,7 +7,9 @@ module Bitfields
   class DuplicateBitNameError < ArgumentError; end
 
   def self.included(base)
-    base.class_inheritable_accessor :bitfields, :bitfield_options
+    class << base
+      attr_accessor :bitfields, :bitfield_options
+    end
     base.extend Bitfields::ClassMethods
   end
 
@@ -119,7 +122,7 @@ module Bitfields
 
   module InstanceMethods
     def bitfield_values(column)
-      Hash[bitfields[column.to_sym].map{|bit_name, bit| [bit_name, bitfield_value(bit_name)]}]
+      Hash[self.class.bitfields[column.to_sym].map{|bit_name, bit| [bit_name, bitfield_value(bit_name)]}]
     end
 
     private

data/spec/bitfields_spec.rb

@@ -338,15 +338,19 @@ describe Bitfields do
       User.respond_to?(:seller).should == true
       OverwrittenUser.respond_to?(:seller).should == true
     end
+  end
+
+  describe 'inheritance' do
+    it "knows overwritten values and normal" do
+      User.bitfields.should == {:bits=>{:seller=>1, :insane=>2, :stupid=>4}}
+      OverwrittenUser.bitfields.should == {:bits=>{:seller_inherited=>1}}
+    end
 
-    it "knows inherited values" do
-      pending
+    xit "knows inherited values when overwriting" do
       OverwrittenUser.bitfield_column(:seller).should == :bits
     end
-  end
 
-  describe 'inheritance' do
-    it "knows inherited values" do
+    xit "knows inherited values without overwriting" do
       InheritedUser.bitfield_column(:seller).should == :bits
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bitfields
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-22 00:00:00 +01:00
+date: 2011-06-21 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -28,6 +28,8 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- Gemfile
+- Gemfile.lock
 - Rakefile
 - Readme.md
 - VERSION
@@ -67,11 +69,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Save migrations and columns by storing multiple booleans in a single integer.
-test_files: 
-- spec/bitfields_spec.rb
-- spec/database.rb
-- spec/spec_helper.rb
+test_files: []
+