reform 2.2.4 → 2.3.1

data/test/validation/result_test.rb

@@ -0,0 +1,77 @@
+require "test_helper"
+
+class ErrorsResultTest < Minitest::Spec
+  MyResult = Struct.new(:success?, :errors) do
+    def failure?; !success? end
+  end
+
+  # TODO: errors(args) not tested.
+
+  describe "Contract::Result#success?" do
+    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 }
+  end
+
+  describe "Contract::Result#errors" do
+    let(:results) do
+      [
+        MyResult.new(false, {length: ["no Int"]}),
+        MyResult.new(false, {title: ["must be filled"], nested: {something: []}}),
+        MyResult.new(false, {title: ["must be filled"], nested: {something: []}}),
+        MyResult.new(false, {title: ["something more"], nested: {something: []}})
+      ]
+    end
+
+    it { Reform::Contract::Result.new(results).errors.must_equal({title: ["must be filled", "something more"], length: ["no Int"]}) }
+  end
+
+  describe "Result::Pointer" do
+    let(:errors) do # dry result #errors format.
+      {
+        title: ["ignore"],
+        artist: {age: ["too old"],
+          bands: {
+            0 => {name: "too new school"},
+            1 => {name: "too boring"},
+          }
+        }
+      }
+    end
+
+    let(:top) { Reform::Contract::Result::Pointer.new(MyResult.new(false, errors), []) }
+    it { top.success?.must_equal false }
+    it { top.errors.must_equal 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"}}}) }
+
+    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"}) }
+
+    describe "advance" do
+      let(:advanced) { artist.advance(:bands, 1) }
+
+      it { advanced.success?.must_equal false }
+      it { advanced.errors.must_equal({name: "too boring"}) }
+
+      it { artist.advance(%i[absolute nonsense]).must_be_nil }
+    end
+  end
+end
+
+# validation group:
+
+# form.errors/messages/hint(*args)            ==> {:title: [..]}
+#   @call_result.errors/messages/hint(*args) }
+
+# # result = Result(original_result => [:band, :label], my_local_result => [] )
+# # result.messages(locale: :en) merges original_result and my_local_result
+
+# form.errors => Result(fetch tree of all nested forms.messages(*args))

data/test/validation_library_provided_test.rb

@@ -0,0 +1,16 @@
+require "reform"
+require "minitest/autorun"
+
+class ValidationLibraryProvidedTest < MiniTest::Spec
+  it "no validation library loaded" do
+    assert_raises Reform::Validation::NoValidationLibraryError do
+      class PersonForm < Reform::Form
+        property :name
+
+        validation do
+          required(:name).maybe(:str?)
+        end
+      end
+    end
+  end
+end

data/test/virtual_test.rb

@@ -1,16 +1,20 @@
-require 'test_helper'
+require "test_helper"
 
 class VirtualTest < MiniTest::Spec
-  class CreditCardForm < Reform::Form
+  class CreditCardForm < TestForm
     property :credit_card_number, virtual: true # no read, no write, it's virtual.
+    collection :transactions, virtual: true, populate_if_empty: OpenStruct do
+      property :id
+    end
   end
 
-  let (:form) { CreditCardForm.new(Object.new) }
+  let(:form) { CreditCardForm.new(Object.new) }
 
   it {
-    form.validate("credit_card_number" => "123")
+    form.validate(credit_card_number: "123", transactions: [id: 1])
 
-    form.credit_card_number.must_equal "123"  # this is still readable in the UI.
+    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.
 
     form.sync
 
@@ -19,6 +23,42 @@ class VirtualTest < MiniTest::Spec
       hash = nested
     end
 
-    hash.must_equal("credit_card_number"=> "123")
+    hash.must_equal("credit_card_number" => "123", "transactions" => ["id" => 1])
+  }
+end
+
+class VirtualAndDefaultTest < MiniTest::Spec
+  class CreditCardForm < TestForm
+    property :credit_card_number, virtual: true, default: "123" # no read, no write, it's virtual.
+    collection :transactions, virtual: true, populate_if_empty: OpenStruct, default: [OpenStruct.new(id: 2)] do
+      property :id
+    end
+  end
+
+  def hash(form)
+    hash = {}
+    form.save do |nested|
+      hash = nested
+    end
+    hash
+  end
+
+  let(:form) { CreditCardForm.new(Object.new) }
+
+  it {
+    form = CreditCardForm.new(Object.new)
+    form.validate({})
+
+    hash(form).must_equal("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.
+
+    form.sync
+
+    hash(form).must_equal("credit_card_number" => "123", "transactions" => ["id" => 1])
   }
-end
+end

data/test/writeable_test.rb

@@ -1,14 +1,14 @@
-require 'test_helper'
+require "test_helper"
 
 class WriteableTest < MiniTest::Spec
   Location = Struct.new(:country)
 
-  class LocationForm < Reform::Form
+  class LocationForm < TestForm
     property :country, writeable: false
   end
 
-  let (:loc) { Location.new("Australia") }
-  let (:form) { LocationForm.new(loc) }
+  let(:loc) { Location.new("Australia") }
+  let(:form) { LocationForm.new(loc) }
 
   it do
     form.country.must_equal "Australia"
@@ -24,6 +24,35 @@ class WriteableTest < MiniTest::Spec
       hash = nested
     end
 
-    hash.must_equal("country"=> "Germany")
+    hash.must_equal("country" => "Germany")
   end
-end
+end
+
+# writable option is alias of writeable option.
+class WritableTest < MiniTest::Spec
+  Location = Struct.new(:country)
+
+  class LocationForm < TestForm
+    property :country, writable: false
+  end
+
+  let(:loc) { Location.new("Australia") }
+  let(:form) { LocationForm.new(loc) }
+
+  it do
+    form.country.must_equal "Australia"
+
+    form.validate("country" => "Germany") # this usually won't change when submitting.
+    form.country.must_equal "Germany"
+
+    form.sync
+    loc.country.must_equal "Australia" # the writer wasn't called.
+
+    hash = {}
+    form.save do |nested|
+      hash = nested
+    end
+
+    hash.must_equal("country" => "Germany")
+  end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: reform
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.3.1
 platform: ruby
 authors:
 - Nick Sutterer
-- Garrett Heinlen
+- Fran Worley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2020-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: disposable
@@ -17,14 +17,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: representable
   requirement: !ruby/object:Gem::Requirement
@@ -45,6 +51,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: uber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -60,7 +80,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -74,7 +94,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: minitest-line
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -88,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dry-types
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -116,93 +136,130 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dry-validation
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Form object decoupled from models.
 email:
 - apotonick@gmail.com
-- heinleng@gmail.com
+- frances@safetytoolbox.co.uk
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
+- Appraisals
 - CHANGES.md
+- CONTRIBUTING.md
 - Gemfile
+- ISSUE_TEMPLATE.md
 - LICENSE.txt
 - README.md
 - Rakefile
 - TODO.md
-- gemfiles/Gemfile.disposable-0.3
+- gemfiles/0.13.0.gemfile
+- gemfiles/1.5.0.gemfile
 - lib/reform.rb
 - lib/reform/contract.rb
-- lib/reform/contract/errors.rb
+- lib/reform/contract/custom_error.rb
 - lib/reform/contract/validate.rb
+- lib/reform/errors.rb
 - lib/reform/form.rb
 - lib/reform/form/call.rb
 - lib/reform/form/coercion.rb
 - 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/mongoid.rb
-- lib/reform/form/orm.rb
 - lib/reform/form/populator.rb
 - lib/reform/form/prepopulate.rb
 - lib/reform/form/validate.rb
-- lib/reform/mongoid.rb
+- lib/reform/result.rb
 - lib/reform/validation.rb
 - lib/reform/validation/groups.rb
 - lib/reform/version.rb
 - reform.gemspec
 - test/benchmarking.rb
-- test/call_test.rb
+- test/call_new_api.rb
+- test/call_old_api.rb
 - test/changed_test.rb
 - test/coercion_test.rb
-- test/composition_test.rb
-- test/contract_test.rb
+- test/composition_new_api.rb
+- test/composition_old_api.rb
+- test/contract/custom_error_test.rb
+- test/contract_new_api.rb
+- test/contract_old_api.rb
 - test/default_test.rb
-- test/deprecation_test.rb
 - test/deserialize_test.rb
-- test/errors_test.rb
+- test/errors_new_api.rb
+- test/errors_old_api.rb
 - test/feature_test.rb
 - test/fixtures/dry_error_messages.yml
-- test/form_option_test.rb
-- test/form_test.rb
+- 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/from_test.rb
-- test/inherit_test.rb
-- test/module_test.rb
+- test/inherit_new_api.rb
+- test/inherit_old_api.rb
+- test/module_new_api.rb
+- test/module_old_api.rb
+- test/parse_option_test.rb
 - test/parse_pipeline_test.rb
-- test/populate_test.rb
+- test/populate_new_api.rb
+- test/populate_old_api.rb
 - test/populator_skip_test.rb
 - test/prepopulator_test.rb
 - test/read_only_test.rb
 - test/readable_test.rb
-- test/readonly_test.rb
-- test/reform_test.rb
-- test/save_test.rb
+- test/reform_new_api.rb
+- test/reform_old_api.rb
+- test/save_new_api.rb
+- test/save_old_api.rb
 - test/setup_test.rb
-- test/skip_if_test.rb
+- test/skip_if_new_api.rb
+- test/skip_if_old_api.rb
 - test/skip_setter_and_getter_test.rb
 - test/test_helper.rb
-- test/validate_test.rb
-- test/validation/dry_test.rb
-- test/validation/dry_validation_test.rb
-- test/validation/errors.yml
+- 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/validation/result_test.rb
+- test/validation_library_provided_test.rb
 - test/virtual_test.rb
 - test/writeable_test.rb
-homepage: https://github.com/apotonick/reform
+homepage: https://github.com/trailblazer/reform
 licenses:
 - MIT
 metadata: {}
@@ -221,45 +278,59 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Form object decoupled from models with validation, population and presentation.
 test_files:
 - test/benchmarking.rb
-- test/call_test.rb
+- test/call_new_api.rb
+- test/call_old_api.rb
 - test/changed_test.rb
 - test/coercion_test.rb
-- test/composition_test.rb
-- test/contract_test.rb
+- test/composition_new_api.rb
+- test/composition_old_api.rb
+- test/contract/custom_error_test.rb
+- test/contract_new_api.rb
+- test/contract_old_api.rb
 - test/default_test.rb
-- test/deprecation_test.rb
 - test/deserialize_test.rb
-- test/errors_test.rb
+- test/errors_new_api.rb
+- test/errors_old_api.rb
 - test/feature_test.rb
 - test/fixtures/dry_error_messages.yml
-- test/form_option_test.rb
-- test/form_test.rb
+- 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/from_test.rb
-- test/inherit_test.rb
-- test/module_test.rb
+- test/inherit_new_api.rb
+- test/inherit_old_api.rb
+- test/module_new_api.rb
+- test/module_old_api.rb
+- test/parse_option_test.rb
 - test/parse_pipeline_test.rb
-- test/populate_test.rb
+- test/populate_new_api.rb
+- test/populate_old_api.rb
 - test/populator_skip_test.rb
 - test/prepopulator_test.rb
 - test/read_only_test.rb
 - test/readable_test.rb
-- test/readonly_test.rb
-- test/reform_test.rb
-- test/save_test.rb
+- test/reform_new_api.rb
+- test/reform_old_api.rb
+- test/save_new_api.rb
+- test/save_old_api.rb
 - test/setup_test.rb
-- test/skip_if_test.rb
+- test/skip_if_new_api.rb
+- test/skip_if_old_api.rb
 - test/skip_setter_and_getter_test.rb
 - test/test_helper.rb
-- test/validate_test.rb
-- test/validation/dry_test.rb
-- test/validation/dry_validation_test.rb
-- test/validation/errors.yml
+- 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/validation/result_test.rb
+- test/validation_library_provided_test.rb
 - test/virtual_test.rb
 - test/writeable_test.rb