reform 2.3.2 → 2.6.1

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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reform
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.6.1
 platform: ruby
 authors:
 - Nick Sutterer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-07 00:00:00.000000000 Z
+date: 2021-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: disposable
@@ -17,40 +17,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.5.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.5.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: representable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 3.1.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 3.1.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: uber
   requirement: !ruby/object:Gem::Requirement
@@ -157,9 +157,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".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
@@ -262,58 +243,44 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.3
 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/.travis.yml

@@ -1,16 +0,0 @@
-language: ruby
-cache: bundler
-bundler_args: --without benchmarks tools
-rvm:
-  - ruby-head
-  - 2.7
-  - 2.6
-  - 2.5
-  - 2.4
-gemfile:
-  - gemfiles/1.5.0.gemfile
-  - gemfiles/0.13.0.gemfile
-matrix:
-  fast_finish: true
-  allow_failures:
-    - rvm: ruby-head

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,47 +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(:schema, 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)
-
-          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

data/test/call_new_api.rb

@@ -1,23 +0,0 @@
-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 { 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"]) }
-end

data/test/call_old_api.rb

@@ -1,23 +0,0 @@
-require "test_helper"
-
-class CallTest < Minitest::Spec
-  Song = Struct.new(:title)
-
-  class SongForm < TestForm
-    property :title
-
-    validation do
-      required(:title).filled
-    end
-  end
-
-  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").errors.messages.must_equal({}) }
-  it { form.(title: "").errors.messages.must_equal(title: ["must be filled"]) }
-end

data/test/composition_old_api.rb

@@ -1,184 +0,0 @@
-require "test_helper"
-
-class FormCompositionInheritanceTest < MiniTest::Spec
-  module SizePrice
-    include Reform::Form::Module
-
-    property :price
-    property :size
-
-    module InstanceMethods
-      def price(for_size: size)
-        case for_size.to_sym
-          when :s then super() * 1
-          when :m then super() * 2
-          when :l then super() * 3
-        end
-      end
-    end
-  end
-
-  class OutfitForm < TestForm
-    include Reform::Form::Composition
-    include SizePrice
-
-    property :price,  inherit: true, on: :tshirt
-    property :size,   inherit: true, on: :measurement
-  end
-
-  let(:measurement) { Measurement.new(:l) }
-  let(:tshirt)      { Tshirt.new(2, :m) }
-  let(:form)        { OutfitForm.new(tshirt: tshirt, measurement: measurement) }
-
-  Tshirt = Struct.new(:price, :size)
-  Measurement = Struct.new(:size)
-
-  it { form.price.must_equal 6 }
-  it { form.price(for_size: :s).must_equal 2 }
-end
-
-class FormCompositionTest < MiniTest::Spec
-  Song      = Struct.new(:id, :title, :band)
-  Requester = Struct.new(:id, :name, :requester)
-  Band      = Struct.new(:title)
-
-  class RequestForm < TestForm
-    include Composition
-
-    property  :name,          on: :requester
-    property  :requester_id,  on: :requester, from: :id
-    properties :title, :id, on: :song
-    # property  :channel # FIXME: what about the "main model"?
-    property :channel, virtual: true, on: :song
-    property :requester,      on: :requester
-    property :captcha,        on: :song, virtual: true
-
-    validation do
-      required(:name).filled
-      required(:title).filled
-    end
-
-    property :band,           on: :song do
-      property :title
-    end
-  end
-
-  let(:form)       { RequestForm.new(song: song, requester: requester) }
-  let(:song)       { Song.new(1, "Rio", band) }
-  let(:requester)  { Requester.new(2, "Duran Duran", "MCP") }
-  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_nil form.channel }
-  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 }
-
-  # #model[] -> composed models
-  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
-  end
-
-  describe "#save" do
-    # #save with {}
-    it do
-      hash = {}
-
-      form.save do |map|
-        hash[:name]   = form.name
-        hash[:title]  = form.title
-      end
-
-      hash.must_equal({name: "Duran Duran", title: "Rio"})
-    end
-
-    it "provides nested symbolized hash as second block argument" do
-      form.validate("title" => "Greyhound", "name" => "Frenzal Rhomb", "channel" => "JJJ", "captcha" => "wonderful")
-
-      hash = nil
-
-      form.save do |map|
-        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"}
-                      }
-      )
-    end
-
-    it "xxx pushes data to models and calls #save when no block passed" do
-      song.extend(Saveable)
-      requester.extend(Saveable)
-      band.extend(Saveable)
-
-      form.validate("title" => "Greyhound", "name" => "Frenzal Rhomb", "captcha" => "1337")
-      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
-    end
-
-    it "returns true when models all save successfully" do
-      song.extend(Saveable)
-      requester.extend(Saveable)
-      band.extend(Saveable)
-
-      form.save.must_equal true
-    end
-
-    it "returns false when one or more models don't save successfully" do
-      module Unsaveable
-        def save
-          false
-        end
-      end
-
-      song.extend(Unsaveable)
-      requester.extend(Saveable)
-      band.extend(Saveable)
-
-      form.save.must_equal false
-    end
-  end
-end
-
-class FormCompositionCollectionTest < MiniTest::Spec
-  Book = Struct.new(:id, :name)
-  Library = Struct.new(:id) do
-    def books
-      [Book.new(1, "My book")]
-    end
-  end
-
-  class LibraryForm < TestForm
-    include Reform::Form::Composition
-
-    collection :books, on: :library do
-      property :id
-      property :name
-    end
-  end
-
-  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"}]}}) } }
-end