reform 2.3.3 → 2.6.0

data/test/{form_option_new_api.rb → form_option_test.rb}

@@ -17,7 +17,7 @@ class FormOptionTest < MiniTest::Spec
 
   it do
     form = AlbumForm.new(Album.new(Song.new("When It Comes To You")))
-    _(form.song.title).must_equal "When It Comes To You"
+    assert_equal "When It Comes To You", form.song.title
 
     form.validate(song: {title: "Run For Cover"})
   end

data/test/{form_new_api.rb → form_test.rb}

@@ -25,8 +25,8 @@ class FormTest < MiniTest::Spec
     let(:cloned) { AlbumForm.clone }
 
     # #dup is called in Op.inheritable_attr(:contract_class), it must be subclass of the original one.
-    it { _(cloned).wont_equal AlbumForm }
-    it { _(AlbumForm.definitions).wont_equal cloned.definitions }
+    it { refute_equal cloned, AlbumForm }
+    it { refute_equal AlbumForm.definitions, cloned.definitions }
 
     it do
       # currently, forms need a name for validation, even without AM.
@@ -51,7 +51,7 @@ class FormTest < MiniTest::Spec
     end
 
     it "allows injecting :virtual options" do
-      _(ArtistForm.new(Artist.new, current_user: Object).current_user).must_equal Object
+      assert_equal ArtistForm.new(Artist.new, current_user: Object).current_user, Object
     end
   end
 end

data/test/from_test.rb

@@ -31,19 +31,19 @@ class AsTest < BaseTest
 
   subject { AlbumForm.new(Album.new("Best Of", hit, [Song.new("Fallout"), song2])) }
 
-  it { _(subject.name).must_equal "Best Of" }
-  it { _(subject.single.title).must_equal "Roxanne" }
-  it { _(subject.tracks[0].name).must_equal "Fallout" }
-  it { _(subject.tracks[1].name).must_equal "Roxanne" }
+  it { assert_equal subject.name, "Best Of" }
+  it { assert_equal subject.single.title, "Roxanne" }
+  it { assert_equal subject.tracks[0].name, "Fallout" }
+  it { assert_equal subject.tracks[1].name, "Roxanne" }
 
   describe "#validate" do
 
     before { subject.validate(params) }
 
-    it { _(subject.name).must_equal "Best Of The Police" }
-    it { _(subject.single.title).must_equal "So Lonely" }
-    it { _(subject.tracks[0].name).must_equal "Message In A Bottle" }
-    it { _(subject.tracks[1].name).must_equal "Roxanne" }
+    it { assert_equal subject.name, "Best Of The Police" }
+    it { assert_equal subject.single.title, "So Lonely" }
+    it { assert_equal subject.tracks[0].name, "Message In A Bottle" }
+    it { assert_equal subject.tracks[1].name, "Roxanne" }
   end
 
   describe "#sync" do
@@ -52,7 +52,7 @@ class AsTest < BaseTest
       subject.sync
     end
 
-    it { _(song2.title).must_equal "Livin' Ain't No Crime" }
+    it { assert_equal song2.title, "Livin' Ain't No Crime" }
   end
 
   describe "#save (nested hash)" do
@@ -65,7 +65,7 @@ class AsTest < BaseTest
         hash = nested_hash
       end
 
-      _(hash).must_equal({"title" => "Best Of The Police", "hit" => {"title" => "So Lonely"}, "songs" => [{"title" => "Message In A Bottle"}, {"title" => "Roxanne"}], "band" => nil})
+      assert_equal hash, "title" => "Best Of The Police", "hit" => {"title" => "So Lonely"}, "songs" => [{"title" => "Message In A Bottle"}, {"title" => "Roxanne"}], "band" => nil
     end
   end
 end

data/test/{inherit_new_api.rb → inherit_test.rb}

@@ -52,46 +52,46 @@ class InheritTest < BaseTest
 
   it do
     subject.validate("hit" => {"title" => "LA Drone", "rating" => 10})
-    _(subject.hit.title).must_equal "LA Drone"
-    _(subject.hit.rating).must_equal 10
-    _(subject.errors.messages).must_equal({})
+    assert_equal subject.hit.title, "LA Drone"
+    assert_equal subject.hit.rating, 10
+    assert_equal subject.errors.messages, {}
   end
 
   it do
     subject.validate({})
     assert_nil subject.model.hit.title
     assert_nil subject.model.hit.rating
-    _(subject.errors.messages).must_equal("hit.title": ["must be filled"], "hit.rating": ["must be filled"])
+    assert_equal subject.errors.messages, "hit.title": ["must be filled"], "hit.rating": ["must be filled"]
   end
 
   it "xxx" do
     # sub hashes like :deserializer must be properly cloned when inheriting.
-    _(AlbumForm.options_for(:title)[:deserializer].object_id).wont_equal CompilationForm.options_for(:title)[:deserializer].object_id
+    refute_equal AlbumForm.options_for(:title)[:deserializer].object_id, CompilationForm.options_for(:title)[:deserializer].object_id
 
     # don't overwrite direct deserializer: {} configuration.
-    _(AlbumForm.options_for(:title)[:internal_populator]).must_be_instance_of Reform::Form::Populator::Sync
-    _(AlbumForm.options_for(:title)[:deserializer][:skip_parse]).must_equal "skip_if in AlbumForm"
+    assert AlbumForm.options_for(:title)[:internal_populator].is_a? Reform::Form::Populator::Sync
+    assert_equal AlbumForm.options_for(:title)[:deserializer][:skip_parse], "skip_if in AlbumForm"
 
     # AlbumForm.options_for(:hit)[:internal_populator].inspect.must_match /Reform::Form::Populator:.+ @user_proc="Populator"/
     # AlbumForm.options_for(:hit)[:deserializer][:instance].inspect.must_be_instance_with Reform::Form::Populator, user_proc: "Populator"
 
-    _(AlbumForm.options_for(:songs)[:internal_populator]).must_be_instance_of Reform::Form::Populator::IfEmpty
-    _(AlbumForm.options_for(:songs)[:deserializer][:skip_parse]).must_be_instance_of Reform::Form::Validate::Skip::AllBlank
+    assert AlbumForm.options_for(:songs)[:internal_populator].is_a? Reform::Form::Populator::IfEmpty
+    assert AlbumForm.options_for(:songs)[:deserializer][:skip_parse].is_a? Reform::Form::Validate::Skip::AllBlank
 
-    _(AlbumForm.options_for(:band)[:internal_populator]).must_be_instance_of Reform::Form::Populator::IfEmpty
+    assert AlbumForm.options_for(:band)[:internal_populator].is_a? Reform::Form::Populator::IfEmpty
 
-    _(CompilationForm.options_for(:title)[:deserializer][:skip_parse]).must_equal "skip_if from CompilationForm"
+    assert_equal CompilationForm.options_for(:title)[:deserializer][:skip_parse], "skip_if from CompilationForm"
     # pp CompilationForm.options_for(:songs)
-    _(CompilationForm.options_for(:songs)[:internal_populator]).must_be_instance_of Reform::Form::Populator::IfEmpty
+    assert CompilationForm.options_for(:songs)[:internal_populator].is_a? Reform::Form::Populator::IfEmpty
 
-    _(CompilationForm.options_for(:band)[:internal_populator]).must_be_instance_of Reform::Form::Populator::IfEmpty
+    assert CompilationForm.options_for(:band)[:internal_populator].is_a? Reform::Form::Populator::IfEmpty
 
     # completely overwrite inherited.
-    _(CompilationForm.options_for(:hit)[:deserializer][:skip_parse]).must_be_instance_of SkipParse
+    assert CompilationForm.options_for(:hit)[:deserializer][:skip_parse].is_a? SkipParse
 
     # inherit: true with block will still inherit the original class.
-    _(AlbumForm.new(OpenStruct.new(band: OpenStruct.new)).band.band_id).must_equal 1
-    _(CompilationForm.new(OpenStruct.new(band: OpenStruct.new)).band.band_id).must_equal 1
+    assert_equal AlbumForm.new(OpenStruct.new(band: OpenStruct.new)).band.band_id, 1
+    assert_equal CompilationForm.new(OpenStruct.new(band: OpenStruct.new)).band.band_id, 1
   end
 
   class CDForm < AlbumForm
@@ -101,5 +101,5 @@ class InheritTest < BaseTest
     end
   end
 
-  it { _(CDForm.options_for(:band)[:internal_populator].instance_variable_get(:@user_proc)).must_equal "CD Populator" }
+  it { assert_equal CDForm.options_for(:band)[:internal_populator].instance_variable_get(:@user_proc), "CD Populator" }
 end

data/test/{module_new_api.rb → module_test.rb}

@@ -25,8 +25,8 @@ class ModuleInclusionTest < MiniTest::Spec
       params { required(:band).filled }
     end
 
-    include Dry::Types.module # allows using Types::* in module.
-    property :cool, type: DRY_TYPES_CONSTANT::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!
@@ -60,24 +60,24 @@ class ModuleInclusionTest < MiniTest::Spec
   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
+    assert form.cool
   end
 
   # include a module into a module into a class :)
@@ -106,7 +106,7 @@ class ModuleInclusionTest < MiniTest::Spec
   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"])
+    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
@@ -130,8 +130,8 @@ class ModuleInclusionTest < MiniTest::Spec
     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

@@ -13,13 +13,13 @@ class ParseOptionTest < MiniTest::Spec
   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
@@ -30,11 +30,11 @@ class ParseOptionTest < MiniTest::Spec
     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

@@ -10,6 +10,6 @@ class ParsePipelineTest < MiniTest::Spec
   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

data/test/{populate_new_api.rb → populate_test.rb}

@@ -48,7 +48,7 @@ class PopulatorTest < MiniTest::Spec
       "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,36 +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].composer.model.is_a? 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"
+    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
 
@@ -117,7 +117,7 @@ class PopulateWithMethodTest < Minitest::Spec
   it "runs populator method" do
     form.validate("title" => "override me!")
 
-    _(form.title).must_equal "!em edirrevo"
+    assert_equal form.title, "!em edirrevo"
   end
 end
 
@@ -127,6 +127,14 @@ class PopulateWithCallableTest < Minitest::Spec
   class TitlePopulator
     include Uber::Callable
 
+    def call(form:, **options)
+      form.title = options[:fragment].reverse
+    end
+  end
+
+  class TitlePopulatorWithOldSignature
+    include Uber::Callable
+
     def call(form, options)
       form.title = options[:fragment].reverse
     end
@@ -136,12 +144,28 @@ class PopulateWithCallableTest < Minitest::Spec
     property :title, populator: TitlePopulator.new
   end
 
+  class AlbumFormWithOldPopulator < TestForm
+    property :title, populator: TitlePopulatorWithOldSignature.new
+  end
+
   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
+
+  it "gives warning when `form` is accepted as a positional argument" do
+    _, warnings = capture_io do
+      form = AlbumFormWithOldPopulator.new(Album.new)
+      form.validate("title" => "override me!")
+
+      assert_equal form.title, "!em edirrevo"
+    end
+
+    assert_equal warnings, %{[Reform] Accepting `form` as a positional argument in `:populator` will be deprecated. Please use `def call(form:, **options)` signature instead.
+}
   end
 end
 
@@ -161,7 +185,7 @@ class PopulateWithProcTest < Minitest::Spec
   it "runs populator method" do
     form.validate("title" => "override me!")
 
-    _(form.title).must_equal "!em edirrevo"
+    assert_equal form.title, "!em edirrevo"
   end
 end
 
@@ -216,35 +240,35 @@ class PopulateIfEmptyTest < MiniTest::Spec
   let(:form) { AlbumForm.new(album) }
 
   it do
-    _(form.songs.size).must_equal 2
+    assert_equal form.songs.size, 2
 
-    _(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"
-    _(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.
@@ -252,11 +276,11 @@ 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
@@ -292,13 +316,72 @@ class PopulateIfEmptyWithDeletionTest < MiniTest::Spec
   let(:form) { AlbumForm.new(album) }
 
   it do
-    _(form.validate(
+    assert form.validate(
       "songs" => [{"title" => "Broken, delete me!"}, {"title" => "Roxanne"}]
-    )).must_equal true
+    )
+
+    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