has_enumeration 1.0.1 → 1.0.2

data/Gemfile

@@ -1,20 +1,21 @@
 source 'http://rubygems.org'
 
-if  ENV['AR_VERSION'] == '2.3'
-  gem 'activerecord', '~> 2.3.8'
-else
-  gem 'activerecord', '~> 3.0.3'
+gem 'activerecord', '>= 2.3.8', :require => 'active_record'
+
+group :meta_where do
   gem 'meta_where'
 end
 
-gem 'rspec', '~> 2.1.0'
-gem 'cucumber', '~> 0.9.3'
+group :test do
+  gem 'rspec', '~> 2.1.0'
+  gem 'cucumber', '~> 0.9.3'
 
-platforms :ruby do
-  gem 'sqlite3-ruby', :require => 'sqlite3'
-end
+  platforms :ruby do
+    gem 'sqlite3-ruby', :require => 'sqlite3'
+  end
 
-platforms :jruby do
-  gem 'jdbc-sqlite3'
-  gem 'activerecord-jdbcsqlite3-adapter', '~> 0.9.7'
+  platforms :jruby do
+    gem 'jdbc-sqlite3'
+    gem 'activerecord-jdbcsqlite3-adapter', '~> 0.9.7'
+  end
 end

data/Gemfile.lock

@@ -45,7 +45,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 3.0.3)
+  activerecord (>= 2.3.8)
   activerecord-jdbcsqlite3-adapter (~> 0.9.7)
   cucumber (~> 0.9.3)
   jdbc-sqlite3

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/features/support/env.rb

@@ -1,20 +1,20 @@
 $LOAD_PATH << File.expand_path('../../../lib', __FILE__)
 
-ENV['AR_VERSION'] ||= '3.0'
-
 require 'rubygems'
-require 'bundler/setup'
-require 'has_enumeration'
+require 'bundler'
+Bundler.require(:default, :test)
 
-if ENV['AR_VERSION'] == '3.0'
-  require 'meta_where'
-end
+require 'has_enumeration'
 
 ActiveRecord::Base.establish_connection(
   :adapter => defined?(JRUBY_VERSION) ? 'jdbcsqlite3': 'sqlite3',
   :database => File.expand_path('../database', __FILE__)
 )
 
+if ActiveRecord::VERSION::MAJOR >= 3
+  Bundler.require(:meta_where)
+end
+
 class CreateTables < ActiveRecord::Migration
   create_table :explicitly_mapped_models, :force => true do |t|
     t.integer :color

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
-ENV['AR_VERSION'] ||= '3.0'
-
 require 'rubygems'
-require 'bundler/setup'
+require 'bundler'
+Bundler.require(:default, :test)
+
 require 'rspec'
 
 require File.expand_path('../lib/has_enumeration', File.dirname(__FILE__))
@@ -13,7 +13,7 @@ ActiveRecord::Base.establish_connection(
 )
 
 if ActiveRecord::VERSION::MAJOR >= 3
-  require 'meta_where'
+  Bundler.require(:meta_where)
 end
 
 class CreateTables < ActiveRecord::Migration

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has_enumeration
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Greg Spurrier
@@ -23,107 +23,17 @@ dependencies:
   prerelease: false
   name: activerecord
   version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 0
-        - 3
-        version: 3.0.3
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  name: meta_where
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  name: rspec
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 19
         segments: 
         - 2
-        - 1
-        - 0
-        version: 2.1.0
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  name: cucumber
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 61
-        segments: 
-        - 0
-        - 9
         - 3
-        version: 0.9.3
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  name: sqlite3-ruby
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  name: jdbc-sqlite3
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  name: activerecord-jdbcsqlite3-adapter
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 53
-        segments: 
-        - 0
-        - 9
-        - 7
-        version: 0.9.7
-  requirement: *id007
+        - 8
+        version: 2.3.8
+  requirement: *id001
 description: |
   Extends ActiveRecord with the has_enumeration method allowing a symbolic
   enumeration to be stored in an ActiveRecord attribute.  The enumeration is