reform 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1b845d6f45f5131183408c9cea079d554d6983c
-  data.tar.gz: 2cc7e0c7444007024bcd4e7eab8b6d2f18c7868e
+  metadata.gz: 851795d3f1959935496c4a582f24dffc6020b848
+  data.tar.gz: f62755eb2d9e6302a00790b703698149838474af
 SHA512:
-  metadata.gz: b9e001d2215c2923d99d75c69db17615f65c7b896b1d815e90bfa0fc86b4fb13ef037a2aa6342f1fc13794b0a0171a628be2655a91307cd197c656a3180ea4a6
-  data.tar.gz: f919c2d2f8e8f9f21258bcc467613d1734f7c365ef81cf9b13b076321de33e5286a5307ed4c1ec4f4d09189fca0690d82f49777103bb03e287de9201742be26a
+  metadata.gz: 865c755aea555fedc28f61ae04a7903544ad637c621e656c68a64fc9f952b0a105906f4abc77571dce490099227224cd966c12ccc802b8ae7e830c0b27d108f3
+  data.tar.gz: a90c092125bd9f2a7db2a6092267ba3ac439c6d92bd3b2e657a50156128c4de5b8f28e3f62cc2eefc47b6a8f36b1e8d5f94e393f31ab115cf297a60210fc58c4

data/CHANGES.md

@@ -1,3 +1,10 @@
+## 2.2.4
+
+* Always require `disposable` >= 0.4.1. 
+  
+  The only difference here is that `Form#sync`/`#save` with a block will include `nil` properties into the nested hash.
+* Remove `uber` dependency.
+
 ## 2.2.3
 
 * Add `Form#call` as an alias for `validate` and the `Result` object.

data/Gemfile

@@ -15,5 +15,5 @@ gemspec
 gem "minitest-line"
 gem 'byebug'
 
-gem "uber", path: "../uber"
+# gem "uber", path: "../uber"
 gem "representable", ">= 3.0.1"

data/lib/reform/form/populator.rb

@@ -5,11 +5,9 @@
 #
 # For collections, the entire collection and the currently deserialised index is passed in.
 class Reform::Form::Populator
-  include Uber::Callable
-
   def initialize(user_proc)
     @user_proc = user_proc # the actual `populator: ->{}` block from the user, via ::property.
-    @value     = Uber::Options::Value.new(user_proc) # we can now process Callable, procs, :symbol.
+    @value     = Declarative::Option(user_proc, instance_exec: true) # we can now process Callable, procs, :symbol.
   end
 
   def call(input, options)

data/lib/reform/form/prepopulate.rb

@@ -12,7 +12,7 @@ private
   def prepopulate_local!(options)
     schema.each do |dfn|
       next unless block = dfn[:prepopulator]
-      Uber::Options::Value.new(block).evaluate(self, options)
+      Declarative::Option(block, instance_exec: true).(self, options)
     end
   end
 

data/lib/reform/version.rb

@@ -1,3 +1,3 @@
 module Reform
-  VERSION = "2.2.3"
+  VERSION = "2.2.4"
 end

data/reform.gemspec

@@ -17,9 +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.3.0", "< 0.4.0"
-  spec.add_dependency             "uber",           ">= 0.0.15", "< 0.2.0"
-  spec.add_dependency             "representable",  ">= 2.4.0", "< 3.1.0"
+  spec.add_dependency             "disposable",    ">= 0.4.1"
+  spec.add_dependency             "representable", ">= 2.4.0", "< 3.1.0"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/test/errors_test.rb

@@ -1,165 +1,165 @@
-# require "test_helper"
-
-# class ErrorsTest < MiniTest::Spec
-#   class AlbumForm < Reform::Form
-#     property :title
-
-#     property :hit do
-#       property :title
-#       validation do
-#         key(:title).required
-#       end
-#     end
-
-#     collection :songs do
-#       property :title
-#       validation do
-#         key(:title).required
-#       end
-#     end
-
-#     property :band do # yepp, people do crazy stuff like that.
-#       property :name
-#       property :label do
-#         property :name
-#         validation do
-#           key(:name).required
-#         end
-#       end
-#       # TODO: make band a required object.
-
-#       validation do
-#         key(:name).required(:music_taste_ok?)
-
-#         configure do
-#           config.messages_file = "test/validation/errors.yml"
-
-#           def music_taste_ok?(value)
-#             value != "Nickelback"
-#             # errors.add(:base, "You are a bad person") if name == "Nickelback"
-#           end
-#         end
-#       end
-#       # validate :music_taste_ok?
-
-#     # private
-#     #   def music_taste_ok?
-#     #     errors.add(:base, "You are a bad person") if name == "Nickelback"
-#     #   end
-#     end
-
-#     validation do
-#       key(:title).required
-#     end
-#   end
-
-#   let (:album) do
-#     OpenStruct.new(
-#       :title  => "Blackhawks Over Los Angeles",
-#       :hit    => song,
-#       :songs  => songs, # TODO: document this requirement,
-
-#       :band => Struct.new(:name, :label).new("Epitaph", OpenStruct.new),
-#     )
-#   end
-#   let (:song)  { OpenStruct.new(:title => "Downtown") }
-#   let (:songs) { [song=OpenStruct.new(:title => "Calling"), song] }
-#   let (:form)  { AlbumForm.new(album) }
-
-
-#   describe "incorrect #validate" do
-#     before { form.validate(
-#       "hit"   =>{"title" => ""},
-#       "title" => "",
-#       "songs" => [{"title" => ""}, {"title" => ""}]) } # FIXME: what happens if item is missing?
-
-#     it do
-#       form.errors.messages.must_equal({
-#         :title  => ["must be filled"],
-#         :"hit.title"=>["must be filled"],
-#         :"songs.title"=>["must be filled"],
-#         :"band.label.name"=>["is missing"]
-#       })
-#     end
-
-#     it do
-#       #form.errors.must_equal({:title  => ["must be filled"]})
-#       # TODO: this should only contain local errors?
-#     end
-
-#     # nested forms keep their own Errors:
-#     it { form.hit.errors.messages.must_equal({:title=>["must be filled"]}) }
-#     it { form.songs[0].errors.messages.must_equal({:title=>["must be filled"]}) }
-
-#     it do
-#       form.errors.messages.must_equal({
-#         :title        => ["must be filled"],
-#         :"hit.title"  => ["must be filled"],
-#         :"songs.title"=> ["must be filled"],
-#         :"band.label.name"=>["is missing"]
-#       })
-#     end
-#   end
-
-
-#   describe "#validate with main form invalid" do
-#     it do
-#       form.validate("title"=>"", "band"=>{"label"=>{:name => "Fat Wreck"}}).must_equal false
-#       form.errors.messages.must_equal({:title=>["must be filled"]})
-#     end
-#   end
-
-
-#   describe "#validate with middle nested form invalid" do
-#     before { @result = form.validate("hit"=>{"title" => ""}, "band"=>{"label"=>{:name => "Fat Wreck"}}) }
-
-#     it { @result.must_equal false }
-#     it { form.errors.messages.must_equal({:"hit.title"=>["must be filled"]}) }
-#   end
-
-
-#   describe "#validate with collection form invalid" do
-#     before { @result = form.validate("songs"=>[{"title" => ""}], "band"=>{"label"=>{:name => "Fat Wreck"}}) }
-
-#     it { @result.must_equal false }
-#     it { form.errors.messages.must_equal({:"songs.title"=>["must be filled"]}) }
-#   end
-
-
-#   describe "#validate with collection and 2-level-nested invalid" do
-#     before { @result = form.validate("songs"=>[{"title" => ""}], "band" => {"label" => {}}) }
-
-#     it { @result.must_equal false }
-#     it { form.errors.messages.must_equal({:"songs.title"=>["must be filled"], :"band.label.name"=>["is missing"]}) }
-#   end
-
-#   describe "#validate with nested form using :base invalid" do
-#     it do
-#       result = form.validate("songs"=>[{"title" => "Someday"}], "band" => {"name" => "Nickelback", "label" => {"name" => "Roadrunner Records"}})
-#       result.must_equal false
-#       form.errors.messages.must_equal({:"band.name"=>["You are a bad person"]})
-#     end
-#   end
-
-#   describe "correct #validate" do
-#     before { @result = form.validate(
-#       "hit"   => {"title" => "Sacrifice"},
-#       "title" => "Second Heat",
-#       "songs" => [{"title"=>"Heart Of A Lion"}],
-#       "band"  => {"label"=>{:name => "Fat Wreck"}}
-#       ) }
-
-#     it { @result.must_equal true }
-#     it { form.hit.title.must_equal "Sacrifice" }
-#     it { form.title.must_equal "Second Heat" }
-#     it { form.songs.first.title.must_equal "Heart Of A Lion" }
-#   end
-
-
-#   describe "Errors#to_s" do
-#     before { form.validate("songs"=>[{"title" => ""}], "band" => {"label" => {}}) }
-
-#     # to_s is aliased to messages
-#     it { form.errors.to_s.must_equal "{:\"songs.title\"=>[\"must be filled\"], :\"band.label.name\"=>[\"is missing\"]}" }
-#   end
-# end
+require "test_helper"
+
+class ErrorsTest < MiniTest::Spec
+  class AlbumForm < Reform::Form
+    property :title
+
+    property :hit do
+      property :title
+      validation do
+        required(:title).filled
+      end
+    end
+
+    collection :songs do
+      property :title
+      validation do
+        required(:title).filled
+      end
+    end
+
+    property :band do # yepp, people do crazy stuff like that.
+      property :name
+      property :label do
+        property :name
+        validation do
+          required(:name).filled
+        end
+      end
+      # TODO: make band a required object.
+
+      validation do
+        # required(:name).filled(:music_taste_ok?)
+
+        configure do
+          config.messages_file = "test/validation/errors.yml"
+
+          def music_taste_ok?(value)
+            value != "Nickelback"
+            # errors.add(:base, "You are a bad person") if name == "Nickelback"
+          end
+        end
+      end
+      # validate :music_taste_ok?
+
+    # private
+    #   def music_taste_ok?
+    #     errors.add(:base, "You are a bad person") if name == "Nickelback"
+    #   end
+    end
+
+    validation do
+      required(:title).filled
+    end
+  end
+
+  let (:album) do
+    OpenStruct.new(
+      :title  => "Blackhawks Over Los Angeles",
+      :hit    => song,
+      :songs  => songs, # TODO: document this requirement,
+
+      :band => Struct.new(:name, :label).new("Epitaph", OpenStruct.new),
+    )
+  end
+  let (:song)  { OpenStruct.new(:title => "Downtown") }
+  let (:songs) { [song=OpenStruct.new(:title => "Calling"), song] }
+  let (:form)  { AlbumForm.new(album) }
+
+
+  describe "incorrect #validate" do
+    before { form.validate(
+      "hit"   =>{"title" => ""},
+      "title" => "",
+      "songs" => [{"title" => ""}, {"title" => ""}]) } # FIXME: what happens if item is missing?
+
+    it do
+      form.errors.messages.must_equal({
+        :title  => ["must be filled"],
+        :"hit.title"=>["must be filled"],
+        :"songs.title"=>["must be filled"],
+        :"band.label.name"=>["is missing"]
+      })
+    end
+
+    it do
+      #form.errors.must_equal({:title  => ["must be filled"]})
+      # TODO: this should only contain local errors?
+    end
+
+    # nested forms keep their own Errors:
+    it { form.hit.errors.messages.must_equal({:title=>["must be filled"]}) }
+    it { form.songs[0].errors.messages.must_equal({:title=>["must be filled"]}) }
+
+    it do
+      form.errors.messages.must_equal({
+        :title        => ["must be filled"],
+        :"hit.title"  => ["must be filled"],
+        :"songs.title"=> ["must be filled"],
+        :"band.label.name"=>["is missing"]
+      })
+    end
+  end
+
+
+  describe "#validate with main form invalid" do
+    it do
+      form.validate("title"=>"", "band"=>{"label"=>{:name => "Fat Wreck"}}).must_equal false
+      form.errors.messages.must_equal({:title=>["must be filled"]})
+    end
+  end
+
+
+  describe "#validate with middle nested form invalid" do
+    before { @result = form.validate("hit"=>{"title" => ""}, "band"=>{"label"=>{:name => "Fat Wreck"}}) }
+
+    it { @result.must_equal false }
+    it { form.errors.messages.must_equal({:"hit.title"=>["must be filled"]}) }
+  end
+
+
+  describe "#validate with collection form invalid" do
+    before { @result = form.validate("songs"=>[{"title" => ""}], "band"=>{"label"=>{:name => "Fat Wreck"}}) }
+
+    it { @result.must_equal false }
+    it { form.errors.messages.must_equal({:"songs.title"=>["must be filled"]}) }
+  end
+
+
+  describe "#validate with collection and 2-level-nested invalid" do
+    before { @result = form.validate("songs"=>[{"title" => ""}], "band" => {"label" => {}}) }
+
+    it { @result.must_equal false }
+    it { form.errors.messages.must_equal({:"songs.title"=>["must be filled"], :"band.label.name"=>["is missing"]}) }
+  end
+
+  describe "#validate with nested form using :base invalid" do
+    it do
+      result = form.validate("songs"=>[{"title" => "Someday"}], "band" => {"name" => "Nickelback", "label" => {"name" => "Roadrunner Records"}})
+      result.must_equal false
+      form.errors.messages.must_equal({:"band.name"=>["You are a bad person"]})
+    end
+  end
+
+  describe "correct #validate" do
+    before { @result = form.validate(
+      "hit"   => {"title" => "Sacrifice"},
+      "title" => "Second Heat",
+      "songs" => [{"title"=>"Heart Of A Lion"}],
+      "band"  => {"label"=>{:name => "Fat Wreck"}}
+      ) }
+
+    it { @result.must_equal true }
+    it { form.hit.title.must_equal "Sacrifice" }
+    it { form.title.must_equal "Second Heat" }
+    it { form.songs.first.title.must_equal "Heart Of A Lion" }
+  end
+
+
+  describe "Errors#to_s" do
+    before { form.validate("songs"=>[{"title" => ""}], "band" => {"label" => {}}) }
+
+    # to_s is aliased to messages
+    it { form.errors.to_s.must_equal "{:\"songs.title\"=>[\"must be filled\"], :\"band.label.name\"=>[\"is missing\"]}" }
+  end
+end

data/test/validation/dry_validation_test.rb

@@ -1,352 +1,352 @@
-# require "test_helper"
-# require "reform/form/dry"
-
-# class DryValidationDefaultGroupTest < Minitest::Spec
-#   Session = Struct.new(:username, :email, :password, :confirm_password)
-
-#   class SessionForm < Reform::Form
-#     include Reform::Form::Dry
-
-#     property :username
-#     property :email
-#     property :password
-#     property :confirm_password
-
-#     validation do
-#       key(:username).required
-#       key(:email).required
-#     end
-#   end
-
-#   let (:form) { SessionForm.new(Session.new) }
-
-#   # valid.
-#   it do
-#     form.validate(username: "Helloween",
-#                   email:    "yep").must_equal true
-#     form.errors.messages.inspect.must_equal "{}"
-#   end
-# end
-
-# class ValidationGroupsTest < MiniTest::Spec
-#   describe "basic validations" do
-#     Session = Struct.new(:username, :email, :password, :confirm_password)
-
-#     class SessionForm < Reform::Form
-#       include Reform::Form::Dry::Validations
-
-#       property :username
-#       property :email
-#       property :password
-#       property :confirm_password
-
-#       validation :default do
-#         key(:username).required
-#         key(:email).required
-#       end
-
-#       validation :email, if: :default do
-#         key(:email).required(min_size?: 3)
-#       end
-
-#       validation :nested, if: :default do
-#         key(:password).required(min_size?: 2)
-#       end
-
-#       validation :confirm, if: :default, after: :email do
-#         key(:confirm_password).required(min_size?: 2)
-#       end
-#     end
-
-#     let (:form) { SessionForm.new(Session.new) }
-
-#     # valid.
-#     it do
-#       form.validate({ username: "Helloween",
-#                       email: "yep",
-#                       password: "99",
-#                       confirm_password: "99" }).must_equal true
-#       form.errors.messages.inspect.must_equal "{}"
-#     end
-
-#     # invalid.
-#     it do
-#       form.validate({}).must_equal false
-#       form.errors.messages.inspect.must_equal "{:username=>[\"is missing\"], :email=>[\"is missing\"]}"
-#     end
-
-#     # partially invalid.
-#     # 2nd group fails.
-#     it do
-#       form.validate(username: "Helloween", email: "yo", confirm_password:"9").must_equal false
-#       form.errors.messages.inspect.must_equal "{:email=>[\"size cannot be less than 3\"], :confirm_password=>[\"size cannot be less than 2\"], :password=>[\"is missing\", \"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=>[\"size cannot be less than 2\"], :password=>[\"is missing\", \"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=>[\"size cannot be less than 2\"], :password=>[\"must be filled\", \"size cannot be less than 2\"]}"
-#     end
-#   end
-
-#   describe "Nested validations" do
-#     class AlbumForm < Reform::Form
-#       include Reform::Form::Dry::Validations
-
-#       property :title
-
-#       property :hit do
-#         property :title
-
-#         # FIX ME: this doesn't work now, @apotonick said he knows why
-#         #  The error is that this validation block act as an AM:V instead of the Dry one.
-#         # validation :default do
-#         #   key(:title, &:filled?)
-#         # end
-#       end
-
-#       collection :songs do
-#         property :title
-#       end
-
-#       property :band do
-#         property :name
-#         property :label do
-#           property :name
-#         end
-#       end
-
-#       validation :default do
-
-#         key(:title).required
-
-#         key(:band).schema do
-#           key(:name).required
-#           key(:label).schema do
-#             key(:name).required
-#           end
-#         end
-
-#         configure do
-#           option :form
-#           # message need to be defined on fixtures/dry_error_messages
-#           # d-v expects you to define your custome messages on the .yml file
-#           def good_musical_taste?(value)
-#             value != 'Nickelback'
-#           end
-
-#           def form_access_validation?(value)
-#             form.title == 'Reform'
-#           end
-#         end
-
-#         key(:title).required(:good_musical_taste?)
-#         key(:title).required(:form_access_validation?)
-#       end
-#     end
-
-#     let (:album) do
-#       OpenStruct.new(
-#         :title  => "Blackhawks Over Los Angeles",
-#         :hit    => song,
-#         :songs  => songs,
-#         :band => Struct.new(:name, :label).new("Epitaph", OpenStruct.new),
-#       )
-#     end
-#     let (:song)  { OpenStruct.new(:title => "Downtown") }
-#     let (:songs) { [ song = OpenStruct.new(:title => "Calling"), song ] }
-#     let (:form)  { AlbumForm.new(album) }
-
-#     # correct #validate.
-#     it do
-#       result = form.validate(
-#         "title"  => "Reform",
-#         "songs"  => [
-#           {"title" => "Fallout"},
-#           {"title" => "Roxanne", "composer" => {"name" => "Sting"}}
-#         ],
-#         "band"   => {"label" => {"name" => "Epitaph"}},
-#       )
-
-#       result.must_equal true
-#       form.errors.messages.inspect.must_equal "{}"
-#     end
-#   end
-
-
-#   describe "fails with :validate, :validates and :validates_with" do
-
-#     it "throws a goddamn error" do
-#       e = proc do
-#         class FailingForm < Reform::Form
-#           include Reform::Form::Dry::Validations
-
-#           property :username
-
-#           validation :email do
-#             validates(:email, &:filled?)
-#           end
-#         end
-#       end.must_raise(NoMethodError)
-#       # e.message.must_equal 'validates() is not supported by Dry Validation backend.'
-
-#       e = proc do
-#         class FailingForm < Reform::Form
-#           include Reform::Form::Dry::Validations
-
-#           property :username
-
-#           validation :email do
-#             validate(:email, &:filled?)
-#           end
-#         end
-#       end.must_raise(NoMethodError)
-#       # e.message.must_equal 'validate() is not supported by Dry Validation backend.'
-
-#       e = proc do
-#         class FailingForm < Reform::Form
-#           include Reform::Form::Dry::Validations
-
-#           property :username
-
-#           validation :email do
-#             validates_with(:email, &:filled?)
-#           end
-#         end
-#       end.must_raise(NoMethodError)
-#       # e.message.must_equal (NoMethodError)'validates_with() is not supported by Dry Validation backend.'
-#     end
-#   end
-
-
-#   # describe "same-named group" do
-#   #   class OverwritingForm < Reform::Form
-#   #     include Reform::Form::Dry::Validations
-
-#   #     property :username
-#   #     property :email
-
-#   #     validation :email do # FIX ME: is this working for other validator or just bugging here?
-#   #       key(:email, &:filled?) # it's not considered, overitten
-#   #     end
-
-#   #     validation :email do # just another group.
-#   #       key(:username, &:filled?)
-#   #     end
-#   #   end
-
-#   #   let (:form) { OverwritingForm.new(Session.new) }
-
-#   #   # valid.
-#   #   it do
-#   #     form.validate({username: "Helloween"}).must_equal true
-#   #   end
-
-#   #   # invalid.
-#   #   it "whoo" do
-#   #     form.validate({}).must_equal false
-#   #     form.errors.messages.inspect.must_equal "{:username=>[\"username can't be blank\"]}"
-#   #   end
-#   # end
-
-
-#   describe "inherit: true in same group" do
-#     class InheritSameGroupForm < Reform::Form
-#       include Reform::Form::Dry::Validations
-
-#       property :username
-#       property :email
-
-#       validation :email do
-#         key(:email).required
-#       end
-
-#       validation :email, inherit: true do # extends the above.
-#         key(:username).required
-#       end
-#     end
-
-#     let (:form) { InheritSameGroupForm.new(Session.new) }
-
-#     # valid.
-#     it do
-#       form.validate({username: "Helloween", email: 9}).must_equal true
-#     end
-
-#     # invalid.
-#     it do
-#       form.validate({}).must_equal false
-#       form.errors.messages.inspect.must_equal "{:email=>[\"is missing\"], :username=>[\"is missing\"]}"
-#     end
-#   end
-
-
-#   describe "if: with lambda" do
-#     class IfWithLambdaForm < Reform::Form
-#       include Reform::Form::Dry::Validations # ::build_errors.
-
-#       property :username
-#       property :email
-#       property :password
-
-#       validation :email do
-#         key(:email).required
-#       end
-
-#       # run this is :email group is true.
-#       validation :after_email, if: lambda { |results| results[:email]==true } do # extends the above.
-#         key(:username).required
-#       end
-
-#       # block gets evaled in form instance context.
-#       validation :password, if: lambda { |results| email == "john@trb.org" } do
-#         key(:password).required
-#       end
-#     end
-
-#     let (:form) { IfWithLambdaForm.new(Session.new) }
-
-#     # valid.
-#     it do
-#       form.validate({username: "Strung Out", email: 9}).must_equal true
-#     end
-
-#     # invalid.
-#     it do
-#       form.validate({email: 9}).must_equal false
-#       form.errors.messages.inspect.must_equal "{:username=>[\"is missing\"]}"
-#     end
-#   end
-
-
-#   # Currenty dry-v don't support that option, it doesn't make sense
-#   #   I've talked to @solnic and he plans to add a "hint" feature to show
-#   #   more errors messages than only those that have failed.
-#   #
-#   # describe "multiple errors for property" do
-#   #   class MultipleErrorsForPropertyForm < Reform::Form
-#   #     include Reform::Form::Dry::Validations
-
-#   #     property :username
-
-#   #     validation :default do
-#   #       key(:username) do |username|
-#   #         username.filled? | (username.min_size?(2) & username.max_size?(3))
-#   #       end
-#   #     end
-#   #   end
-
-#   #   let (:form) { MultipleErrorsForPropertyForm.new(Session.new) }
-
-#   #   # valid.
-#   #   it do
-#   #     form.validate({username: ""}).must_equal false
-#   #     form.errors.messages.inspect.must_equal "{:username=>[\"username must be filled\", \"username is not proper size\"]}"
-#   #   end
-#   # end
-# end
+require "test_helper"
+require "reform/form/dry"
+
+class DryValidationDefaultGroupTest < Minitest::Spec
+  Session = Struct.new(:username, :email, :password, :confirm_password)
+
+  class SessionForm < Reform::Form
+    include Reform::Form::Dry
+
+    property :username
+    property :email
+    property :password
+    property :confirm_password
+
+    validation do
+      key(:username).required
+      key(:email).required
+    end
+  end
+
+  let (:form) { SessionForm.new(Session.new) }
+
+  # valid.
+  it do
+    form.validate(username: "Helloween",
+                  email:    "yep").must_equal true
+    form.errors.messages.inspect.must_equal "{}"
+  end
+end
+
+class ValidationGroupsTest < MiniTest::Spec
+  describe "basic validations" do
+    Session = Struct.new(:username, :email, :password, :confirm_password)
+
+    class SessionForm < Reform::Form
+      include Reform::Form::Dry::Validations
+
+      property :username
+      property :email
+      property :password
+      property :confirm_password
+
+      validation :default do
+        key(:username).required
+        key(:email).required
+      end
+
+      validation :email, if: :default do
+        key(:email).required(min_size?: 3)
+      end
+
+      validation :nested, if: :default do
+        key(:password).required(min_size?: 2)
+      end
+
+      validation :confirm, if: :default, after: :email do
+        key(:confirm_password).required(min_size?: 2)
+      end
+    end
+
+    let (:form) { SessionForm.new(Session.new) }
+
+    # valid.
+    it do
+      form.validate({ username: "Helloween",
+                      email: "yep",
+                      password: "99",
+                      confirm_password: "99" }).must_equal true
+      form.errors.messages.inspect.must_equal "{}"
+    end
+
+    # invalid.
+    it do
+      form.validate({}).must_equal false
+      form.errors.messages.inspect.must_equal "{:username=>[\"is missing\"], :email=>[\"is missing\"]}"
+    end
+
+    # partially invalid.
+    # 2nd group fails.
+    it do
+      form.validate(username: "Helloween", email: "yo", confirm_password:"9").must_equal false
+      form.errors.messages.inspect.must_equal "{:email=>[\"size cannot be less than 3\"], :confirm_password=>[\"size cannot be less than 2\"], :password=>[\"is missing\", \"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=>[\"size cannot be less than 2\"], :password=>[\"is missing\", \"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=>[\"size cannot be less than 2\"], :password=>[\"must be filled\", \"size cannot be less than 2\"]}"
+    end
+  end
+
+  describe "Nested validations" do
+    class AlbumForm < Reform::Form
+      include Reform::Form::Dry::Validations
+
+      property :title
+
+      property :hit do
+        property :title
+
+        # FIX ME: this doesn't work now, @apotonick said he knows why
+        #  The error is that this validation block act as an AM:V instead of the Dry one.
+        # validation :default do
+        #   key(:title, &:filled?)
+        # end
+      end
+
+      collection :songs do
+        property :title
+      end
+
+      property :band do
+        property :name
+        property :label do
+          property :name
+        end
+      end
+
+      validation :default do
+
+        key(:title).required
+
+        key(:band).schema do
+          key(:name).required
+          key(:label).schema do
+            key(:name).required
+          end
+        end
+
+        configure do
+          option :form
+          # message need to be defined on fixtures/dry_error_messages
+          # d-v expects you to define your custome messages on the .yml file
+          def good_musical_taste?(value)
+            value != 'Nickelback'
+          end
+
+          def form_access_validation?(value)
+            form.title == 'Reform'
+          end
+        end
+
+        key(:title).required(:good_musical_taste?)
+        key(:title).required(:form_access_validation?)
+      end
+    end
+
+    let (:album) do
+      OpenStruct.new(
+        :title  => "Blackhawks Over Los Angeles",
+        :hit    => song,
+        :songs  => songs,
+        :band => Struct.new(:name, :label).new("Epitaph", OpenStruct.new),
+      )
+    end
+    let (:song)  { OpenStruct.new(:title => "Downtown") }
+    let (:songs) { [ song = OpenStruct.new(:title => "Calling"), song ] }
+    let (:form)  { AlbumForm.new(album) }
+
+    # correct #validate.
+    it do
+      result = form.validate(
+        "title"  => "Reform",
+        "songs"  => [
+          {"title" => "Fallout"},
+          {"title" => "Roxanne", "composer" => {"name" => "Sting"}}
+        ],
+        "band"   => {"label" => {"name" => "Epitaph"}},
+      )
+
+      result.must_equal true
+      form.errors.messages.inspect.must_equal "{}"
+    end
+  end
+
+
+  describe "fails with :validate, :validates and :validates_with" do
+
+    it "throws a goddamn error" do
+      e = proc do
+        class FailingForm < Reform::Form
+          include Reform::Form::Dry::Validations
+
+          property :username
+
+          validation :email do
+            validates(:email, &:filled?)
+          end
+        end
+      end.must_raise(NoMethodError)
+      # e.message.must_equal 'validates() is not supported by Dry Validation backend.'
+
+      e = proc do
+        class FailingForm < Reform::Form
+          include Reform::Form::Dry::Validations
+
+          property :username
+
+          validation :email do
+            validate(:email, &:filled?)
+          end
+        end
+      end.must_raise(NoMethodError)
+      # e.message.must_equal 'validate() is not supported by Dry Validation backend.'
+
+      e = proc do
+        class FailingForm < Reform::Form
+          include Reform::Form::Dry::Validations
+
+          property :username
+
+          validation :email do
+            validates_with(:email, &:filled?)
+          end
+        end
+      end.must_raise(NoMethodError)
+      # e.message.must_equal (NoMethodError)'validates_with() is not supported by Dry Validation backend.'
+    end
+  end
+
+
+  # describe "same-named group" do
+  #   class OverwritingForm < Reform::Form
+  #     include Reform::Form::Dry::Validations
+
+  #     property :username
+  #     property :email
+
+  #     validation :email do # FIX ME: is this working for other validator or just bugging here?
+  #       key(:email, &:filled?) # it's not considered, overitten
+  #     end
+
+  #     validation :email do # just another group.
+  #       key(:username, &:filled?)
+  #     end
+  #   end
+
+  #   let (:form) { OverwritingForm.new(Session.new) }
+
+  #   # valid.
+  #   it do
+  #     form.validate({username: "Helloween"}).must_equal true
+  #   end
+
+  #   # invalid.
+  #   it "whoo" do
+  #     form.validate({}).must_equal false
+  #     form.errors.messages.inspect.must_equal "{:username=>[\"username can't be blank\"]}"
+  #   end
+  # end
+
+
+  describe "inherit: true in same group" do
+    class InheritSameGroupForm < Reform::Form
+      include Reform::Form::Dry::Validations
+
+      property :username
+      property :email
+
+      validation :email do
+        key(:email).required
+      end
+
+      validation :email, inherit: true do # extends the above.
+        key(:username).required
+      end
+    end
+
+    let (:form) { InheritSameGroupForm.new(Session.new) }
+
+    # valid.
+    it do
+      form.validate({username: "Helloween", email: 9}).must_equal true
+    end
+
+    # invalid.
+    it do
+      form.validate({}).must_equal false
+      form.errors.messages.inspect.must_equal "{:email=>[\"is missing\"], :username=>[\"is missing\"]}"
+    end
+  end
+
+
+  describe "if: with lambda" do
+    class IfWithLambdaForm < Reform::Form
+      include Reform::Form::Dry::Validations # ::build_errors.
+
+      property :username
+      property :email
+      property :password
+
+      validation :email do
+        key(:email).required
+      end
+
+      # run this is :email group is true.
+      validation :after_email, if: lambda { |results| results[:email]==true } do # extends the above.
+        key(:username).required
+      end
+
+      # block gets evaled in form instance context.
+      validation :password, if: lambda { |results| email == "john@trb.org" } do
+        key(:password).required
+      end
+    end
+
+    let (:form) { IfWithLambdaForm.new(Session.new) }
+
+    # valid.
+    it do
+      form.validate({username: "Strung Out", email: 9}).must_equal true
+    end
+
+    # invalid.
+    it do
+      form.validate({email: 9}).must_equal false
+      form.errors.messages.inspect.must_equal "{:username=>[\"is missing\"]}"
+    end
+  end
+
+
+  # Currenty dry-v don't support that option, it doesn't make sense
+  #   I've talked to @solnic and he plans to add a "hint" feature to show
+  #   more errors messages than only those that have failed.
+  #
+  # describe "multiple errors for property" do
+  #   class MultipleErrorsForPropertyForm < Reform::Form
+  #     include Reform::Form::Dry::Validations
+
+  #     property :username
+
+  #     validation :default do
+  #       key(:username) do |username|
+  #         username.filled? | (username.min_size?(2) & username.max_size?(3))
+  #       end
+  #     end
+  #   end
+
+  #   let (:form) { MultipleErrorsForPropertyForm.new(Session.new) }
+
+  #   # valid.
+  #   it do
+  #     form.validate({username: ""}).must_equal false
+  #     form.errors.messages.inspect.must_equal "{:username=>[\"username must be filled\", \"username is not proper size\"]}"
+  #   end
+  # end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reform
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Nick Sutterer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-04 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: disposable
@@ -17,40 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-- !ruby/object:Gem::Dependency
-  name: uber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.15
-    - - "<"
-      - !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.0.15
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: representable
   requirement: !ruby/object:Gem::Requirement
@@ -248,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Form object decoupled from models with validation, population and presentation.