reform 2.1.0.rc1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fd73b0dc59751240c4ec4518477b225c5becf81
-  data.tar.gz: 1a6a1e8eba9f547424e533698129299afbdc8a93
+  metadata.gz: 22e0b3849f8a705c51f5e805dfaca960279b8d3d
+  data.tar.gz: 1fa928b3309dcca60a1c5801a58acca34d7996ee
 SHA512:
-  metadata.gz: 59066ba1ed67fc72da96561cb77f4dfcf3750c2840ce825b55344851476a09feba5e8222b2aa75d560014c027ce313f2896ad49b651c6de7a52ede2cee0db854
-  data.tar.gz: 57f67e136f2e7ea8c99db1baaab671a26ae6ebbfb62066564048c38ccd3bbc8b1846a54733b9f5629bb01d32085470649fa4f7c255f35042eab5f7fc9b990b69
+  metadata.gz: 5daaf2a361ee1a200b7d300f926ff6e4acf7503d73b5b3dcde106201d9b6bcf8a015ba4472ba5496a67af48af7be7bd4879d6afa6ed2cee649ec776ec437afea
+  data.tar.gz: 1adf91b4dfd4de9e14871b7f56953cd83ce765d6d1576858314ba4416f9c15c0d9eaad57b26b450345c8d4420ffd3ff524b67df210665d9f4268f4484a9b8894

data/CHANGES.md

@@ -1,15 +1,24 @@
-## 2.1
+## 2.1.0
+
+You should be able to upgrade from 2.0 without any code changes.
 
 ### Awesomeness
 
 * You can now have `:populator` for scalar properties, too. This allows "parsing code" per property which is super helpful to structure your deserialization.
 * `:populator` can be a method name, as in `populator: :populate_authors!`.
-* Populators can now skip deserialization of a nested fragment using `skip!`. [Learn more here](http://trailblazer.to/gems/reform/populator.html).
-* Added basic support for dry-validation as a future replacement for ActiveModel::Validation. Note that this is still experimental, but feel free to test.
+* Populators can now skip deserialization of a nested fragment using `skip!`. [Learn more here](http://trailblazer.to/gems/reform/populator.html#skip).
+* Added support for dry-validation as a future replacement for ActiveModel::Validation. Note that this is still experimental, but works great.
+* Added validation groups.
+
+### Changes
 
-* :populator ->(options) or ->(fragment:, model:, **o)
+* All lambda APIs change (with deprecation): `populator: ->(options)` or `->(fragment:, model:, **o)` where we only receive one hash instead of a varying number or arguments. This is pretty cool and should be listed under _Awesomeness_.
 * `ActiveModel::Validator` prevents Rails from adding methods to it. This makes `acceptance` and `confirmation` validations work properly.
 
+### Notes
+
+* Please be warned that we will drop support for `ActiveModel::Validations` from 2.2 onwards. Don't worry, it will still work, but we don't want to work with it anymore.
+
 ## 2.0.5
 
 * `ActiveModel::Validator` now delegates all methods properly to the form. It used to crashed with properties called `format` or other private `Object` methods.

data/Gemfile

@@ -13,5 +13,4 @@ gemspec
 # gem "declarative", path: "../declarative"
 
 gem "minitest-line"
-gem 'dry-validation'
-gem 'byebug'
+gem 'byebug'

data/lib/reform/contract.rb

@@ -33,6 +33,7 @@ module Reform
       args.each { |name| property(name, options.dup) }
     end
 
+    require "reform/contract/errors"
     require 'reform/contract/validate'
     include Reform::Contract::Validate
 
@@ -40,6 +41,7 @@ module Reform
     include Reform::Validation # ::validates and #valid?
 
 
+
     # module ValidatesWarning
     #   def validates(*)
     #     raise "[Reform] Please include either Reform::Form::ActiveModel::Validations or Reform::Form::Lotus in your form class."

data/lib/reform/contract/errors.rb

@@ -0,0 +1,43 @@
+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/active_model/validations.rb

@@ -1,5 +1,4 @@
 require "active_model"
-require "reform/form/active_model/errors"
 require "uber/delegates"
 
 module Reform::Form::ActiveModel
@@ -35,7 +34,7 @@ module Reform::Form::ActiveModel
     end
 
     def build_errors
-      Reform::Contract::Errors.new(self)
+      Errors.new(self)
     end
 
     # The concept of "composition" has still not arrived in Rails core and they rely on 400 methods being
@@ -101,4 +100,8 @@ module Reform::Form::ActiveModel
       end
     end
   end
+
+  class Errors < ActiveModel::Errors
+    include Reform::Form::Errors::Merge
+  end
 end

data/lib/reform/form/dry.rb

@@ -1,6 +1,6 @@
 require "dry-validation"
-require "reform/validation"
 require "dry/validation/schema/form"
+require "reform/validation"
 
 module Reform::Form::Dry
   module Validations
@@ -31,11 +31,10 @@ module Reform::Form::Dry
       def call(fields, reform_errors, form)
         validator = @validator.new(form)
 
-        validator.call(fields).messages.each do |dry_error|
-          # a dry error message looks like this:
-          # [:email, [['Please provide your email', '']]]
-          dry_error[1].each do |attr_error|
-            reform_errors.add(dry_error[0], attr_error[0])
+        # a message item looks like: {:confirm_password=>[["confirm_password size cannot be less than 2"], "9"]}
+        validator.call(fields).messages.each do |field, dry_error|
+          dry_error[0].each do |attr_error|
+            reform_errors.add(field, attr_error)
           end
         end
       end

data/lib/reform/version.rb

@@ -1,3 +1,3 @@
 module Reform
-  VERSION = "2.1.0.rc1"
+  VERSION = "2.1.0"
 end

data/reform.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency             "disposable",     ">= 0.2.1", "< 0.3.0"
+  spec.add_dependency             "disposable",     ">= 0.2.2", "< 0.3.0"
   spec.add_dependency             "uber",           "~> 0.0.11"
   spec.add_dependency             "representable",  ">= 2.4.0", "< 3.1.0"
 
@@ -32,6 +32,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "multi_json"
 
   spec.add_development_dependency "lotus-validations"
-  spec.add_development_dependency "dry-validation"
+  spec.add_development_dependency "dry-validation", ">= 0.4.0"
   spec.add_development_dependency "actionpack"
 end

data/test/fixtures/dry_error_messages.yml

@@ -40,4 +40,5 @@ str?: "%{name} must be a string"
 
 good_musical_taste?: "you're a bad person"
 
-form_access_validation?: "this doesn't look like a Reform form dude!!"
+form_access_validation?: "this doesn't look like a Reform form dude!!"
+

data/test/reform_test.rb

@@ -89,7 +89,7 @@ class ReformTest < ReformSpec
   describe "#errors" do
     before { form.validate({})}
 
-    it { form.errors.must_be_kind_of Reform::Form::Errors }
+    it { form.errors.must_be_kind_of Reform::Form::ActiveModel::Errors }
 
     it { form.errors.messages.must_equal({}) }
 

data/test/validation/dry_validation_test.rb

@@ -59,18 +59,18 @@ class ValidationGroupsTest < MiniTest::Spec
     # 2nd group fails.
     it do
       form.validate(username: "Helloween", email: "yo", confirm_password:"9").must_equal false
-      form.errors.messages.inspect.must_equal "{:email=>[\"email size cannot be less than 3\"], :confirm_password=>[\"confirm_password size cannot be less than 2\"], :password=>[\"password must be filled\"]}"
+      form.errors.messages.inspect.must_equal "{:email=>[\"email size cannot be less than 3\"], :confirm_password=>[\"confirm_password size cannot be less than 2\"], :password=>[\"password must be filled\", \"password size cannot be less than 2\"]}"
     end
     # 3rd group fails.
     it do
       form.validate(username: "Helloween", email: "yo!", confirm_password:"9").must_equal false
       form.errors.messages.inspect
-        .must_equal "{:confirm_password=>[\"confirm_password size cannot be less than 2\"], :password=>[\"password must be filled\"]}"
+        .must_equal "{:confirm_password=>[\"confirm_password size cannot be less than 2\"], :password=>[\"password must be filled\", \"password size cannot be less than 2\"]}"
     end
     # 4th group with after: fails.
     it do
       form.validate(username: "Helloween", email: "yo!", password: "", confirm_password: "9").must_equal false
-      form.errors.messages.inspect.must_equal "{:confirm_password=>[\"confirm_password size cannot be less than 2\"], :password=>[\"password must be filled\"]}"
+      form.errors.messages.inspect.must_equal "{:confirm_password=>[\"confirm_password size cannot be less than 2\"], :password=>[\"password must be filled\", \"password size cannot be less than 2\"]}"
     end
   end
 
@@ -104,7 +104,7 @@ class ValidationGroupsTest < MiniTest::Spec
 
       validation :default do
         configure { |config|
-          config.messages_file = 'test/fixtures/dry_error_messages.yml'
+          # config.messages_file = 'test/fixtures/dry_error_messages.yml'
         }
 
         key(:title) do |title|
@@ -167,7 +167,7 @@ class ValidationGroupsTest < MiniTest::Spec
             validates(:email, &:filled?)
           end
         end
-      end.must_raise
+      end.must_raise(NoMethodError)
       # e.message.must_equal 'validates() is not supported by Dry Validation backend.'
 
       e = proc do
@@ -193,8 +193,8 @@ class ValidationGroupsTest < MiniTest::Spec
             validates_with(:email, &:filled?)
           end
         end
-      end.must_raise
-      # e.message.must_equal 'validates_with() is not supported by Dry Validation backend.'
+      end.must_raise(NoMethodError)
+      # e.message.must_equal (NoMethodError)'validates_with() is not supported by Dry Validation backend.'
     end
   end
 
@@ -327,4 +327,4 @@ class ValidationGroupsTest < MiniTest::Spec
   #     form.errors.messages.inspect.must_equal "{:username=>[\"username must be filled\", \"username is not proper size\"]}"
   #   end
   # end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reform
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc1
+  version: 2.1.0
 platform: ruby
 authors:
 - Nick Sutterer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-21 00:00:00.000000000 Z
+date: 2015-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: disposable
@@ -17,7 +17,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
     - - "<"
       - !ruby/object:Gem::Version
         version: 0.3.0
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
     - - "<"
       - !ruby/object:Gem::Version
         version: 0.3.0
@@ -211,14 +211,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -258,10 +258,10 @@ files:
 - lib/reform.rb
 - lib/reform/active_record.rb
 - lib/reform/contract.rb
+- lib/reform/contract/errors.rb
 - lib/reform/contract/validate.rb
 - lib/reform/form.rb
 - lib/reform/form/active_model.rb
-- lib/reform/form/active_model/errors.rb
 - lib/reform/form/active_model/form_builder_methods.rb
 - lib/reform/form/active_model/model_reflections.rb
 - lib/reform/form/active_model/model_validations.rb
@@ -373,9 +373,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8

data/lib/reform/form/active_model/errors.rb

@@ -1,23 +0,0 @@
-# The Errors class is planned to replace AM::Errors. It provides proper nested error messages.
-class Reform::Contract::Errors < ActiveModel::Errors
-  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 valid? # TODO: test me in unit test.
-    empty?
-  end
-
-  def to_s
-    messages.inspect
-  end
-end # Errors