Merge pull request #27 from morr/nil-strings

allow_nil for strings and inverse logic of allow_nil

Author: davydovanton

lib/shallow_attributes/type/float.rb

@@ -25,7 +25,7 @@ class Float
       # @since 0.1.0
       def coerce(value, options = {})
         case value
-        when nil then options[:allow_nil] ? 0.0 : nil
+        when nil then options[:allow_nil] ? nil : 0.0
         when ::TrueClass then 1.0
         when ::FalseClass then 0.0
         else

lib/shallow_attributes/type/integer.rb

@@ -25,7 +25,7 @@ class Integer
       # @since 0.1.0
       def coerce(value, options = {})
         case value
-        when nil then options[:allow_nil] ? 0 : nil
+        when nil then options[:allow_nil] ? nil : 0
         when ::TrueClass then 1
         when ::FalseClass then 0
         else

lib/shallow_attributes/type/string.rb

@@ -20,8 +20,9 @@ class String
       # @return [Sting]
       #
       # @since 0.1.0
-      def coerce(value, _options = {})
+      def coerce(value, options = {})
         case value
+        when nil then options[:allow_nil] ? nil : ''
         when ::Array then value.join
         when ::Hash, ::Class then error(value)
         else

test/float_type_test.rb

@@ -21,13 +21,13 @@
 
     describe 'when value is Nil' do
       it 'returns nil' do
-        assert_nil type.coerce(nil)
+        type.coerce(nil).must_equal 0
       end
     end
 
     describe 'when allow_nil is true' do
       it 'returns float' do
-        type.coerce(nil, allow_nil: true).must_equal 0.0
+        assert_nil type.coerce(nil, allow_nil: true)
       end
     end
 

test/integer_type_test.rb

@@ -20,13 +20,13 @@
 
     describe 'when value is Nil' do
       it 'returns nil' do
-        assert_nil type.coerce(nil)
+        type.coerce(nil).must_equal 0
       end
     end
 
     describe 'when allow_nil is true' do
       it 'returns integer' do
-        type.coerce(nil, allow_nil: true).must_equal 0
+        assert_nil type.coerce(nil, allow_nil: true)
       end
     end
 

test/shallow_attributes_test.rb

@@ -140,7 +140,7 @@ def default_color
         user.name  = nil
         user.age   = nil
         user.admin = nil
-        user.attributes.must_equal(name: '', age: nil, last_name: "Affleck", full_name: "Anton Affleck", color: "Pink", friends_count: 0, sizes: [], admin: false)
+        user.attributes.must_equal(name: '', age: 0, last_name: "Affleck", full_name: "Anton Affleck", color: "Pink", friends_count: 0, sizes: [], admin: false)
       end
     end
   end

test/string_type_test.rb

@@ -30,6 +30,12 @@
       end
     end
 
+    describe 'when allow_nil is true' do
+      it 'returns integer' do
+        assert_nil type.coerce(nil, allow_nil: true)
+      end
+    end
+
     describe 'when value is TrueClass' do
       it 'returns string' do
         type.coerce(true).must_equal 'true'