reform 2.2.4 → 2.3.0.rc1

data/test/validation/result_test.rb

@@ -0,0 +1,79 @@
+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) {
+      [
+        MyResult.new(false, { title: ["must be filled"], nested: { something: [] } }),
+        MyResult.new(false, { length: ["no Int"] })
+      ]
+    }
+
+    it { Reform::Contract::Result.new(results).errors.must_equal({:title=>["must be filled"], :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([:absolute, :nonsense]).must_equal 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,7 +1,7 @@
 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.
   end
 

data/test/writeable_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class WriteableTest < MiniTest::Spec
   Location = Struct.new(:country)
 
-  class LocationForm < Reform::Form
+  class LocationForm < TestForm
     property :country, writeable: false
   end
 
@@ -26,4 +26,33 @@ class WriteableTest < MiniTest::Spec
 
     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.0.rc1
 platform: ruby
 authors:
 - Nick Sutterer
-- Garrett Heinlen
+- Fran Worley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: disposable
@@ -17,14 +17,34 @@ 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: 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: representable
   requirement: !ruby/object:Gem::Requirement
@@ -121,18 +141,18 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.10.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.10.1
 description: Form object decoupled from models.
 email:
 - apotonick@gmail.com
-- heinleng@gmail.com
+- frances@safetytoolbox.co.uk
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -140,28 +160,27 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - CHANGES.md
+- CONTRIBUTING.md
 - Gemfile
+- ISSUE_TEMPLATE.md
 - LICENSE.txt
 - README.md
 - Rakefile
 - TODO.md
-- gemfiles/Gemfile.disposable-0.3
 - lib/reform.rb
 - lib/reform/contract.rb
-- lib/reform/contract/errors.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/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
@@ -173,7 +192,6 @@ files:
 - test/composition_test.rb
 - test/contract_test.rb
 - test/default_test.rb
-- test/deprecation_test.rb
 - test/deserialize_test.rb
 - test/errors_test.rb
 - test/feature_test.rb
@@ -183,6 +201,7 @@ files:
 - test/from_test.rb
 - test/inherit_test.rb
 - test/module_test.rb
+- test/parse_option_test.rb
 - test/parse_pipeline_test.rb
 - test/populate_test.rb
 - test/populator_skip_test.rb
@@ -197,12 +216,12 @@ files:
 - 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/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: {}
@@ -217,12 +236,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: Form object decoupled from models with validation, population and presentation.
@@ -234,7 +253,6 @@ test_files:
 - test/composition_test.rb
 - test/contract_test.rb
 - test/default_test.rb
-- test/deprecation_test.rb
 - test/deserialize_test.rb
 - test/errors_test.rb
 - test/feature_test.rb
@@ -244,6 +262,7 @@ test_files:
 - test/from_test.rb
 - test/inherit_test.rb
 - test/module_test.rb
+- test/parse_option_test.rb
 - test/parse_pipeline_test.rb
 - test/populate_test.rb
 - test/populator_skip_test.rb
@@ -258,8 +277,8 @@ test_files:
 - 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/validation/result_test.rb
+- test/validation_library_provided_test.rb
 - test/virtual_test.rb
 - test/writeable_test.rb

data/gemfiles/Gemfile.disposable-0.3

@@ -1,6 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in reform.gemspec
-gemspec :path => '../'
-
-gem 'minitest'

data/lib/reform/contract/errors.rb

@@ -1,43 +0,0 @@
-class Reform::Contract::Errors
-  def initialize(*)
-    @errors = {}
-  end
-
-  module Merge
-    def merge!(errors, prefix)
-      errors.messages.each do |field, msgs|
-        unless field.to_sym == :base
-          field = (prefix+[field]).join(".").to_sym # TODO: why is that a symbol in Rails?
-        end
-
-        msgs.each do |msg|
-          next if messages[field] and messages[field].include?(msg)
-          add(field, msg)
-        end # Forms now contains a plain errors hash. the errors for each item are still available in item.errors.
-      end
-    end
-
-    def to_s
-      messages.inspect
-    end
-  end
-  include Merge
-
-  def add(field, message)
-    @errors[field] ||= []
-    @errors[field] << message
-  end
-
-  def messages
-    @errors
-  end
-
-  def empty?
-    @errors.empty?
-  end
-
-  # needed by Rails form builder.
-  def [](name)
-    @errors[name] || []
-  end
-end

data/lib/reform/form/mongoid.rb

@@ -1,37 +0,0 @@
-module Reform::Form::Mongoid
-  def self.included(base)
-    base.class_eval do
-      register_feature Reform::Form::Mongoid
-      include Reform::Form::ActiveModel
-      include Reform::Form::ORM
-      extend ClassMethods
-    end
-  end
-
-  module ClassMethods
-    def validates_uniqueness_of(attribute, options={})
-      options = options.merge(:attributes => [attribute])
-      validates_with(UniquenessValidator, options)
-    end
-    def i18n_scope
-      :mongoid
-    end
-  end
-
-
-  def self.mongoid_namespace
-    if mongoid_is_4_or_more?
-      'Validatable'
-    else
-      'Validations'
-    end
-  end
-
-  def self.mongoid_is_4_or_more?
-    Mongoid::VERSION.split('.').first.to_i >= 4
-  end
-
-  UniquenessValidator = Class.new("::Mongoid::#{mongoid_namespace}::UniquenessValidator".constantize) do
-    include Reform::Form::ORM::UniquenessValidator
-  end
-end

data/lib/reform/form/orm.rb

@@ -1,26 +0,0 @@
-module Reform::Form::ORM
-  def model_for_property(name)
-    return model unless is_a?(Reform::Form::Composition) # i am too lazy for proper inheritance. there should be a ActiveRecord::Composition that handles this.
-
-    model_name = options_for(name)[:on]
-    model[model_name]
-  end
-
-  module UniquenessValidator
-    # when calling validates it should create the Vali instance already and set @klass there! # TODO: fix this in AM.
-    def validate(form)
-      property = attributes.first
-
-      # here is the thing: why does AM::UniquenessValidator require a filled-out record to work properly? also, why do we need to set
-      # the class? it would be way easier to pass #validate a hash of attributes and get back an errors hash.
-      # the class for the finder could either be infered from the record or set in the validator instance itself in the call to ::validates.
-      record = form.model_for_property(property)
-      record.send("#{property}=", form.send(property))
-
-      @klass = record.class # this is usually done in the super-sucky #setup method.
-      super(record).tap do |res|
-        form.errors.add(property, record.errors.first.last) if record.errors.present?
-      end
-    end
-  end
-end