reform 2.2.4 → 2.3.0.rc1

data/test/module_test.rb

@@ -9,7 +9,7 @@ class ModuleInclusionTest < MiniTest::Spec
       property :title
 
       validation do
-        key(:title).required
+        required(:title).filled
       end
 
       def id # gets mixed into Form, too.
@@ -22,7 +22,7 @@ class ModuleInclusionTest < MiniTest::Spec
     end
 
     validation do
-      key(:band).required
+      required(:band).filled
     end
 
     include Dry::Types.module # allows using Types::* in module.
@@ -36,22 +36,22 @@ class ModuleInclusionTest < MiniTest::Spec
     collection :airplays do
       property :station
       validation do
-        key(:station).required
+        required(:station).filled
       end
     end
     validation do
-      key(:airplays).required
+      required(:airplays).filled
     end
   end
 
 
   # test:
   # by including BandPropertyForm into multiple classes we assure that options hashes don't get messed up by AM:V.
-  class HitForm < Reform::Form
+  class HitForm < TestForm
     include BandPropertyForm
   end
 
-  class SongForm < Reform::Form
+  class SongForm < TestForm
     include Coercion
     property :title
 
@@ -72,7 +72,7 @@ class ModuleInclusionTest < MiniTest::Spec
   it do
     form = SongForm.new(OpenStruct.new)
     form.validate({})
-    form.errors.messages.must_equal({:band=>["is missing"]})
+    form.errors.messages.must_equal({:band=>["must be filled"]})
   end
 
   # coercion works
@@ -90,18 +90,18 @@ class ModuleInclusionTest < MiniTest::Spec
 
     property :name
     validation do
-      key(:name).required
+      required(:name).filled
     end
   end
 
-  class AlbumForm < Reform::Form
+  class AlbumForm < TestForm
     include AlbumFormModule
 
     # pp heritage
     property :band, :inherit => true do
       property :label
       validation do
-        key(:label).required
+        required(:label).filled
       end
     end
   end
@@ -109,7 +109,7 @@ class ModuleInclusionTest < MiniTest::Spec
   it do
     form = AlbumForm.new(OpenStruct.new(:band => OpenStruct.new))
     form.validate({"band" => {}})
-    form.errors.messages.must_equal({:band=>["must be filled"], :"band.title"=>["is missing"], :"band.label"=>["is missing"], :name=>["is missing"]})
+    form.errors.messages.must_equal({:"band.title"=>["must be filled"], :"band.label"=>["must be filled"], :name=>["must be filled"]})
   end
 
 
@@ -127,7 +127,7 @@ class ModuleInclusionTest < MiniTest::Spec
       end
     end
 
-    class IncludingSongForm < Reform::Form
+    class IncludingSongForm < TestForm
       include SongModule
     end
 

data/test/parse_option_test.rb

@@ -0,0 +1,40 @@
+require 'test_helper'
+
+class ParseOptionTest < MiniTest::Spec
+  Comment = Struct.new(:content, :user)
+  User    = Struct.new(:name)
+
+  class CommentForm < TestForm
+    property :content
+    property :user, parse: false
+  end
+
+  let (:current_user) { User.new("Peter") }
+  let (:form) { CommentForm.new(Comment.new, user: current_user) }
+
+  it do
+    form.user.must_equal current_user
+
+    lorem = "Lorem ipsum dolor sit amet..."
+    form.validate("content" => lorem, "user" => "not the current user")
+
+    form.content.must_equal lorem
+    form.user.must_equal current_user
+  end
+
+  describe "using ':parse' option doesn't override other ':deserialize' options" do
+    class ArticleCommentForm < TestForm
+      property :content
+      property :article, deserializer: { instance: "Instance" }
+      property :user, parse: false, deserializer: { instance: "Instance" }
+    end
+
+    it do
+      ArticleCommentForm.definitions.get(:user)[:deserializer][:writeable].must_equal false
+      ArticleCommentForm.definitions.get(:user)[:deserializer][:instance].must_equal "Instance"
+
+      ArticleCommentForm.definitions.get(:article)[:deserializer][:writeable].must_equal true
+      ArticleCommentForm.definitions.get(:article)[:deserializer][:instance].must_equal "Instance"
+    end
+  end
+end

data/test/parse_pipeline_test.rb

@@ -3,8 +3,8 @@ require "test_helper"
 class ParsePipelineTest < MiniTest::Spec
   Album = Struct.new(:name)
 
-  class AlbumForm < Reform::Form
-    property :name, deserializer: { parse_pipeline: ->(input, options) { Representable::Pipeline[->(input, options) { options[:represented].name = input.inspect }] } }
+  class AlbumForm < TestForm
+    property :name, deserializer: { parse_pipeline: ->(input, options) { Representable::Pipeline[->(ipt, opts) { opts[:represented].name = ipt.inspect }] } }
   end
 
   it "allows passing :parse_pipeline directly" do

data/test/populate_test.rb

@@ -5,27 +5,25 @@ class PopulatorTest < MiniTest::Spec
   Album = Struct.new(:name, :songs, :artist)
   Artist = Struct.new(:name)
 
-  class AlbumForm < Reform::Form
+  class AlbumForm < TestForm
     property :name, populator: ->(options) { self.name = options[:fragment].reverse }
     validation do
-      key(:name).required
+      required(:name).filled
     end
 
     collection :songs,
-      populator: ->(options) {
-        fragment, collection, index = options[:fragment], options[:model], options[:index]
-
-        (item = collection[index]) ? item : collection.insert(index, Song.new) } do
+      populator: ->(fragment:, model:, index:, **) {
+        (item = model[index]) ? item : model.insert(index, Song.new) } do
 
       property :title
       validation do
-        key(:title).required
+        required(:title).filled
       end
 
       property :composer, populator: ->(options) { options[:model] || self.composer= Artist.new } do
         property :name
         validation do
-          key(:name).required
+          required(:name).filled
         end
       end
     end
@@ -107,7 +105,7 @@ end
 class PopulateWithMethodTest < Minitest::Spec
   Album = Struct.new(:title)
 
-  class AlbumForm < Reform::Form
+  class AlbumForm < TestForm
     property :title, populator: :title!
 
     def title!(options)
@@ -118,9 +116,51 @@ class PopulateWithMethodTest < Minitest::Spec
   let (:form) { AlbumForm.new(Album.new) }
 
   it "runs populator method" do
-    form.validate(
-      "title" => "override me!"
-    )
+    form.validate("title" => "override me!")
+
+    form.title.must_equal "!em edirrevo"
+  end
+end
+
+class PopulateWithCallableTest < Minitest::Spec
+  Album = Struct.new(:title)
+
+  class TitlePopulator
+    include Uber::Callable
+
+    def call(form, options)
+      form.title = options[:fragment].reverse
+    end
+  end
+
+  class AlbumForm < TestForm
+    property :title, populator: TitlePopulator.new
+  end
+
+  let (:form) { AlbumForm.new(Album.new) }
+
+  it "runs populator method" do
+    form.validate("title" => "override me!")
+
+    form.title.must_equal "!em edirrevo"
+  end
+end
+
+class PopulateWithProcTest < Minitest::Spec
+  Album = Struct.new(:title)
+
+  TitlePopulator = ->(options) do
+    options[:represented].title = options[:fragment].reverse
+  end
+
+  class AlbumForm < TestForm
+    property :title, populator: TitlePopulator
+  end
+
+  let (:form) { AlbumForm.new(Album.new) }
+
+  it "runs populator method" do
+    form.validate("title" => "override me!")
 
     form.title.must_equal "!em edirrevo"
   end
@@ -139,7 +179,7 @@ class PopulateIfEmptyTest < MiniTest::Spec
 
 
 
-  class AlbumForm < Reform::Form
+  class AlbumForm < TestForm
     property :name
 
     collection :songs,
@@ -147,18 +187,18 @@ class PopulateIfEmptyTest < MiniTest::Spec
 
       property :title
       validation do
-        key(:title).required
+        required(:title).filled
       end
 
       property :composer, populate_if_empty: :populate_composer! do # lambda works, too. in form context.
         property :name
         validation do
-          key(:name).required
+          required(:name).filled
         end
       end
 
     private
-      def populate_composer!(fragment, options)
+      def populate_composer!(options)
         Artist.new
       end
     end
@@ -222,7 +262,7 @@ class PopulateIfEmptyTest < MiniTest::Spec
     # test lambda block arguments.
     form.artist.model.args.to_s.must_equal "[{\"name\"=>\"From Autumn To Ashes\"}, nil]"
 
-    album.artist.must_equal nil
+    assert_nil album.artist
   end
 end
 
@@ -237,7 +277,7 @@ class PopulateIfEmptyWithDeletionTest < MiniTest::Spec
   let (:album) { Album.new("The Dissent Of Man", [song, song2]) }
 
 
-  class AlbumForm < Reform::Form
+  class AlbumForm < TestForm
     property :name
 
     collection :songs,
@@ -245,7 +285,7 @@ class PopulateIfEmptyWithDeletionTest < MiniTest::Spec
 
       property :title
       validation do
-        key(:title).required
+        required(:title).filled
       end
     end
 

data/test/populator_skip_test.rb

@@ -5,13 +5,14 @@ class PopulatorSkipTest < MiniTest::Spec
   Song  = Struct.new(:title)
 
 
-  class AlbumForm < Reform::Form
-    collection :songs,
-      populator: ->(options) {
-        return skip! if options[:fragment][:title] == "Good"
-        songs[options[:index]]
-      } do
-        property :title
+  class AlbumForm < TestForm
+    collection :songs, populator: :my_populator do
+      property :title
+    end
+
+    def my_populator(options)
+      return skip! if options[:fragment][:title] == "Good"
+      songs[options[:index]]
     end
   end
 
@@ -22,7 +23,7 @@ class PopulatorSkipTest < MiniTest::Spec
     form.validate(hash)
 
     form.songs.size.must_equal 2
-    form.songs[0].title.must_equal nil
+    assert_nil form.songs[0].title
     form.songs[1].title.must_equal "Bad"
   end
 end

data/test/prepopulator_test.rb

@@ -4,7 +4,7 @@ class PrepopulatorTest < MiniTest::Spec
   Song = Struct.new(:title, :band, :length)
   Band = Struct.new(:name)
 
-  class AlbumForm < Reform::Form
+  class AlbumForm < TestForm
     property :title, prepopulator: ->(*){ self.title = "Another Day At Work" }                  # normal assignment.
     property :length
 
@@ -63,7 +63,7 @@ end
 class PrepopulateWithoutConfiguration < MiniTest::Spec
   Song = Struct.new(:title)
 
-  class AlbumForm < Reform::Form
+  class AlbumForm < TestForm
     collection :songs do
       property :title
     end
@@ -83,7 +83,7 @@ class ManualPrepopulatorOverridingTest < MiniTest::Spec
   Song = Struct.new(:title, :band, :length)
   Band = Struct.new(:name)
 
-  class AlbumForm < Reform::Form
+  class AlbumForm < TestForm
     property :title
     property :length
 

data/test/readable_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class ReadableTest < MiniTest::Spec
   Credentials = Struct.new(:password)
 
-  class PasswordForm < Reform::Form
+  class PasswordForm < TestForm
     property :password, readable: false
   end
 
@@ -11,7 +11,7 @@ class ReadableTest < MiniTest::Spec
   let (:form) { PasswordForm.new(cred) }
 
   it {
-    form.password.must_equal nil # password not read.
+    assert_nil form.password # password not read.
 
     form.validate("password" => "123")
 

data/test/readonly_test.rb

@@ -1,7 +1,7 @@
 require "test_helper"
 
 class ReadonlyTest < MiniTest::Spec
-  class SongForm < Reform::Form
+  class SongForm < TestForm
     property :artist
     property :title, writeable: false
     # TODO: what to do with virtual values?

data/test/reform_test.rb

@@ -6,12 +6,12 @@ class ReformTest < Minitest::Spec
 
   let (:form) { SongForm.new(comp) }
 
-  class SongForm < Reform::Form
+  class SongForm < TestForm
     property :name
     property :title
 
     validation do
-      key(:name).required
+      required(:name).filled
     end
   end
 
@@ -19,7 +19,7 @@ class ReformTest < Minitest::Spec
     let (:comp) { OpenStruct.new }
 
     it "returns empty fields" do
-      form.title.must_equal nil
+      assert_nil form.title
       form.name.must_equal  nil
     end
 
@@ -27,7 +27,7 @@ class ReformTest < Minitest::Spec
       it "returns filled-out fields" do
         form.validate("name" => "Duran Duran")
 
-        form.title.must_equal nil
+        assert_nil form.title
         form.name.must_equal  "Duran Duran"
       end
     end
@@ -63,18 +63,18 @@ class ReformTest < Minitest::Spec
     it "doesn't change model properties" do
       form.validate("name" => "Duran Duran")
 
-      comp.name.must_equal nil # don't touch model, yet.
+      assert_nil comp.name # don't touch model, yet.
     end
 
     # TODO: test errors. test valid.
     describe "invalid input" do
-      class ValidatingForm < Reform::Form
+      class ValidatingForm < TestForm
         property :name
         property :title
 
         validation do
-          key(:name).required
-          key(:title).required
+          required(:name).filled
+          required(:title).filled
         end
       end
       let (:form) { ValidatingForm.new(comp) }
@@ -85,26 +85,11 @@ class ReformTest < Minitest::Spec
 
       it "populates errors" do
         form.validate({})
-        form.errors.messages.must_equal({:name=>["is missing"], :title=>["is missing"]})
+        form.errors.messages.must_equal({:name=>["must be filled"], :title=>["must be filled"]})
       end
     end
   end
 
-  # FIXME: add this test to reform-rails.
-  describe "#errors" do
-    before { form.validate({})}
-
-    it { form.errors.must_be_kind_of Reform::Contract::Errors }
-
-    it { form.errors.messages.must_equal({}) }
-
-    it do
-      form.validate({"name"=>""})
-      form.errors.messages.must_equal({:name=>["must be filled"]})
-    end
-  end
-
-
   describe "#save" do
     let (:comp) { OpenStruct.new }
     let (:form) { SongForm.new(comp) }
@@ -115,7 +100,7 @@ class ReformTest < Minitest::Spec
       form.save
 
       comp.name.must_equal "Diesel Boy"
-      comp.title.must_equal nil
+      assert_nil comp.title
     end
 
     describe "#save with block" do
@@ -126,7 +111,7 @@ class ReformTest < Minitest::Spec
           hash = map
         end
 
-        hash.must_equal({"name"=>"Diesel Boy"})
+        hash.must_equal({"name"=>"Diesel Boy", "title" => nil})
       end
     end
   end
@@ -141,7 +126,7 @@ class ReformTest < Minitest::Spec
     class HitForm < SongForm
       property :position
       validation do
-        key(:position).required
+        required(:position).filled
       end
     end
 
@@ -149,15 +134,15 @@ class ReformTest < Minitest::Spec
     it do
       form.validate({"title" => "The Body"})
       form.title.must_equal "The Body"
-      form.position.must_equal nil
-      form.errors.messages.must_equal({:name=>["is missing"], :position=>["is missing"]})
+      assert_nil form.position
+      form.errors.messages.must_equal({:name=>["must be filled"], :position=>["must be filled"]})
     end
   end
 end
 
 
 class OverridingAccessorsTest < BaseTest
-  class SongForm < Reform::Form
+  class SongForm < TestForm
     property :title
 
     def title=(v) # used in #validate.
@@ -200,7 +185,7 @@ end
 
 
 class MethodInFormTest < MiniTest::Spec
-  class AlbumForm < Reform::Form
+  class AlbumForm < TestForm
     property :title
 
     def title