reform 2.2.4 → 2.3.0.rc1

data/test/contract_test.rb

@@ -5,30 +5,30 @@ class ContractTest < MiniTest::Spec
   Album = Struct.new(:name, :duration, :songs, :artist)
   Artist = Struct.new(:name)
 
-  class ArtistForm < Reform::Form
+  class ArtistForm < TestForm
     property :name
   end
 
-  class AlbumForm < Reform::Contract
+  class AlbumForm < TestContract
     property :name
 
     properties :duration
     properties :year, :style, readable: false
 
     validation do
-      key(:name).required
+      required(:name).filled
     end
 
     collection :songs do
       property :title
       validation do
-        key(:title).required
+        required(:title).filled
       end
 
       property :composer do
         property :name
         validation do
-          key(:name).required
+          required(:name).filled
         end
       end
     end

data/test/default_test.rb

@@ -5,7 +5,7 @@ class DefaultTest < Minitest::Spec
   Album = Struct.new(:name, :songs, :artist)
   Artist = Struct.new(:name)
 
-  class AlbumForm < Reform::Form
+  class AlbumForm < TestForm
     property :name, default: "Wrong"
 
     collection :songs do

data/test/deserialize_test.rb

@@ -6,7 +6,7 @@ class DeserializeTest < MiniTest::Spec
   Album = Struct.new(:title, :artist)
   Artist = Struct.new(:name, :callname)
 
-  class JsonAlbumForm < Reform::Form
+  class JsonAlbumForm < TestForm
     module Json
       def deserialize(params)
         deserializer.new(self).
@@ -49,7 +49,7 @@ class DeserializeTest < MiniTest::Spec
   end
 
   describe "infering the deserializer from another form should NOT copy its populators" do
-    class CompilationForm < Reform::Form
+    class CompilationForm < TestForm
       property :artist, populator: ->(options) { self.artist = Artist.new(nil, options[:fragment].to_s) } do
         property :name
       end
@@ -75,7 +75,7 @@ class ValidateWithBlockTest < MiniTest::Spec
   Album = Struct.new(:title, :artist)
   Artist = Struct.new(:name)
 
-  class AlbumForm < Reform::Form
+  class AlbumForm < TestForm
     property :title
     property :artist, populate_if_empty: Artist do
       property :name

data/test/errors_test.rb

@@ -1,7 +1,11 @@
 require "test_helper"
 
+# TODO:
+# This test should, at some point soon, only test the `Errors` object and its
+# Rails-ish API. No validation specifics, etc. to be tested here.
+
 class ErrorsTest < MiniTest::Spec
-  class AlbumForm < Reform::Form
+  class AlbumForm < TestForm
     property :title
 
     property :hit do
@@ -29,23 +33,16 @@ class ErrorsTest < MiniTest::Spec
       # TODO: make band a required object.
 
       validation do
-        # required(:name).filled(:music_taste_ok?)
-
         configure do
-          config.messages_file = "test/validation/errors.yml"
+          config.messages_file = "test/fixtures/dry_error_messages.yml"
 
-          def music_taste_ok?(value)
+          def good_musical_taste?(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
+        required(:name).filled(:good_musical_taste?)
+      end
     end
 
     validation do
@@ -58,8 +55,7 @@ class ErrorsTest < MiniTest::Spec
       :title  => "Blackhawks Over Los Angeles",
       :hit    => song,
       :songs  => songs, # TODO: document this requirement,
-
-      :band => Struct.new(:name, :label).new("Epitaph", OpenStruct.new),
+      :band   => Struct.new(:name, :label).new("Epitaph", OpenStruct.new),
     )
   end
   let (:song)  { OpenStruct.new(:title => "Downtown") }
@@ -67,18 +63,24 @@ class ErrorsTest < MiniTest::Spec
   let (:form)  { AlbumForm.new(album) }
 
 
-  describe "incorrect #validate" do
+  describe "#errors without #validate" do
+    it do
+      form.errors.size.must_equal 0
+    end
+  end
+
+  describe "blank everywhere" do
     before { form.validate(
       "hit"   =>{"title" => ""},
       "title" => "",
-      "songs" => [{"title" => ""}, {"title" => ""}]) } # FIXME: what happens if item is missing?
+      "songs" => [{"title" => ""}, {"title" => ""}]) } # FIXME: what happens if item 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"]
+        :"band.label.name"=>["must be filled"]
       })
     end
 
@@ -96,8 +98,9 @@ class ErrorsTest < MiniTest::Spec
         :title        => ["must be filled"],
         :"hit.title"  => ["must be filled"],
         :"songs.title"=> ["must be filled"],
-        :"band.label.name"=>["is missing"]
+        :"band.label.name"=>["must be filled"]
       })
+      form.errors.size.must_equal(4)
     end
   end
 
@@ -106,6 +109,7 @@ class ErrorsTest < MiniTest::Spec
     it do
       form.validate("title"=>"", "band"=>{"label"=>{:name => "Fat Wreck"}}).must_equal false
       form.errors.messages.must_equal({:title=>["must be filled"]})
+      form.errors.size.must_equal(1)
     end
   end
 
@@ -115,6 +119,7 @@ class ErrorsTest < MiniTest::Spec
 
     it { @result.must_equal false }
     it { form.errors.messages.must_equal({:"hit.title"=>["must be filled"]}) }
+    it { form.errors.size.must_equal(1) }
   end
 
 
@@ -123,6 +128,7 @@ class ErrorsTest < MiniTest::Spec
 
     it { @result.must_equal false }
     it { form.errors.messages.must_equal({:"songs.title"=>["must be filled"]}) }
+    it { form.errors.size.must_equal(1) }
   end
 
 
@@ -130,14 +136,16 @@ class ErrorsTest < MiniTest::Spec
     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"]}) }
+    it { form.errors.messages.must_equal({:"songs.title"=>["must be filled"], :"band.label.name"=>["must be filled"]}) }
+    it { form.errors.size.must_equal(2) }
   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"]})
+      form.errors.messages.must_equal({:"band.name"=>["you're a bad person"]})
+      form.errors.size.must_equal(1)
     end
   end
 
@@ -153,6 +161,11 @@ class ErrorsTest < MiniTest::Spec
     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" }
+    it do
+      skip "WE DON'T NEED COUNT AND EMPTY? ON THE CORE ERRORS OBJECT"
+      form.errors.size.must_equal(0)
+      form.errors.empty?.must_equal(true)
+    end
   end
 
 
@@ -160,6 +173,8 @@ class ErrorsTest < MiniTest::Spec
     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\"]}" }
+    it {
+      skip "why do we need Errors#to_s ?"
+      form.errors.to_s.must_equal "{:\"songs.title\"=>[\"must be filled\"], :\"band.label.name\"=>[\"must be filled\"]}" }
   end
 end

data/test/feature_test.rb

@@ -21,7 +21,7 @@ class FeatureInheritanceTest < BaseTest
   #   end
   # end
 
-  class AlbumForm < Reform::Form
+  class AlbumForm < TestForm
     feature Date # feature.
     property :name
 

data/test/fixtures/dry_error_messages.yml

@@ -1,44 +1,91 @@
-array?: "%{name} must be an array"
+en:
+  errors:
+    array?: "must be an array"
 
-empty?: "%{name} cannot be empty"
+    empty?: "must be empty"
 
-exclusion?: "%{name} must not be one of: %{list}"
+    excludes?: "must not include %{value}"
 
-eql?: "%{name} must be equal to %{eql_value}"
+    excluded_from?:
+      arg:
+        default: "must not be one of: %{list}"
+        range: "must not be one of: %{list_left} - %{list_right}"
 
-filled?: "%{name} must be filled"
+    eql?: "must be equal to %{left}"
 
-format?: "%{name} is in invalid format"
+    not_eql?: "must not be equal to %{left}"
 
-gt?: "%{name} must be greater than %{num} (%{value} was given)"
+    filled?: "must be filled"
 
-gteq?: "%{name} must be greater than or equal to %{num}"
+    format?: "is in invalid format"
 
-hash?: "%{name} must be a hash"
+    number?: "must be a number"
 
-inclusion?: "%{name} must be one of: %{list}"
+    odd?: "must be odd"
 
-int?: "%{name} must be an integer"
+    even?: "must be even"
 
-key?: "%{name} is missing"
+    gt?: "must be greater than %{num}"
 
-lt?: "%{name} must be less than %{num} (%{value} was given)"
+    gteq?: "must be greater than or equal to %{num}"
 
-lteq?: "%{name} must be less than or equal to %{num}"
+    hash?: "must be a hash"
 
-max_size?: "%{name} size cannot be greater than %{num}"
+    included_in?:
+      arg:
+        default: "must be one of: %{list}"
+        range: "must be one of: %{list_left} - %{list_right}"
 
-min_size?: "%{name} size cannot be less than %{num}"
+    includes?: "must include %{value}"
 
-nil?: "%{name} cannot be nil"
+    bool?: "must be boolean"
 
-size?:
-  range: "%{name} size must be within %{left} - %{right}"
-  default: "%{name} size must be %{num}"
+    true?: "must be true"
 
-str?: "%{name} must be a string"
+    false?: "must be false"
 
-good_musical_taste?: "you're a bad person"
+    int?: "must be an integer"
 
-form_access_validation?: "this doesn't look like a Reform form dude!!"
+    float?: "must be a float"
 
+    decimal?: "must be a decimal"
+
+    date?: "must be a date"
+
+    date_time?: "must be a date time"
+
+    time?: "must be a time"
+
+    key?: "is missing"
+
+    attr?: "is missing"
+
+    lt?: "must be less than %{num}"
+
+    lteq?: "must be less than or equal to %{num}"
+
+    max_size?: "size cannot be greater than %{num}"
+
+    min_size?: "size cannot be less than %{num}"
+
+    none?: "cannot be defined"
+
+    str?: "must be a string"
+
+    type?: "must be %{type}"
+
+    size?:
+      arg:
+        default: "size must be %{size}"
+        range: "size must be within %{size_left} - %{size_right}"
+
+      value:
+        string:
+          arg:
+            default: "length must be %{size}"
+            range: "length must be within %{size_left} - %{size_right}"
+
+    good_musical_taste?: "you're a bad person"
+de:
+    errors:
+        filled?: "muss abgefüllt sein"

data/test/form_option_test.rb

@@ -4,14 +4,14 @@ class FormOptionTest < MiniTest::Spec
   Song  = Struct.new(:title)
   Album = Struct.new(:song)
 
-  class SongForm < Reform::Form
+  class SongForm < TestForm
     property :title
     validation do
-      key(:title).required
+      required(:title).filled
     end
   end
 
-  class AlbumForm < Reform::Form
+  class AlbumForm < TestForm
     property :song, form: SongForm
   end
 

data/test/form_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class FormTest < MiniTest::Spec
   Artist = Struct.new(:name)
 
-  class AlbumForm < Reform::Form
+  class AlbumForm < TestForm
     property :title
 
     property :hit do
@@ -37,7 +37,7 @@ class FormTest < MiniTest::Spec
       end
 
       cloned.validation do
-        key(:title).required
+        required(:title).filled
       end
 
       cloned.new(OpenStruct.new).validate({})
@@ -45,7 +45,7 @@ class FormTest < MiniTest::Spec
   end
 
   describe "#initialize" do
-    class ArtistForm < Reform::Form
+    class ArtistForm < TestForm
       property :name
       property :current_user, virtual: true
     end

data/test/from_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class AsTest < BaseTest
-  class AlbumForm < Reform::Form
+  class AlbumForm < TestForm
     property :name, from: :title
 
     property :single, from: :hit do
@@ -69,7 +69,7 @@ class AsTest < BaseTest
         hash = nested_hash
       end
 
-      hash.must_equal({"title"=>"Best Of The Police", "hit"=>{"title"=>"So Lonely"}, "songs"=>[{"title"=>"Message In A Bottle"}, {"title"=>"Roxanne"}]})
+      hash.must_equal({"title"=>"Best Of The Police", "hit"=>{"title"=>"So Lonely"}, "songs"=>[{"title"=>"Message In A Bottle"}, {"title"=>"Roxanne"}], "band"=> nil})
     end
   end
 end

data/test/inherit_test.rb

@@ -4,72 +4,66 @@ require 'representable/json'
 class InheritTest < BaseTest
   Populator = Reform::Form::Populator
 
-  class AlbumForm < Reform::Form
+  class SkipParse
+    include Uber::Callable
+    def call(*args)
+      false
+    end
+  end
+
+  class AlbumForm < TestForm
     property :title, deserializer: {instance: "Instance"}, skip_if: "skip_if in AlbumForm" # allow direct configuration of :deserializer.
 
-    property :hit, populator: "Populator" do
+    property :hit, populate_if_empty: -> (*) { Song.new } do
       property :title
+      validation do
+        required(:title).filled
+      end
     end
 
     collection :songs, populate_if_empty: lambda {}, skip_if: :all_blank do
       property :title
     end
 
-    property :artist, populate_if_empty: lambda {} do
+    property :band, populate_if_empty: lambda {} do
 
-      def artist_id
+      def band_id
         1
       end
     end
   end
 
-  puts
-  puts "inherit"
-
   class CompilationForm < AlbumForm
     property :title, inherit: true, skip_if: "skip_if from CompilationForm"
-    puts "[#{options_for(:title)[:deserializer].object_id}] COM@@@@@ #{options_for(:title)[:deserializer].inspect}"
-    # property :hit, :inherit => true do
-    #   property :rating
-    #   validates :title, :rating, :presence => true
-    # end
-
-    # puts representer_class.representable_attrs.
-    #   get(:hit)[:extend].evaluate(nil).new(OpenStruct.new).rating
+    property :hit, :inherit => true, populate_if_empty: -> (*) { Song.new }, skip_if: SkipParse.new do
+      property :rating
+      validation do
+        required(:rating).filled
+      end
+    end
 
     # NO collection here, this is entirely inherited.
-    # collection :songs, ..
 
-    property :artist, inherit: true do # inherit everything, but explicitely.
+    property :band, inherit: true do # inherit everything, but explicitely.
     end
-
-    # completely override.
-    property :hit, skip_if: "SkipParse" do
-    end
-
-    # override partly.
   end
 
-  let (:album) { Album.new(nil, OpenStruct.new(:hit => OpenStruct.new()) ) }
+  let (:album) { Album.new(nil, Song.new, [], Band.new) }
   subject { CompilationForm.new(album) }
 
+  it do
+    subject.validate({"hit" => {"title" => "LA Drone", "rating" => 10}})
+    subject.hit.title.must_equal "LA Drone"
+    subject.hit.rating.must_equal 10
+    subject.errors.messages.must_equal({})
+  end
 
-  # valid.
-  # it {
-  #   subject.validate("hit" => {"title" => "LA Drone", "rating" => 10})
-  #   subject.hit.title.must_equal "LA Drone"
-  #   subject.hit.rating.must_equal 10
-  #   subject.errors.messages.must_equal({})
-  # }
-
-  # it do
-  #   subject.validate({})
-  #   subject.hit.title.must_equal nil
-  #   subject.hit.rating.must_equal nil
-  #   subject.errors.messages.must_equal({:"hit.title"=>["can't be blank"], :"hit.rating"=>["can't be blank"]})
-  # end
-
-require "pp"
+  it do
+    subject.validate({})
+    assert_nil subject.model.hit.title
+    assert_nil subject.model.hit.rating
+    subject.errors.messages.must_equal({:"hit.title"=>["must be filled"], :"hit.rating"=>["must be filled"]})
+  end
 
   it "xxx" do
     # sub hashes like :deserializer must be properly cloned when inheriting.
@@ -79,14 +73,14 @@ require "pp"
     AlbumForm.options_for(:title)[:internal_populator].must_be_instance_of Reform::Form::Populator::Sync
     AlbumForm.options_for(:title)[:deserializer][:skip_parse].must_equal "skip_if in AlbumForm"
 
-    AlbumForm.options_for(:hit)[:internal_populator].inspect.must_match /Reform::Form::Populator:.+ @user_proc="Populator"/
+    # AlbumForm.options_for(:hit)[:internal_populator].inspect.must_match /Reform::Form::Populator:.+ @user_proc="Populator"/
     # AlbumForm.options_for(:hit)[:deserializer][:instance].inspect.must_be_instance_with Reform::Form::Populator, user_proc: "Populator"
 
 
     AlbumForm.options_for(:songs)[:internal_populator].must_be_instance_of Reform::Form::Populator::IfEmpty
     AlbumForm.options_for(:songs)[:deserializer][:skip_parse].must_be_instance_of Reform::Form::Validate::Skip::AllBlank
 
-    AlbumForm.options_for(:artist)[:internal_populator].must_be_instance_of Reform::Form::Populator::IfEmpty
+    AlbumForm.options_for(:band)[:internal_populator].must_be_instance_of Reform::Form::Populator::IfEmpty
 
 
 
@@ -95,25 +89,24 @@ require "pp"
     CompilationForm.options_for(:songs)[:internal_populator].must_be_instance_of Reform::Form::Populator::IfEmpty
 
 
-    CompilationForm.options_for(:artist)[:internal_populator].must_be_instance_of Reform::Form::Populator::IfEmpty
+    CompilationForm.options_for(:band)[:internal_populator].must_be_instance_of Reform::Form::Populator::IfEmpty
 
     # completely overwrite inherited.
-    CompilationForm.options_for(:hit)[:internal_populator].must_be_instance_of Reform::Form::Populator::Sync # reset to default.
-    CompilationForm.options_for(:hit)[:deserializer][:skip_parse].must_equal "SkipParse"
+    CompilationForm.options_for(:hit)[:deserializer][:skip_parse].must_be_instance_of SkipParse
 
 
     # inherit: true with block will still inherit the original class.
-    AlbumForm.new(OpenStruct.new(artist: OpenStruct.new)).artist.artist_id.must_equal 1
-    CompilationForm.new(OpenStruct.new(artist: OpenStruct.new)).artist.artist_id.must_equal 1
+    AlbumForm.new(OpenStruct.new(band: OpenStruct.new)).band.band_id.must_equal 1
+    CompilationForm.new(OpenStruct.new(band: OpenStruct.new)).band.band_id.must_equal 1
   end
 
 
   class CDForm < AlbumForm
-    # override :artist's original populate_if_empty but with :inherit.
-    property :artist, inherit: true, populator: "CD Populator" do
+    # override :band's original populate_if_empty but with :inherit.
+    property :band, inherit: true, populator: "CD Populator" do
 
     end
   end
 
-  it { CDForm.options_for(:artist)[:internal_populator].instance_variable_get(:@user_proc).must_equal "CD Populator" }
-end
+  it { CDForm.options_for(:band)[:internal_populator].instance_variable_get(:@user_proc).must_equal "CD Populator" }
+end