flex_columns 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: 6beca81659e3d23049cba155f6991641af01d31e
-  data.tar.gz: 5c476c72d15bd39871ae3e46bbab7b9d9b66d40c
+  metadata.gz: 77ffdb1f8ef333becb22e7ee81a54d32be00e4ce
+  data.tar.gz: 33e7afb514f21decc7fb4711f28c908a0e7e247b
 SHA512: 
-  metadata.gz: e33340f20bc94ab8aa1e097a0533ea6e03ad019fe53f9dfee95dbf78997f3a450bb24f72118278f38cee8822bb4280398a9bd5d8439392f829e51c6de503dfc2
-  data.tar.gz: 08aeb48a67d3b06146e9ccf1a39e210d55e0ade0f4a82ddbad1f7303d21cfe409831513bfc4b11533f7f418540f045ae362828ab10cc8f2d89ae6e421838382a
+  metadata.gz: 7d64c5801c2d5765463776a89ff56a85a5384f69b94917a18c2e1816d3fd9853d77bf4b81bbdd62a270e36f157a9c7852f6efda7730a9f6d2225b05b4d3ec4a4
+  data.tar.gz: 9f32a575764ad59cd86fbe4479a7f6b59e7b5fc5f04dc0632c86d7b0b227f40d68e77c541fef9e8ec7fc1c97e25b667571009584ad1d2e22961ad2a6b5cc62db

data/CHANGES.md

@@ -1,5 +1,10 @@
 # `flex_columns` Changelog
 
+## 1.0.5, 2014-04-03
+
+* Fixed an issue where boolean fields would fail to validate if `:null => false` was passed and their value was `false`.
+* Fixed an issue where integer fields would fail to validate if `nil` was allowed (that is, `:null => false` was _not_ passed) and yet `nil` was stored in them.
+
 ## 1.0.4, 2014-03-31
 
 * Fixed an incompatibility with Rails 4.0.3 or 4.0.4 due to a change in the way ActiveRecord::Base#method missing works. The way we were handling this (by double-implementing `_flex_column_object_for` and trying to use `super` to delegate one to the other) was pretty gross, anyway; this fix is much more solid.

data/lib/flex_columns/definition/field_definition.rb

@@ -206,12 +206,12 @@ module FlexColumns
       # Given any additional arguments after the name of the field (e.g., <tt>field :foo, :integer</tt>), apply them
       # as appropriate. Currently, the only kind of accepted additional argument is a type.
       def apply_additional_arguments(additional_arguments)
-        type = additional_arguments.shift
-        if type
+        @type = additional_arguments.shift
+        if @type
           begin
-            send("apply_validations_for_#{type}")
+            send("apply_validations_for_#{@type}")
           rescue NoMethodError => nme
-            raise ArgumentError, "Unknown type: #{type.inspect}"
+            raise ArgumentError, "Unknown type: #{@type.inspect}"
           end
         end
 
@@ -220,10 +220,16 @@ module FlexColumns
         end
       end
 
+      def not_nullable?
+        options.has_key?(:null) && (! options[:null])
+      end
+
       # Apply the correct validations for a field of type :integer. (Called from #apply_additional_arguments via
       # metaprogramming.)
       def apply_validations_for_integer
-        flex_column_class.validates field_name, :numericality => { :only_integer => true }
+        options = { :numericality => { :only_integer => true } }
+        options[:allow_nil] = true unless not_nullable?
+        flex_column_class.validates field_name, options
       end
 
       # Apply the correct validations for a field of type :string. (Called from #apply_additional_arguments via
@@ -285,13 +291,19 @@ module FlexColumns
       # Apply the correct validations for a field of type :boolean. (Called from #apply_additional_arguments via
       # metaprogramming.)
       def apply_validations_for_boolean
-        flex_column_class.validates field_name, :inclusion => { :in => [ true, false, nil ] }
+        value_set = [ true, false ]
+        value_set << nil unless not_nullable?
+        flex_column_class.validates field_name, :inclusion => { :in => value_set }
+      end
+
+      def skip_not_nullable_validation_due_to_type?
+        [ :boolean ].include?(@type)
       end
 
       # Applies any validations resulting from options to this class (but not types; they're handled by
       # #apply_additional_arguments, above). Currently, this applies validations for +:null+, +:enum+, and +:limit+.
       def apply_validations!
-        if options.has_key?(:null) && (! options[:null])
+        if not_nullable? && (! skip_not_nullable_validation_due_to_type?)
           flex_column_class.validates field_name, :presence => true
         end
 

data/lib/flex_columns/version.rb

@@ -1,4 +1,4 @@
 module FlexColumns
   # The current version of FlexColumns.
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/spec/flex_columns/system/types_system_spec.rb

@@ -18,6 +18,7 @@ describe "FlexColumns basic operations" do
   def should_fail_validation(field, value, pattern = nil)
     object = ::User.new
     object.some_integer = 123
+    object.some_boolean_that_is_not_nullable = false
 
     object.send("#{field}=", value)
 
@@ -46,6 +47,9 @@ describe "FlexColumns basic operations" do
         field :some_timestamp, :timestamp
         field :some_boolean, :boolean
         field :some_enum, :enum => [ 'foo', 'bar', 'baz', nil ]
+
+        field :some_integer_that_is_nullable, :integer
+        field :some_boolean_that_is_not_nullable, :boolean, :null => false
       end
     end
 
@@ -60,6 +64,8 @@ describe "FlexColumns basic operations" do
     should_fail_validation(:some_timestamp, "foo", /must be a Time/i)
     should_fail_validation(:some_boolean, "true", /is not included in the list/i)
     should_fail_validation(:some_enum, "quux", /is not included in the list/i)
+    should_fail_validation(:some_integer_that_is_nullable, "quux", /is not a number/i)
+    should_fail_validation(:some_boolean_that_is_not_nullable, nil, /is not included in the list/i)
 
     user = ::User.new
     user.name = 'User 1'
@@ -75,6 +81,7 @@ describe "FlexColumns basic operations" do
     user.user_attributes.some_timestamp = 1.minute.from_now
     user.user_attributes.some_boolean = true
     user.user_attributes.some_enum = 'foo'
+    user.user_attributes.some_boolean_that_is_not_nullable = false
 
     user.valid?.should be
 
@@ -89,5 +96,8 @@ describe "FlexColumns basic operations" do
 
     user.user_attributes.some_string = :bonk
     user.valid?.should be
+
+    user.user_attributes.some_boolean = false
+    user.valid?.should be
   end
 end

data/spec/flex_columns/unit/definition/field_definition_spec.rb

@@ -40,7 +40,7 @@ describe FlexColumns::Definition::FieldDefinition do
     end
 
     it "should raise an error if there are additional arguments" do
-      expect(@flex_column_class).to receive(:validates).once.with(:foo, { :numericality => { :only_integer => true }})
+      expect(@flex_column_class).to receive(:validates).once.with(:foo, { :numericality => { :only_integer => true }, :allow_nil => true})
       lambda { klass.new(@flex_column_class, :foo, [ :integer, :bar ], { }) }.should raise_error(ArgumentError)
     end
 
@@ -70,7 +70,7 @@ describe FlexColumns::Definition::FieldDefinition do
       end
 
       it "should validate integers properly" do
-        expect_validation(:integer, { :numericality => { :only_integer => true } })
+        expect_validation(:integer, { :numericality => { :only_integer => true }, :allow_nil => true })
       end
 
       it "should validate floats properly" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: flex_columns
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors: 
 - Andrew Geweke
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-03-31 00:00:00 Z
+date: 2014-04-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json