reform 2.3.0.rc1 → 2.5.0

data/test/feature_test.rb

@@ -1,5 +1,3 @@
-require 'test_helper'
-
 class FeatureInheritanceTest < BaseTest
   Song  = Struct.new(:title, :album, :composer)
   Album = Struct.new(:name, :songs, :artist)
@@ -38,17 +36,17 @@ class FeatureInheritanceTest < BaseTest
     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 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) }
@@ -62,4 +60,4 @@ class FeatureInheritanceTest < BaseTest
   # it { subject.band.label.is_a?(Reform::Form::ActiveModel) }
   # it { subject.band.label.is_a?(Reform::Form::Coercion) }
   # it { subject.band.label.is_a?(Reform::Form::MultiParameterAttributes) }
-end
+end

data/test/fixtures/dry_error_messages.yml

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

data/test/form_option_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 class FormOptionTest < MiniTest::Spec
   Song  = Struct.new(:title)
@@ -7,7 +7,7 @@ class FormOptionTest < MiniTest::Spec
   class SongForm < TestForm
     property :title
     validation do
-      required(:title).filled
+      params { required(:title).filled }
     end
   end
 
@@ -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_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 class FormTest < MiniTest::Spec
   Artist = Struct.new(:name)
@@ -22,11 +22,11 @@ class FormTest < MiniTest::Spec
   end
 
   describe "::dup" do
-    let (:cloned) { AlbumForm.clone }
+    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.
@@ -37,7 +37,7 @@ class FormTest < MiniTest::Spec
       end
 
       cloned.validation do
-        required(:title).filled
+        params { required(:title).filled }
       end
 
       cloned.new(OpenStruct.new).validate({})
@@ -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

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 class AsTest < BaseTest
   class AlbumForm < TestForm
@@ -19,46 +19,42 @@ class AsTest < BaseTest
     end
   end
 
-  let (:song2) { Song.new("Roxanne") }
+  let(:song2) { Song.new("Roxanne") }
 
-  let (:params) {
+  let(:params) do
       {
         "name" => "Best Of The Police",
-        "single"   => {"title" => "So Lonely"},
+        "single" => {"title" => "So Lonely"},
         "tracks" => [{"name" => "Message In A Bottle"}, {"name" => "Roxanne"}]
       }
-    }
+    end
 
   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
-    before {
+    before do
       subject.tracks[1].name = "Livin' Ain't No Crime"
       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
     before { subject.validate(params) }
 
@@ -69,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_test.rb

@@ -1,12 +1,12 @@
-require 'test_helper'
-require 'representable/json'
+require "test_helper"
+require "representable/json"
 
 class InheritTest < BaseTest
   Populator = Reform::Form::Populator
 
   class SkipParse
     include Uber::Callable
-    def call(*args)
+    def call(*_args)
       false
     end
   end
@@ -14,19 +14,18 @@ class InheritTest < BaseTest
   class AlbumForm < TestForm
     property :title, deserializer: {instance: "Instance"}, skip_if: "skip_if in AlbumForm" # allow direct configuration of :deserializer.
 
-    property :hit, populate_if_empty: -> (*) { Song.new } do
+    property :hit, populate_if_empty: ->(*) { Song.new } do
       property :title
       validation do
-        required(:title).filled
+        params { required(:title).filled }
       end
     end
 
-    collection :songs, populate_if_empty: lambda {}, skip_if: :all_blank do
+    collection :songs, populate_if_empty: -> {}, skip_if: :all_blank do
       property :title
     end
 
-    property :band, populate_if_empty: lambda {} do
-
+    property :band, populate_if_empty: -> {} do
       def band_id
         1
       end
@@ -35,10 +34,10 @@ class InheritTest < BaseTest
 
   class CompilationForm < AlbumForm
     property :title, inherit: true, skip_if: "skip_if from CompilationForm"
-    property :hit, :inherit => true, populate_if_empty: -> (*) { Song.new }, skip_if: SkipParse.new do
+    property :hit, inherit: true, populate_if_empty: ->(*) { Song.new }, skip_if: SkipParse.new do
       property :rating
       validation do
-        required(:rating).filled
+        params { required(:rating).filled }
       end
     end
 
@@ -48,59 +47,53 @@ class InheritTest < BaseTest
     end
   end
 
-  let (:album) { Album.new(nil, Song.new, [], Band.new) }
+  let(:album) { Album.new(nil, Song.new, [], Band.new) }
   subject { CompilationForm.new(album) }
 
   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({})
+    subject.validate("hit" => {"title" => "LA Drone", "rating" => 10})
+    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"
 
+    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(: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
-
-    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
     # override :band's original populate_if_empty but with :inherit.
     property :band, inherit: true, populator: "CD Populator" do
@@ -108,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