reform 2.3.0.rc1 → 2.5.0

data/test/module_test.rb

@@ -1,5 +1,5 @@
 require "test_helper"
-require 'reform/form/coercion'
+require "reform/form/coercion"
 
 class ModuleInclusionTest < MiniTest::Spec
   module BandPropertyForm
@@ -9,7 +9,7 @@ class ModuleInclusionTest < MiniTest::Spec
       property :title
 
       validation do
-        required(:title).filled
+        params { required(:title).filled }
       end
 
       def id # gets mixed into Form, too.
@@ -22,11 +22,11 @@ class ModuleInclusionTest < MiniTest::Spec
     end
 
     validation do
-      required(:band).filled
+      params { required(:band).filled }
     end
 
-    include Dry::Types.module # allows using Types::* in module.
-    property :cool, type: Form::Bool # test coercion.
+    include Dry.Types(default: :nominal) # allows using Types::* in module.
+    property :cool, type: Types::Params::Bool # test coercion.
   end
 
   # TODO: test if works, move stuff into inherit_schema!
@@ -36,15 +36,14 @@ class ModuleInclusionTest < MiniTest::Spec
     collection :airplays do
       property :station
       validation do
-        required(:station).filled
+        params { required(:station).filled }
       end
     end
     validation do
-      required(:airplays).filled
+      params { required(:airplays).filled }
     end
   end
 
-
   # test:
   # by including BandPropertyForm into multiple classes we assure that options hashes don't get messed up by AM:V.
   class HitForm < TestForm
@@ -58,31 +57,29 @@ class ModuleInclusionTest < MiniTest::Spec
     include BandPropertyForm
   end
 
-
-  let (:song) { OpenStruct.new(:band => OpenStruct.new(:title => "Time Again")) }
+  let(:song) { OpenStruct.new(band: OpenStruct.new(title: "Time Again")) }
 
   # nested form from module is present and creates accessor.
-  it { SongForm.new(song).band.title.must_equal "Time Again" }
+  it { assert_equal SongForm.new(song).band.title, "Time Again" }
 
   # methods from module get included.
-  it { SongForm.new(song).id.must_equal 1 }
-  it { SongForm.new(song).band.id.must_equal 2 }
+  it { assert_equal SongForm.new(song).id, 1 }
+  it { assert_equal SongForm.new(song).band.id, 2 }
 
   # validators get inherited.
   it do
     form = SongForm.new(OpenStruct.new)
     form.validate({})
-    form.errors.messages.must_equal({:band=>["must be filled"]})
+    assert_equal form.errors.messages, band: ["must be filled"]
   end
 
   # coercion works
   it do
     form = SongForm.new(OpenStruct.new)
-    form.validate({cool: "1"})
-    form.cool.must_equal true
+    form.validate(cool: "1")
+    assert form.cool
   end
 
-
   # include a module into a module into a class :)
   module AlbumFormModule
     include Reform::Form::Module
@@ -90,7 +87,7 @@ class ModuleInclusionTest < MiniTest::Spec
 
     property :name
     validation do
-      required(:name).filled
+      params { required(:name).filled }
     end
   end
 
@@ -98,21 +95,20 @@ class ModuleInclusionTest < MiniTest::Spec
     include AlbumFormModule
 
     # pp heritage
-    property :band, :inherit => true do
+    property :band, inherit: true do
       property :label
       validation do
-        required(:label).filled
+        params { required(:label).filled }
       end
     end
   end
 
   it do
-    form = AlbumForm.new(OpenStruct.new(:band => OpenStruct.new))
-    form.validate({"band" => {}})
-    form.errors.messages.must_equal({:"band.title"=>["must be filled"], :"band.label"=>["must be filled"], :name=>["must be filled"]})
+    form = AlbumForm.new(OpenStruct.new(band: OpenStruct.new))
+    form.validate("band" => {})
+    assert_equal form.errors.messages, "band.title": ["must be filled"], "band.label": ["must be filled"], name: ["must be filled"]
   end
 
-
   describe "module with custom accessors" do
     module SongModule
       include Reform::Form::Module
@@ -131,12 +127,11 @@ class ModuleInclusionTest < MiniTest::Spec
       include SongModule
     end
 
-    let (:song) { OpenStruct.new(id: 1, title: "Instant Mash") }
+    let(:song) { OpenStruct.new(id: 1, title: "Instant Mash") }
 
     it do
-      IncludingSongForm.new(song).id.must_equal 1
-      IncludingSongForm.new(song).title.must_equal "INSTANT MASH"
+      assert_equal IncludingSongForm.new(song).id, 1
+      assert_equal IncludingSongForm.new(song).title, "INSTANT MASH"
     end
   end
 end
-

data/test/parse_option_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 class ParseOptionTest < MiniTest::Spec
   Comment = Struct.new(:content, :user)
@@ -9,32 +9,32 @@ class ParseOptionTest < MiniTest::Spec
     property :user, parse: false
   end
 
-  let (:current_user) { User.new("Peter") }
-  let (:form) { CommentForm.new(Comment.new, user: current_user) }
+  let(:current_user) { User.new("Peter") }
+  let(:form) { CommentForm.new(Comment.new, user: current_user) }
 
   it do
-    form.user.must_equal current_user
+    assert_equal form.user, current_user
 
     lorem = "Lorem ipsum dolor sit amet..."
     form.validate("content" => lorem, "user" => "not the current user")
 
-    form.content.must_equal lorem
-    form.user.must_equal current_user
+    assert_equal form.content, lorem
+    assert_equal form.user, current_user
   end
 
   describe "using ':parse' option doesn't override other ':deserialize' options" do
     class ArticleCommentForm < TestForm
       property :content
-      property :article, deserializer: { instance: "Instance" }
-      property :user, parse: false, deserializer: { instance: "Instance" }
+      property :article, deserializer: {instance: "Instance"}
+      property :user, parse: false, deserializer: {instance: "Instance"}
     end
 
     it do
-      ArticleCommentForm.definitions.get(:user)[:deserializer][:writeable].must_equal false
-      ArticleCommentForm.definitions.get(:user)[:deserializer][:instance].must_equal "Instance"
+      assert_equal ArticleCommentForm.definitions.get(:user)[:deserializer][:writeable], false
+      assert_equal ArticleCommentForm.definitions.get(:user)[:deserializer][:instance], "Instance"
 
-      ArticleCommentForm.definitions.get(:article)[:deserializer][:writeable].must_equal true
-      ArticleCommentForm.definitions.get(:article)[:deserializer][:instance].must_equal "Instance"
+      assert ArticleCommentForm.definitions.get(:article)[:deserializer][:writeable]
+      assert_equal ArticleCommentForm.definitions.get(:article)[:deserializer][:instance], "Instance"
     end
   end
 end

data/test/parse_pipeline_test.rb

@@ -4,12 +4,12 @@ class ParsePipelineTest < MiniTest::Spec
   Album = Struct.new(:name)
 
   class AlbumForm < TestForm
-    property :name, deserializer: { parse_pipeline: ->(input, options) { Representable::Pipeline[->(ipt, opts) { opts[:represented].name = ipt.inspect }] } }
+    property :name, deserializer: {parse_pipeline: ->(input, options) { Representable::Pipeline[->(ipt, opts) { opts[:represented].name = ipt.inspect }] }}
   end
 
   it "allows passing :parse_pipeline directly" do
     form = AlbumForm.new(Album.new)
     form.validate("name" => "Greatest Hits")
-    form.name.must_equal "{\"name\"=>\"Greatest Hits\"}"
+    assert_equal form.name, "{\"name\"=>\"Greatest Hits\"}"
   end
-end
+end

data/test/populate_test.rb

@@ -8,22 +8,22 @@ class PopulatorTest < MiniTest::Spec
   class AlbumForm < TestForm
     property :name, populator: ->(options) { self.name = options[:fragment].reverse }
     validation do
-      required(:name).filled
+      params { required(:name).filled }
     end
 
     collection :songs,
-      populator: ->(fragment:, model:, index:, **) {
-        (item = model[index]) ? item : model.insert(index, Song.new) } do
-
+               populator: ->(fragment:, model:, index:, **) {
+                 (item = model[index]) ? item : model.insert(index, Song.new)
+               } do
       property :title
       validation do
-        required(:title).filled
+        params { required(:title).filled }
       end
 
-      property :composer, populator: ->(options) { options[:model] || self.composer= Artist.new } do
+      property :composer, populator: ->(options) { options[:model] || self.composer = Artist.new } do
         property :name
         validation do
-          required(:name).filled
+          params { required(:name).filled }
         end
       end
     end
@@ -35,20 +35,20 @@ class PopulatorTest < MiniTest::Spec
     end
   end
 
-  let (:song)               { Song.new("Broken") }
-  let (:song_with_composer) { Song.new("Resist Stance", nil, composer) }
-  let (:composer)           { Artist.new("Greg Graffin") }
-  let (:artist)             { Artist.new("Bad Religion") }
-  let (:album)              { Album.new("The Dissent Of Man", [song, song_with_composer], artist) }
+  let(:song)               { Song.new("Broken") }
+  let(:song_with_composer) { Song.new("Resist Stance", nil, composer) }
+  let(:composer)           { Artist.new("Greg Graffin") }
+  let(:artist)             { Artist.new("Bad Religion") }
+  let(:album)              { Album.new("The Dissent Of Man", [song, song_with_composer], artist) }
 
-  let (:form) { AlbumForm.new(album) }
+  let(:form) { AlbumForm.new(album) }
 
   it "runs populator on scalar" do
     form.validate(
       "name" => "override me!"
     )
 
-    form.name.must_equal "!em edirrevo"
+    assert_equal form.name, "!em edirrevo"
   end
 
   # changing existing property :artist.
@@ -60,7 +60,7 @@ class PopulatorTest < MiniTest::Spec
       "artist" => {"name" => "Marcus Miller"}
     )
 
-    form.artist.model.object_id.must_equal old_id
+    assert_equal form.artist.model.object_id, old_id
   end
 
   # use populator for default value on scalars?
@@ -68,37 +68,36 @@ class PopulatorTest < MiniTest::Spec
   # adding to collection via :populator.
   # valid.
   it "yyy" do
-    form.validate(
+    assert form.validate(
       "songs"  => [{"title" => "Fallout"}, {"title" => "Roxanne"},
         {"title" => "Rime Of The Ancient Mariner"}, # new song.
         {"title" => "Re-Education", "composer" => {"name" => "Rise Against"}}], # new song with new composer.
-    ).must_equal true
+    )
 
-    form.errors.messages.inspect.must_equal "{}"
+    assert_equal form.errors.messages.inspect, "{}"
 
     # form has updated.
-    form.name.must_equal "The Dissent Of Man"
-    form.songs[0].title.must_equal "Fallout"
-    form.songs[1].title.must_equal "Roxanne"
-    form.songs[1].composer.name.must_equal "Greg Graffin"
+    assert_equal form.name, "The Dissent Of Man"
+    assert_equal form.songs[0].title, "Fallout"
+    assert_equal form.songs[1].title, "Roxanne"
+    assert_equal form.songs[1].composer.name, "Greg Graffin"
 
-    form.songs[1].composer.model.must_be_instance_of Artist
-
-    form.songs[1].title.must_equal "Roxanne"
-    form.songs[2].title.must_equal "Rime Of The Ancient Mariner" # new song added.
-    form.songs[3].title.must_equal "Re-Education"
-    form.songs[3].composer.name.must_equal "Rise Against"
-    form.songs.size.must_equal 4
-    form.artist.name.must_equal "Bad Religion"
+    form.songs[1].composer.model.is_a? Artist
 
+    assert_equal form.songs[1].title, "Roxanne"
+    assert_equal form.songs[2].title, "Rime Of The Ancient Mariner" # new song added.
+    assert_equal form.songs[3].title, "Re-Education"
+    assert_equal form.songs[3].composer.name, "Rise Against"
+    assert_equal form.songs.size, 4
+    assert_equal form.artist.name, "Bad Religion"
 
     # model has not changed, yet.
-    album.name.must_equal "The Dissent Of Man"
-    album.songs[0].title.must_equal "Broken"
-    album.songs[1].title.must_equal "Resist Stance"
-    album.songs[1].composer.name.must_equal "Greg Graffin"
-    album.songs.size.must_equal 2
-    album.artist.name.must_equal "Bad Religion"
+    assert_equal album.name, "The Dissent Of Man"
+    assert_equal album.songs[0].title, "Broken"
+    assert_equal album.songs[1].title, "Resist Stance"
+    assert_equal album.songs[1].composer.name, "Greg Graffin"
+    assert_equal album.songs.size, 2
+    assert_equal album.artist.name, "Bad Religion"
   end
 end
 
@@ -113,12 +112,12 @@ class PopulateWithMethodTest < Minitest::Spec
     end
   end
 
-  let (:form) { AlbumForm.new(Album.new) }
+  let(:form) { AlbumForm.new(Album.new) }
 
   it "runs populator method" do
     form.validate("title" => "override me!")
 
-    form.title.must_equal "!em edirrevo"
+    assert_equal form.title, "!em edirrevo"
   end
 end
 
@@ -137,12 +136,12 @@ class PopulateWithCallableTest < Minitest::Spec
     property :title, populator: TitlePopulator.new
   end
 
-  let (:form) { AlbumForm.new(Album.new) }
+  let(:form) { AlbumForm.new(Album.new) }
 
   it "runs populator method" do
     form.validate("title" => "override me!")
 
-    form.title.must_equal "!em edirrevo"
+    assert_equal form.title, "!em edirrevo"
   end
 end
 
@@ -157,12 +156,12 @@ class PopulateWithProcTest < Minitest::Spec
     property :title, populator: TitlePopulator
   end
 
-  let (:form) { AlbumForm.new(Album.new) }
+  let(:form) { AlbumForm.new(Album.new) }
 
   it "runs populator method" do
     form.validate("title" => "override me!")
 
-    form.title.must_equal "!em edirrevo"
+    assert_equal form.title, "!em edirrevo"
   end
 end
 
@@ -171,13 +170,11 @@ class PopulateIfEmptyTest < MiniTest::Spec
   Album = Struct.new(:name, :songs, :artist)
   Artist = Struct.new(:name)
 
-  let (:song)               { Song.new("Broken") }
-  let (:song_with_composer) { Song.new("Resist Stance", nil, composer) }
-  let (:composer)           { Artist.new("Greg Graffin") }
-  let (:artist)             { Artist.new("Bad Religion") }
-  let (:album)              { Album.new("The Dissent Of Man", [song, song_with_composer], artist) }
-
-
+  let(:song)               { Song.new("Broken") }
+  let(:song_with_composer) { Song.new("Resist Stance", nil, composer) }
+  let(:composer)           { Artist.new("Greg Graffin") }
+  let(:artist)             { Artist.new("Bad Religion") }
+  let(:album)              { Album.new("The Dissent Of Man", [song, song_with_composer], artist) }
 
   class AlbumForm < TestForm
     property :name
@@ -187,13 +184,13 @@ class PopulateIfEmptyTest < MiniTest::Spec
 
       property :title
       validation do
-        required(:title).filled
+        params { required(:title).filled }
       end
 
       property :composer, populate_if_empty: :populate_composer! do # lambda works, too. in form context.
         property :name
         validation do
-          required(:name).filled
+          params { required(:name).filled }
         end
       end
 
@@ -203,52 +200,51 @@ class PopulateIfEmptyTest < MiniTest::Spec
       end
     end
 
-    property :artist, populate_if_empty: lambda { |args| create_artist(args[:fragment], args[:user_options]) } do # methods work, too.
+    property :artist, populate_if_empty: ->(args) { create_artist(args[:fragment], args[:user_options]) } do # methods work, too.
       property :name
     end
 
-  private
+    private
     class Sting < Artist
       attr_accessor :args
     end
     def create_artist(input, user_options)
-      Sting.new.tap { |artist| artist.args=([input, user_options].to_s) }
+      Sting.new.tap { |artist| artist.args = ([input, user_options].to_s) }
     end
   end
 
-  let (:form) { AlbumForm.new(album) }
+  let(:form) { AlbumForm.new(album) }
 
   it do
-    form.songs.size.must_equal 2
+    assert_equal form.songs.size, 2
 
-    form.validate(
-      "songs"  => [{"title" => "Fallout"}, {"title" => "Roxanne"},
+    assert form.validate(
+      "songs" => [{"title" => "Fallout"}, {"title" => "Roxanne"},
         {"title" => "Rime Of The Ancient Mariner"}, # new song.
         {"title" => "Re-Education", "composer" => {"name" => "Rise Against"}}], # new song with new composer.
-    ).must_equal true
+    )
 
-    form.errors.messages.inspect.must_equal "{}"
+    assert_equal form.errors.messages.inspect, "{}"
 
     # form has updated.
-    form.name.must_equal "The Dissent Of Man"
-    form.songs[0].title.must_equal "Fallout"
-    form.songs[1].title.must_equal "Roxanne"
-    form.songs[1].composer.name.must_equal "Greg Graffin"
-    form.songs[1].title.must_equal "Roxanne"
-    form.songs[2].title.must_equal "Rime Of The Ancient Mariner" # new song added.
-    form.songs[3].title.must_equal "Re-Education"
-    form.songs[3].composer.name.must_equal "Rise Against"
-    form.songs.size.must_equal 4
-    form.artist.name.must_equal "Bad Religion"
-
+    assert_equal form.name, "The Dissent Of Man"
+    assert_equal form.songs[0].title, "Fallout"
+    assert_equal form.songs[1].title, "Roxanne"
+    assert_equal form.songs[1].composer.name, "Greg Graffin"
+    assert_equal form.songs[1].title, "Roxanne"
+    assert_equal form.songs[2].title, "Rime Of The Ancient Mariner" # new song added.
+    assert_equal form.songs[3].title, "Re-Education"
+    assert_equal form.songs[3].composer.name, "Rise Against"
+    assert_equal form.songs.size, 4
+    assert_equal form.artist.name, "Bad Religion"
 
     # model has not changed, yet.
-    album.name.must_equal "The Dissent Of Man"
-    album.songs[0].title.must_equal "Broken"
-    album.songs[1].title.must_equal "Resist Stance"
-    album.songs[1].composer.name.must_equal "Greg Graffin"
-    album.songs.size.must_equal 2
-    album.artist.name.must_equal "Bad Religion"
+    assert_equal album.name, "The Dissent Of Man"
+    assert_equal album.songs[0].title, "Broken"
+    assert_equal album.songs[1].title, "Resist Stance"
+    assert_equal album.songs[1].composer.name, "Greg Graffin"
+    assert_equal album.songs.size, 2
+    assert_equal album.artist.name, "Bad Religion"
   end
 
   # trigger artist populator. lambda calling form instance method.
@@ -256,26 +252,24 @@ class PopulateIfEmptyTest < MiniTest::Spec
     form = AlbumForm.new(album = Album.new)
     form.validate("artist" => {"name" => "From Autumn To Ashes"})
 
-    form.artist.name.must_equal "From Autumn To Ashes"
+    assert_equal form.artist.name, "From Autumn To Ashes"
     # test lambda was executed in form context.
-    form.artist.model.must_be_instance_of AlbumForm::Sting
+    assert form.artist.model.is_a? AlbumForm::Sting
     # test lambda block arguments.
-    form.artist.model.args.to_s.must_equal "[{\"name\"=>\"From Autumn To Ashes\"}, nil]"
+    assert_equal form.artist.model.args.to_s, "[{\"name\"=>\"From Autumn To Ashes\"}, nil]"
 
     assert_nil album.artist
   end
 end
 
-
 # delete songs while deserializing.
 class PopulateIfEmptyWithDeletionTest < MiniTest::Spec
   Song  = Struct.new(:title, :album, :composer)
   Album = Struct.new(:name, :songs, :artist)
 
-  let (:song)  { Song.new("Broken") }
-  let (:song2) { Song.new("Resist Stance") }
-  let (:album) { Album.new("The Dissent Of Man", [song, song2]) }
-
+  let(:song)  { Song.new("Broken") }
+  let(:song2) { Song.new("Resist Stance") }
+  let(:album) { Album.new("The Dissent Of Man", [song, song2]) }
 
   class AlbumForm < TestForm
     property :name
@@ -285,7 +279,7 @@ class PopulateIfEmptyWithDeletionTest < MiniTest::Spec
 
       property :title
       validation do
-        required(:title).filled
+        params { required(:title).filled }
       end
     end
 
@@ -295,16 +289,75 @@ class PopulateIfEmptyWithDeletionTest < MiniTest::Spec
     end
   end
 
-  let (:form) { AlbumForm.new(album) }
+  let(:form) { AlbumForm.new(album) }
 
   it do
-    form.validate(
-      "songs"  => [{"title" => "Broken, delete me!"}, {"title" => "Roxanne"}]
-    ).must_equal true
+    assert form.validate(
+      "songs" => [{"title" => "Broken, delete me!"}, {"title" => "Roxanne"}]
+    )
+
+    assert_equal form.errors.messages.inspect, "{}"
 
-    form.errors.messages.inspect.must_equal "{}"
+    assert_equal form.songs.size, 1
+    assert_equal form.songs[0].title, "Roxanne"
+  end
+end
+
+class PopulateWithFormKeyTest < MiniTest::Spec
+  Song  = Struct.new(:title, :album, :composer)
+  Album = Struct.new(:name, :songs, :artist)
 
-    form.songs.size.must_equal 1
-    form.songs[0].title.must_equal "Roxanne"
+  let(:song)  { Song.new('Broken') }
+  let(:song2) { Song.new('Resist Stance') }
+  let(:album) { Album.new('The Dissent Of Man', [song, song2]) }
+
+  class SongForm < TestForm
+    property :title
+
+    validation do
+      params { required(:title).filled }
+    end
+  end
+
+  class AlbumForm < TestForm
+    property :name
+
+    collection :songs, form: SongForm, populator: :populator!, model_identifier: :title
+
+    def populator!(fragment:, **)
+      item = songs.find { |song| song.title == fragment['title'] }
+      if item && fragment['delete'] == '1'
+        songs.delete(item)
+        return skip!
+      end
+      item || songs.append(Song.new)
+    end
+  end
+
+  let(:form) { AlbumForm.new(album) }
+
+  it do
+    assert_equal 2, form.songs.size
+
+    assert form.validate(
+      'songs' => [
+        { 'title' => 'Broken' },
+        { 'title' => 'Resist Stance' },
+        { 'title' => 'Rime Of The Ancient Mariner' }
+      ]
+    )
+
+    assert_equal 3, form.songs.size
+
+    assert form.validate(
+      'songs' => [
+        { 'title' => 'Broken', 'delete' => '1' },
+        { 'title' => 'Resist Stance' },
+        { 'title' => 'Rime Of The Ancient Mariner' }
+      ]
+    )
+    assert_equal 2, form.songs.size
+    assert_equal 'Resist Stance', form.songs.first.title
+    assert_equal 'Rime Of The Ancient Mariner', form.songs.last.title
   end
 end