reform 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b95fac93b5186e174e6e2aef263bff4bf5305210
-  data.tar.gz: bafdc2c15f78fa1fe27e9b554c32d3aafcfb4fbd
+  metadata.gz: 4eac1a339ca122c10c68332cbb713fee79ef7670
+  data.tar.gz: fbea1c3d34b9af52108f4d3e508b562b32f79c27
 SHA512:
-  metadata.gz: a55abac9d331f20d75fa66ed8950c35e5cd16460fc054a182c6d0cfb0c4d9e1524349553b9aeeeafa33b75453d35ce3c8476ad8f0adce7775c41d99d4176338a
-  data.tar.gz: 61d436b3f4cb696e2cffa02f7e3ff1179741209da8a4f2073e36da45d12971983ff19be9ffdcb0b515ed601f933240685287fa208287a63f521d3d4dbcb2e99c
+  metadata.gz: 9242a0e45d2392e58af57958d695d37fb0f316f90701ebc383e256a72fa01066097e441752cd1deb112dabe628d91fca7ccfee835ee3deb2e2997fb0ca69a836
+  data.tar.gz: a95af8299b9fc16284ec5c5d583208c1efdc12ed3a6a0bfc71a6cb885409731102d20faba0009c7827523baee402165d9cf331589e41e841d0d449b0b7d2ada5

data/CHANGES.md

@@ -1,3 +1,15 @@
+## 1.1.2
+
+* `::validates_uniqueness_of` now accepts options like `:scope`. Thanks to @cveneziani for a failing test and insight.
+
+## 1.1.1
+
+* Fix a bug where including a form module would mess up the options has of the validations (under older Rails).
+* Fix `::properties` which modified the options hash while iterating properties.
+* `Form#save` now returns the result of the `model.save` invocation.
+* Fix: When overriding a reader method for a nested form for presentation (e.g. to provide an initial new record), this reader was used in `#update!`. The deserialize/update run now grabs the actual nested form instances directly from `fields`.
+* `Errors#to_s` is now delegated to `messages.to_s`. This is used in `Trailblazer::Operation`.
+
 ## 1.1.0
 
 * Deprecate first block argument in save. It's new signature is `save { |hash| }`. You already got the form instance when calling `form.save` so there's no need to pass it into the block.
@@ -6,6 +18,7 @@
 * You can now define forms in modules including `Reform::Form::Module` to improve reusability.
 * Inheriting from forms and then overriding/extending properties with `:inherit` now works properly.
 * You can now define methods in inline forms.
+* Added `Form::ActiveModel::ModelValidations` to copy validations from model classes. Thanks to @cameron-martin for this fine addition.
 * Forms can now also deserialize other formats, e.g. JSON. This allows them to be used as a contract for API endpoints and in Operations in Trailblazer.
 * Composition forms no longer expose readers to the composition members. The composition is available via `Form#model`, members via `Form#model[:member_name]`.
 * ActiveRecord support is now included correctly and passed on to nested forms.

data/Gemfile

@@ -2,5 +2,5 @@ source 'https://rubygems.org'
 
 gemspec
 
-# gem 'representable', path: "../representable"
+gem 'representable', path: "../representable"
 # gem "disposable", path: "../disposable"

data/README.md

@@ -493,6 +493,35 @@ Here's how the block parameters look like.
 end
 ```
 
+
+## Forms In Modules
+
+To maximize reusability, you can also define forms in modules and include them in other modules or classes.
+
+```ruby
+module SongsForm
+  include Reform::Form::Module
+
+  collection :songs do
+    property :title
+    validates :title, presence: true
+  end
+end
+```
+
+This can now be included into a real form.
+
+```ruby
+class AlbumForm < Reform::Form
+  property :title
+
+  include SongsForm
+end
+```
+
+Note that you can also override properties [using inheritance](#inheritance) in Reform.
+
+
 ## Inheritance
 
 Forms can be derived from other forms and will inherit all properties and validations.
@@ -538,6 +567,8 @@ Using `inherit:` here will extend the existing `songs` form with the `band_id` f
 
 Often you want incoming form data to be converted to a type, like timestamps. Reform uses [virtus](https://github.com/solnic/virtus) for coercion, the DSL is seamlessly integrated into Reform with the `:type` option.
 
+### Virtus Coercion
+
 Be sure to add `virtus` to your Gemfile.
 
 ```ruby
@@ -549,10 +580,32 @@ class SongForm < Reform::Form
   property :written_at, type: DateTime
 end
 
-@form.save do |data, nested|
-  data.written_at #=> <DateTime XXX>
+form.validate("written_at" => "26 September")
+```
+
+Coercion only happens in `#validate`.
+
+```
+form.written_at #=> <DateTime "2014 September 26 00:00">
+```
+
+### Manual Coercing Values
+
+If you need to filter values manually, you can override the setter in the form.
+
+```ruby
+class SongForm < Reform::Form
+  property :title
+
+  def title=(value)
+    super sanitize(value) # value is raw form input.
+  end
+end
 ```
 
+As with the built-in coercion, this setter is only called in `#validate`.
+
+
 ## Virtual Attributes
 
 Virtual fields come in handy when there's no direct mapping to a model attribute or when you plan on displaying but not processing a value.
@@ -605,6 +658,35 @@ form.save do |f, nested|
   f.country #=> "Australia"
 ```
 
+## Validations From Models
+
+Sometimes when you still keep validations in your models (which you shouldn't) copying them to a form might not feel right. In that case, you can let Reform automatically copy them.
+
+```ruby
+class SongForm < Reform::Form
+  property :title
+
+  extend ActiveModel::ModelValidations
+  copy_validations_from Song
+end
+```
+
+Note how `copy_validations_from` copies over the validations allowing you to stay DRY.
+
+This also works with Composition.
+
+```ruby
+class SongForm < Reform::Form
+  include Composition
+  # ...
+
+  extend ActiveModel::ModelValidations
+  copy_validations_from song: Song, band: Band
+end
+```
+
+Be warned that we _do not_ encourage copying validations. You should rather move validation code into forms and not work on your model directly anymore.
+
 ## Agnosticism: Mapping Data
 
 Reform doesn't really know whether it's working with a PORO, an `ActiveRecord` instance or a `Sequel` row.

data/lib/reform/contract.rb

@@ -48,14 +48,14 @@ module Reform
         property(name, options, &block)
       end
 
-      def properties(names, *args)
-        names.each { |name| property(name, *args) }
+      def properties(names, options={})
+        names.each { |name| property(name, options.dup) }
       end
 
       def setup_form_definition(definition)
         options = {
           # TODO: make this a bit nicer. why do we need :form at all?
-          :form         => (definition[:extend] and definition[:extend].evaluate(nil)) || definition[:form], # :form is always just a Form class name.
+          :form         => (definition.representer_module) || definition[:form], # :form is always just a Form class name.
           :pass_options => true, # new style of passing args
           :prepare      => lambda { |form, args| form }, # always just return the form without decorating.
           :representable => true, # form: Class must be treated as a typed property.
@@ -109,6 +109,20 @@ module Reform
       features[mod] = true
     end
 
+    # allows including representers from Representable, Roar or disposable.
+    def self.inherit_module!(representer) # called from Representable::included.
+      # representer_class.inherit_module!(representer)
+      representer.representable_attrs.each do |dfn|
+        next if dfn.name == "links" # wait a second # FIXME what is that?
+
+        # TODO: remove manifesting and do that in representable, too!
+        args = [dfn.name, dfn.instance_variable_get(:@options)] # TODO: dfn.to_args (inluding &block)
+
+        property(*args) and next unless dfn.representer_module
+        property(*args) { include dfn.representer_module } # nested.
+      end
+    end
+
     alias_method :aliased_model, :model
 
 

data/lib/reform/contract/errors.rb

@@ -30,4 +30,8 @@ class Reform::Contract::Errors < ActiveModel::Errors
   def valid? # TODO: test me in unit test.
     blank?
   end
+
+  def to_s
+    messages.inspect
+  end
 end # Errors

data/lib/reform/form/active_model.rb

@@ -25,8 +25,9 @@ module Reform::Form::ActiveModel
 
     # Modify the incoming Rails params hash to be representable compliant.
     def update!(params)
-      # DISCUSS: #validate should actually expect the complete params hash and then pick the right key as it knows the form name.
-      # however, this would cause confusion?
+      return super unless params.is_a?(Hash)
+      # TODO: run this only for hash deserialization, but generically (#deserialize_hash ?).
+
       mapper.new(self).nested_forms do |attr, model| # FIXME: make this simpler.
         rename_nested_param_for!(params, attr)
       end

data/lib/reform/form/active_record.rb

@@ -8,8 +8,9 @@ module Reform::Form::ActiveRecord
   end
 
   module ClassMethods
-    def validates_uniqueness_of(attribute)
-      validates_with UniquenessValidator, :attributes => [attribute]
+    def validates_uniqueness_of(attribute, options={})
+      options = options.merge(:attributes => [attribute])
+      validates_with(UniquenessValidator, options)
     end
     def i18n_scope
       :activerecord

data/lib/reform/form/module.rb

@@ -1,5 +1,5 @@
 # Include this in every module that gets further included.
-module Reform::Form::Module
+module Reform::Form::Module # Schema
   def self.included(base)
     base.extend ClassMethods
     base.extend Included
@@ -8,16 +8,17 @@ module Reform::Form::Module
   module Included # TODO: use representable's inheritance mechanism.
     def included(base)
       super
-      @instructions.each { |cfg| base.send(cfg[0], *cfg[1], &cfg[2]) } # property :name, {} do .. end
+      instructions.each { |cfg|
+        args    = cfg[1].dup
+        options = args.extract_options!.dup # we need to duplicate options has as AM::Validations messes it up later.
+
+        base.send(cfg[0], *args, options, &cfg[2]) } # property :name, {} do .. end
     end
   end
 
   module ClassMethods
-    def property(*args, &block)
-      instructions << [:property, args, block]
-    end
-    def validates(*args, &block)
-      instructions << [:validates, args, block]
+    def method_missing(method, *args, &block)
+      instructions << [method, args, block]
     end
 
     def instructions

data/lib/reform/form/save.rb

@@ -14,6 +14,7 @@ module Reform::Form::Save
     end
   end
 
+  # Returns the result of that save invocation on the model.
   def save(&block)
     # DISCUSS: we should never hit @mapper here (which writes to the models) when a block is passed.
     return deprecate_first_save_block_arg(&block) if block_given?
@@ -23,8 +24,9 @@ module Reform::Form::Save
   end
 
   def save!
-    save_model
+    result = save_model
     mapper.new(fields).extend(RecursiveSave).to_hash # save! on all nested forms.  # TODO: only include nested forms here.
+    result
   end
 
   def save_model

data/lib/reform/form/validate.rb

@@ -12,6 +12,8 @@ module Reform::Form::Validate
           :collection => attr[:collection], # TODO: Def#merge! doesn't consider :collection if it's already set in attr YET.
           :parse_strategy => :sync, # just use nested objects as they are.
 
+          # :getter grabs nested forms directly from fields bypassing the reader method which could possibly be overridden for presentation.
+          :getter      => lambda { |options| fields.send(options.binding.name) },
           :deserialize => lambda { |object, params, args| object.update!(params) },
         )
 
@@ -59,6 +61,10 @@ module Reform::Form::Validate
         form  = binding[:form].new(model) # free service: wrap model with Form. this usually happens in #setup.
 
         if binding.array?
+          # TODO: please extract this into Disposable.
+          fields = fields.send(:fields)
+
+          fields.send("#{binding.setter}", []) unless fields.send("#{binding.getter}") # DISCUSS: why do I have to initialize this here?
           fields.send("#{binding.getter}")[index] = form
         else
           fields.send("#{binding.setter}", form) # :setter is currently overwritten by :parse_strategy.
@@ -76,6 +82,8 @@ module Reform::Form::Validate
     super() # run the actual validation on self.
   end
 
+  # Some users use this method to pre-populate a form. Not saying this is right, but we'll keep
+  # this method here.
   def update!(params)
     deserialize!(params)
   end

data/lib/reform/version.rb

@@ -1,3 +1,3 @@
 module Reform
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/test/active_record_test.rb

@@ -19,7 +19,6 @@ require 'reform/active_record'
 # end
 # Artist.new(:name => "Racer X").save
 
-
 class ActiveRecordTest < MiniTest::Spec
   class SongForm < Reform::Form
     include Reform::Form::ActiveRecord
@@ -28,7 +27,7 @@ class ActiveRecordTest < MiniTest::Spec
     property :title
     property :created_at
 
-    validates_uniqueness_of :title
+    validates_uniqueness_of :title, scope: [:album_id, :artist_id]
     validates :created_at, :presence => true # have another property to test if we mix up.
 
     property :artist do
@@ -37,7 +36,9 @@ class ActiveRecordTest < MiniTest::Spec
     end
   end
 
-  let (:form) { SongForm.new(Song.new(:artist => Artist.new)) }
+  let(:album)   { Album.create(:title => "Damnation") }
+  let(:artist)  { Artist.create(:name => "Opeth") }
+  let(:form)    { SongForm.new(Song.new(:artist => Artist.new)) }
 
   it { form.class.i18n_scope.must_equal :activerecord }
 
@@ -45,11 +46,20 @@ class ActiveRecordTest < MiniTest::Spec
   end
 
   # uniqueness
-  it "is valid when name is unique" do
-    form.validate("artist" => {"name" => "Paul Gilbert"}, "title" => "The Gargoyle", "created_at" => "November 6, 1966").must_equal true
+  it "is valid when title is unique for the same artist and album" do
+    form.validate("title" => "The Gargoyle", "artist_id" => artist.id, "album" => album.id, "created_at" => "November 6, 1966").must_equal true
+  end
+
+  it "is invalid when title is taken for the same artist and album" do
+    Song.create(title: "Windowpane", artist_id: artist.id, album_id: album.id)
+    form.validate("title" => "Windowpane", "artist_id" => artist.id, "album" => album).must_equal false
   end
 
   # nested object taken.
+  it "is valid when artist name is unique" do
+    form.validate("artist" => {"name" => "Paul Gilbert"}, "title" => "The Gargoyle", "created_at" => "November 6, 1966").must_equal true
+  end
+
   it "is invalid and shows error when taken" do
     Song.delete_all
     Artist.create(:name => "Racer X")
@@ -190,8 +200,6 @@ class PopulateWithActiveRecordTest < MiniTest::Spec
   #   a.save
   #   puts a.songs.inspect
 
-
-
   #   b = a.songs.first
 
   #   a.songs = [Song.new(title:"Biomag")]

data/test/builder_test.rb

@@ -1,32 +1,32 @@
-require 'test_helper'
+# require 'test_helper'
 
-class BuilderTest < MiniTest::Spec
-  it do
-    Builder.new.checkboxes(:settings, :hash => {"play" => true, "released" => false}).must_equal %{<input name="yo" type="hidden" value="unchecked_value" /><input id="object_name_method" name="yo" type="checkbox" value="checked_value" />
-<input name="yo" type="hidden" value="unchecked_value" /><input id="object_name_method" name="yo" type="checkbox" value="checked_value" />}
-  end
-end
+# class BuilderTest < MiniTest::Spec
+#   it do
+#     Builder.new.checkboxes(:settings, :hash => {"play" => true, "released" => false}).must_equal %{<input name="yo" type="hidden" value="unchecked_value" /><input id="object_name_method" name="yo" type="checkbox" value="checked_value" />
+# <input name="yo" type="hidden" value="unchecked_value" /><input id="object_name_method" name="yo" type="checkbox" value="checked_value" />}
+#   end
+# end
 
 
-require 'action_view/helpers/capture_helper'
-require 'action_view/helpers/tag_helper'
-require 'action_view/helpers/url_helper'
-require 'action_view/helpers/sanitize_helper'
-require 'action_view/helpers/text_helper'
-require 'action_view/helpers/form_tag_helper'
-require 'action_view/helpers/form_helper'
+# require 'action_view/helpers/capture_helper'
+# require 'action_view/helpers/tag_helper'
+# require 'action_view/helpers/url_helper'
+# require 'action_view/helpers/sanitize_helper'
+# require 'action_view/helpers/text_helper'
+# require 'action_view/helpers/form_tag_helper'
+# require 'action_view/helpers/form_helper'
 
-class Builder
-  include ActionView::Helpers::CaptureHelper
-  include ActionView::Helpers::FormHelper
+# class Builder
+#   include ActionView::Helpers::CaptureHelper
+#   include ActionView::Helpers::FormHelper
 
-  # {name: value}
-  def checkboxes(name, options)
-    # get property form.to_a ? to_builder_hash or something like that
-    options[:hash].collect do |id, value|
-      ActionView::Helpers::InstanceTag.new(:object_name, :method, self).to_check_box_tag({:name => "yo"}, :checked_value, :unchecked_value)
+#   # {name: value}
+#   def checkboxes(name, options)
+#     # get property form.to_a ? to_builder_hash or something like that
+#     options[:hash].collect do |id, value|
+#       ActionView::Helpers::InstanceTag.new(:object_name, :method, self).to_check_box_tag({:name => "yo"}, :checked_value, :unchecked_value)
 
-      # check_box_tag(id, value, checked = false, {})
-    end.join("\n")
-  end
-end
+#       # check_box_tag(id, value, checked = false, {})
+#     end.join("\n")
+#   end
+# end

data/test/deserialize_test.rb

@@ -3,6 +3,8 @@ require 'representable/json'
 
 class DeserializeTest < BaseTest
   class AlbumContract < Reform::Form
+    include Reform::Form::ActiveModel::FormBuilderMethods # overrides #update!, too.
+
     self.representer_class.class_eval do
       include Representable::JSON
     end
@@ -33,8 +35,8 @@ class DeserializeTest < BaseTest
 
   let (:json) { '{"hit":{"title":"Sacrifice"},"title":"Second Heat","songs":[{"title":"Heart Of A Lion"}],"band":{"label":{"name":"Fat Wreck"}}}' }
 
-  it {
+  it do
     subject.validate(json)
     subject.band.label.name.must_equal "Fat Wreck"
-     }
+  end
 end

data/test/errors_test.rb

@@ -119,4 +119,12 @@ class ErrorsTest < MiniTest::Spec
     it { form.title.must_equal "Second Heat" }
     it { form.songs.first.title.must_equal "Heart Of A Lion" }
   end
+
+
+  describe "Errors#to_s" do
+    before { form.validate("songs"=>[{"title" => ""}], "band" => {"label" => {}}) }
+
+    # to_s is aliased to messages
+    it { form.errors.to_s.must_equal "{:\"songs.title\"=>[\"can't be blank\"], :\"band.label.name\"=>[\"can't be blank\"]}" }
+  end
 end

data/test/inherit_test.rb

@@ -34,6 +34,7 @@ class InheritTest < BaseTest
 end
 
 
+require 'reform/form/coercion'
 class ModuleInclusionTest < MiniTest::Spec
   module BandPropertyForm
     include Reform::Form::Module
@@ -53,15 +54,35 @@ class ModuleInclusionTest < MiniTest::Spec
     end
 
     validates :band, :presence => true
+
+    property :cool, type: Virtus::Attribute::Boolean # test coercion.
+  end
+
+  # TODO: test if works, move stuff into inherit_schema!
+  module AirplaysPropertyForm
+    include Reform::Form::Module
+
+    collection :airplays do
+      property :station
+      validates :station, :presence => true
+    end
+    validates :airplays, :presence => true
   end
 
 
+  # test:
+  # by including BandPropertyForm into multiple classes we assure that options hashes don't get messed up by AM:V.
+  class HitForm < Reform::Form
+    include BandPropertyForm
+  end
+
   class SongForm < Reform::Form
     property :title
 
     include BandPropertyForm
   end
 
+
   let (:song) { OpenStruct.new(:band => OpenStruct.new(:title => "Time Again")) }
 
   # nested form from module is present and creates accessor.
@@ -71,9 +92,72 @@ class ModuleInclusionTest < MiniTest::Spec
   it { SongForm.new(song).id.must_equal 1 }
   it { SongForm.new(song).band.id.must_equal 2 }
 
+  # validators get inherited.
+  it do
+    form = SongForm.new(OpenStruct.new)
+    form.validate({})
+    form.errors.messages.must_equal({:band=>["can't be blank"]})
+  end
+
+  # coercion works
+  it do
+    form = SongForm.new(OpenStruct.new)
+    form.validate({:cool => "1"})
+    form.cool.must_equal true
+  end
+
+
+  # include a module into a module into a class :)
+  module AlbumFormModule
+    include Reform::Form::Module
+    include BandPropertyForm
+
+    property :name
+    validates :name, :presence => true
+  end
+
+  class AlbumForm < Reform::Form
+    include AlbumFormModule
+
+    property :band, :inherit => true do
+      property :label
+      validates :label, :presence => true
+    end
+  end
+  # puts "......"+ AlbumForm.representer_class.representable_attrs.get(:band).inspect
+
+  it do
+    form = AlbumForm.new(OpenStruct.new(:band => OpenStruct.new))
+    form.validate({"band" => {}})
+    form.errors.messages.must_equal({:"band.title"=>["can't be blank"], :"band.label"=>["can't be blank"], :name=>["can't be blank"]})
+  end
+
+
+  # including representer into form
+  module GenericRepresenter
+    include Representable
+
+    property :title
+    property :manager do
+      property :title
+    end
+  end
+
+  class LabelForm < Reform::Form
+    property :location
+
+    include GenericRepresenter
+    validates :title, :presence => true
+    property :manager, :inherit => true do
+      validates :title, :presence => true
+    end
+  end
+    puts "......"+ LabelForm.representer_class.representable_attrs.get(:title).inspect
+
+
   it do
-     form = SongForm.new(OpenStruct.new())
-     form.validate({})
-     form.errors.messages.must_equal({:band=>["can't be blank"]})
+    form = LabelForm.new(OpenStruct.new(:manager => OpenStruct.new))
+    form.validate({"manager" => {}, "title"=>""}) # it's important to pass both nested and scalar here!
+    form.errors.messages.must_equal(:title=>["can't be blank"], :"manager.title"=>["can't be blank"], )
   end
 end

data/test/reform_test.rb

@@ -69,14 +69,21 @@ class ReformTest < ReformSpec
 
 
   describe "::properties" do
+    let (:options) { {:type => String} }
+
     subject do
+      opts = options
       Class.new(Reform::Form) do
-        properties [:name, :title]
+        properties [:name, :title], opts
+        properties [:created_at]
       end.new(comp)
     end
 
-    it { subject.name.must_equal "Duran Duran" }
-    it { subject.title.must_equal "Rio" }
+    it { subject.name.must_equal       "Duran Duran" }
+    it { subject.title.must_equal      "Rio" }
+    it { subject.created_at.must_equal nil }
+    # don't overwrite options.
+    it { subject; options.must_equal({:type => String}) }
   end
 
   class SongForm < Reform::Form
@@ -157,23 +164,6 @@ class ReformTest < ReformSpec
         form.errors.messages.must_equal({:name=>["can't be blank"], :title=>["can't be blank"]})
       end
     end
-
-    describe "method validations" do
-      it "allows accessing models" do
-        form = Class.new(Reform::Form) do
-          property :name
-          validate "name_correct?"
-
-          def name_correct?
-            errors.add :name, "Please give me a name" if model.name.nil?
-          end
-        end.new(comp)
-
-        form.validate({}).must_equal false
-        form.errors.messages.must_equal({:name=>["Please give me a name"]})
-      end
-    end
-
   end
 
   describe "#errors" do

data/test/save_test.rb

@@ -78,4 +78,12 @@ class SaveTest < BaseTest
     it { band.saved?.must_equal true }
     it { label.saved?.must_equal nil }
   end
+
+
+  # #save returns result (this goes into disposable soon).
+  it { subject.save.must_equal true }
+  it do
+    album.instance_eval { def save; false; end }
+    subject.save.must_equal false
+  end
 end

data/test/scalar_test.rb

@@ -163,5 +163,23 @@ class SelfNestedTest < BaseTest
     form.validate({}).must_equal true
   end
 
+
+  it do
+    form = StringForm.new(AlbumCover.new(nil))
+    form.validate({"image"=>""}).must_equal true
+  end
+
+
+
+  # TODO: move to validate_test.
+  # property :rejection_reason, scalar: true, virtual: true, empty: true do # optional parameter
+  #         validates length: {minimum: 5}, if: lambda { model.present? and avatar_moderation == "2" } # IF present, at least 5 characters.
+  #       end
+  class BlaForm < Reform::Form
+    property :image# creates "empty" form
+    validates :image, :length => {:minimum => 10}, if: lambda { image and image != "" }
+  end
+
+  it { BlaForm.new(AlbumCover.new(nil)).validate({"image"=>""}).must_equal true }
   # DISCUSS: when AlbumCover.new("Hello").validate({}), does that fail?
 end

data/test/validate_test.rb

@@ -275,6 +275,66 @@ class ValidateTest < BaseTest
     it { subject.band.label.name.must_equal "Stiff" }
     it { subject.title.must_equal "House Of Fun" }
   end
+
+
+  # providing manual validator method allows accessing form's API.
+  describe "with ::validate" do
+    let (:form) {
+      Class.new(Reform::Form) do
+        property :title
+
+        validate :title?
+
+        def title?
+          errors.add :title, "not lowercase" if title == "Fallout"
+        end
+      end
+     }
+
+    let (:params) { {"title" => "Fallout"} }
+    let (:song) { Song.new("Englishman") }
+
+    subject { form.new(song) }
+
+    before { @res = subject.validate(params) }
+
+    it { @res.must_equal false }
+    it { subject.errors.messages.must_equal({:title=>["not lowercase"]}) }
+  end
+
+
+  # overriding the reader for a nested form should only be considered when rendering.
+  describe "with overridden reader for nested form" do
+    let (:form) {
+      Class.new(Reform::Form) do
+        property :band, :populate_if_empty => lambda { |*| Band.new } do
+          property :label
+        end
+
+        collection :songs, :populate_if_empty => lambda { |*| Song.new } do
+          property :title
+        end
+
+        def band
+          raise "only call me when rendering the form!"
+        end
+
+        def songs
+          raise "only call me when rendering the form!"
+        end
+      end.new(album)
+     }
+
+     let (:album) { Album.new }
+
+     # don't use #artist when validating!
+     it do
+       form.validate("band" => {"label" => "Hellcat"}, "songs" => [{"title" => "Stand Your Ground"}, {"title" => "Otherside"}])
+       form.sync
+       album.band.label.must_equal "Hellcat"
+       album.songs.first.title.must_equal "Stand Your Ground"
+     end
+  end
 end
 
 # #validate(params)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reform
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Nick Sutterer
@@ -9,90 +9,90 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: representable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: disposable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: uber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.8
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -113,70 +113,70 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Freeing your AR models from form logic.
@@ -187,8 +187,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - LICENSE.txt
@@ -279,12 +279,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []