bitfields 0.1.2 → 0.1.3

data/Rakefile

@@ -1,7 +1,19 @@
-task :default => :spec
 require 'spec/rake/spectask'
 Spec::Rake::SpecTask.new {|t| t.spec_opts = ['--color']}
 
+task :default do
+  # test with 2.x
+  puts `VERSION='~>2' rake spec`
+
+  # gem 'activerecord', '>=3' did not work for me, but just require gets the right version...
+  require 'active_record'
+  if ActiveRecord::VERSION::MAJOR >= 3
+    puts `rake spec`
+  else
+    'install rails 3 to get full test coverage...'
+  end
+end
+
 begin
   require 'jeweler'
   project_name = 'bitfields'
@@ -16,4 +28,4 @@ begin
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install jeweler"
-end
+end

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/bitfields.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bitfields}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]

data/lib/bitfields.rb

@@ -19,6 +19,12 @@ module Bitfields
     bitfields
   end
 
+  # AR 3+ -> :scope, below :named_scope
+  def self.ar_scoping_method
+    return :scope if defined?(ActiveRecord::VERSION::MAJOR) and ActiveRecord::VERSION::MAJOR >= 3
+    :named_scope
+  end
+
   module ClassMethods
     def bitfield(column, options)
       # prepare ...
@@ -37,7 +43,7 @@ module Bitfields
         define_method("#{bit_name}?"){ bitfield_value(bit_name) }
         define_method("#{bit_name}="){|value| set_bitfield_value(bit_name, value) }
         if options[:scopes] != false
-          scoping_method = (respond_to?(:named_scope) ? :named_scope : :scope) # AR 3.0+ uses scope
+          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)
         end

data/spec/spec_helper.rb

@@ -1,4 +1,12 @@
 require 'rubygems'
+if ENV['VERSION']
+  gem 'activerecord', ENV['VERSION']
+  gem 'activesupport', ENV['VERSION']
+end
 $LOAD_PATH << 'lib'
 require 'bitfields'
-require 'spec/database'
+
+require 'active_record'
+puts "Using ActiveRecord #{ActiveRecord::VERSION::STRING}"
+
+require 'spec/database'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Michael Grosser