reform 2.3.2 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1632a1964f6950c4451e586caae9bfe4766501e22c6e7961c442aae3327c6b8f
-  data.tar.gz: cfa18510a8fad6eab78a5d7ffdb890b3f8e80dbbe2dcb7390a386fded0b7f479
+  metadata.gz: 68e69ea827ccacd9338da23633e8a375a8a1d8e5d1c1ba19d6c3024d700d0cdd
+  data.tar.gz: 70d9ae61c5ff37307e8e94c66f048e876fd13056558cc173c4f9b5543192aa52
 SHA512:
-  metadata.gz: af8948ced80b6370a1878317d5cb99609c64e073c6206c511825358a9535de70f1ef34791d06fd240f864554b00ef8e04a595b8993aefa8d9f49580b6644c226
-  data.tar.gz: c3f5a610f6dad84cb451f8880aa84294cfbf610649fc33aba20cf69b0be0414868b77756843b3c842a872c54dfbab759f40b15505b2e19c3075e5010119076c5
+  metadata.gz: 7410df891945423b07d34bbca31976037306ad90c9e935108101e2ec2fbf3e11ba4f115f23bb4fae3ae72e0360f1111eaee152c4e85d630d344505b27f8ddf79
+  data.tar.gz: 6f838dfb0b78180526545e7b54378a8cb3b62c4cfa437bd951afdcfa58a3f3e19445963501edb1a601b588a44201573eb5adaad51ac3ceeb61cda93db282d788

data/.github/workflows/ci.yml

@@ -0,0 +1,17 @@
+name: CI
+on: [push, pull_request]
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
+        ruby: [2.4, 2.5, 2.6, 2.7, '3.0', head]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - run: bundle exec rake

data/.gitignore

@@ -15,7 +15,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-.rubocop-https*
+.rubocop*
 .byebug_history
 .idea
 *.iml

data/CHANGES.md

@@ -1,3 +1,26 @@
+## 2.6.1
+
+* Loosen `disposable` dependency to `>= 0.5.0`.
+
+## 2.6.0
+
+* Support ruby-3 by using `Representable::Option` to handle `keyword_arguments` forwarding :tada:
+* Upgrade `representable` and `disposable` dependencies which uses `trailblazer-option` over `declarative-option`.
+* Deprecate populator's callable signature which accepts `form` as a separate positional argument. Make all callable (proc, method, `Uber::Callable`) signatures identical.
+
+## 2.5.0
+*  fix memory leak with Dry validation (#525)
+
+## 2.4.0
+
+* [BREAKING] Dropping compatibility of dry-validation < 1.x
+[* Removed `Reform::Contract` ?]
+[* Move Form#deserializer to Form::deserializer]
+
+## 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/Gemfile

@@ -2,4 +2,4 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "appraisal", "~> 2.2"
+gem 'dry-validation', '~> 1.5.0'

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 - 2020 Nick Sutterer
+Copyright (c) 2013 - 2021 Nick Sutterer
 
 MIT License
 

data/README.md

@@ -10,11 +10,11 @@ _Form objects decoupled from your models._
 
 Reform gives you a form object with validations and nested setup of models. It is completely framework-agnostic and doesn't care about your database.
 
-Although reform can be used in any Ruby framework, it comes with [Rails support](#rails-integration), works with [simple_form and other form gems](#formbuilder-support), allows nesting forms to implement [has_one](#nesting-forms-1-1-relations) and [has_many](#nesting-forms-1-n-relations) relationships, can [compose a form](#compositions) from multiple objects and gives you [coercion](#coercion).
+Although reform can be used in any Ruby framework, it comes with [Rails support](#rails-integration), works with simple_form and other form gems, allows nesting forms to implement has_one and has_many relationships, can [compose a form](#compositions) from multiple objects and gives you coercion.
 
 ## Full Documentation
 
-Reform is part of the [Trailblazer](http://trailblazer.to) framework. [Full documentation](http://trailblazer.to/gems/reform) is available on the project site.
+Reform is part of the [Trailblazer](http://trailblazer.to) framework. [Full documentation](http://trailblazer.to/2.1/docs/reform.html) is available on the project site.
 
 ## Reform 2.2
 
@@ -250,7 +250,7 @@ The manual saving with block is not encouraged. You should rather check the Disp
 
 ## Populating Forms
 
-Very often, you need to give Reform some information how to create or find nested objects when `validate`ing. This directive is called _populator_ and [documented here](http://trailblazer.to/gems/reform/populator.html).
+Very often, you need to give Reform some information how to create or find nested objects when `validate`ing. This directive is called _populator_ and [documented here](http://trailblazer.to/2.1/docs/reform.html#reform-populators).
 
 ## Installation
 
@@ -313,7 +313,7 @@ AlbumForm.new(album: album, cd: CD.find(1))
 
 ## More
 
-Reform comes many more optional features, like hash fields, coercion, virtual fields, and so on. Check the [full documentation here](http://trailblazer.to/gems/reform).
+Reform comes many more optional features, like hash fields, coercion, virtual fields, and so on. Check the [full documentation here](http://trailblazer.to/2.1/docs/reform.html).
 
 [![](http://trailblazer.to/images/3dbuch-freigestellt.png)](https://leanpub.com/trailblazer)
 
@@ -330,7 +330,7 @@ Temporary note: This is the README and API for Reform 2. On the public API, only
 
 Anyway, please upgrade and _report problems_ and do not simply assume that we will magically find out what needs to get fixed. When in trouble, join us on [Gitter](https://gitter.im/trailblazer/chat).
 
-[Full documentation for Reform](http://trailblazer.to/gems/reform) is available online, or support us and grab the [Trailblazer book](https://leanpub.com/trailblazer). There is an [Upgrading Guide](http://trailblazer.to/gems/reform/upgrading-guide.html) to help you migrate from Reform 1.x.
+[Full documentation for Reform](http://trailblazer.to/2.1/docs/reform.html) is available online, or support us and grab the [Trailblazer book](https://leanpub.com/trailblazer). There is an [Upgrading Guide](http://trailblazer.to/2.1/docs/reform.html#reform-upgrading-guide) to help you migrate through versions.
 
 ### Attributions!!!
 

data/Rakefile

@@ -4,19 +4,8 @@ require "dry/types/version"
 
 task default: %i[test]
 
-TEST_WITH_OLD_AND_NEW_API = %w[
-  validation/dry_validation call composition contract errors inherit module reform
-  save skip_if populate validate form
-].freeze
-
-def dry_v_test_files
-  api = Gem::Version.new(Dry::Types::VERSION).to_s.split('.').first.to_i >= 1 ? "new" : "old"
-  TEST_WITH_OLD_AND_NEW_API.map { |file| "test/#{file}_#{api}_api.rb" }
-end
-
 Rake::TestTask.new(:test) do |test|
   test.libs << "test"
-  test.test_files = FileList["test/*_test.rb"] + FileList["test/validation/*_test.rb"] + dry_v_test_files
+  test.test_files = FileList["test/**/*_test.rb"]
   test.verbose = true
 end
-

data/lib/reform/contract/validate.rb

@@ -11,7 +11,7 @@ class Reform::Contract < Disposable::Twin
       validate!(nil).success?
     end
 
-    # The #errors method will be removed in Reform 2.4/3.0 core.
+    # The #errors method will be removed in Reform 3.0 core.
     def errors(*args)
       Result::Errors.new(@result, self)
     end

data/lib/reform/form/dry.rb

@@ -1,19 +1,57 @@
+gem 'dry-validation', '~> 1.5'
 require "dry-validation"
-require "dry/validation/version"
 require "reform/validation"
 require "reform/form/dry/input_hash"
 
+::Dry::Validation.load_extensions(:hints)
+
 module Reform::Form::Dry
+  class Contract < Dry::Validation::Contract
+  end
+
   def self.included(includer)
-    if Gem::Version.new(Dry::Validation::VERSION) > Gem::Version.new("0.13.3")
-      require "reform/form/dry/new_api"
-      validations = Reform::Form::Dry::NewApi::Validations
-    else
-      require "reform/form/dry/old_api"
-      validations = Reform::Form::Dry::OldApi::Validations
+    includer.send :include, Validations
+    includer.extend Validations::ClassMethods
+  end
+
+  module Validations
+    module ClassMethods
+      def validation_group_class
+        Group
+      end
+    end
+
+    def self.included(includer)
+      includer.extend(ClassMethods)
     end
 
-    includer.send :include, validations
-    includer.extend validations::ClassMethods
+    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)
+        # 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 }
+        inject_options = schema_inject_params.merge(dynamic_options)
+        contract.new(**inject_options).call(input_hash(form))
+      end
+
+      def contract
+        @contract ||= Class.new(validator, &block)
+      end
+    end
   end
 end

data/lib/reform/form/populator.rb

@@ -7,7 +7,7 @@
 class Reform::Form::Populator
   def initialize(user_proc)
     @user_proc = user_proc # the actual `populator: ->{}` block from the user, via ::property.
-    @value     = Declarative::Option(user_proc, instance_exec: true, callable: Object) # we can now process Callable, procs, :symbol.
+    @value     = ::Representable::Option(user_proc) # we can now process Callable, procs, :symbol.
   end
 
   def call(input, options)
@@ -30,7 +30,17 @@ class Reform::Form::Populator
 
   def call!(options)
     form = options[:represented]
-    @value.(form, options) # Declarative::Option call.
+    evaluate_option(form, options)
+  end
+
+  def evaluate_option(form, options)
+    if @user_proc.is_a?(Uber::Callable) && @user_proc.method(:call).arity == 2 # def call(form, options)
+      warn %{[Reform] Accepting `form` as a positional argument in `:populator` will be deprecated. Please use `def call(form:, **options)` signature instead.}
+
+      return @value.(form, exec_context: form, keyword_arguments: options)
+    end
+
+    @value.(exec_context: form, keyword_arguments: options.merge(form: form)) # Representable::Option call
   end
 
   def handle_fail(twin, options)
@@ -66,7 +76,7 @@ class Reform::Form::Populator
       return @user_proc.new if @user_proc.is_a?(Class) # handle populate_if_empty: Class. this excludes using Callables, though.
 
       deprecate_positional_args(form, @user_proc, options) do
-        @value.(form, options)
+        evaluate_option(form, options)
       end
     end
 

data/lib/reform/form/prepopulate.rb

@@ -13,7 +13,7 @@ module Reform::Form::Prepopulate
   def prepopulate_local!(options)
     schema.each do |dfn|
       next unless block = dfn[:prepopulator]
-      Declarative::Option(block, instance_exec: true).(self, options)
+      ::Representable::Option(block).(exec_context: self, keyword_arguments: options)
     end
   end
 

data/lib/reform/form/validate.rb

@@ -4,15 +4,15 @@ module Reform::Form::Validate
     class AllBlank
       include Uber::Callable
 
-      def call(form, options)
+      def call(input:, binding:, **)
         # TODO: Schema should provide property names as plain list.
         # ensure param keys are strings.
-        params = options[:input].each_with_object({}) { |(k, v), hash|
+        params = input.each_with_object({}) { |(k, v), hash|
           hash[k.to_s] = v
         }
 
         # return false if any property inputs are populated.
-        options[:binding][:nested].definitions.each do |definition|
+        binding[:nested].definitions.each do |definition|
           value = params[definition.name.to_s]
           return false if (!value.nil? && value != '')
         end

data/lib/reform/validation/groups.rb

@@ -43,7 +43,6 @@ module Reform::Validation
 
         groups.collect do |(name, group, options)|
           next unless evaluate?(options[:if], results, form)
-
           results[name] = group.(form) # run validation for group. store and collect <Result>.
         end
       end

data/lib/reform/version.rb

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

data/reform.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency             "disposable",     ">= 0.4.2", "< 0.5.0"
-  spec.add_dependency             "representable",  ">= 2.4.0", "< 3.1.0"
+  spec.add_dependency             "disposable",     ">= 0.5.0", "< 1.0.0"
+  spec.add_dependency             "representable",  ">= 3.1.1", "< 3.2.0"
   spec.add_dependency             "uber",           "< 0.2.0"
 
   spec.add_development_dependency "bundler"

data/test/call_test.rb

@@ -0,0 +1,23 @@
+require "test_helper"
+
+class CallTest < Minitest::Spec
+  Song = Struct.new(:title)
+
+  class SongForm < TestForm
+    property :title
+
+    validation do
+      params { required(:title).filled }
+    end
+  end
+
+  let(:form) { SongForm.new(Song.new) }
+
+  it { assert form.(title: "True North").success? }
+  it { refute form.(title: "True North").failure? }
+  it { refute form.(title: "").success? }
+  it { assert form.(title: "").failure? }
+
+  it { assert_equal form.(title: "True North").errors.messages, {} }
+  it { assert_equal form.(title: "").errors.messages, 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
+    refute form.changed?(:name)
+    refute form.songs[0].changed?(:title)
+    refute form.songs[0].composer.changed?(:name)
   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
+    assert form.changed?(:name)
+    refute form.songs[0].changed?(:title)
+    assert form.songs[0].composer.changed?(:name)
   end
 end

data/test/coercion_test.rb

@@ -13,11 +13,11 @@ class CoercionTest < BaseTest
     feature Coercion
     include Disposable::Twin::Property::Hash
 
-    property :released_at, type: DRY_TYPES_CONSTANT::DateTime
+    property :released_at, type: Types::Params::DateTime
 
     property :hit do
-      property :length, type: DRY_TYPES_INT_CONSTANT
-      property :good,   type: DRY_TYPES_CONSTANT::Bool
+      property :length, type: Types::Params::Integer
+      property :good,   type: Types::Params::Bool
     end
 
     property :band do
@@ -28,7 +28,7 @@ class CoercionTest < BaseTest
 
     property :metadata, field: :hash do
       property :publication_settings do
-        property :featured, type: DRY_TYPES_CONSTANT::Bool
+        property :featured, type: Types::Params::Bool
       end
     end
   end
@@ -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 { assert_equal subject.released_at, "31/03/1981" } # NO coercion in setup.
+  it { assert_equal subject.hit.length, "312" }
+  it { assert_equal subject.band.label.value, "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 { assert_equal subject.released_at, DateTime.parse("30/03/1981") }
+    it { assert_equal subject.hit.length, 312 }
+    it { assert_equal subject.hit.good, false }
+    it { assert_equal subject.band.label.value, "9999.999999.99" } # coercion happened once.
+    it { assert_equal subject.metadata.publication_settings.featured, false }
   end
 
   # sync
   describe "#sync" do
     before do
-      subject.validate(params).must_equal true
+      assert subject.validate(params)
       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 { assert_equal album.released_at, DateTime.parse("30/03/1981") }
+    it { assert_equal album.hit.length, 312 }
+    it { assert_equal album.hit.good, false }
     it { assert_nil album.metadata[:publication_settings] }
-    it { album.metadata["publication_settings"]["featured"].must_equal false }
+    it { assert_equal album.metadata["publication_settings"]["featured"], false }
   end
 end

data/test/{composition_new_api.rb → composition_test.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 { assert_equal form.price, 6 }
+  it { assert_equal form.price(for_size: :s), 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 { assert_equal form.id, 1 }
+  it { assert_equal form.title, "Rio" }
+  it { assert_equal form.name, "Duran Duran" }
+  it { assert_equal form.requester_id, 2 }
   it { assert_nil form.channel }
-  it { form.requester.must_equal "MCP" } # same name as composed model.
+  it { assert_equal form.requester, "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 { assert form.mapper.is_a? Disposable::Composition }
 
   # #model[] -> composed models
-  it { form.model[:requester].must_equal requester }
-  it { form.model[:song].must_equal song }
+  it { assert_equal form.model[:requester], requester }
+  it { assert_equal form.model[:song], 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
+    assert_equal form.validate("title" => "Greyhound", "name" => "Frenzal Rhomb"), true
+    assert_equal form.validate("title" => "", "name" => "Frenzal Rhomb"), 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"})
+      assert_equal hash, name: "Duran Duran", title: "Rio"
     end
 
     it "provides nested symbolized hash as second block argument" do
@@ -113,11 +113,10 @@ class FormCompositionTest < MiniTest::Spec
         hash = map
       end
 
-      hash.must_equal({
-                        song: {"title" => "Greyhound", "id" => 1, "channel" => "JJJ", "captcha" => "wonderful", "band" => {"title" => "Duran^2"}},
-                        requester: {"name" => "Frenzal Rhomb", "id" => 2, "requester" => "MCP"}
-                      }
-      )
+      assert_equal hash, {
+        song: {"title" => "Greyhound", "id" => 1, "channel" => "JJJ", "captcha" => "wonderful", "band" => {"title" => "Duran^2"}},
+        requester: {"name" => "Frenzal Rhomb", "id" => 2, "requester" => "MCP"}
+      }
     end
 
     it "xxx pushes data to models and calls #save when no block passed" do
@@ -126,16 +125,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.
+      assert_equal form.captcha, "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
+      assert_equal requester.name, "Frenzal Rhomb"
+      assert_equal requester.saved?, true
+      assert_equal song.title, "Greyhound"
+      assert_equal song.saved?, true
+      assert_equal song.band.title, "Duran^2"
+      assert_equal song.band.saved?, true
     end
 
     it "returns true when models all save successfully" do
@@ -143,7 +142,7 @@ class FormCompositionTest < MiniTest::Spec
       requester.extend(Saveable)
       band.extend(Saveable)
 
-      form.save.must_equal true
+      assert_equal form.save, true
     end
 
     it "returns false when one or more models don't save successfully" do
@@ -157,7 +156,7 @@ class FormCompositionTest < MiniTest::Spec
       requester.extend(Saveable)
       band.extend(Saveable)
 
-      form.save.must_equal false
+      assert_equal form.save, false
     end
   end
 end
@@ -182,5 +181,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| assert_equal hash, { library: { "books" => [{ "id" => 1, "name" => "My book" }] } } } }
 end

data/test/{contract_new_api.rb → contract_test.rb}

@@ -46,32 +46,32 @@ class ContractTest < MiniTest::Spec
 
   # accept `property form: SongForm`.
   it do
-    form.artist.must_be_instance_of ArtistForm
+    assert form.artist.is_a? ArtistForm
   end
 
   describe ".properties" do
     it "defines a property when called with one argument" do
-      form.must_respond_to :duration
+      assert_respond_to form, :duration
     end
 
     it "defines several properties when called with multiple arguments" do
-      form.must_respond_to :year
-      form.must_respond_to :style
+      assert_respond_to form, :year
+      assert_respond_to form, :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
+      assert_equal readable, 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]
+      assert_equal returned_value, %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 { assert_equal AlbumForm.options_for(:name).extend(Declarative::Inspect).inspect, "#<Disposable::Twin::Definition: @options={:private_name=>:name, :name=>\"name\"}>" }
+    it { assert_equal AlbumForm.new(album).options_for(:name).extend(Declarative::Inspect).inspect, "#<Disposable::Twin::Definition: @options={:private_name=>:name, :name=>\"name\"}>" }
   end
 end

data/test/default_test.rb

@@ -16,7 +16,7 @@ class DefaultTest < Minitest::Spec
   it do
     form = AlbumForm.new(Album.new(nil, [Song.new]))
 
-    form.name.must_equal "Wrong"
-    form.songs[0].title.must_equal "It's Catching Up"
+    assert_equal form.name, "Wrong"
+    assert_equal form.songs[0].title, "It's Catching Up"
   end
 end

data/test/deserialize_test.rb

@@ -41,9 +41,9 @@ class DeserializeTest < MiniTest::Spec
 
     form.validate(json)
 
-    form.title.must_equal "Apocalypse Soon"
-    form.artist.name.must_equal "Mute"
-    form.artist.model.object_id.must_equal artist_id
+    assert_equal form.title, "Apocalypse Soon"
+    assert_equal form.artist.name, "Mute"
+    assert_equal form.artist.model.object_id, artist_id
   end
 
   describe "infering the deserializer from another form should NOT copy its populators" do
@@ -62,7 +62,7 @@ class DeserializeTest < MiniTest::Spec
       form = CompilationForm.new(Album.new)
       form.validate("artist" => {"name" => "Horowitz"}) # the deserializer doesn't know symbols.
       form.sync
-      form.artist.model.must_equal Artist.new("Horowitz", %{{"name"=>"Horowitz"}})
+      assert_equal form.artist.model, Artist.new("Horowitz", %{{"name"=>"Horowitz"}})
     end
   end
 end
@@ -91,11 +91,11 @@ class ValidateWithBlockTest < MiniTest::Spec
       options_from:     :deserializer
     )
 
-    form.validate(json) { |params|
+    assert form.validate(json) { |params|
       deserializer.new(form).from_json(params)
-    }.must_equal true # with block must return result, too.
+    } # with block must return result, too.
 
-    form.title.must_equal "Apocalypse Soon"
-    form.artist.name.must_equal "Mute"
+    assert_equal form.title, "Apocalypse Soon"
+    assert_equal form.artist.name, "Mute"
   end
 end