reform 2.3.3 → 2.5.0

data/test/validation/result_test.rb

@@ -11,10 +11,10 @@ class ErrorsResultTest < Minitest::Spec
     let(:failed) { MyResult.new(false) }
     let(:succeeded) { MyResult.new(true) }
 
-    it { _(Reform::Contract::Result.new([failed, failed]).success?).must_equal false }
-    it { _(Reform::Contract::Result.new([succeeded, failed]).success?).must_equal false }
-    it { _(Reform::Contract::Result.new([failed, succeeded]).success?).must_equal false }
-    it { _(Reform::Contract::Result.new([succeeded, succeeded]).success?).must_equal true }
+    it { assert_equal Reform::Contract::Result.new([failed, failed]).success?, false }
+    it { assert_equal Reform::Contract::Result.new([succeeded, failed]).success?, false }
+    it { assert_equal Reform::Contract::Result.new([failed, succeeded]).success?, false }
+    it { assert Reform::Contract::Result.new([succeeded, succeeded]).success? }
   end
 
   describe "Contract::Result#errors" do
@@ -27,7 +27,7 @@ class ErrorsResultTest < Minitest::Spec
       ]
     end
 
-    it { _(Reform::Contract::Result.new(results).errors).must_equal({title: ["must be filled", "something more"], length: ["no Int"]}) }
+    it { assert_equal Reform::Contract::Result.new(results).errors, {title: ["must be filled", "something more"], length: ["no Int"]} }
   end
 
   describe "Result::Pointer" do
@@ -44,24 +44,24 @@ class ErrorsResultTest < Minitest::Spec
     end
 
     let(:top) { Reform::Contract::Result::Pointer.new(MyResult.new(false, errors), []) }
-    it { _(top.success?).must_equal false }
-    it { _(top.errors).must_equal errors }
+    it { assert_equal top.success?, false }
+    it { assert_equal top.errors, errors }
 
     let(:artist) { Reform::Contract::Result::Pointer.new(MyResult.new(false, errors), [:artist]) }
-    it { _(artist.success?).must_equal false }
-    it { _(artist.errors).must_equal({age: ["too old"], bands: {0 => {name: "too new school"}, 1 => {name: "too boring"}}}) }
+    it { assert_equal artist.success?, false }
+    it { assert_equal artist.errors,({age: ["too old"], bands: {0 => {name: "too new school"}, 1 => {name: "too boring"}}}) }
 
     let(:band) { Reform::Contract::Result::Pointer.new(MyResult.new(false, errors), [:artist, :bands, 1]) }
-    it { _(band.success?).must_equal false }
-    it { _(band.errors).must_equal({name: "too boring"}) }
+    it { assert_equal band.success?, false }
+    it { assert_equal band.errors,({name: "too boring"}) }
 
     describe "advance" do
       let(:advanced) { artist.advance(:bands, 1) }
 
-      it { _(advanced.success?).must_equal false }
-      it { _(advanced.errors).must_equal({name: "too boring"}) }
+      it { assert_equal advanced.success?, false }
+      it { assert_equal advanced.errors,({name: "too boring"}) }
 
-      it { _(artist.advance(%i[absolute nonsense])).must_be_nil }
+      it { assert_nil artist.advance(%i[absolute nonsense]) }
     end
   end
 end

data/test/virtual_test.rb

@@ -13,8 +13,8 @@ class VirtualTest < MiniTest::Spec
   it {
     form.validate(credit_card_number: "123", transactions: [id: 1])
 
-    _(form.credit_card_number).must_equal "123" # this is still readable in the UI.
-    _(form.transactions.first.id).must_equal 1 # this is still readable in the UI.
+    assert_equal form.credit_card_number, "123" # this is still readable in the UI.
+    assert_equal form.transactions.first.id, 1 # this is still readable in the UI.
 
     form.sync
 
@@ -23,7 +23,7 @@ class VirtualTest < MiniTest::Spec
       hash = nested
     end
 
-    _(hash).must_equal("credit_card_number" => "123", "transactions" => ["id" => 1])
+    assert_equal hash, "credit_card_number" => "123", "transactions" => ["id" => 1]
   }
 end
 
@@ -49,16 +49,16 @@ class VirtualAndDefaultTest < MiniTest::Spec
     form = CreditCardForm.new(Object.new)
     form.validate({})
 
-    _(hash(form)).must_equal("credit_card_number" => "123", "transactions" => ["id" => 2])
+    assert_equal hash(form), "credit_card_number" => "123", "transactions" => ["id" => 2]
 
     form = CreditCardForm.new(Object.new)
     form.validate(credit_card_number: "123", transactions: [id: 1])
 
-    _(form.credit_card_number).must_equal "123" # this is still readable in the UI.
-    _(form.transactions.first.id).must_equal 1 # this is still readable in the UI.
+    assert_equal form.credit_card_number,  "123" # this is still readable in the UI.
+    assert_equal form.transactions.first.id,  1 # this is still readable in the UI.
 
     form.sync
 
-    _(hash(form)).must_equal("credit_card_number" => "123", "transactions" => ["id" => 1])
+    assert_equal hash(form), "credit_card_number" => "123", "transactions" => ["id" => 1]
   }
 end

data/test/writeable_test.rb

@@ -11,20 +11,20 @@ class WriteableTest < MiniTest::Spec
   let(:form) { LocationForm.new(loc) }
 
   it do
-    _(form.country).must_equal "Australia"
+    assert_equal form.country, "Australia"
 
     form.validate("country" => "Germany") # this usually won't change when submitting.
-    _(form.country).must_equal "Germany"
+    assert_equal form.country, "Germany"
 
     form.sync
-    _(loc.country).must_equal "Australia" # the writer wasn't called.
+    assert_equal loc.country, "Australia" # the writer wasn't called.
 
     hash = {}
     form.save do |nested|
       hash = nested
     end
 
-    _(hash).must_equal("country" => "Germany")
+    assert_equal hash, "country" => "Germany"
   end
 end
 
@@ -40,19 +40,19 @@ class WritableTest < MiniTest::Spec
   let(:form) { LocationForm.new(loc) }
 
   it do
-    _(form.country).must_equal "Australia"
+    assert_equal form.country, "Australia"
 
     form.validate("country" => "Germany") # this usually won't change when submitting.
-    _(form.country).must_equal "Germany"
+    assert_equal form.country, "Germany"
 
     form.sync
-    _(loc.country).must_equal "Australia" # the writer wasn't called.
+    assert_equal loc.country, "Australia" # the writer wasn't called.
 
     hash = {}
     form.save do |nested|
       hash = nested
     end
 
-    _(hash).must_equal("country" => "Germany")
+    assert_equal hash, "country" => "Germany"
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: reform
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.5.0
 platform: ruby
 authors:
 - Nick Sutterer
 - Fran Worley
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-09 00:00:00.000000000 Z
+date: 2021-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: disposable
@@ -159,7 +159,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
-- Appraisals
 - CHANGES.md
 - CONTRIBUTING.md
 - Gemfile
@@ -168,8 +167,6 @@ files:
 - README.md
 - Rakefile
 - TODO.md
-- gemfiles/0.13.0.gemfile
-- gemfiles/1.5.0.gemfile
 - lib/reform.rb
 - lib/reform/contract.rb
 - lib/reform/contract/custom_error.rb
@@ -181,8 +178,6 @@ files:
 - lib/reform/form/composition.rb
 - lib/reform/form/dry.rb
 - lib/reform/form/dry/input_hash.rb
-- lib/reform/form/dry/new_api.rb
-- lib/reform/form/dry/old_api.rb
 - lib/reform/form/module.rb
 - lib/reform/form/populator.rb
 - lib/reform/form/prepopulate.rb
@@ -193,52 +188,38 @@ files:
 - lib/reform/version.rb
 - reform.gemspec
 - test/benchmarking.rb
-- test/call_new_api.rb
-- test/call_old_api.rb
+- test/call_test.rb
 - test/changed_test.rb
 - test/coercion_test.rb
-- test/composition_new_api.rb
-- test/composition_old_api.rb
+- test/composition_test.rb
 - test/contract/custom_error_test.rb
-- test/contract_new_api.rb
-- test/contract_old_api.rb
+- test/contract_test.rb
 - test/default_test.rb
 - test/deserialize_test.rb
-- test/errors_new_api.rb
-- test/errors_old_api.rb
+- test/docs/validation_test.rb
+- test/errors_test.rb
 - test/feature_test.rb
 - test/fixtures/dry_error_messages.yml
-- test/fixtures/dry_new_api_error_messages.yml
-- test/form_new_api.rb
-- test/form_old_api.rb
-- test/form_option_new_api.rb
-- test/form_option_old_api.rb
+- test/form_option_test.rb
+- test/form_test.rb
 - test/from_test.rb
-- test/inherit_new_api.rb
-- test/inherit_old_api.rb
-- test/module_new_api.rb
-- test/module_old_api.rb
+- test/inherit_test.rb
+- test/module_test.rb
 - test/parse_option_test.rb
 - test/parse_pipeline_test.rb
-- test/populate_new_api.rb
-- test/populate_old_api.rb
+- test/populate_test.rb
 - test/populator_skip_test.rb
 - test/prepopulator_test.rb
 - test/read_only_test.rb
 - test/readable_test.rb
-- test/reform_new_api.rb
-- test/reform_old_api.rb
-- test/save_new_api.rb
-- test/save_old_api.rb
+- test/reform_test.rb
+- test/save_test.rb
 - test/setup_test.rb
-- test/skip_if_new_api.rb
-- test/skip_if_old_api.rb
+- test/skip_if_test.rb
 - test/skip_setter_and_getter_test.rb
 - test/test_helper.rb
-- test/validate_new_api.rb
-- test/validate_old_api.rb
-- test/validation/dry_validation_new_api.rb
-- test/validation/dry_validation_old_api.rb
+- test/validate_test.rb
+- test/validation/dry_validation_test.rb
 - test/validation/result_test.rb
 - test/validation_library_provided_test.rb
 - test/virtual_test.rb
@@ -247,7 +228,7 @@ homepage: https://github.com/trailblazer/reform
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -263,57 +244,43 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Form object decoupled from models with validation, population and presentation.
 test_files:
 - test/benchmarking.rb
-- test/call_new_api.rb
-- test/call_old_api.rb
+- test/call_test.rb
 - test/changed_test.rb
 - test/coercion_test.rb
-- test/composition_new_api.rb
-- test/composition_old_api.rb
+- test/composition_test.rb
 - test/contract/custom_error_test.rb
-- test/contract_new_api.rb
-- test/contract_old_api.rb
+- test/contract_test.rb
 - test/default_test.rb
 - test/deserialize_test.rb
-- test/errors_new_api.rb
-- test/errors_old_api.rb
+- test/docs/validation_test.rb
+- test/errors_test.rb
 - test/feature_test.rb
 - test/fixtures/dry_error_messages.yml
-- test/fixtures/dry_new_api_error_messages.yml
-- test/form_new_api.rb
-- test/form_old_api.rb
-- test/form_option_new_api.rb
-- test/form_option_old_api.rb
+- test/form_option_test.rb
+- test/form_test.rb
 - test/from_test.rb
-- test/inherit_new_api.rb
-- test/inherit_old_api.rb
-- test/module_new_api.rb
-- test/module_old_api.rb
+- test/inherit_test.rb
+- test/module_test.rb
 - test/parse_option_test.rb
 - test/parse_pipeline_test.rb
-- test/populate_new_api.rb
-- test/populate_old_api.rb
+- test/populate_test.rb
 - test/populator_skip_test.rb
 - test/prepopulator_test.rb
 - test/read_only_test.rb
 - test/readable_test.rb
-- test/reform_new_api.rb
-- test/reform_old_api.rb
-- test/save_new_api.rb
-- test/save_old_api.rb
+- test/reform_test.rb
+- test/save_test.rb
 - test/setup_test.rb
-- test/skip_if_new_api.rb
-- test/skip_if_old_api.rb
+- test/skip_if_test.rb
 - test/skip_setter_and_getter_test.rb
 - test/test_helper.rb
-- test/validate_new_api.rb
-- test/validate_old_api.rb
-- test/validation/dry_validation_new_api.rb
-- test/validation/dry_validation_old_api.rb
+- test/validate_test.rb
+- test/validation/dry_validation_test.rb
 - test/validation/result_test.rb
 - test/validation_library_provided_test.rb
 - test/virtual_test.rb

data/Appraisals

@@ -1,8 +0,0 @@
-appraise "1.5.0" do
-  gem 'dry-monads', "1.3.5"
-  gem 'dry-validation', '~> 1.5.0'
-end
-
-appraise "0.13.0" do
-  gem 'dry-validation', '~> 0.13.0'
-end

data/gemfiles/0.13.0.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal", "~> 2.2"
-gem "dry-validation", "~> 0.13.0"
-
-gemspec path: "../"

data/gemfiles/1.5.0.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal", "~> 2.2"
-gem "dry-monads", "1.3.5"
-gem "dry-validation", "~> 1.5.0"
-
-gemspec path: "../"

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

@@ -1,45 +0,0 @@
-::Dry::Validation.load_extensions(:hints)
-
-module Reform::Form::Dry
-  module NewApi
-
-    class Contract < ::Dry::Validation::Contract
-    end
-
-    module Validations
-      module ClassMethods
-        def validation_group_class
-          Group
-        end
-      end
-
-      def self.included(includer)
-        includer.extend(ClassMethods)
-      end
-
-      class Group
-        include InputHash
-
-        def initialize(**options)
-          @validator = options.fetch(:contract, Contract)
-          @schema_inject_params = options.fetch(:with, {})
-        end
-
-        attr_reader :validator, :schema_inject_params, :block
-
-        def instance_exec(&block)
-          @block = block
-        end
-
-        def call(form)
-          return validator.call(input_hash(form)) unless validator.is_a?(Class) && @validator <= ::Dry::Validation::Contract
-
-          dynamic_options = { form: form }
-          inject_options = schema_inject_params.merge(dynamic_options)
-
-          validator.build(inject_options, &block).call(input_hash(form))
-        end
-      end
-    end
-  end
-end

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

@@ -1,61 +0,0 @@
-module Reform::Form::Dry
-  module OldApi
-    class Schema < Dry::Validation::Schema
-    end
-
-    module Validations
-      module ClassMethods
-        def validation_group_class
-          Group
-        end
-      end
-
-      def self.included(includer)
-        includer.extend(ClassMethods)
-      end
-
-      class Group
-        include InputHash
-
-        def initialize(options = {})
-          options ||= {}
-          schema_class = options[:schema] || Reform::Form::Dry::OldApi::Schema
-          @validator = Dry::Validation.Schema(schema_class, build: false)
-
-          @schema_inject_params = options[:with] || {}
-        end
-
-        def instance_exec(&block)
-          @validator = Dry::Validation.Schema(@validator, build: false, &block)
-          # inject the keys into the configure block automatically
-          keys = @schema_inject_params.keys
-          @validator.class_eval do
-            configure do
-              keys.each { |k| option k }
-            end
-          end
-        end
-
-        def call(form)
-          dynamic_options = {}
-          dynamic_options[:form] = form if @schema_inject_params[:form]
-          inject_options = @schema_inject_params.merge(dynamic_options)
-
-          # TODO: only pass submitted values to Schema#call?
-          dry_result = call_schema(inject_options, input_hash(form))
-          # dry_messages    = dry_result.messages
-
-          return dry_result
-
-          _reform_errors = Reform::Contract::Errors.new(dry_result) # TODO: dry should be merged here.
-        end
-
-        private
-
-        def call_schema(inject_options, input)
-          @validator.new(@validator.rules, inject_options).(input)
-        end
-      end
-    end
-  end
-end