reform 2.3.2 → 2.6.1

data/test/docs/validation_test.rb

@@ -0,0 +1,134 @@
+require 'test_helper'
+require 'reform/form/dry'
+
+class DocsDryVTest < Minitest::Spec
+  #:basic
+  class AlbumForm < Reform::Form
+    feature Reform::Form::Dry
+
+    property :name
+
+    validation do
+      params do
+        required(:name).filled
+      end
+    end
+  end
+  #:basic end
+
+  it 'validates correctly' do
+    form = DocsDryVTest::AlbumForm.new(Album.new(nil, nil, nil))
+    result = form.call(name: nil)
+
+    refute result.success?
+    assert_equal({ name: ['must be filled'] }, form.errors.messages)
+  end
+end
+
+class DocsDryVWithRulesTest < Minitest::Spec
+  #:basic_with_rules
+  class AlbumForm < Reform::Form
+    feature Reform::Form::Dry
+
+    property :name
+
+    validation name: :default do
+      option :form
+
+      params do
+        required(:name).filled
+      end
+
+      rule(:name) do
+        key.failure('must be unique') if Album.where.not(id: form.model.id).where(name: value).exists?
+      end
+    end
+  end
+  #:basic_with_rules end
+
+  it 'validates correctly' do
+    Album = Struct.new(:name, :songs, :artist, :user)
+    form = DocsDryVWithRulesTest::AlbumForm.new(Album.new(nil, nil, nil, nil))
+    result = form.call(name: nil)
+
+    refute result.success?
+    assert_equal({ name: ['must be filled'] }, form.errors.messages)
+  end
+end
+
+class DryVWithNestedTest < Minitest::Spec
+  #:nested
+  class AlbumForm < Reform::Form
+    feature Reform::Form::Dry
+
+    property :name
+
+    validation do
+      params { required(:name).filled }
+    end
+
+    property :artist do
+      property :name
+
+      validation do
+        params { required(:name).filled }
+      end
+    end
+  end
+  #:nested end
+
+  it 'validates correctly' do
+    form = DryVWithNestedTest::AlbumForm.new(Album.new(nil, nil, Artist.new(nil)))
+    result = form.call(name: nil, artist: { name: '' })
+
+    refute result.success?
+    assert_equal({ name: ['must be filled'], 'artist.name': ['must be filled'] }, form.errors.messages)
+  end
+end
+
+class DryVValGroupTest < Minitest::Spec
+  class AlbumForm < Reform::Form
+    feature Reform::Form::Dry
+
+    property :name
+    property :artist
+    #:validation_groups
+    validation name: :default do
+      params { required(:name).filled }
+    end
+
+    validation name: :artist, if: :default do
+      params { required(:artist).filled }
+    end
+
+    validation name: :famous, after: :default do
+      params { optional(:artist) }
+
+      rule(:artist) do
+        if value
+          key.failure('only famous artist') unless value =~ /famous/
+        end
+      end
+    end
+    #:validation_groups end
+  end
+
+  it 'validates correctly' do
+    form = DryVValGroupTest::AlbumForm.new(Album.new(nil, nil, nil))
+    result = form.call(name: nil)
+
+    refute result.success?
+    assert_equal({ name: ['must be filled'] }, result.errors.messages)
+
+    result = form.call(name: 'Title')
+    refute result.success?
+    assert_equal({ artist: ['must be filled'] }, result.errors.messages)
+
+    result = form.call(name: 'Title', artist: 'Artist')
+    refute result.success?
+    assert_equal({ artist: ['only famous artist'] }, result.errors.messages)
+
+    result = form.call(name: 'Title', artist: 'Artist famous')
+    assert result.success?
+  end
+end

data/test/{errors_new_api.rb → errors_test.rb}

@@ -37,7 +37,7 @@ class ErrorsTest < MiniTest::Spec
       # TODO: make band a required object.
 
       validation do
-        config.messages.load_paths << "test/fixtures/dry_new_api_error_messages.yml"
+        config.messages.load_paths << "test/fixtures/dry_error_messages.yml"
 
         params { required(:name).filled }
 
@@ -72,22 +72,22 @@ class ErrorsTest < MiniTest::Spec
 
   describe "#validate with invalid array property" do
     it do
-      form.validate(
+      refute form.validate(
         title: "Swimming Pool - EP",
         band: {
           name: "Marie Madeleine",
           label: {name: "Ekler'o'shocK"}
         },
         artists: [42, "Good Charlotte", 43]
-      ).must_equal false
-      form.errors.messages.must_equal(artists: {0 => ["must be a string"], 2 => ["must be a string"]})
-      form.errors.size.must_equal(1)
+      )
+      assert_equal form.errors.messages, artists: {0 => ["must be a string"], 2 => ["must be a string"]}
+      assert_equal form.errors.size, 1
     end
   end
 
   describe "#errors without #validate" do
     it do
-      form.errors.size.must_equal 0
+      assert_equal form.errors.size, 0
     end
   end
 
@@ -102,13 +102,13 @@ class ErrorsTest < MiniTest::Spec
     end
 
     it do
-      form.errors.messages.must_equal(
+      assert_equal form.errors.messages,{
         title: ["must be filled"],
         "hit.title": ["must be filled"],
         "songs.title": ["must be filled"],
         "band.label.name": ["must be filled"],
         "producer.name": ["must be filled"]
-      )
+      }
     end
 
     # it do
@@ -117,60 +117,60 @@ class ErrorsTest < MiniTest::Spec
     # end
 
     # nested forms keep their own Errors:
-    it { form.producer.errors.messages.must_equal(name: ["must be filled"]) }
-    it { form.hit.errors.messages.must_equal(title: ["must be filled"]) }
-    it { form.songs[0].errors.messages.must_equal(title: ["must be filled"]) }
+    it { assert_equal form.producer.errors.messages, name: ["must be filled"] }
+    it { assert_equal form.hit.errors.messages, title: ["must be filled"] }
+    it { assert_equal form.songs[0].errors.messages, title: ["must be filled"] }
 
     it do
-      form.errors.messages.must_equal(
+      assert_equal form.errors.messages, {
         title: ["must be filled"],
         "hit.title": ["must be filled"],
         "songs.title": ["must be filled"],
         "band.label.name": ["must be filled"],
         "producer.name": ["must be filled"]
-      )
-      form.errors.size.must_equal(5)
+      }
+      assert_equal form.errors.size, 5
     end
   end
 
   describe "#validate with main form invalid" do
     it do
-      form.validate("title" => "", "band" => {"label" => {name: "Fat Wreck"}}, "producer" => nil).must_equal false
-      form.errors.messages.must_equal(title: ["must be filled"], producer: ["must be a hash"])
-      form.errors.size.must_equal(2)
+      refute form.validate("title" => "", "band" => {"label" => {name: "Fat Wreck"}}, "producer" => nil)
+      assert_equal form.errors.messages, title: ["must be filled"], producer: ["must be a hash"]
+      assert_equal form.errors.size, 2
     end
   end
 
   describe "#validate with middle nested form invalid" do
     before { @result = form.validate("hit" => {"title" => ""}, "band" => {"label" => {name: "Fat Wreck"}}) }
 
-    it { @result.must_equal false }
-    it { form.errors.messages.must_equal("hit.title": ["must be filled"]) }
-    it { form.errors.size.must_equal(1) }
+    it { refute @result }
+    it { assert_equal form.errors.messages, "hit.title": ["must be filled"] }
+    it { assert_equal form.errors.size, 1 }
   end
 
   describe "#validate with collection form invalid" do
     before { @result = form.validate("songs" => [{"title" => ""}], "band" => {"label" => {name: "Fat Wreck"}}) }
 
-    it { @result.must_equal false }
-    it { form.errors.messages.must_equal("songs.title": ["must be filled"]) }
-    it { form.errors.size.must_equal(1) }
+    it { refute @result }
+    it { assert_equal form.errors.messages, "songs.title": ["must be filled"] }
+    it { assert_equal form.errors.size, 1 }
   end
 
   describe "#validate with collection and 2-level-nested invalid" do
     before { @result = form.validate("songs" => [{"title" => ""}], "band" => {"label" => {}}) }
 
-    it { @result.must_equal false }
-    it { form.errors.messages.must_equal("songs.title": ["must be filled"], "band.label.name": ["must be filled"]) }
-    it { form.errors.size.must_equal(2) }
+    it { refute @result }
+    it { assert_equal form.errors.messages, "songs.title": ["must be filled"], "band.label.name": ["must be filled"] }
+    it { assert_equal form.errors.size, 2 }
   end
 
   describe "#validate with nested form using :base invalid" do
     it do
       result = form.validate("songs" => [{"title" => "Someday"}], "band" => {"name" => "Nickelback", "label" => {"name" => "Roadrunner Records"}})
-      result.must_equal false
-      form.errors.messages.must_equal("band.name": ["you're a bad person"])
-      form.errors.size.must_equal(1)
+      refute result
+      assert_equal form.errors.messages, "band.name": ["you're a bad person"]
+      assert_equal form.errors.size, 1
     end
   end
 
@@ -178,17 +178,17 @@ class ErrorsTest < MiniTest::Spec
     let(:album_title) { nil }
     it do
       result = form.validate("songs" => [{"title" => "Someday"}], "band" => {"name" => "Nickelback", "label" => {"name" => "Roadrunner Records"}})
-      result.must_equal false
-      form.errors.messages.must_equal(title: ["must be filled"], "band.name": ["you're a bad person"])
+      refute result
+      assert_equal form.errors.messages, title: ["must be filled"], "band.name": ["you're a bad person"]
       # add a new custom error
       form.errors.add(:policy, "error_text")
-      form.errors.messages.must_equal(title: ["must be filled"], "band.name": ["you're a bad person"], policy: ["error_text"])
+      assert_equal form.errors.messages, title: ["must be filled"], "band.name": ["you're a bad person"], policy: ["error_text"]
       # does not duplicate errors
       form.errors.add(:title, "must be filled")
-      form.errors.messages.must_equal(title: ["must be filled"], "band.name": ["you're a bad person"], policy: ["error_text"])
+      assert_equal form.errors.messages, title: ["must be filled"], "band.name": ["you're a bad person"], policy: ["error_text"]
       # merge existing errors
       form.errors.add(:policy, "another error")
-      form.errors.messages.must_equal(title: ["must be filled"], "band.name": ["you're a bad person"], policy: ["error_text", "another error"])
+      assert_equal form.errors.messages, title: ["must be filled"], "band.name": ["you're a bad person"], policy: ["error_text", "another error"]
     end
   end
 
@@ -202,14 +202,14 @@ class ErrorsTest < MiniTest::Spec
       )
     end
 
-    it { @result.must_equal true }
-    it { form.hit.title.must_equal "Sacrifice" }
-    it { form.title.must_equal "Second Heat" }
-    it { form.songs.first.title.must_equal "Heart Of A Lion" }
+    it { assert @result }
+    it { assert_equal form.hit.title, "Sacrifice" }
+    it { assert_equal form.title, "Second Heat" }
+    it { assert_equal form.songs.first.title, "Heart Of A Lion" }
     it do
       skip "WE DON'T NEED COUNT AND EMPTY? ON THE CORE ERRORS OBJECT"
-      form.errors.size.must_equal(0)
-      form.errors.empty?.must_equal(true)
+      assert_equal form.errors.size, 0
+      assert form.errors.empty
     end
   end
 
@@ -219,7 +219,7 @@ class ErrorsTest < MiniTest::Spec
     # to_s is aliased to messages
     it {
       skip "why do we need Errors#to_s ?"
-      form.errors.to_s.must_equal "{:\"songs.title\"=>[\"must be filled\"], :\"band.label.name\"=>[\"must be filled\"]}"
+      assert_equal form.errors.to_s, "{:\"songs.title\"=>[\"must be filled\"], :\"band.label.name\"=>[\"must be filled\"]}"
     }
   end
 end

data/test/feature_test.rb

@@ -45,8 +45,8 @@ class FeatureInheritanceTest < BaseTest
   let(:form) { AlbumForm.new(album) }
 
   it do
-    form.date.must_equal "May 16"
-    form.songs[0].date.must_equal "May 16"
+    assert_equal form.date, "May 16"
+    assert_equal form.songs[0].date, "May 16"
   end
 
   # it { subject.class.include?(Reform::Form::ActiveModel) }

data/test/fixtures/dry_error_messages.yml

@@ -1,94 +1,104 @@
 en:
-  errors:
-    array?: "must be an array"
+  dry_validation:
+    errors:
+      array?: "must be an array"
 
-    empty?: "must be empty"
+      empty?: "must be empty"
 
-    excludes?: "must not include %{value}"
+      excludes?: "must not include %{value}"
 
-    excluded_from?:
-      arg:
-        default: "must not be one of: %{list}"
-        range: "must not be one of: %{list_left} - %{list_right}"
+      excluded_from?:
+        arg:
+          default: "must not be one of: %{list}"
+          range: "must not be one of: %{list_left} - %{list_right}"
 
-    eql?: "must be equal to %{left}"
+      eql?: "must be equal to %{left}"
 
-    not_eql?: "must not be equal to %{left}"
+      not_eql?: "must not be equal to %{left}"
 
-    filled?: "must be filled"
+      filled?: "must be filled"
 
-    format?: "is in invalid format"
+      format?: "is in invalid format"
 
-    number?: "must be a number"
+      number?: "must be a number"
 
-    odd?: "must be odd"
+      odd?: "must be odd"
 
-    even?: "must be even"
+      even?: "must be even"
 
-    gt?: "must be greater than %{num}"
+      gt?: "must be greater than %{num}"
 
-    gteq?: "must be greater than or equal to %{num}"
+      gteq?: "must be greater than or equal to %{num}"
 
-    hash?: "must be a hash"
+      hash?: "must be a hash"
 
-    included_in?:
-      arg:
-        default: "must be one of: %{list}"
-        range: "must be one of: %{list_left} - %{list_right}"
+      included_in?:
+        arg:
+          default: "must be one of: %{list}"
+          range: "must be one of: %{list_left} - %{list_right}"
 
-    includes?: "must include %{value}"
+      includes?: "must include %{value}"
 
-    bool?: "must be boolean"
+      bool?: "must be boolean"
 
-    true?: "must be true"
+      true?: "must be true"
 
-    false?: "must be false"
+      false?: "must be false"
 
-    int?: "must be an integer"
+      int?: "must be an integer"
 
-    float?: "must be a float"
+      float?: "must be a float"
 
-    decimal?: "must be a decimal"
+      decimal?: "must be a decimal"
 
-    date?: "must be a date"
+      date?: "must be a date"
 
-    date_time?: "must be a date time"
+      date_time?: "must be a date time"
 
-    time?: "must be a time"
+      time?: "must be a time"
 
-    key?: "is missing"
+      key?: "is missing"
 
-    attr?: "is missing"
+      attr?: "is missing"
 
-    lt?: "must be less than %{num}"
+      lt?: "must be less than %{num}"
 
-    lteq?: "must be less than or equal to %{num}"
+      lteq?: "must be less than or equal to %{num}"
 
-    max_size?: "size cannot be greater than %{num}"
+      max_size?: "size cannot be greater than %{num}"
 
-    min_size?: "size cannot be less than %{num}"
+      min_size?: "size cannot be less than %{num}"
 
-    none?: "cannot be defined"
+      none?: "cannot be defined"
 
-    str?: "must be a string"
+      str?: "must be a string"
 
-    type?: "must be %{type}"
+      type?: "must be %{type}"
 
-    size?:
-      arg:
-        default: "size must be %{size}"
-        range: "size must be within %{size_left} - %{size_right}"
+      size?:
+        arg:
+          default: "size must be %{size}"
+          range: "size must be within %{size_left} - %{size_right}"
 
-      value:
-        string:
-          arg:
-            default: "length must be %{size}"
-            range: "length must be within %{size_left} - %{size_right}"
+        value:
+          string:
+            arg:
+              default: "length must be %{size}"
+              range: "length must be within %{size_left} - %{size_right}"
 
-    good_musical_taste?: "you're a bad person"
 
-    a_song?: "must have at least one enabled song"
-    with_last_name?: "must have last name"
+
+      rules:
+        name:
+          good_musical_taste?: "you're a bad person"
+        title:
+          good_musical_taste?: "you're a bad person"
+        songs:
+          a_song?: "must have at least one enabled song"
+        artist:
+          with_last_name?: "must have last name"
+
 de:
-  errors:
+  dry_validation:
+    errors:
       filled?: "muss abgefüllt sein"

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