simple_enum 1.6.3 → 1.6.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple_enum (1.6.3)
+    simple_enum (1.6.4)
       activesupport (>= 3.0.0)
 
 GEM

data/Rakefile

@@ -31,6 +31,7 @@ task :test => [:'test:activerecord', :'test:mongoid']
 
 # Mongodb
 directory "tmp/mongodb.data"
+desc 'Run mongodb in tmp/'
 task :mongodb => [:'tmp/mongodb.data'] do |t|
   system "mongod", "--dbpath", "tmp/mongodb.data"
 end

data/lib/simple_enum/mongoid.rb

@@ -36,7 +36,7 @@ module SimpleEnum
       # Wrap method chain to create mongoid field and additional
       # column options
       def as_enum_with_mongoid(enum_cd, values, options = {})
-        options = SimpleEnum.default_options.merge({ :column => "#{enum_cd}_cd" }).merge(options)
+        options = SimpleEnum.default_options.merge({ :column => "#{enum_cd}_cd" }).deep_merge(options)
 
         # forward custom field options
         field_options = options.delete(:field)

data/lib/simple_enum/version.rb

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

data/test/mongoid_test.rb

@@ -51,4 +51,16 @@ class MongoidTest < MiniTest::Unit::TestCase
     refute_nil klass.new.fields['gender_cd']
     assert_equal String, klass.new.fields['gender_cd'].options[:type]
   end
+
+  def test_default_field_options_are_merged_recursivly
+    skip('Only available in mongoid') unless mongoid?
+    SimpleEnum.default_options[:field] = { :type => String }
+    klass = anonymous_dummy do
+      as_enum :gender, [:male, :female], :field => { :default => "0" }
+    end
+
+    refute_nil klass.new.fields['gender_cd']
+    assert_equal String, klass.new.fields['gender_cd'].options[:type]
+    assert_equal "0", klass.new.fields['gender_cd'].options[:default]
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_enum
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 1
   - 6
-  - 3
-  version: 1.6.3
+  - 4
+  version: 1.6.4
 platform: ruby
 authors: 
 - Lukas Westermann
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-08 00:00:00 Z
+date: 2012-10-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement