reform 2.0.5 → 2.1.0.rc1

data/test/form_test.rb

@@ -31,47 +31,12 @@ class FormTest < MiniTest::Spec
     form.errors.to_s.must_equal "{:title=>[\"can't be blank\"], :genre=>[\"can't be blank\"], :band=>[\"can't be blank\"]}"
   end
 
-  # ::schema
-  # TODO: refactor schema tests, this is all covered in Disposable.
-  describe "::schema" do
-    let (:schema) { AlbumForm.schema }
-
-    # it must be a clone
-    it { schema.wont_equal AlbumForm.representer_class }
-    it { assert schema < Representable::Decorator }
-    it { schema.representable_attrs.get(:title).name.must_equal "title" }
-
-    # hit is clone.
-    it { schema.representable_attrs.get(:hit).representer_module.object_id.wont_equal AlbumForm.representer_class.representable_attrs.get(:hit).representer_module.object_id }
-    it { assert schema.representable_attrs.get(:hit).representer_module < Representable::Decorator }
-    # we delete :prepare from schema.
-    it { schema.representable_attrs.get(:hit)[:prepare].must_equal nil }
-
-    # band:label is clone.
-    # this test might look ridiculous but it is mission-critical to assert that schema is really a clone and doesn't mess up the original structure.
-    let (:label) { schema.representable_attrs.get(:band).representer_module.representable_attrs.get(:label) }
-    it { assert label.representer_module < Representable::Decorator }
-    it { label.representer_module.object_id.wont_equal AlbumForm.representer_class.representable_attrs.get(:band).representer_module.representer_class.representable_attrs.get(:label).representer_module.object_id }
-
-    # #apply
-    it do
-      properties = []
-
-      schema.apply do |dfn|
-        properties << dfn.name
-      end
-
-      properties.must_equal ["title", "hit", "title", "songs", "title", "band", "label", "name"]
-    end
-  end
-
-
   describe "::dup" do
     let (:cloned) { AlbumForm.clone }
 
     # #dup is called in Op.inheritable_attr(:contract_class), it must be subclass of the original one.
     it { cloned.wont_equal AlbumForm }
-    it { AlbumForm.representer_class.wont_equal cloned.representer_class }
+    it { AlbumForm.definitions.wont_equal cloned.definitions }
 
     it do
       # currently, forms need a name for validation, even without AM.

data/test/inherit_test.rb

@@ -2,9 +2,10 @@ require 'test_helper'
 require 'representable/json'
 
 class InheritTest < BaseTest
+  Populator = Reform::Form::Populator
+
   class AlbumForm < Reform::Form
     property :title, deserializer: {instance: "Instance"}, skip_if: "skip_if in AlbumForm" # allow direct configuration of :deserializer.
-    # puts "[#{options_for(:title)[:deserializer].object_id}] ALB@@@@@ #{options_for(:title)[:deserializer].inspect}"
 
     property :hit, populator: "Populator" do
       property :title
@@ -75,28 +76,29 @@ require "pp"
     AlbumForm.options_for(:title)[:deserializer].object_id.wont_equal CompilationForm.options_for(:title)[:deserializer].object_id
 
     # don't overwrite direct deserializer: {} configuration.
-    AlbumForm.options_for(:title)[:deserializer][:instance].must_equal "Instance"
+    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)[:deserializer][:instance].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)[:deserializer][:instance].must_be_instance_of Reform::Form::Populator::IfEmpty
+    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)[:deserializer][:instance].must_be_instance_of Reform::Form::Populator::IfEmpty
+    AlbumForm.options_for(:artist)[:internal_populator].must_be_instance_of Reform::Form::Populator::IfEmpty
 
 
 
     CompilationForm.options_for(:title)[:deserializer][:skip_parse].must_equal "skip_if from CompilationForm"
     # pp CompilationForm.options_for(:songs)
-    CompilationForm.options_for(:songs)[:deserializer][:instance].must_be_instance_of Reform::Form::Populator::IfEmpty
+    CompilationForm.options_for(:songs)[:internal_populator].must_be_instance_of Reform::Form::Populator::IfEmpty
+
 
-    CompilationForm.options_for(:artist)[:deserializer][:instance].must_be_instance_of Reform::Form::Populator::IfEmpty
+    CompilationForm.options_for(:artist)[:internal_populator].must_be_instance_of Reform::Form::Populator::IfEmpty
 
     # completely overwrite inherited.
-    CompilationForm.options_for(:hit)[:deserializer][:instance].must_be_instance_of Reform::Form::Populator::Sync # reset to default.
+    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"
 
 
@@ -104,4 +106,14 @@ require "pp"
     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
   end
+
+
+  class CDForm < AlbumForm
+    # override :artist's original populate_if_empty but with :inherit.
+    property :artist, 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

data/test/module_test.rb

@@ -81,50 +81,22 @@ class ModuleInclusionTest < MiniTest::Spec
 
     property :name
     validates :name, :presence => true
+
   end
 
   class AlbumForm < Reform::Form
     include AlbumFormModule
 
+    # pp heritage
     property :band, :inherit => true do
       property :label
       validates :label, :presence => true
     end
   end
-  # puts "......"+ AlbumForm.representer_class.representable_attrs.get(:band).inspect
 
   it do
     form = AlbumForm.new(OpenStruct.new(:band => OpenStruct.new))
     form.validate({"band" => {}})
     form.errors.messages.must_equal({:"band.title"=>["can't be blank"], :"band.label"=>["can't be blank"], :name=>["can't be blank"]})
   end
-
-
-#   # including representer into form
-#   module GenericRepresenter
-#     include Representable
-
-#     property :title
-#     property :manager do
-#       property :title
-#     end
-#   end
-
-#   class LabelForm < Reform::Form
-#     property :location
-
-#     include GenericRepresenter
-#     validates :title, :presence => true
-#     property :manager, :inherit => true do
-#       validates :title, :presence => true
-#     end
-#   end
-#     puts "......"+ LabelForm.representer_class.representable_attrs.get(:title).inspect
-
-
-#   it do
-#     form = LabelForm.new(OpenStruct.new(:manager => OpenStruct.new))
-#     form.validate({"manager" => {}, "title"=>""}) # it's important to pass both nested and scalar here!
-#     form.errors.messages.must_equal(:title=>["can't be blank"], :"manager.title"=>["can't be blank"], )
-#   end
 end

data/test/parse_pipeline_test.rb

@@ -0,0 +1,15 @@
+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 }] } }
+  end
+
+  it "allows passing :parse_pipeline directly" do
+    form = AlbumForm.new(Album.new)
+    form.validate("name" => "Greatest Hits")
+    form.name.must_equal "{\"name\"=>\"Greatest Hits\"}"
+  end
+end

data/test/populate_test.rb

@@ -6,18 +6,19 @@ class PopulatorTest < MiniTest::Spec
   Artist = Struct.new(:name)
 
   class AlbumForm < Reform::Form
-    property :name
+    property :name, populator: ->(options) { self.name = options[:fragment].reverse }
     validates :name, presence: true
 
     collection :songs,
-      populator: lambda { |fragment, collection, index, options|
-        # collection = options.binding.get # we don't need this anymore as this comes in for free!
+      populator: ->(options) {
+        fragment, collection, index = options[:fragment], options[:model], options[:index]
+
         (item = collection[index]) ? item : collection.insert(index, Song.new) } do
 
       property :title
       validates :title, presence: true
 
-      property :composer, populator: lambda { |fragment, model, options| model || self.composer= Artist.new } do
+      property :composer, populator: ->(options) { options[:model] || self.composer= Artist.new } do
         property :name
         validates :name, presence: true
       end
@@ -25,7 +26,7 @@ class PopulatorTest < MiniTest::Spec
 
     # property :artist, populator: lambda { |fragment, options| (item = options.binding.get) ? item : Artist.new } do
     # NOTE: we have to document that model here is the twin!
-    property :artist, populator: lambda { |fragment, twin, *| twin || self.artist = Artist.new } do
+    property :artist, populator: ->(options) { options[:model] || self.artist = Artist.new } do
       property :name
     end
   end
@@ -38,6 +39,14 @@ class PopulatorTest < MiniTest::Spec
 
   let (:form) { AlbumForm.new(album) }
 
+  it "runs populator on scalar" do
+    form.validate(
+      "name" => "override me!"
+    )
+
+    form.name.must_equal "!em edirrevo"
+  end
+
   # changing existing property :artist.
   # TODO: check with artist==nil
   it do
@@ -89,6 +98,26 @@ class PopulatorTest < MiniTest::Spec
   end
 end
 
+class PopulateWithMethodTest < Minitest::Spec
+  class AlbumForm < Reform::Form
+    property :title, populator: :title!
+
+    def title!(options)
+      self.title = options[:fragment].reverse
+    end
+  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 PopulateIfEmptyTest < MiniTest::Spec
   Song  = Struct.new(:title, :album, :composer)
   Album = Struct.new(:name, :songs, :artist)
@@ -122,7 +151,7 @@ class PopulateIfEmptyTest < MiniTest::Spec
       end
     end
 
-    property :artist, populate_if_empty: lambda { |*args| create_artist(args) } do # methods work, too.
+    property :artist, populate_if_empty: lambda { |args| create_artist(args[:fragment], args[:user_options]) } do # methods work, too.
       property :name
     end
 
@@ -130,8 +159,8 @@ class PopulateIfEmptyTest < MiniTest::Spec
     class Sting < Artist
       attr_accessor :args
     end
-    def create_artist(args)
-      Sting.new.tap { |artist| artist.args=(args) }
+    def create_artist(input, user_options)
+      Sting.new.tap { |artist| artist.args=([input, user_options].to_s) }
     end
   end
 
@@ -171,7 +200,7 @@ class PopulateIfEmptyTest < MiniTest::Spec
   end
 
   # trigger artist populator. lambda calling form instance method.
-  it do
+  it "xxxx" do
     form = AlbumForm.new(album = Album.new)
     form.validate("artist" => {"name" => "From Autumn To Ashes"})
 
@@ -179,7 +208,7 @@ class PopulateIfEmptyTest < MiniTest::Spec
     # test lambda was executed in form context.
     form.artist.model.must_be_instance_of AlbumForm::Sting
     # test lambda block arguments.
-    form.artist.model.args.to_s.must_equal "[{\"name\"=>\"From Autumn To Ashes\"}, {}]"
+    form.artist.model.args.to_s.must_equal "[{\"name\"=>\"From Autumn To Ashes\"}, nil]"
 
     album.artist.must_equal nil
   end
@@ -206,8 +235,8 @@ class PopulateIfEmptyWithDeletionTest < MiniTest::Spec
       validates :title, presence: true
     end
 
-    def delete_song!(fragment, *)
-      songs.delete(songs[0]) and return true if fragment["title"] == "Broken, delete me!"
+    def delete_song!(options)
+      songs.delete(songs[0]) and return true if options[:fragment]["title"] == "Broken, delete me!"
       false
     end
   end

data/test/populator_skip_test.rb

@@ -0,0 +1,28 @@
+require "test_helper"
+
+class PopulatorSkipTest < MiniTest::Spec
+  Album = Struct.new(:songs)
+  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
+    end
+  end
+
+  it do
+    form = AlbumForm.new(Album.new([Song.new, Song.new]))
+    hash = {songs: [{title: "Good"}, {title: "Bad"}]}
+
+    form.validate(hash)
+
+    form.songs.size.must_equal 2
+    form.songs[0].title.must_equal nil
+    form.songs[1].title.must_equal "Bad"
+  end
+end

data/test/reform_test.rb

@@ -106,7 +106,7 @@ class ReformTest < ReformSpec
 
     before { form.validate("name" => "Diesel Boy") }
 
-    it "pushes data to models" do
+    it "xxpushes data to models" do
       form.save
 
       comp.name.must_equal "Diesel Boy"

data/test/skip_if_test.rb

@@ -5,7 +5,7 @@ class SkipIfTest < BaseTest
   class AlbumForm < Reform::Form
     property :title
 
-    property :hit, skip_if: lambda { |fragment, *| fragment["title"].blank? } do
+    property :hit, skip_if: lambda { |options| options[:fragment]["title"].blank? } do
       property :title
       validates :title, presence: true
     end
@@ -14,8 +14,8 @@ class SkipIfTest < BaseTest
       property :title
     end
 
-    def skip_song?(fragment, options)
-      fragment["title"].nil?
+    def skip_song?(options)
+      options[:fragment]["title"].nil?
     end
   end
 
@@ -62,4 +62,11 @@ class SkipIfAllBlankTest < BaseTest
     form.songs.size.must_equal 1
     form.songs[0].title.must_equal "Apathy"
   end
+
+  it do
+    form = AlbumForm.new(OpenStruct.new(songs: []))
+    form.validate("songs" => [{"title"=>"", "length" => ""}, {"title"=>"Apathy"}]).must_equal true
+    form.songs.size.must_equal 1
+    form.songs[0].title.must_equal "Apathy"
+  end
 end

data/test/test_helper.rb

@@ -1,6 +1,7 @@
-require 'reform'
+require "reform"
 require 'minitest/autorun'
 require "representable/debug"
+require "declarative/testing"
 require "pp"
 
 class ReformSpec < MiniTest::Spec
@@ -62,6 +63,10 @@ MiniTest::Spec.class_eval do
     end
   end
 
+  def self.rails4_2?
+    ::ActiveModel::VERSION::MAJOR == 4 and ::ActiveModel::VERSION::MINOR == 2
+  end
+
   def self.rails4_0?
     ::ActiveModel::VERSION::MAJOR == 4 and ::ActiveModel::VERSION::MINOR == 0
   end
@@ -73,7 +78,11 @@ end
 
 require "reform/form/active_model/validations"
 Reform::Contract.class_eval do
-  include Reform::Form::ActiveModel::Validations
+  feature Reform::Form::ActiveModel::Validations
+end
+# FIXME!
+Reform::Form.class_eval do
+  feature Reform::Form::ActiveModel::Validations
 end
 
 I18n.load_path << Dir['test/dummy/config/locales/*.yml']

data/test/unique_test.rb

@@ -19,7 +19,7 @@ class UniquenessValidatorOnCreateTest < MiniTest::Spec
 
     form = SongForm.new(Song.new)
     form.validate("title" => "How Many Tears").must_equal false
-    form.errors.to_s.must_equal "{:title=>[\"title must be unique.\"]}"
+    form.errors.to_s.must_equal "{:title=>[\"has already been taken\"]}"
   end
 end
 
@@ -61,4 +61,75 @@ class UniqueWithCompositionTest < MiniTest::Spec
     form.validate("title" => "How Many Tears").must_equal true
     form.save
   end
+end
+
+
+class UniqueValidatorWithScopeTest < MiniTest::Spec
+  class SongForm < Reform::Form
+    include ActiveRecord
+    property :album_id
+    property :title
+    validates :title, unique: { scope: :album_id }
+  end
+
+  it do
+    Song.delete_all
+
+    album = Album.new
+    album.save
+
+    form = SongForm.new(Song.new)
+    form.validate(album_id: album.id, title: 'How Many Tears').must_equal true
+    form.save
+
+    form = SongForm.new(Song.new)
+    form.validate(album_id: album.id, title: 'How Many Tears').must_equal false
+    form.errors.to_s.must_equal "{:title=>[\"has already been taken\"]}"
+
+    album = Album.new
+    album.save
+
+    form = SongForm.new(Song.new)
+    form.validate(album_id: album.id, title: 'How Many Tears').must_equal true
+  end
+end
+
+class UniqueValidatorWithScopeArrayTest < MiniTest::Spec
+  class SongForm < Reform::Form
+    include ActiveRecord
+    property :album_id
+    property :artist_id
+    property :title
+    validates :title, unique: { scope: [:album_id, :artist_id] }
+  end
+
+  it do
+    Song.delete_all
+
+    album1 = Album.new
+    album1.save
+
+    artist1 = Artist.new
+    artist1.save
+
+    form = SongForm.new(Song.new)
+    form.validate(album_id: album1.id, artist_id: artist1.id, title: 'How Many Tears').must_equal true
+    form.save
+
+    form = SongForm.new(Song.new)
+    form.validate(album_id: album1.id, artist_id: artist1.id, title: 'How Many Tears').must_equal false
+    form.errors.to_s.must_equal "{:title=>[\"has already been taken\"]}"
+
+    album2 = Album.new
+    album2.save
+
+    form = SongForm.new(Song.new)
+    form.validate(album_id: album2.id, artist_id: artist1.id, title: 'How Many Tears').must_equal true
+
+    artist2 = Artist.new
+    artist2.save
+
+    form = SongForm.new(Song.new)
+    form.validate(album_id: album1.id, artist_id: artist2.id, title: 'How Many Tears').must_equal true
+  end
 end