reform 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 565c9da5e49ef68eac9707011e9574284cac113c
-  data.tar.gz: 5feef4e923913adb8099b6e307aa38b0adff6dbf
+  metadata.gz: a7b6c745acf6fc96e9d5c0291d4fa64df5be3c92
+  data.tar.gz: 0304e04e195f525af7aed8081c87a328885c2581
 SHA512:
-  metadata.gz: c1e962dda69e280292e94394aea4876e3ec2714cf1dc07de305a0c316248ecc065ab23785014838780258c6ac0b91d68d99c5c985494d601ac157636067e97e4
-  data.tar.gz: dbc31dd351bb1ac8cf223e513676d061ed85237a5eecba759319d753a482e5a20246a3859d6e23b8a6ede2893628587c833c8c1b70242fa2dc2a22e3c78252c9
+  metadata.gz: 1070cf32ba255c0b08d5b0dc7bc3a666cd1a515fe627e77af2168519908fe9a0680b132cdc2e77e512cd346c1b458051bc5c1e055db31bcc101ac718dfca8bf4
+  data.tar.gz: 42777ea0870fa57d5eb6c87df3cda716bd6eff0f0c479e50610df969845b089c6dcaa366ab1e14c66484c1980fbf621dd045463cc2ae357d5e8fbbcc3f13fdf8

data/CHANGES.md

@@ -1,3 +1,9 @@
+## 2.0.5
+
+* `ActiveModel::Validator` now delegates all methods properly to the form. It used to crashed with properties called `format` or other private `Object` methods.
+* Simpleform will now properly display fields as required, or not (by introducion `ModelReflections::validators_on`).
+* The `:default` option is not copied into the deserializer anymore from the schema. This requires disposable 0.1.11.
+
 ## 2.0.4
 
 * `#sync` and `#save` with block now provide `HashWithIndifferentAccess` in Rails.

data/Gemfile

@@ -4,5 +4,4 @@ gemspec
 
 #gem 'representable', path: "../representable"
 # gem "disposable", path: "../disposable"
-# gem "disposable", github: "apotonick/disposable"o
-# gem "uber", path: "../uber"
+# gem "disposable", github: "apotonick/disposable"

data/lib/reform/form/active_model/model_reflections.rb

@@ -16,6 +16,11 @@ class Reform::Form < Reform::Contract
       def reflect_on_association(*args)
         model_name.to_s.constantize.reflect_on_association(*args)
       end
+
+      # this is needed in simpleform to infer required fields.
+      def validators_on(*args)
+        validator.validators_on(*args)
+      end
     end
 
     # Delegate column for attribute to the model to support simple_form's

data/lib/reform/form/active_model/validations.rb

@@ -5,19 +5,13 @@ require "uber/delegates"
 module Reform::Form::ActiveModel
   # AM::Validations for your form.
   #
-  # Note: The preferred way for validations should be Lotus::Validations, as ActiveModel::Validation's
-  # implementation is old, very complex given that it needs to do a simple thing, is using
-  # globals like @errors, and relies and more than 100 methods to be mixed into your form.
-  #
-  # Implements ::validates and friends, and #valid?.
-  #
+  # Provides ::validates, ::validate, #validate, and #valid?.
   module Validations
     def self.included(includer)
       includer.instance_eval do
         include Reform::Form::ActiveModel
-        extend Uber::InheritableAttr
         inheritable_attr :validator
-        self.validator = Class.new(Validator)
+        self.validator = Class.new(Validator) # the actual validations happen in this instance.
 
         class << self
           extend Uber::Delegates
@@ -40,9 +34,10 @@ module Reform::Form::ActiveModel
     end
 
 
-    # Validators is the validatable object. On the class level, we define validations,
+    # Validator is the validatable object. On the class level, we define validations,
     # on instance, it exposes #valid?.
-    class Validator
+    require "delegate"
+    class Validator < SimpleDelegator
       # current i18n scope: :activemodel.
       include ActiveModel::Validations
 
@@ -61,12 +56,12 @@ module Reform::Form::ActiveModel
       end
 
       def initialize(form, name)
-        @form = form
+        super(form)
         self.class.model_name = name # one of the many reasons why i will drop support for AM::V in 2.1.
       end
 
-      def method_missing(method_name, *args, &block)
-        @form.send(method_name, *args, &block)
+      def method_missing(m, *args, &block)
+        __getobj__.send(m, *args, &block) # send all methods to the form, even privates.
       end
     end
 
@@ -81,7 +76,6 @@ module Reform::Form::ActiveModel
       validator = self.class.validator.new(self, model_name)
       validator.valid? # run the Validations object's validator with the form as context. this won't pollute anything in the form.
 
-
       #errors.merge!(validator.errors, "")
       validator.errors.each do |name, error| # TODO: handle with proper merge, or something. validator.errors is ALWAYS AM::Errors.
         errors.add(name, error)

data/lib/reform/form/multi_parameter_attributes.rb

@@ -24,12 +24,17 @@ module Reform::Form::MultiParameterAttributes
 
   private
     def params_to_date(year, month, day, hour, minute)
-      return nil if [year, month, day].any?(&:blank?)
+      date_fields = [year, month, day].map!(&:to_i)
+      time_fields = [hour, minute].map!(&:to_i)
+
+      if date_fields.any?(&:zero?) || !Date.valid_date?(*date_fields)
+        return nil
+      end
 
       if hour.blank? && minute.blank?
-        Date.new(year.to_i, month.to_i, day.to_i) # TODO: test fails.
+        Date.new(*date_fields)
       else
-        args = [year, month, day, hour, minute].map(&:to_i)
+        args = date_fields + time_fields
         Time.zone ? Time.zone.local(*args) :
           Time.new(*args)
       end

data/lib/reform/version.rb

@@ -1,3 +1,3 @@
 module Reform
-  VERSION = "2.0.4"
+  VERSION = "2.0.5"
 end

data/test/active_model_validation_for_property_named_format_test.rb

@@ -0,0 +1,18 @@
+require "test_helper"
+
+class AMValidationWithFormatTest < MiniTest::Spec
+  class SongForm < Reform::Form
+    property :format
+    validates :format, presence: true
+  end
+
+  class Song
+    def format
+      1
+    end
+  end
+
+  it do
+    SongForm.new(Song.new).validate({}).must_equal true
+  end
+end

data/test/form_test.rb

@@ -25,7 +25,7 @@ class FormTest < MiniTest::Spec
     property :title, validates: {presence: true}
     properties :genre, :band, validates: {presence: true}
   end
-  it "xxx" do
+  it do
     form = SongForm.new(OpenStruct.new)
     form.validate({})
     form.errors.to_s.must_equal "{:title=>[\"can't be blank\"], :genre=>[\"can't be blank\"], :band=>[\"can't be blank\"]}"

data/test/model_reflections_test.rb

@@ -131,4 +131,8 @@ class ModelReflectionTest < MiniTest::Spec
       form.defined_enums.must_include Artist
     end
   end
+
+  describe "::validators_on" do
+    it { assert SongWithArtistForm.validators_on }
+  end
 end

data/test/mongoid_test.rb

@@ -1,313 +1,313 @@
-# require 'test_helper'
-# def mongoid_present?
-#   require 'mongoid'
-#   Mongoid.configure do |config|
-#     config.connect_to("reform-mongoid-test")
-#   end
-#   true
-# rescue
-#   false
-# end
-
-# if mongoid_present?
-#   require 'reform/mongoid'
-
-#   class Disc
-#     include Mongoid::Document
-#     field :title, type: String
-#     has_many :tunes
-#     has_and_belongs_to_many :musicians
-#   end
-
-#   class Musician
-#     include Mongoid::Document
-#     field :name, type: String
-#   end
-
-#   class Tune
-#     include Mongoid::Document
-#     include Mongoid::Timestamps
-#     field :title, type: String
-#     belongs_to :disc
-#     belongs_to :musician
-#   end
-
-#   class MongoidTest < MiniTest::Spec
-#     class TuneForm < Reform::Form
-#       include Reform::Form::Mongoid
-#       model :tune
-
-#       property :title
-#       property :created_at
-
-#       validates_uniqueness_of :title, scope: [:disc_id, :musician_id]
-#       validates :created_at, :presence => true # have another property to test if we mix up.
-
-#       property :musician do
-#         property :name
-#         validates_uniqueness_of :name # this currently also tests if Form::AR is included as a feature.
-#       end
-#     end
-
-#     let(:disc)   { Disc.create(:title => "Damnation") }
-#     let(:musician)  { Musician.create(:name => "Opeth") }
-#     let(:form)    { TuneForm.new(Tune.new(:musician => Musician.new)) }
-
-#     it { form.class.i18n_scope.must_equal :mongoid }
-
-#     it "allows accessing the database" do
-#     end
-
-#     # uniqueness
-#     it "has no errors on title when title is unique for the same musician and disc" do
-#       form.validate("title" => "The Gargoyle", "musician_id" => musician.id, "disc" => disc.id, "created_at" => "November 6, 1966")
-#       assert_empty form.errors[:title]
-#     end
-
-#     it "has errors on title when title is taken for the same musician and disc" do
-#       skip "replace ActiveModel::Validations with our own, working and reusable gem."
-#       Tune.create(title: "Windowpane", musician_id: musician.id, disc_id: disc.id)
-#       form.validate("title" => "Windowpane", "musician_id" => musician.id, "disc" => disc)
-#       refute_empty form.errors[:title]
-#     end
-
-#     # nested object taken.
-#     it "is valid when musician name is unique" do
-#       form.validate("musician" => {"name" => "Paul Gilbert"}, "title" => "The Gargoyle", "created_at" => "November 6, 1966").must_equal true
-#     end
-
-#     it "is invalid and shows error when taken" do
-#       Tune.delete_all
-#       Musician.create(:name => "Racer X")
-
-#       form.validate("musician" => {"name" => "Racer X"}, "title" => "Ghost Inside My Skin").must_equal false
-#       form.errors.messages.must_equal({:"musician.name"=>["is already taken"], :created_at => ["can't be blank"]})
-#     end
-
-#     it "works with Composition" do
-#       form = Class.new(Reform::Form) do
-#         include Reform::Form::Mongoid
-#         include Reform::Form::Composition
-
-#         property :name, :on => :musician
-#         validates_uniqueness_of :name
-#       end.new(:musician => Musician.new)
-
-#       Musician.create(:name => "Bad Religion")
-#       form.validate("name" => "Bad Religion").must_equal false
-#     end
-
-#     describe "#save" do
-#       # TODO: test 1-n?
-#       it "calls model.save" do
-#         Musician.delete_all
-#         form.validate("musician" => {"name" => "Bad Religion"}, "title" => "Ghost Inside My Skin")
-#         form.save
-#         Musician.where(:name => "Bad Religion").size.must_equal 1
-#       end
-
-#       it "doesn't call model.save when block is given" do
-#         Musician.delete_all
-#         form.validate("name" => "Bad Religion")
-#         form.save {}
-#         Musician.where(:name => "Bad Religion").size.must_equal 0
-#       end
-#     end
-#   end
-
+require 'test_helper'
+def mongoid_present?
+  require 'mongoid'
+  Mongoid.configure do |config|
+    config.connect_to("reform-mongoid-test")
+  end
+  true
+rescue
+  false
+end
+
+if mongoid_present?
+  require 'reform/mongoid'
+
+  class Disc
+    include Mongoid::Document
+    field :title, type: String
+    has_many :tunes
+    has_and_belongs_to_many :musicians
+  end
+
+  class Musician
+    include Mongoid::Document
+    field :name, type: String
+  end
+
+  class Tune
+    include Mongoid::Document
+    include Mongoid::Timestamps
+    field :title, type: String
+    belongs_to :disc
+    belongs_to :musician
+  end
+
+  class MongoidTest < MiniTest::Spec
+    class TuneForm < Reform::Form
+      include Reform::Form::Mongoid
+      model :tune
+
+      property :title
+      property :created_at
+
+      validates_uniqueness_of :title, scope: [:disc_id, :musician_id]
+      validates :created_at, :presence => true # have another property to test if we mix up.
+
+      property :musician do
+        property :name
+        validates_uniqueness_of :name # this currently also tests if Form::AR is included as a feature.
+      end
+    end
+
+    let(:disc)   { Disc.create(:title => "Damnation") }
+    let(:musician)  { Musician.create(:name => "Opeth") }
+    let(:form)    { TuneForm.new(Tune.new(:musician => Musician.new)) }
+
+    it { form.class.i18n_scope.must_equal :mongoid }
+
+    it "allows accessing the database" do
+    end
+
+    # uniqueness
+    it "has no errors on title when title is unique for the same musician and disc" do
+      form.validate("title" => "The Gargoyle", "musician_id" => musician.id, "disc" => disc.id, "created_at" => "November 6, 1966")
+      assert_empty form.errors[:title]
+    end
+
+    it "has errors on title when title is taken for the same musician and disc" do
+      skip "replace ActiveModel::Validations with our own, working and reusable gem."
+      Tune.create(title: "Windowpane", musician_id: musician.id, disc_id: disc.id)
+      form.validate("title" => "Windowpane", "musician_id" => musician.id, "disc" => disc)
+      refute_empty form.errors[:title]
+    end
+
+    # nested object taken.
+    it "is valid when musician name is unique" do
+      form.validate("musician" => {"name" => "Paul Gilbert"}, "title" => "The Gargoyle", "created_at" => "November 6, 1966").must_equal true
+    end
+
+    it "is invalid and shows error when taken" do
+      Tune.delete_all
+      Musician.create(:name => "Racer X")
+
+      form.validate("musician" => {"name" => "Racer X"}, "title" => "Ghost Inside My Skin").must_equal false
+      form.errors.messages.must_equal({:"musician.name"=>["is already taken"], :created_at => ["can't be blank"]})
+    end
+
+    it "works with Composition" do
+      form = Class.new(Reform::Form) do
+        include Reform::Form::Mongoid
+        include Reform::Form::Composition
+
+        property :name, :on => :musician
+        validates_uniqueness_of :name
+      end.new(:musician => Musician.new)
+
+      Musician.create(:name => "Bad Religion")
+      form.validate("name" => "Bad Religion").must_equal false
+    end
+
+    describe "#save" do
+      # TODO: test 1-n?
+      it "calls model.save" do
+        Musician.delete_all
+        form.validate("musician" => {"name" => "Bad Religion"}, "title" => "Ghost Inside My Skin")
+        form.save
+        Musician.where(:name => "Bad Religion").size.must_equal 1
+      end
+
+      it "doesn't call model.save when block is given" do
+        Musician.delete_all
+        form.validate("name" => "Bad Religion")
+        form.save {}
+        Musician.where(:name => "Bad Religion").size.must_equal 0
+      end
+    end
+  end
+
 
-#   class PopulateWithActiveRecordTest < MiniTest::Spec
-#     class DiscForm < Reform::Form
+  class PopulateWithActiveRecordTest < MiniTest::Spec
+    class DiscForm < Reform::Form
 
-#       property :title
+      property :title
 
-#       collection :tunes, :populate_if_empty => Tune do
-#         property :title
-#       end
-#     end
+      collection :tunes, :populate_if_empty => Tune do
+        property :title
+      end
+    end
 
-#     let (:disc) { Disc.new(:tunes => []) }
-#     it do
-#       form = DiscForm.new(disc)
+    let (:disc) { Disc.new(:tunes => []) }
+    it do
+      form = DiscForm.new(disc)
 
-#       form.validate("tunes" => [{"title" => "Straight From The Jacket"}])
+      form.validate("tunes" => [{"title" => "Straight From The Jacket"}])
 
-#       # form populated.
-#       form.tunes.size.must_equal 1
-#       form.tunes[0].model.must_be_kind_of Tune
+      # form populated.
+      form.tunes.size.must_equal 1
+      form.tunes[0].model.must_be_kind_of Tune
 
-#       # model NOT populated.
-#       disc.tunes.must_equal []
+      # model NOT populated.
+      disc.tunes.must_equal []
 
 
-#       form.sync
+      form.sync
 
-#       # form populated.
-#       form.tunes.size.must_equal 1
-#       form.tunes[0].model.must_be_kind_of Tune
+      # form populated.
+      form.tunes.size.must_equal 1
+      form.tunes[0].model.must_be_kind_of Tune
 
-#       # model also populated.
-#       tune = disc.tunes[0]
-#       disc.tunes.must_equal [tune]
-#       tune.title.must_equal "Straight From The Jacket"
+      # model also populated.
+      tune = disc.tunes[0]
+      disc.tunes.must_equal [tune]
+      tune.title.must_equal "Straight From The Jacket"
 
 
-#       # if ActiveRecord::VERSION::STRING !~ /^3.0/
-#       #   # saving saves association.
-#       #   form.save
-#       #
-#       #   disc.reload
-#       #   tune = disc.tunes[0]
-#       #   disc.tunes.must_equal [tune]
-#       #   tune.title.must_equal "Straight From The Jacket"
-#       # end
-#     end
+      # if ActiveRecord::VERSION::STRING !~ /^3.0/
+      #   # saving saves association.
+      #   form.save
+      #
+      #   disc.reload
+      #   tune = disc.tunes[0]
+      #   disc.tunes.must_equal [tune]
+      #   tune.title.must_equal "Straight From The Jacket"
+      # end
+    end
 
 
-#     describe "modifying 1., adding 2." do
-#       let (:tune) { Tune.new(:title => "Part 2") }
-#       let (:disc) { Disc.create.tap { |a| a.tunes << tune } }
+    describe "modifying 1., adding 2." do
+      let (:tune) { Tune.new(:title => "Part 2") }
+      let (:disc) { Disc.create.tap { |a| a.tunes << tune } }
 
-#       it do
-#         form = DiscForm.new(disc)
+      it do
+        form = DiscForm.new(disc)
 
-#         id = disc.tunes[0].id
-#         disc.tunes[0].persisted?.must_equal true
-#         assert id.to_s.size > 0
+        id = disc.tunes[0].id
+        disc.tunes[0].persisted?.must_equal true
+        assert id.to_s.size > 0
 
-#         form.validate("tunes" => [{"title" => "Part Two"}, {"title" => "Check For A Pulse"}])
+        form.validate("tunes" => [{"title" => "Part Two"}, {"title" => "Check For A Pulse"}])
 
-#         # form populated.
-#         form.tunes.size.must_equal 2
-#         form.tunes[0].model.must_be_kind_of Tune
-#         form.tunes[1].model.must_be_kind_of Tune
+        # form populated.
+        form.tunes.size.must_equal 2
+        form.tunes[0].model.must_be_kind_of Tune
+        form.tunes[1].model.must_be_kind_of Tune
 
-#         # model NOT populated.
-#         disc.tunes.must_equal [tune]
+        # model NOT populated.
+        disc.tunes.must_equal [tune]
 
 
-#         form.sync
+        form.sync
 
-#         # form populated.
-#         form.tunes.size.must_equal 2
+        # form populated.
+        form.tunes.size.must_equal 2
 
-#         # model also populated.
-#         disc.tunes.size.must_equal 2
+        # model also populated.
+        disc.tunes.size.must_equal 2
 
-#         # corrected title
-#         disc.tunes[0].title.must_equal "Part Two"
-#         # ..but same tune.
-#         disc.tunes[0].id.must_equal id
+        # corrected title
+        disc.tunes[0].title.must_equal "Part Two"
+        # ..but same tune.
+        disc.tunes[0].id.must_equal id
 
-#         # and a new tune.
-#         disc.tunes[1].title.must_equal "Check For A Pulse"
-#         disc.tunes[1].persisted?.must_equal true # TODO: with << strategy, this shouldn't be saved.
-#       end
+        # and a new tune.
+        disc.tunes[1].title.must_equal "Check For A Pulse"
+        disc.tunes[1].persisted?.must_equal true # TODO: with << strategy, this shouldn't be saved.
+      end
 
-#       describe 'using nested_models_attributes to modify nested collection' do
-#         class ActiveModelDiscForm < Reform::Form
-#           include Reform::Form::ActiveModel
-#           include Reform::Form::ActiveModel::FormBuilderMethods
+      describe 'using nested_models_attributes to modify nested collection' do
+        class ActiveModelDiscForm < Reform::Form
+          include Reform::Form::ActiveModel
+          include Reform::Form::ActiveModel::FormBuilderMethods
 
-#           property :title
+          property :title
 
-#           collection :tunes, :populate_if_empty => Tune do
-#             property :title
-#           end
-#         end
+          collection :tunes, :populate_if_empty => Tune do
+            property :title
+          end
+        end
 
-#         let (:disc) { Disc.create(:title => 'Greatest Hits') }
-#         let (:form) { ActiveModelDiscForm.new(disc) }
+        let (:disc) { Disc.create(:title => 'Greatest Hits') }
+        let (:form) { ActiveModelDiscForm.new(disc) }
 
-#         it do
-#           form.validate('tunes_attributes' => {'0' => {'title' => 'Tango'}})
+        it do
+          form.validate('tunes_attributes' => {'0' => {'title' => 'Tango'}})
 
-#           # form populated.
-#           form.tunes.size.must_equal 1
-#           form.tunes[0].model.must_be_kind_of Tune
-#           form.tunes[0].title.must_equal 'Tango'
+          # form populated.
+          form.tunes.size.must_equal 1
+          form.tunes[0].model.must_be_kind_of Tune
+          form.tunes[0].title.must_equal 'Tango'
 
-#           # model NOT populated.
-#           disc.tunes.must_equal []
+          # model NOT populated.
+          disc.tunes.must_equal []
 
-#           form.save
+          form.save
 
-#           # nested model persisted.
-#           first_tune = disc.tunes[0]
-#           first_tune.persisted?.must_equal true
-#           assert first_tune.id.to_s.size > 0
+          # nested model persisted.
+          first_tune = disc.tunes[0]
+          first_tune.persisted?.must_equal true
+          assert first_tune.id.to_s.size > 0
 
-#           # form populated.
-#           form.tunes.size.must_equal 1
+          # form populated.
+          form.tunes.size.must_equal 1
 
-#           # model also populated.
-#           disc.tunes.size.must_equal 1
-#           disc.tunes[0].title.must_equal 'Tango'
+          # model also populated.
+          disc.tunes.size.must_equal 1
+          disc.tunes[0].title.must_equal 'Tango'
 
-#           form = ActiveModelDiscForm.new(disc)
-#           form.validate('tunes_attributes' => {'0' => {'id' => first_tune.id, 'title' => 'Tango nuevo'}, '1' => {'title' => 'Waltz'}})
+          form = ActiveModelDiscForm.new(disc)
+          form.validate('tunes_attributes' => {'0' => {'id' => first_tune.id, 'title' => 'Tango nuevo'}, '1' => {'title' => 'Waltz'}})
 
-#           # form populated.
-#           form.tunes.size.must_equal 2
-#           form.tunes[0].model.must_be_kind_of Tune
-#           form.tunes[1].model.must_be_kind_of Tune
-#           form.tunes[0].title.must_equal 'Tango nuevo'
-#           form.tunes[1].title.must_equal 'Waltz'
+          # form populated.
+          form.tunes.size.must_equal 2
+          form.tunes[0].model.must_be_kind_of Tune
+          form.tunes[1].model.must_be_kind_of Tune
+          form.tunes[0].title.must_equal 'Tango nuevo'
+          form.tunes[1].title.must_equal 'Waltz'
 
-#           # model NOT populated.
-#           disc.tunes.size.must_equal 1
-#           disc.tunes[0].title.must_equal 'Tango'
+          # model NOT populated.
+          disc.tunes.size.must_equal 1
+          disc.tunes[0].title.must_equal 'Tango'
 
-#           form.save
+          form.save
 
-#           # form populated.
-#           form.tunes.size.must_equal 2
+          # form populated.
+          form.tunes.size.must_equal 2
 
-#           # model also populated.
-#           disc.tunes.size.must_equal 2
-#           disc.tunes[0].id.must_equal first_tune.id
-#           disc.tunes[0].persisted?.must_equal true
-#           disc.tunes[1].persisted?.must_equal true
-#           disc.tunes[0].title.must_equal 'Tango nuevo'
-#           disc.tunes[1].title.must_equal 'Waltz'
-#         end
-#       end
-#     end
+          # model also populated.
+          disc.tunes.size.must_equal 2
+          disc.tunes[0].id.must_equal first_tune.id
+          disc.tunes[0].persisted?.must_equal true
+          disc.tunes[1].persisted?.must_equal true
+          disc.tunes[0].title.must_equal 'Tango nuevo'
+          disc.tunes[1].title.must_equal 'Waltz'
+        end
+      end
+    end
 
-#     # it do
-#     #   a=Disc.new
-#     #   a.tunes << Tune.new(title: "Old What's His Name") # Tune does not get persisted.
+    # it do
+    #   a=Disc.new
+    #   a.tunes << Tune.new(title: "Old What's His Name") # Tune does not get persisted.
 
-#     #   a.tunes[1] = Tune.new(title: "Permanent Rust")
+    #   a.tunes[1] = Tune.new(title: "Permanent Rust")
 
-#     #   puts "@@@"
-#     #   puts a.tunes.inspect
+    #   puts "@@@"
+    #   puts a.tunes.inspect
 
-#     #   puts "---"
-#     #   a.save
-#     #   puts a.tunes.inspect
+    #   puts "---"
+    #   a.save
+    #   puts a.tunes.inspect
 
-#     #   b = a.tunes.first
+    #   b = a.tunes.first
 
-#     #   a.tunes = [Tune.new(title:"Biomag")]
-#     #   puts "\\\\"
-#     #   a.save
-#     #   a.reload
-#     #   puts a.tunes.inspect
-
-#     #   b.reload
-#     #   puts "#{b.inspect}, #{b.persisted?}"
+    #   a.tunes = [Tune.new(title:"Biomag")]
+    #   puts "\\\\"
+    #   a.save
+    #   a.reload
+    #   puts a.tunes.inspect
+
+    #   b.reload
+    #   puts "#{b.inspect}, #{b.persisted?}"
 
 
-#     #   a.tunes = [a.tunes.first, Tune.new(title: "Count Down")]
-#     #   b = a.tunes.first
-#     #   puts ":::::"
-#     #   a.save
-#     #   a.reload
-#     #   puts a.tunes.inspect
+    #   a.tunes = [a.tunes.first, Tune.new(title: "Count Down")]
+    #   b = a.tunes.first
+    #   puts ":::::"
+    #   a.save
+    #   a.reload
+    #   puts a.tunes.inspect
 
-#     #   b.reload
-#     #   puts "#{b.inspect}, #{b.persisted?}"
-#     # end
-#   end
-# end
+    #   b.reload
+    #   puts "#{b.inspect}, #{b.persisted?}"
+    # end
+  end
+end

data/test/multi_parameter_attributes_test.rb

@@ -0,0 +1,50 @@
+require 'test_helper'
+
+class ReformTest < ReformSpec
+  describe "Date" do
+    Person = Struct.new(:date_of_birth)
+    let (:form) { DateOfBirthForm.new(Person.new) }
+
+    class DateOfBirthForm < Reform::Form
+      feature Reform::Form::ActiveModel::FormBuilderMethods
+      feature Reform::Form::MultiParameterAttributes
+      property :date_of_birth, type: Date, :multi_params => true
+    end
+
+    it "munges multi-param date fields into a valid Date attribute" do
+      date_of_birth_params = { "date_of_birth(1i)"=>"1950", "date_of_birth(2i)"=>"1", "date_of_birth(3i)"=>"1" }
+      form.validate(date_of_birth_params)
+      form.date_of_birth.must_equal Date.civil(1950, 1, 1)
+    end
+
+    it "handles invalid Time input" do
+      date_of_birth_params = { "date_of_birth(1i)"=>"1950", "date_of_birth(2i)"=>"99", "date_of_birth(3i)"=>"1" }
+      form.validate(date_of_birth_params)
+      form.date_of_birth.must_equal nil
+    end
+  end
+
+  describe "DateTime" do
+    Party = Struct.new(:start_time)
+    let (:form) { PartyForm.new(Party.new) }
+
+    class PartyForm < Reform::Form
+      feature Reform::Form::ActiveModel::FormBuilderMethods
+      feature Reform::Form::MultiParameterAttributes
+      property :start_time, type: DateTime, :multi_params => true
+    end
+
+    it "munges multi-param date and time fields into a valid Time attribute" do
+      start_time_params = { "start_time(1i)"=>"2000", "start_time(2i)"=>"1", "start_time(3i)"=>"1", "start_time(4i)"=>"12", "start_time(5i)"=>"00" }
+      time_format = "%Y-%m-%d %H:%M"
+      form.validate(start_time_params)
+      form.start_time.strftime(time_format).must_equal DateTime.strptime("2000-01-01 12:00", time_format)
+    end
+
+    it "handles invalid Time input" do
+      start_time_params = { "start_time(1i)"=>"2000", "start_time(2i)"=>"99", "start_time(3i)"=>"1", "start_time(4i)"=>"12", "start_time(5i)"=>"00" }
+      form.validate(start_time_params)
+      form.start_time.must_equal nil
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reform
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Nick Sutterer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: disposable
@@ -245,6 +245,7 @@ files:
 - reform.gemspec
 - test/active_model_custom_validation_translations_test.rb
 - test/active_model_test.rb
+- test/active_model_validation_for_property_named_format_test.rb
 - test/active_record_test.rb
 - test/benchmarking.rb
 - test/builder_test.rb
@@ -292,6 +293,7 @@ files:
 - test/model_validations_test.rb
 - test/module_test.rb
 - test/mongoid_test.rb
+- test/multi_parameter_attributes_test.rb
 - test/populate_test.rb
 - test/prepopulator_test.rb
 - test/rails/integration_test.rb
@@ -335,6 +337,7 @@ summary: Form object decoupled from models with validation, population and prese
 test_files:
 - test/active_model_custom_validation_translations_test.rb
 - test/active_model_test.rb
+- test/active_model_validation_for_property_named_format_test.rb
 - test/active_record_test.rb
 - test/benchmarking.rb
 - test/builder_test.rb
@@ -382,6 +385,7 @@ test_files:
 - test/model_validations_test.rb
 - test/module_test.rb
 - test/mongoid_test.rb
+- test/multi_parameter_attributes_test.rb
 - test/populate_test.rb
 - test/prepopulator_test.rb
 - test/rails/integration_test.rb