reform 2.3.2 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1632a1964f6950c4451e586caae9bfe4766501e22c6e7961c442aae3327c6b8f
-  data.tar.gz: cfa18510a8fad6eab78a5d7ffdb890b3f8e80dbbe2dcb7390a386fded0b7f479
+  metadata.gz: 0f5d5dea8c04f5d993a91776afffea2a0b48603d850c11204d04e79248be6cf8
+  data.tar.gz: e4132e9db35384198bf31797b8620219c6418df4781a8f5300bbcf38c1a1c630
 SHA512:
-  metadata.gz: af8948ced80b6370a1878317d5cb99609c64e073c6206c511825358a9535de70f1ef34791d06fd240f864554b00ef8e04a595b8993aefa8d9f49580b6644c226
-  data.tar.gz: c3f5a610f6dad84cb451f8880aa84294cfbf610649fc33aba20cf69b0be0414868b77756843b3c842a872c54dfbab759f40b15505b2e19c3075e5010119076c5
+  metadata.gz: '0845ada0bbafc7c3a45485d51f93c66c8616bee7b23c851712d297be20c73e82f23a8e575f803adb2972c382c4c9003951ae8d788fe12df87195950490505028'
+  data.tar.gz: bd463ddb326f4db34ef9ad6948cdb9466a56c87514f2a18fcafba6dff29b54baf5640b97b490657b92e438c336869f35adc3e407b91be80351f427fd84f28c35

data/CHANGES.md

@@ -1,3 +1,7 @@
+## 2.3.3
+
+* Rename validation option for dry-v 1+ to `contract` instead of `schema`
+
 ## 2.3.2
 
 * Fix Validation block option :form incorrectly memoized between tests

data/lib/reform/form/dry/new_api.rb

@@ -20,8 +20,8 @@ module Reform::Form::Dry
       class Group
         include InputHash
 
-        def initialize(options = {})
-          @validator = options.fetch(:schema, Contract)
+        def initialize(**options)
+          @validator = options.fetch(:contract, Contract)
           @schema_inject_params = options.fetch(:with, {})
         end
 
@@ -32,8 +32,6 @@ module Reform::Form::Dry
         end
 
         def call(form)
-          # when passing options[:schema] the class instance is already created so we just need to call
-          # "call"
           return validator.call(input_hash(form)) unless validator.is_a?(Class) && @validator <= ::Dry::Validation::Contract
 
           dynamic_options = { form: form }

data/lib/reform/version.rb

@@ -1,3 +1,3 @@
 module Reform
-  VERSION = "2.3.2".freeze
+  VERSION = "2.3.3".freeze
 end

data/test/call_new_api.rb

@@ -13,11 +13,11 @@ class CallTest < Minitest::Spec
 
   let(:form) { SongForm.new(Song.new) }
 
-  it { form.(title: "True North").success?.must_equal true }
-  it { form.(title: "True North").failure?.must_equal false }
-  it { form.(title: "").success?.must_equal false }
-  it { form.(title: "").failure?.must_equal true }
+  it { _(form.(title: "True North").success?).must_equal true }
+  it { _(form.(title: "True North").failure?).must_equal false }
+  it { _(form.(title: "").success?).must_equal false }
+  it { _(form.(title: "").failure?).must_equal true }
 
-  it { form.(title: "True North").errors.messages.must_equal({}) }
-  it { form.(title: "").errors.messages.must_equal(title: ["must be filled"]) }
+  it { _(form.(title: "True North").errors.messages).must_equal({}) }
+  it { _(form.(title: "").errors.messages).must_equal(title: ["must be filled"]) }
 end

data/test/call_old_api.rb

@@ -13,11 +13,11 @@ class CallTest < Minitest::Spec
 
   let(:form) { SongForm.new(Song.new) }
 
-  it { form.(title: "True North").success?.must_equal true }
-  it { form.(title: "True North").failure?.must_equal false }
-  it { form.(title: "").success?.must_equal false }
-  it { form.(title: "").failure?.must_equal true }
+  it { _(form.(title: "True North").success?).must_equal true }
+  it { _(form.(title: "True North").failure?).must_equal false }
+  it { _(form.(title: "").success?).must_equal false }
+  it { _(form.(title: "").failure?).must_equal true }
 
-  it { form.(title: "True North").errors.messages.must_equal({}) }
-  it { form.(title: "").errors.messages.must_equal(title: ["must be filled"]) }
+  it { _(form.(title: "True North").errors.messages).must_equal({}) }
+  it { _(form.(title: "").errors.messages).must_equal(title: ["must be filled"]) }
 end

data/test/changed_test.rb

@@ -26,16 +26,16 @@ class ChangedTest < MiniTest::Spec
 
   # nothing changed after setup.
   it do
-    form.changed?(:name).must_equal false
-    form.songs[0].changed?(:title).must_equal false
-    form.songs[0].composer.changed?(:name).must_equal false
+    _(form.changed?(:name)).must_equal false
+    _(form.songs[0].changed?(:title)).must_equal false
+    _(form.songs[0].composer.changed?(:name)).must_equal false
   end
 
   # after validate, things might have changed.
   it do
     form.validate("name" => "Out Of Bounds", "songs" => [{"composer" => {"name" => "Ingemar Jansson & Mikael Danielsson"}}])
-    form.changed?(:name).must_equal true
-    form.songs[0].changed?(:title).must_equal false
-    form.songs[0].composer.changed?(:name).must_equal true
+    _(form.changed?(:name)).must_equal true
+    _(form.songs[0].changed?(:title)).must_equal false
+    _(form.songs[0].composer.changed?(:name)).must_equal true
   end
 end

data/test/coercion_test.rb

@@ -47,9 +47,9 @@ class CoercionTest < BaseTest
   end
 
   # it { subject.released_at.must_be_kind_of DateTime }
-  it { subject.released_at.must_equal "31/03/1981" } # NO coercion in setup.
-  it { subject.hit.length.must_equal "312" }
-  it { subject.band.label.value.must_equal "9999.99" }
+  it { _(subject.released_at).must_equal "31/03/1981" } # NO coercion in setup.
+  it { _(subject.hit.length).must_equal "312" }
+  it { _(subject.band.label.value).must_equal "9999.99" }
 
   let(:params) do
     {
@@ -75,24 +75,24 @@ class CoercionTest < BaseTest
   describe "#validate" do
     before { subject.validate(params) }
 
-    it { subject.released_at.must_equal DateTime.parse("30/03/1981") }
-    it { subject.hit.length.must_equal 312 }
-    it { subject.hit.good.must_equal false }
-    it { subject.band.label.value.must_equal "9999.999999.99" } # coercion happened once.
-    it { subject.metadata.publication_settings.featured.must_equal false }
+    it { _(subject.released_at).must_equal DateTime.parse("30/03/1981") }
+    it { _(subject.hit.length).must_equal 312 }
+    it { _(subject.hit.good).must_equal false }
+    it { _(subject.band.label.value).must_equal "9999.999999.99" } # coercion happened once.
+    it { _(subject.metadata.publication_settings.featured).must_equal false }
   end
 
   # sync
   describe "#sync" do
     before do
-      subject.validate(params).must_equal true
+      _(subject.validate(params)).must_equal true
       subject.sync
     end
 
-    it { album.released_at.must_equal DateTime.parse("30/03/1981") }
-    it { album.hit.length.must_equal 312 }
-    it { album.hit.good.must_equal false }
+    it { _(album.released_at).must_equal DateTime.parse("30/03/1981") }
+    it { _(album.hit.length).must_equal 312 }
+    it { _(album.hit.good).must_equal false }
     it { assert_nil album.metadata[:publication_settings] }
-    it { album.metadata["publication_settings"]["featured"].must_equal false }
+    it { _(album.metadata["publication_settings"]["featured"]).must_equal false }
   end
 end

data/test/composition_new_api.rb

@@ -33,8 +33,8 @@ class FormCompositionInheritanceTest < MiniTest::Spec
   Tshirt = Struct.new(:price, :size)
   Measurement = Struct.new(:size)
 
-  it { form.price.must_equal 6 }
-  it { form.price(for_size: :s).must_equal 2 }
+  it { _(form.price).must_equal 6 }
+  it { _(form.price(for_size: :s)).must_equal 2 }
 end
 
 class FormCompositionTest < MiniTest::Spec
@@ -71,24 +71,24 @@ class FormCompositionTest < MiniTest::Spec
   let(:band)       { Band.new("Duran^2") }
 
   # delegation form -> composition works
-  it { form.id.must_equal 1 }
-  it { form.title.must_equal "Rio" }
-  it { form.name.must_equal "Duran Duran" }
-  it { form.requester_id.must_equal 2 }
+  it { _(form.id).must_equal 1 }
+  it { _(form.title).must_equal "Rio" }
+  it { _(form.name).must_equal "Duran Duran" }
+  it { _(form.requester_id).must_equal 2 }
   it { assert_nil form.channel }
-  it { form.requester.must_equal "MCP" } # same name as composed model.
+  it { _(form.requester).must_equal "MCP" } # same name as composed model.
   it { assert_nil form.captcha }
 
   # #model just returns <Composition>.
-  it { form.mapper.must_be_kind_of Disposable::Composition }
+  it { _(form.mapper).must_be_kind_of Disposable::Composition }
 
   # #model[] -> composed models
-  it { form.model[:requester].must_equal requester }
-  it { form.model[:song].must_equal song }
+  it { _(form.model[:requester]).must_equal requester }
+  it { _(form.model[:song]).must_equal song }
 
   it "creates Composition for you" do
-    form.validate("title" => "Greyhound", "name" => "Frenzal Rhomb").must_equal true
-    form.validate("title" => "", "name" => "Frenzal Rhomb").must_equal false
+    _(form.validate("title" => "Greyhound", "name" => "Frenzal Rhomb")).must_equal true
+    _(form.validate("title" => "", "name" => "Frenzal Rhomb")).must_equal false
   end
 
   describe "#save" do
@@ -101,7 +101,7 @@ class FormCompositionTest < MiniTest::Spec
         hash[:title]  = form.title
       end
 
-      hash.must_equal({name: "Duran Duran", title: "Rio"})
+      _(hash).must_equal({name: "Duran Duran", title: "Rio"})
     end
 
     it "provides nested symbolized hash as second block argument" do
@@ -113,7 +113,7 @@ class FormCompositionTest < MiniTest::Spec
         hash = map
       end
 
-      hash.must_equal({
+      _(hash).must_equal({
                         song: {"title" => "Greyhound", "id" => 1, "channel" => "JJJ", "captcha" => "wonderful", "band" => {"title" => "Duran^2"}},
                         requester: {"name" => "Frenzal Rhomb", "id" => 2, "requester" => "MCP"}
                       }
@@ -126,16 +126,16 @@ class FormCompositionTest < MiniTest::Spec
       band.extend(Saveable)
 
       form.validate("title" => "Greyhound", "name" => "Frenzal Rhomb", "captcha" => "1337")
-      form.captcha.must_equal "1337" # TODO: move to separate test.
+      _(form.captcha).must_equal "1337" # TODO: move to separate test.
 
       form.save
 
-      requester.name.must_equal "Frenzal Rhomb"
-      requester.saved?.must_equal true
-      song.title.must_equal "Greyhound"
-      song.saved?.must_equal true
-      song.band.title.must_equal "Duran^2"
-      song.band.saved?.must_equal true
+      _(requester.name).must_equal "Frenzal Rhomb"
+      _(requester.saved?).must_equal true
+      _(song.title).must_equal "Greyhound"
+      _(song.saved?).must_equal true
+      _(song.band.title).must_equal "Duran^2"
+      _(song.band.saved?).must_equal true
     end
 
     it "returns true when models all save successfully" do
@@ -143,7 +143,7 @@ class FormCompositionTest < MiniTest::Spec
       requester.extend(Saveable)
       band.extend(Saveable)
 
-      form.save.must_equal true
+      _(form.save).must_equal true
     end
 
     it "returns false when one or more models don't save successfully" do
@@ -157,7 +157,7 @@ class FormCompositionTest < MiniTest::Spec
       requester.extend(Saveable)
       band.extend(Saveable)
 
-      form.save.must_equal false
+      _(form.save).must_equal false
     end
   end
 end
@@ -182,5 +182,5 @@ class FormCompositionCollectionTest < MiniTest::Spec
   let(:form)   { LibraryForm.new(library: library) }
   let(:library) { Library.new(2) }
 
-  it { form.save { |hash| hash.must_equal({library: {"books" => [{"id" => 1, "name" => "My book"}]}}) } }
+  it { form.save { |hash| _(hash).must_equal({library: {"books" => [{"id" => 1, "name" => "My book"}]}}) } }
 end

data/test/composition_old_api.rb

@@ -33,8 +33,8 @@ class FormCompositionInheritanceTest < MiniTest::Spec
   Tshirt = Struct.new(:price, :size)
   Measurement = Struct.new(:size)
 
-  it { form.price.must_equal 6 }
-  it { form.price(for_size: :s).must_equal 2 }
+  it { _(form.price).must_equal 6 }
+  it { _(form.price(for_size: :s)).must_equal 2 }
 end
 
 class FormCompositionTest < MiniTest::Spec
@@ -69,24 +69,24 @@ class FormCompositionTest < MiniTest::Spec
   let(:band)       { Band.new("Duran^2") }
 
   # delegation form -> composition works
-  it { form.id.must_equal 1 }
-  it { form.title.must_equal "Rio" }
-  it { form.name.must_equal "Duran Duran" }
-  it { form.requester_id.must_equal 2 }
+  it { _(form.id).must_equal 1 }
+  it { _(form.title).must_equal "Rio" }
+  it { _(form.name).must_equal "Duran Duran" }
+  it { _(form.requester_id).must_equal 2 }
   it { assert_nil form.channel }
-  it { form.requester.must_equal "MCP" } # same name as composed model.
+  it { _(form.requester).must_equal "MCP" } # same name as composed model.
   it { assert_nil form.captcha }
 
   # #model just returns <Composition>.
-  it { form.mapper.must_be_kind_of Disposable::Composition }
+  it { _(form.mapper).must_be_kind_of Disposable::Composition }
 
   # #model[] -> composed models
-  it { form.model[:requester].must_equal requester }
-  it { form.model[:song].must_equal song }
+  it { _(form.model[:requester]).must_equal requester }
+  it { _(form.model[:song]).must_equal song }
 
   it "creates Composition for you" do
-    form.validate("title" => "Greyhound", "name" => "Frenzal Rhomb").must_equal true
-    form.validate("title" => "", "name" => "Frenzal Rhomb").must_equal false
+    _(form.validate("title" => "Greyhound", "name" => "Frenzal Rhomb")).must_equal true
+    _(form.validate("title" => "", "name" => "Frenzal Rhomb")).must_equal false
   end
 
   describe "#save" do
@@ -99,7 +99,7 @@ class FormCompositionTest < MiniTest::Spec
         hash[:title]  = form.title
       end
 
-      hash.must_equal({name: "Duran Duran", title: "Rio"})
+      _(hash).must_equal({name: "Duran Duran", title: "Rio"})
     end
 
     it "provides nested symbolized hash as second block argument" do
@@ -111,7 +111,7 @@ class FormCompositionTest < MiniTest::Spec
         hash = map
       end
 
-      hash.must_equal({
+      _(hash).must_equal({
                         song: {"title" => "Greyhound", "id" => 1, "channel" => "JJJ", "captcha" => "wonderful", "band" => {"title" => "Duran^2"}},
                         requester: {"name" => "Frenzal Rhomb", "id" => 2, "requester" => "MCP"}
                       }
@@ -124,16 +124,16 @@ class FormCompositionTest < MiniTest::Spec
       band.extend(Saveable)
 
       form.validate("title" => "Greyhound", "name" => "Frenzal Rhomb", "captcha" => "1337")
-      form.captcha.must_equal "1337" # TODO: move to separate test.
+      _(form.captcha).must_equal "1337" # TODO: move to separate test.
 
       form.save
 
-      requester.name.must_equal "Frenzal Rhomb"
-      requester.saved?.must_equal true
-      song.title.must_equal "Greyhound"
-      song.saved?.must_equal true
-      song.band.title.must_equal "Duran^2"
-      song.band.saved?.must_equal true
+      _(requester.name).must_equal "Frenzal Rhomb"
+      _(requester.saved?).must_equal true
+      _(song.title).must_equal "Greyhound"
+      _(song.saved?).must_equal true
+      _(song.band.title).must_equal "Duran^2"
+      _(song.band.saved?).must_equal true
     end
 
     it "returns true when models all save successfully" do
@@ -141,7 +141,7 @@ class FormCompositionTest < MiniTest::Spec
       requester.extend(Saveable)
       band.extend(Saveable)
 
-      form.save.must_equal true
+      _(form.save).must_equal true
     end
 
     it "returns false when one or more models don't save successfully" do
@@ -155,7 +155,7 @@ class FormCompositionTest < MiniTest::Spec
       requester.extend(Saveable)
       band.extend(Saveable)
 
-      form.save.must_equal false
+      _(form.save).must_equal false
     end
   end
 end
@@ -180,5 +180,5 @@ class FormCompositionCollectionTest < MiniTest::Spec
   let(:form)   { LibraryForm.new(library: library) }
   let(:library) { Library.new(2) }
 
-  it { form.save { |hash| hash.must_equal({library: {"books" => [{"id" => 1, "name" => "My book"}]}}) } }
+  it { form.save { |hash| _(hash).must_equal({library: {"books" => [{"id" => 1, "name" => "My book"}]}}) } }
 end

data/test/contract_new_api.rb

@@ -46,32 +46,32 @@ class ContractTest < MiniTest::Spec
 
   # accept `property form: SongForm`.
   it do
-    form.artist.must_be_instance_of ArtistForm
+    _(form.artist).must_be_instance_of ArtistForm
   end
 
   describe ".properties" do
     it "defines a property when called with one argument" do
-      form.must_respond_to :duration
+      _(form).must_respond_to :duration
     end
 
     it "defines several properties when called with multiple arguments" do
-      form.must_respond_to :year
-      form.must_respond_to :style
+      _(form).must_respond_to :year
+      _(form).must_respond_to :style
     end
 
     it "passes options to each property when options are provided" do
       readable = AlbumForm.new(album).options_for(:style)[:readable]
-      readable.must_equal false
+      _(readable).must_equal false
     end
 
     it "returns the list of defined properties" do
       returned_value = AlbumForm.properties(:hello, :world, virtual: true)
-      returned_value.must_equal %i[hello world]
+      _(returned_value).must_equal %i[hello world]
     end
   end
 
   describe "#options_for" do
-    it { AlbumForm.options_for(:name).extend(Declarative::Inspect).inspect.must_equal "#<Disposable::Twin::Definition: @options={:private_name=>:name, :name=>\"name\"}>" }
-    it { AlbumForm.new(album).options_for(:name).extend(Declarative::Inspect).inspect.must_equal "#<Disposable::Twin::Definition: @options={:private_name=>:name, :name=>\"name\"}>" }
+    it { _(AlbumForm.options_for(:name).extend(Declarative::Inspect).inspect).must_equal "#<Disposable::Twin::Definition: @options={:private_name=>:name, :name=>\"name\"}>" }
+    it { _(AlbumForm.new(album).options_for(:name).extend(Declarative::Inspect).inspect).must_equal "#<Disposable::Twin::Definition: @options={:private_name=>:name, :name=>\"name\"}>" }
   end
 end

data/test/contract_old_api.rb

@@ -46,32 +46,32 @@ class ContractTest < MiniTest::Spec
 
   # accept `property form: SongForm`.
   it do
-    form.artist.must_be_instance_of ArtistForm
+    _(form.artist).must_be_instance_of ArtistForm
   end
 
   describe ".properties" do
     it "defines a property when called with one argument" do
-      form.must_respond_to :duration
+      _(form).must_respond_to :duration
     end
 
     it "defines several properties when called with multiple arguments" do
-      form.must_respond_to :year
-      form.must_respond_to :style
+      _(form).must_respond_to :year
+      _(form).must_respond_to :style
     end
 
     it "passes options to each property when options are provided" do
       readable = AlbumForm.new(album).options_for(:style)[:readable]
-      readable.must_equal false
+      _(readable).must_equal false
     end
 
     it "returns the list of defined properties" do
       returned_value = AlbumForm.properties(:hello, :world, virtual: true)
-      returned_value.must_equal %i[hello world]
+      _(returned_value).must_equal %i[hello world]
     end
   end
 
   describe "#options_for" do
-    it { AlbumForm.options_for(:name).extend(Declarative::Inspect).inspect.must_equal "#<Disposable::Twin::Definition: @options={:private_name=>:name, :name=>\"name\"}>" }
-    it { AlbumForm.new(album).options_for(:name).extend(Declarative::Inspect).inspect.must_equal "#<Disposable::Twin::Definition: @options={:private_name=>:name, :name=>\"name\"}>" }
+    it { _(AlbumForm.options_for(:name).extend(Declarative::Inspect).inspect).must_equal "#<Disposable::Twin::Definition: @options={:private_name=>:name, :name=>\"name\"}>" }
+    it { _(AlbumForm.new(album).options_for(:name).extend(Declarative::Inspect).inspect).must_equal "#<Disposable::Twin::Definition: @options={:private_name=>:name, :name=>\"name\"}>" }
   end
 end