reform 1.2.6 → 2.0.0.beta1

data/test/feature_test.rb

@@ -1,18 +1,55 @@
 require 'test_helper'
 
 class FeatureInheritanceTest < BaseTest
+  Song  = Struct.new(:title, :album, :composer)
+  Album = Struct.new(:name, :songs, :artist)
+  Artist = Struct.new(:name)
+
+  module Date
+    def date
+      "May 16"
+    end
+
+    def self.included(base)
+      base.representer_class.representable_attrs.features << self # TODO: register_feature
+    end
+  end
+
+  # module Name
+  #   def name
+  #     "Violins"
+  #   end
+  # end
+
   class AlbumForm < Reform::Form
-    # include Reform::Form::ActiveModel
-    # include Coercion
-    # include MultiParameterAttributes
+    feature Date # feature.
+    property :name
 
-    property :band do
-      property :label do
+    collection :songs do
+      property :title
+
+      property :composer do
+        property :name
       end
     end
+
+    property :artist do
+      property :name
+    end
   end
 
-  subject { AlbumForm.new(Album.new(nil, nil, nil, Band.new(Label.new))) }
+  let (:song)               { Song.new("Broken") }
+  let (:song_with_composer) { Song.new("Resist Stance", nil, composer) }
+  let (:composer)           { Artist.new("Greg Graffin") }
+  let (:artist)             { Artist.new("Bad Religion") }
+  let (:album)              { Album.new("The Dissent Of Man", [song, song_with_composer], artist) }
+
+  let (:form) { AlbumForm.new(album) }
+
+  it do
+    form.date.must_equal "May 16"
+    form.songs[0].date.must_equal "May 16"
+  end
 
   # it { subject.class.include?(Reform::Form::ActiveModel) }
   # it { subject.class.include?(Reform::Form::Coercion) }

data/test/fields_test.rb

@@ -6,19 +6,9 @@ class FieldsTest < MiniTest::Spec
       fields = Reform::Contract::Fields.new([:name, :title])
       fields.name.must_equal  nil
       fields.title.must_equal nil
-    end
 
-    it "accepts list of properties and values" do
-      fields = Reform::Contract::Fields.new(["name", "title"], "title" => "The Body")
-      fields.name.must_equal  nil
-      fields.title.must_equal "The Body"
-    end
-
-    it "processes value syms" do
-      skip "we don't need to test this as representer.to_hash always returns strings"
-      fields = Reform::Fields.new(["name", "title"], :title => "The Body")
-      fields.name.must_equal  nil
-      fields.title.must_equal "The Body"
+      fields.title= "Planet X"
+      fields.title.must_equal "Planet X"
     end
   end
 end

data/test/form_builder_test.rb

@@ -1,37 +1,39 @@
 require 'test_helper'
 
 class FormBuilderCompatTest < BaseTest
-  let (:form_class) {
-    Class.new(Reform::Form) do
-      include Reform::Form::ActiveModel::FormBuilderMethods
+  class AlbumForm < Reform::Form
+    feature Reform::Form::ActiveModel::FormBuilderMethods
 
-      property :artist do
-        property :name
-        validates :name, :presence => true
-      end
+    feature Reform::Form::MultiParameterAttributes
 
-      collection :songs do
-        property :title
-        property :release_date, :multi_params => true
-        validates :title, :presence => true
-      end
+    property :artist do
+      property :name
+      validates :name, :presence => true
+    end
 
-      class LabelForm < Reform::Form
-        property :name
-      end
+    collection :songs do
+      feature Reform::Form::ActiveModel::FormBuilderMethods
+      property :title
+      property :release_date, :multi_params => true
+      validates :title, :presence => true
+    end
 
-      property :label, :form => LabelForm
+    class LabelForm < Reform::Form
+      property :name
+    end
 
-      property :band do
-        property :label do
-          property :name
-        end
+    property :label, form: LabelForm
+
+    property :band do
+      property :label do
+        property :name
       end
     end
-  }
+  end
+
 
   let (:song) { OpenStruct.new }
-  let (:form) { form_class.new(OpenStruct.new(
+  let (:form) { AlbumForm.new(OpenStruct.new(
     :artist => Artist.new(:name => "Propagandhi"),
     :songs  => [song],
     :label  => OpenStruct.new,
@@ -40,9 +42,10 @@ class FormBuilderCompatTest < BaseTest
     )) }
 
   it "respects _attributes params hash" do
-    form.validate("artist_attributes" => {"name" => "Blink 182"},
-      "songs_attributes" => {"0" => {"title" => "Damnit"}},
-      "band_attributes"  => {"label_attributes" => {"name" => "Epitaph"}})
+    form.validate(
+      "artist_attributes" => {"name" => "Blink 182"},
+      "songs_attributes"  => {"0" => {"title" => "Damnit"}},
+      "band_attributes"   => {"label_attributes" => {"name" => "Epitaph"}})
 
     form.artist.name.must_equal "Blink 182"
     form.songs.first.title.must_equal "Damnit"

data/test/form_option_test.rb

@@ -0,0 +1,19 @@
+require 'test_helper'
+
+class FormOptionTest < MiniTest::Spec
+  Song  = Struct.new(:title)
+  Album = Struct.new(:song)
+
+  class SongForm < Reform::Form
+    property :title
+    validates_presence_of :title
+  end
+
+  class AlbumForm < Reform::Form
+    property :song, form: SongForm
+  end
+
+  it do
+    AlbumForm.new(Album.new(Song.new("When It Comes To You"))).song.title.must_equal "When It Comes To You"
+  end
+end

data/test/from_test.rb

@@ -73,78 +73,3 @@ class AsTest < BaseTest
     end
   end
 end
-
-
-class AsREMOVEMEin20Test < BaseTest # TODO: remove me in 2.0.
-  class AlbumForm < Reform::Form
-    property :name, as: :title
-
-    property :single, as: :hit do
-      property :title
-    end
-
-    collection :tracks, as: :songs do
-      property :name, as: :title
-    end
-
-    property :band do
-      property :company, as: :label do
-        property :business, as: :name
-      end
-    end
-  end
-
-  let (:song2) { Song.new("Roxanne") }
-
-  let (:params) {
-      {
-        "name" => "Best Of The Police",
-        "single"   => {"title" => "So Lonely"},
-        "tracks" => [{"name" => "Message In A Bottle"}, {"name" => "Roxanne"}]
-      }
-    }
-
-  subject { AlbumForm.new(Album.new("Best Of", hit, [Song.new("Fallout"), song2])) }
-
-  it { subject.name.must_equal "Best Of" }
-  it { subject.single.title.must_equal "Roxanne" }
-  it { subject.tracks[0].name.must_equal "Fallout" }
-  it { subject.tracks[1].name.must_equal "Roxanne" }
-
-
-  describe "#validate" do
-
-
-    before { subject.validate(params) }
-
-    it { subject.name.must_equal "Best Of The Police" }
-    it { subject.single.title.must_equal "So Lonely" }
-    it { subject.tracks[0].name.must_equal "Message In A Bottle" }
-    it { subject.tracks[1].name.must_equal "Roxanne" }
-  end
-
-
-  describe "#sync" do
-    before {
-      subject.tracks[1].name = "Livin' Ain't No Crime"
-      subject.sync
-    }
-
-    it { song2.title.must_equal "Livin' Ain't No Crime" }
-  end
-
-
-  describe "#save (nested hash)" do
-    before { subject.validate(params) }
-
-    it do
-      hash = nil
-
-      subject.save do |nested_hash|
-        hash = nested_hash
-      end
-
-      hash.must_equal({"title"=>"Best Of The Police", "hit"=>{"title"=>"So Lonely"}, "songs"=>[{"title"=>"Message In A Bottle"}, {"title"=>"Roxanne"}]})
-    end
-  end
-end

data/test/inherit_test.rb

@@ -3,26 +3,50 @@ require 'representable/json'
 
 class InheritTest < BaseTest
   class AlbumForm < Reform::Form
-    property :title
+    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 do
+    property :hit, populator: "Populator" do
       property :title
     end
 
-    collection :songs do
+    collection :songs, populate_if_empty: lambda {}, skip_if: :all_blank do
       property :title
     end
-  end
 
-  class CompilationForm < AlbumForm
+    property :artist, populate_if_empty: lambda {} do
 
-    property :hit, :inherit => true do
-      property :rating
-      validates :title, :rating, :presence => true
+      def artist_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
+
+    # NO collection here, this is entirely inherited.
+    # collection :songs, ..
+
+    property :artist, 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()) ) }
@@ -30,146 +54,183 @@ class InheritTest < BaseTest
 
 
   # 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
-end
+  # 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 'reform/form/coercion'
-class ModuleInclusionTest < MiniTest::Spec
-  module BandPropertyForm
-    include Reform::Form::Module
+require "pp"
 
-    property :band do
-      property :title
+  it "xxx" do
+    # sub hashes like :deserializer must be properly cloned when inheriting.
+    AlbumForm.options_for(:title)[:deserializer].object_id.wont_equal CompilationForm.options_for(:title)[:deserializer].object_id
 
-      validates :title, :presence => true
+    # don't overwrite direct deserializer: {} configuration.
+    AlbumForm.options_for(:title)[:deserializer][:instance].must_equal "Instance"
+    AlbumForm.options_for(:title)[:deserializer][:skip_parse].must_equal "skip_if in AlbumForm"
 
-      def id # gets mixed into Form, too.
-        2
-      end
-    end
+    AlbumForm.options_for(:hit)[:deserializer][:instance].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"
 
-    def id # gets mixed into Form, too.
-      1
-    end
 
-    validates :band, :presence => true
+    AlbumForm.options_for(:songs)[:deserializer][:instance].must_be_instance_of Reform::Form::Populator::IfEmpty
+    AlbumForm.options_for(:songs)[:deserializer][:skip_parse].must_be_instance_of Reform::Form::Validate::Skip::AllBlank
 
-    property :cool, type: Virtus::Attribute::Boolean # test coercion.
-  end
+    AlbumForm.options_for(:artist)[:deserializer][:instance].must_be_instance_of Reform::Form::Populator::IfEmpty
 
-  # TODO: test if works, move stuff into inherit_schema!
-  module AirplaysPropertyForm
-    include Reform::Form::Module
 
-    collection :airplays do
-      property :station
-      validates :station, :presence => true
-    end
-    validates :airplays, :presence => true
-  end
 
+    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
 
-  # test:
-  # by including BandPropertyForm into multiple classes we assure that options hashes don't get messed up by AM:V.
-  class HitForm < Reform::Form
-    include BandPropertyForm
-  end
+    CompilationForm.options_for(:artist)[:deserializer][:instance].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)[:deserializer][:skip_parse].must_equal "SkipParse"
 
-  class SongForm < Reform::Form
-    property :title
 
-    include BandPropertyForm
+    # 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
   end
+end
 
 
-  let (:song) { OpenStruct.new(:band => OpenStruct.new(:title => "Time Again")) }
+# require 'reform/form/coercion'
+# class ModuleInclusionTest < MiniTest::Spec
+#   module BandPropertyForm
+#     include Reform::Form::Module
 
-  # nested form from module is present and creates accessor.
-  it { SongForm.new(song).band.title.must_equal "Time Again" }
+#     property :band do
+#       property :title
 
-  # methods from module get included.
-  it { SongForm.new(song).id.must_equal 1 }
-  it { SongForm.new(song).band.id.must_equal 2 }
+#       validates :title, :presence => true
 
-  # validators get inherited.
-  it do
-    form = SongForm.new(OpenStruct.new)
-    form.validate({})
-    form.errors.messages.must_equal({:band=>["can't be blank"]})
-  end
+#       def id # gets mixed into Form, too.
+#         2
+#       end
+#     end
 
-  # coercion works
-  it do
-    form = SongForm.new(OpenStruct.new)
-    form.validate({:cool => "1"})
-    form.cool.must_equal true
-  end
+#     def id # gets mixed into Form, too.
+#       1
+#     end
 
+#     validates :band, :presence => true
 
-  # include a module into a module into a class :)
-  module AlbumFormModule
-    include Reform::Form::Module
-    include BandPropertyForm
+#     property :cool, type: Virtus::Attribute::Boolean # test coercion.
+#   end
 
-    property :name
-    validates :name, :presence => true
-  end
+#   # TODO: test if works, move stuff into inherit_schema!
+#   module AirplaysPropertyForm
+#     include Reform::Form::Module
 
-  class AlbumForm < Reform::Form
-    include AlbumFormModule
+#     collection :airplays do
+#       property :station
+#       validates :station, :presence => true
+#     end
+#     validates :airplays, :presence => true
+#   end
 
-    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
+#   # test:
+#   # by including BandPropertyForm into multiple classes we assure that options hashes don't get messed up by AM:V.
+#   class HitForm < Reform::Form
+#     include BandPropertyForm
+#   end
 
+#   class SongForm < Reform::Form
+#     property :title
 
-  # including representer into form
-  module GenericRepresenter
-    include Representable
+#     include BandPropertyForm
+#   end
 
-    property :title
-    property :manager do
-      property :title
-    end
-  end
 
-  class LabelForm < Reform::Form
-    property :location
+#   let (:song) { OpenStruct.new(:band => OpenStruct.new(:title => "Time Again")) }
 
-    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
+#   # nested form from module is present and creates accessor.
+#   it { SongForm.new(song).band.title.must_equal "Time Again" }
 
+#   # methods from module get included.
+#   it { SongForm.new(song).id.must_equal 1 }
+#   it { SongForm.new(song).band.id.must_equal 2 }
 
-  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
+#   # validators get inherited.
+#   it do
+#     form = SongForm.new(OpenStruct.new)
+#     form.validate({})
+#     form.errors.messages.must_equal({:band=>["can't be blank"]})
+#   end
+
+#   # coercion works
+#   it do
+#     form = SongForm.new(OpenStruct.new)
+#     form.validate({:cool => "1"})
+#     form.cool.must_equal true
+#   end
+
+
+#   # include a module into a module into a class :)
+#   module AlbumFormModule
+#     include Reform::Form::Module
+#     include BandPropertyForm
+
+#     property :name
+#     validates :name, :presence => true
+#   end
+
+#   class AlbumForm < Reform::Form
+#     include AlbumFormModule
+
+#     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