simple_enum 1.6.1 → 1.6.2

data/.travis.yml

@@ -1,11 +1,5 @@
 language: ruby
-env:
-  - ORM=active_record
-  - ORM=mongoid
 rvm:
   - 1.8.7
   - 1.9.3
-gemfile:
-  - gemfiles/rails-3.0.gemfile
-  - gemfiles/rails-3.1.gemfile
-  - gemfiles/rails-3.2.gemfile
+  - jruby-19mode

data/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 gemspec
 
 # some development deps
-gem 'jdbc-sqlite3', :platform => :jruby
+gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
 
 gem 'sqlite3', :platform => :ruby
 gem 'bson_ext', :platform => :ruby

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple_enum (1.6.1)
+    simple_enum (1.6.2)
       activesupport (>= 3.0.0)
 
 GEM
@@ -18,9 +18,6 @@ GEM
     activesupport (3.2.0)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    appraisal (0.4.0)
-      bundler
-      rake
     arel (3.0.0)
     bson (1.5.2)
     bson (1.5.2-java)
@@ -28,7 +25,6 @@ GEM
       bson (= 1.5.2)
     builder (3.0.0)
     i18n (0.6.0)
-    jdbc-sqlite3 (3.7.2)
     minitest (2.10.1)
     mongo (1.5.2)
       bson (= 1.5.2)
@@ -47,9 +43,8 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (>= 3.0.0)
-  appraisal (>= 0.4)
+  activerecord-jdbcsqlite3-adapter
   bson_ext
-  jdbc-sqlite3
   minitest (>= 2.3.0)
   mongoid (~> 2.0)
   rake (>= 0.9.2)

data/Rakefile

@@ -1,18 +1,30 @@
 require 'rubygems'
 require 'bundler/setup'
-require 'appraisal'
 require 'rake/testtask'
 
-include Rake::DSL
-
 Bundler::GemHelper.install_tasks
 
-desc 'Default: run unit tests.'
+desc 'Default: run all unit tests for both ActiveRecord & Mongoid.'
 task :default => :test
 
-desc 'Run unit tests, use ORM=...'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.test_files = Dir.glob('test/**/*_test.rb')
-  t.verbose = true
+namespace :test do
+  Rake::TestTask.new(:units) do |t|
+    t.libs << "test"
+    t.test_files = Dir['test/*_test.rb']
+    t.verbose = true
+  end
+
+  desc 'Run all unit tests for ActiveRecord'
+  task :activerecord do |t|
+    ENV['SIMPLE_ENUM_TEST_ORM'] = 'active_record'
+    Rake::Task['test:units'].execute
+  end
+
+  desc 'Run all unit tests for Mongoid'
+  task :mongoid do |t|
+    ENV['SIMPLE_ENUM_TEST_ORM'] = 'mongoid'
+    Rake::Task['test:units'].execute
+  end
 end
+
+task :test => [:'test:activerecord', :'test:mongoid']

data/lib/simple_enum.rb

@@ -154,9 +154,11 @@ module SimpleEnum
     #   <tt>false</tt> no exception is thrown and the internal value is set to <tt>nil</tt> (default is <tt>true</tt>)
     # * <tt>:dirty</tt> - Boolean value which if set to <tt>true</tt> generates <tt>..._was</tt> and <tt>..._changed?</tt>
     #   methods for the enum, which delegate to the internal column (default is <tt>false</tt>)
+    # * <tt>:field</tt> - Also allowed as valid key, for Mongoid integration + default options, see simple_enum#27.
+    #
     def as_enum(enum_cd, values, options = {})
       options = SimpleEnum.default_options.merge({ :column => "#{enum_cd}_cd" }).merge(options)
-      options.assert_valid_keys(:column, :whiny, :prefix, :slim, :upcase, :dirty)
+      options.assert_valid_keys(:column, :whiny, :prefix, :slim, :upcase, :dirty, :field)
 
       metaclass = (class << self; self; end)
 

data/lib/simple_enum/version.rb

@@ -1,5 +1,5 @@
 module SimpleEnum
 
   # +SimpleEnum+ version string.
-  VERSION = "1.6.1"
+  VERSION = "1.6.2"
 end

data/simple_enum.gemspec

@@ -23,16 +23,9 @@ Gem::Specification.new do |s|
   s.license          = 'MIT'
 
   s.add_dependency "activesupport", '>= 3.0.0'
-  
+
   s.add_development_dependency 'rake', '>= 0.9.2'
-  s.add_development_dependency 'appraisal', '>= 0.4'
   s.add_development_dependency 'minitest', '>= 2.3.0'
   s.add_development_dependency 'activerecord', '>= 3.0.0'
   s.add_development_dependency 'mongoid', '~> 2.0'
-
-  unless RUBY_PLATFORM =~ /java/
-    s.add_development_dependency 'sqlite3'
-  else
-    s.add_development_dependency 'activerecord-jdbcsqlite3-adapter'
-  end
-end
+end

data/test/mongoid_test.rb

@@ -1,7 +1,10 @@
 require 'test_helper'
 
 class MongoidTest < MiniTest::Unit::TestCase
+  @@default_options = SimpleEnum.default_options
+
   def setup
+    SimpleEnum.default_options.clear.merge(@@default_options)
     reload_db
   end
 
@@ -35,4 +38,15 @@ class MongoidTest < MiniTest::Unit::TestCase
 
     assert_nil klass.new.fields['gender_cd']
   end
-end
+
+  def test_default_field_options
+    skip('Only available in mongoid') unless mongoid?
+    SimpleEnum.default_options[:field] = { :type => String }
+    klass = anonymous_dummy do
+      as_enum :gender, [:male, :female]
+    end
+
+    refute_nil klass.new.fields['gender_cd']
+    assert_equal String, klass.new.fields['gender_cd'].options[:type]
+  end
+end

data/test/test_helper.rb

@@ -1,15 +1,13 @@
 # Setup environment for both tests and IRB interactive console
 #
-
 $KCODE = 'u' unless RUBY_VERSION =~ /^1\.9/ # to make parameterize work...
 
 require 'rubygems'
 require 'bundler/setup'
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'active_support'
 require 'active_support/version'
-require 'minitest/autorun'
 
 # setup fake rails env
 ROOT       = File.join(File.dirname(__FILE__), '..')
@@ -17,7 +15,7 @@ RAILS_ROOT = ROOT
 RAILS_ENV  = 'test'
 
 # load orms
-ORM = ENV['ORM'] || 'active_record'
+ORM = ENV['SIMPLE_ENUM_TEST_ORM'] || 'active_record'
 
 def mongoid?; return ORM == 'mongoid';end
 def activerecord?; return ORM == 'active_record';end
@@ -25,14 +23,14 @@ def activerecord?; return ORM == 'active_record';end
 # load database implemntation
 require ORM
 
-# load simple enum
+# load simple enum AFTER ORM
 require 'simple_enum'
 
 # load ORM specific stuff
 require 'orm/common'
 require "orm/#{ORM}"
 
-# Add test locales
+# Add locales
 I18n.load_path << File.join(File.dirname(__FILE__), 'locales.yml')
 
 # setup db
@@ -40,11 +38,3 @@ setup_db
 
 # Test environment info
 puts "Testing against: activesupport-#{ActiveSupport::VERSION::STRING}, #{ORM.to_s}-#{orm_version}"
-
-# do some magic to initialze DB for IRB session
-if Object.const_defined?('IRB')
-  reload_db :fill => true, :genders => true
-else # and load test classes when in test cases...
-  require 'test/unit'
-  require 'active_support/test_case'
-end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: simple_enum
 version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: 
+  prerelease: false
   segments: 
   - 1
   - 6
-  - 1
-  version: 1.6.1
+  - 2
+  version: 1.6.2
 platform: ruby
 authors: 
 - Lukas Westermann
@@ -15,116 +14,78 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-30 00:00:00 Z
+date: 2012-08-22 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  type: :runtime
   version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 3
         - 0
         - 0
         version: 3.0.0
-  requirement: *id001
-  type: :runtime
   name: activesupport
-- !ruby/object:Gem::Dependency 
+  requirement: *id001
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
   version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 63
         segments: 
         - 0
         - 9
         - 2
         version: 0.9.2
-  requirement: *id002
-  type: :development
   name: rake
-- !ruby/object:Gem::Dependency 
+  requirement: *id002
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 4
-        version: "0.4"
-  requirement: *id003
-  type: :development
-  name: appraisal
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
+  type: :development
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 2
         - 3
         - 0
         version: 2.3.0
-  requirement: *id004
-  type: :development
   name: minitest
-- !ruby/object:Gem::Dependency 
+  requirement: *id003
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 3
         - 0
         - 0
         version: 3.0.0
-  requirement: *id005
-  type: :development
   name: activerecord
-- !ruby/object:Gem::Dependency 
+  requirement: *id004
   prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 2
         - 0
         version: "2.0"
-  requirement: *id006
-  type: :development
   name: mongoid
-- !ruby/object:Gem::Dependency 
+  requirement: *id005
   prerelease: false
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id007
-  type: :development
-  name: sqlite3
 description: Provides enum-like fields for ActiveRecord, ActiveModel and Mongoid models.
 email: 
 - lukas.westermann@gmail.com
@@ -137,18 +98,11 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - .travis.yml
-- Appraisals
 - Gemfile
 - Gemfile.lock
 - LICENCE
 - README.rdoc
 - Rakefile
-- gemfiles/rails-3.0.gemfile
-- gemfiles/rails-3.0.gemfile.lock
-- gemfiles/rails-3.1.gemfile
-- gemfiles/rails-3.1.gemfile.lock
-- gemfiles/rails-3.2.gemfile
-- gemfiles/rails-3.2.gemfile.lock
 - lib/simple_enum.rb
 - lib/simple_enum/enum_hash.rb
 - lib/simple_enum/mongoid.rb
@@ -172,6 +126,7 @@ files:
 - test/simple_enum_test.rb
 - test/test_helper.rb
 - test/without_shortcuts_test.rb
+has_rdoc: true
 homepage: http://github.com/lwe/simple_enum
 licenses: 
 - MIT
@@ -181,22 +136,18 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 57
       segments: 
       - 1
       - 8
       - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
       segments: 
       - 1
       - 3
@@ -205,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Simple enum-like field support for models.

data/Appraisals

@@ -1,14 +0,0 @@
-appraise "rails-3.0" do
-  gem 'activesupport', '~> 3.0.9'
-  gem 'activerecord',  '~> 3.0.9'
-end
-
-appraise "rails-3.1" do
-  gem 'activesupport', '~> 3.1.0'
-  gem 'activerecord',  '~> 3.1.0'
-end
-
-appraise "rails-3.2" do
-  gem 'activesupport', '~> 3.2.0'
-  gem 'activerecord',  '~> 3.2.0'
-end

data/gemfiles/rails-3.0.gemfile

@@ -1,11 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "jdbc-sqlite3", :platform=>:jruby
-gem "sqlite3", :platform=>:ruby
-gem "bson_ext", :platform=>:ruby
-gem "activesupport", "~> 3.0.9"
-gem "activerecord", "~> 3.0.9"
-
-gemspec :path=>"../"

data/gemfiles/rails-3.0.gemfile.lock

@@ -1,53 +0,0 @@
-PATH
-  remote: /Users/lukas/Projects/_github/simple_enum
-  specs:
-    simple_enum (1.6.1)
-      activesupport (>= 3.0.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.0.15)
-      activesupport (= 3.0.15)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.15)
-      activemodel (= 3.0.15)
-      activesupport (= 3.0.15)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.15)
-    appraisal (0.4.1)
-      bundler
-      rake
-    arel (2.0.10)
-    bson (1.6.4)
-    bson_ext (1.6.4)
-      bson (~> 1.6.4)
-    builder (2.1.2)
-    i18n (0.5.0)
-    minitest (3.2.0)
-    mongo (1.6.4)
-      bson (~> 1.6.4)
-    mongoid (2.2.6)
-      activemodel (~> 3.0.0)
-      mongo (~> 1.3)
-      tzinfo (~> 0.3.22)
-    rake (0.9.2.2)
-    sqlite3 (1.3.6)
-    tzinfo (0.3.33)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 3.0.9)
-  activesupport (~> 3.0.9)
-  appraisal (>= 0.4)
-  bson_ext
-  jdbc-sqlite3
-  minitest (>= 2.3.0)
-  mongoid (~> 2.0)
-  rake (>= 0.9.2)
-  simple_enum!
-  sqlite3

data/gemfiles/rails-3.1.gemfile

@@ -1,11 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "jdbc-sqlite3", :platform=>:jruby
-gem "sqlite3", :platform=>:ruby
-gem "bson_ext", :platform=>:ruby
-gem "activesupport", "~> 3.1.0"
-gem "activerecord", "~> 3.1.0"
-
-gemspec :path=>"../"

data/gemfiles/rails-3.1.gemfile.lock

@@ -1,55 +0,0 @@
-PATH
-  remote: /Users/lukas/Projects/_github/simple_enum
-  specs:
-    simple_enum (1.6.1)
-      activesupport (>= 3.0.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.1.6)
-      activesupport (= 3.1.6)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.6)
-      activemodel (= 3.1.6)
-      activesupport (= 3.1.6)
-      arel (~> 2.2.3)
-      tzinfo (~> 0.3.29)
-    activesupport (3.1.6)
-      multi_json (>= 1.0, < 1.3)
-    appraisal (0.4.1)
-      bundler
-      rake
-    arel (2.2.3)
-    bson (1.6.4)
-    bson_ext (1.6.4)
-      bson (~> 1.6.4)
-    builder (3.0.0)
-    i18n (0.6.0)
-    minitest (3.2.0)
-    mongo (1.6.2)
-      bson (~> 1.6.2)
-    mongoid (2.4.11)
-      activemodel (~> 3.1)
-      mongo (<= 1.6.2)
-      tzinfo (~> 0.3.22)
-    multi_json (1.2.0)
-    rake (0.9.2.2)
-    sqlite3 (1.3.6)
-    tzinfo (0.3.33)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 3.1.0)
-  activesupport (~> 3.1.0)
-  appraisal (>= 0.4)
-  bson_ext
-  jdbc-sqlite3
-  minitest (>= 2.3.0)
-  mongoid (~> 2.0)
-  rake (>= 0.9.2)
-  simple_enum!
-  sqlite3

data/gemfiles/rails-3.2.gemfile

@@ -1,11 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "jdbc-sqlite3", :platform=>:jruby
-gem "sqlite3", :platform=>:ruby
-gem "bson_ext", :platform=>:ruby
-gem "activesupport", "~> 3.2.0"
-gem "activerecord", "~> 3.2.0"
-
-gemspec :path=>"../"

data/gemfiles/rails-3.2.gemfile.lock

@@ -1,55 +0,0 @@
-PATH
-  remote: /Users/lukas/Projects/_github/simple_enum
-  specs:
-    simple_enum (1.6.1)
-      activesupport (>= 3.0.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.2.6)
-      activesupport (= 3.2.6)
-      builder (~> 3.0.0)
-    activerecord (3.2.6)
-      activemodel (= 3.2.6)
-      activesupport (= 3.2.6)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.6)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    appraisal (0.4.1)
-      bundler
-      rake
-    arel (3.0.2)
-    bson (1.6.4)
-    bson_ext (1.6.4)
-      bson (~> 1.6.4)
-    builder (3.0.0)
-    i18n (0.6.0)
-    minitest (3.2.0)
-    mongo (1.6.2)
-      bson (~> 1.6.2)
-    mongoid (2.4.11)
-      activemodel (~> 3.1)
-      mongo (<= 1.6.2)
-      tzinfo (~> 0.3.22)
-    multi_json (1.3.6)
-    rake (0.9.2.2)
-    sqlite3 (1.3.6)
-    tzinfo (0.3.33)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 3.2.0)
-  activesupport (~> 3.2.0)
-  appraisal (>= 0.4)
-  bson_ext
-  jdbc-sqlite3
-  minitest (>= 2.3.0)
-  mongoid (~> 2.0)
-  rake (>= 0.9.2)
-  simple_enum!
-  sqlite3