reform 2.0.0.rc1 → 2.0.0.rc2

data/lib/reform/form/mongoid.rb

@@ -0,0 +1,37 @@
+module Reform::Form::Mongoid
+  def self.included(base)
+    base.class_eval do
+      register_feature Reform::Form::Mongoid
+      include Reform::Form::ActiveModel
+      include Reform::Form::ORM
+      extend ClassMethods
+    end
+  end
+
+  module ClassMethods
+    def validates_uniqueness_of(attribute, options={})
+      options = options.merge(:attributes => [attribute])
+      validates_with(UniquenessValidator, options)
+    end
+    def i18n_scope
+      :mongoid
+    end
+  end
+
+
+  def self.mongoid_namespace
+    if mongoid_is_4_or_more?
+      'Validatable'
+    else
+      'Validations'
+    end
+  end
+
+  def self.mongoid_is_4_or_more?
+    Mongoid::VERSION.split('.').first.to_i >= 4
+  end
+
+  UniquenessValidator = Class.new("::Mongoid::#{mongoid_namespace}::UniquenessValidator".constantize) do
+    include Reform::Form::ORM::UniquenessValidator
+  end
+end

data/lib/reform/form/orm.rb

@@ -0,0 +1,26 @@
+module Reform::Form::ORM
+  def model_for_property(name)
+    return model unless is_a?(Reform::Form::Composition) # i am too lazy for proper inheritance. there should be a ActiveRecord::Composition that handles this.
+
+    model_name = schema.representable_attrs.get(name)[:on]
+    model[model_name]
+  end
+
+  module UniquenessValidator
+    # when calling validates it should create the Vali instance already and set @klass there! # TODO: fix this in AM.
+    def validate(form)
+      property = attributes.first
+
+      # here is the thing: why does AM::UniquenessValidator require a filled-out record to work properly? also, why do we need to set
+      # the class? it would be way easier to pass #validate a hash of attributes and get back an errors hash.
+      # the class for the finder could either be infered from the record or set in the validator instance itself in the call to ::validates.
+      record = form.model_for_property(property)
+      record.send("#{property}=", form.send(property))
+
+      @klass = record.class # this is usually done in the super-sucky #setup method.
+      super(record).tap do |res|
+        form.errors.add(property, record.errors.first.last) if record.errors.present?
+      end
+    end
+  end
+end

data/lib/reform/form/validation/unique_validator.rb

@@ -11,3 +11,8 @@ class Reform::Form::UniqueValidator < ActiveModel::EachValidator
   end
 end
 
+# FIXME: ActiveModel loads validators via const_get(#{name}Validator). this magic forces us to
+# make the new :unique validator available here.
+Reform::Form::ActiveModel::Validations::Validator.class_eval do
+  UniqueValidator = Reform::Form::UniqueValidator
+end

data/lib/reform/mongoid.rb

@@ -0,0 +1,4 @@
+require 'reform/form/active_model'
+require 'reform/form/orm'
+require 'reform/form/mongoid'
+require 'reform/form/model_reflections' # only load this in AR context as simple_form currently is bound to AR.

data/lib/reform/rails.rb

@@ -1,9 +1,13 @@
-require 'reform/form/active_model'
+require "reform/form/active_model"
+require "reform/form/active_model/validations"
 
-require 'reform/active_record' if defined?(ActiveRecord)
+require "reform/active_record" if defined?(ActiveRecord)
+require "reform/mongoid" if defined?(Mongoid)
 
 Reform::Form.class_eval do # DISCUSS: i'd prefer having a separate Rails module to be mixed into the Form but this is way more convenient for 99% users.
   include Reform::Form::ActiveModel
   include Reform::Form::ActiveModel::FormBuilderMethods
   include Reform::Form::ActiveRecord if defined?(ActiveRecord)
-end
+  include Reform::Form::Mongoid if defined?(Mongoid)
+  include Reform::Form::ActiveModel::Validations
+end

data/lib/reform/version.rb

@@ -1,3 +1,3 @@
 module Reform
-  VERSION = "2.0.0.rc1"
+  VERSION = "2.0.0.rc2"
 end

data/reform.gemspec

@@ -17,10 +17,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency             "representable",  ">= 2.2.2"
   spec.add_dependency             "disposable",     "~> 0.1.5"
   spec.add_dependency             "uber",           "~> 0.0.11"
-  spec.add_dependency             "activemodel"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
@@ -29,6 +27,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "virtus"
   spec.add_development_dependency "rails"
+  spec.add_development_dependency "mongoid"
 
+  spec.add_development_dependency "lotus-validations"
   spec.add_development_dependency "actionpack"
 end

data/test/active_model_test.rb

@@ -25,11 +25,14 @@ class NewActiveModelTest < MiniTest::Spec # TODO: move to test/rails/
   let (:artist) { Artist.create(:name => "Frank Zappa") }
   let (:form) { SongForm.new(artist) }
 
-  it { form.persisted?.must_equal true }
-  it { form.to_key.must_equal [artist.id] }
-  it { form.to_param.must_equal "#{artist.id}" }
-  it { form.to_model.must_equal form }
-  it { form.id.must_equal artist.id }
+  it do
+    form.persisted?.must_equal true
+    form.to_key.must_equal [artist.id]
+    form.to_param.must_equal "#{artist.id}"
+    form.to_model.must_equal form
+    form.id.must_equal artist.id
+    form.model_name.must_equal form.class.model_name
+  end
 
   describe "::model_name" do
     it { form.class.model_name.must_be_kind_of ActiveModel::Name }
@@ -75,13 +78,11 @@ class NewActiveModelTest < MiniTest::Spec # TODO: move to test/rails/
     it { subclass_of_class_with_model.model_name.must_be_kind_of ActiveModel::Name }
     it { subclass_of_class_with_model.model_name.to_s.must_equal 'Album' }
 
-    unless Reform.rails3_0?
-      it { form.class.model_name.route_key.must_equal "new_active_model_test_songs" }
-      it { class_with_model.model_name.route_key.must_equal "albums" }
-      it { class_with_isolated_model.model_name.route_key.must_equal "lyrics" }
-      it { class_with_namespace_model.model_name.route_key.must_equal "normal_rails_engine_lyrics" }
-      it { subclass_of_class_with_model.model_name.route_key.must_equal 'albums' }
-    end
+    it { form.class.model_name.route_key.must_equal "new_active_model_test_songs" }
+    it { class_with_model.model_name.route_key.must_equal "albums" }
+    it { class_with_isolated_model.model_name.route_key.must_equal "lyrics" }
+    it { class_with_namespace_model.model_name.route_key.must_equal "normal_rails_engine_lyrics" }
+    it { subclass_of_class_with_model.model_name.route_key.must_equal 'albums' }
 
     describe "class named Song::Form" do
       it do

data/test/active_record_test.rb

@@ -42,9 +42,6 @@ class ActiveRecordTest < MiniTest::Spec
 
   it { form.class.i18n_scope.must_equal :activerecord }
 
-  it "allows accessing the database" do
-  end
-
   # uniqueness
   it "has no errors on title when title is unique for the same artist and album" do
     form.validate("title" => "The Gargoyle", "artist_id" => artist.id, "album" => album.id, "created_at" => "November 6, 1966")

data/test/errors_test.rb

@@ -22,9 +22,10 @@ class ErrorsTest < MiniTest::Spec
       end
       # TODO: make band a required object.
 
-      validate :validate_musical_taste
+      validate :music_taste_ok?
 
-      def validate_musical_taste
+    private
+      def music_taste_ok?
         errors.add(:base, "You are a bad person") if name == 'Nickelback'
       end
     end
@@ -101,7 +102,7 @@ class ErrorsTest < MiniTest::Spec
     before { @result = form.validate("songs"=>[{"title" => ""}], "band"=>{"label"=>{:name => "Fat Wreck"}}) }
 
     it { @result.must_equal false }
-    it( "xxxx") { form.errors.messages.must_equal({:"songs.title"=>["can't be blank"]}) }
+    it { form.errors.messages.must_equal({:"songs.title"=>["can't be blank"]}) }
   end
 
 
@@ -113,10 +114,11 @@ class ErrorsTest < MiniTest::Spec
   end
 
   describe "#validate with nested form using :base invalid" do
-    before { @result = form.validate("songs"=>[{"title" => "Someday"}], "band" => {"name" => "Nickelback", "label" => {"name" => "Roadrunner Records"}}) }
-
-    it { @result.must_equal false }
-    it { form.errors.messages.must_equal({:base=>["You are a bad person"]}) }
+    it "xxx" do
+      result = form.validate("songs"=>[{"title" => "Someday"}], "band" => {"name" => "Nickelback", "label" => {"name" => "Roadrunner Records"}})
+      result.must_equal false
+      form.errors.messages.must_equal({:base=>["You are a bad person"]})
+    end
   end
 
   describe "correct #validate" do

data/test/form_option_test.rb

@@ -6,7 +6,7 @@ class FormOptionTest < MiniTest::Spec
 
   class SongForm < Reform::Form
     property :title
-    validates_presence_of :title
+    validates :title, presence: true
   end
 
   class AlbumForm < Reform::Form

data/test/lotus_test.rb

@@ -0,0 +1,150 @@
+require "test_helper"
+
+require "reform/form/lotus"
+
+class LotusValidationsTest < MiniTest::Spec
+  class AlbumForm < Reform::Form
+    feature Lotus
+
+    property :title
+
+    property :hit do
+      property :title
+      validates :title, :presence => true
+    end
+
+    collection :songs do
+      property :title
+      validates :title, :presence => true
+    end
+
+    property :band do # yepp, people do crazy stuff like that.
+      property :name
+      property :label do
+        property :name
+        validates :name, :presence => true
+      end
+      # TODO: make band a required object.
+
+      validate :validate_musical_taste
+
+      def validate_musical_taste
+        errors.add(:base, "You are a bad person") if name == 'Nickelback'
+      end
+    end
+
+    validates :title, :presence => true
+  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) }
+
+
+  # correct #validate.
+  it do
+    result = form.validate(
+      "name"   => "Best Of",
+      "songs"  => [{"title" => "Fallout"}, {"title" => "Roxanne", "composer" => {"name" => "Sting"}}],
+      "artist" => {"name" => "The Police"},
+      "band"   => {"label" => {"name" => "Epitaph"}},
+    )
+
+    result.must_equal true
+    form.errors.inspect.must_equal "{}"
+  end
+
+
+  describe "incorrect #validate" do
+    it("xxx") do
+      result = form.validate(
+      "hit"   =>{"title" => ""},
+      "title" => "",
+      "songs" => [{"title" => ""}, {"title" => ""}])
+
+      result.must_equal false
+
+      form.errors.messages.inspect.must_match "title"
+      form.errors.messages.inspect.must_match "hit.title"
+      form.errors.messages.inspect.must_match "songs.title"
+      form.errors.messages.inspect.must_match "band.label.name"
+
+
+      form.hit.errors.messages.inspect.must_match "title"
+      form.songs[0].errors.messages.inspect.must_match "title"
+      # FIXME
+
+      # form.errors.messages.must_equal({
+      #   :title  => ["can't be blank"],
+      #   :"hit.title"=>["can't be blank"],
+      #   :"songs.title"=>["can't be blank"],
+      #   :"band.label.name"=>["can't be blank"]
+      # })
+
+      # # nested forms keep their own Errors:
+      # form.hit.errors.messages.must_equal({:title=>["can't be blank"]})
+      # form.songs[0].errors.messages.must_equal({:title=>["can't be blank"]})
+
+      # form.errors.messages.must_equal({
+      #   :title        => ["can't be blank"],
+      #   :"hit.title"  => ["can't be blank"],
+      #   :"songs.title"=> ["can't be blank"],
+      #   :"band.label.name"=>["can't be blank"]
+      # })
+    end
+  end
+
+
+  describe "#validate with collection form invalid" do
+    it do
+      result = form.validate("songs"=>[{"title" => ""}], "band"=>{"label"=>{:name => "Fat Wreck"}})
+      result.must_equal false
+      # FIXME
+      # form.errors.messages.must_equal({:"songs.title"=>["can't be blank"]})
+      form.errors.messages.inspect.must_match "songs.title"
+    end
+  end
+
+
+  describe "#validate with collection and 2-level-nested invalid" do
+    it do
+      result = form.validate("songs"=>[{"title" => ""}], "band" => {"label" => {}})
+      result.must_equal false
+      # FIXME
+      # form.errors.messages.must_equal({:"songs.title"=>["can't be blank"], :"band.label.name"=>["can't be blank"]})
+      form.errors.messages.inspect.must_match "songs.title"
+      form.errors.messages.inspect.must_match "band.label.name"
+    end
+  end
+
+  # TODO: implement.
+  # describe "#validate with nested form using :base invalid" do
+  #   before { @result = form.validate("songs"=>[{"title" => "Someday"}], "band" => {"name" => "Nickelback", "label" => {"name" => "Roadrunner Records"}}) }
+
+  #   it { @result.must_equal false }
+  #   it { form.errors.messages.must_equal({:base=>["You are a bad person"]}) }
+  # 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
+end

data/test/mongoid_test.rb

@@ -0,0 +1,311 @@
+# require 'test_helper'
+# def mongoid_present?
+#   require 'mongoid'
+#   Mongoid.configure do |config|
+#     config.connect_to("reform-mongoid-test")
+#   end
+#   true
+# rescue
+#   false
+# end
+
+# if mongoid_present?
+#   require 'reform/mongoid'
+
+#   class Disc
+#     include Mongoid::Document
+#     field :title, type: String
+#     has_many :tunes
+#     has_and_belongs_to_many :musicians
+#   end
+
+#   class Musician
+#     include Mongoid::Document
+#     field :name, type: String
+#   end
+
+#   class Tune
+#     include Mongoid::Document
+#     include Mongoid::Timestamps
+#     field :title, type: String
+#     belongs_to :disc
+#     belongs_to :musician
+#   end
+
+#   class MongoidTest < MiniTest::Spec
+#     class TuneForm < Reform::Form
+#       include Reform::Form::Mongoid
+#       model :tune
+
+#       property :title
+#       property :created_at
+
+#       validates_uniqueness_of :title, scope: [:disc_id, :musician_id]
+#       validates :created_at, :presence => true # have another property to test if we mix up.
+
+#       property :musician do
+#         property :name
+#         validates_uniqueness_of :name # this currently also tests if Form::AR is included as a feature.
+#       end
+#     end
+
+#     let(:disc)   { Disc.create(:title => "Damnation") }
+#     let(:musician)  { Musician.create(:name => "Opeth") }
+#     let(:form)    { TuneForm.new(Tune.new(:musician => Musician.new)) }
+
+#     it { form.class.i18n_scope.must_equal :mongoid }
+
+#     it "allows accessing the database" do
+#     end
+
+#     # uniqueness
+#     it "has no errors on title when title is unique for the same musician and disc" do
+#       form.validate("title" => "The Gargoyle", "musician_id" => musician.id, "disc" => disc.id, "created_at" => "November 6, 1966")
+#       assert_empty form.errors[:title]
+#     end
+
+#     it "has errors on title when title is taken for the same musician and disc" do
+#       skip "replace ActiveModel::Validations with our own, working and reusable gem."
+#       Tune.create(title: "Windowpane", musician_id: musician.id, disc_id: disc.id)
+#       form.validate("title" => "Windowpane", "musician_id" => musician.id, "disc" => disc)
+#       refute_empty form.errors[:title]
+#     end
+
+#     # nested object taken.
+#     it "is valid when musician name is unique" do
+#       form.validate("musician" => {"name" => "Paul Gilbert"}, "title" => "The Gargoyle", "created_at" => "November 6, 1966").must_equal true
+#     end
+
+#     it "is invalid and shows error when taken" do
+#       Tune.delete_all
+#       Musician.create(:name => "Racer X")
+
+#       form.validate("musician" => {"name" => "Racer X"}, "title" => "Ghost Inside My Skin").must_equal false
+#       form.errors.messages.must_equal({:"musician.name"=>["is already taken"], :created_at => ["can't be blank"]})
+#     end
+
+#     it "works with Composition" do
+#       form = Class.new(Reform::Form) do
+#         include Reform::Form::Mongoid
+#         include Reform::Form::Composition
+
+#         property :name, :on => :musician
+#         validates_uniqueness_of :name
+#       end.new(:musician => Musician.new)
+
+#       Musician.create(:name => "Bad Religion")
+#       form.validate("name" => "Bad Religion").must_equal false
+#     end
+
+#     describe "#save" do
+#       # TODO: test 1-n?
+#       it "calls model.save" do
+#         Musician.delete_all
+#         form.validate("musician" => {"name" => "Bad Religion"}, "title" => "Ghost Inside My Skin")
+#         form.save
+#         Musician.where(:name => "Bad Religion").size.must_equal 1
+#       end
+
+#       it "doesn't call model.save when block is given" do
+#         Musician.delete_all
+#         form.validate("name" => "Bad Religion")
+#         form.save {}
+#         Musician.where(:name => "Bad Religion").size.must_equal 0
+#       end
+#     end
+#   end
+
+
+#   class PopulateWithActiveRecordTest < MiniTest::Spec
+#     class DiscForm < Reform::Form
+
+#       property :title
+
+#       collection :tunes, :populate_if_empty => Tune do
+#         property :title
+#       end
+#     end
+
+#     let (:disc) { Disc.new(:tunes => []) }
+#     it do
+#       form = DiscForm.new(disc)
+
+#       form.validate("tunes" => [{"title" => "Straight From The Jacket"}])
+
+#       # form populated.
+#       form.tunes.size.must_equal 1
+#       form.tunes[0].model.must_be_kind_of Tune
+
+#       # model NOT populated.
+#       disc.tunes.must_equal []
+
+
+#       form.sync
+
+#       # form populated.
+#       form.tunes.size.must_equal 1
+#       form.tunes[0].model.must_be_kind_of Tune
+
+#       # model also populated.
+#       tune = disc.tunes[0]
+#       disc.tunes.must_equal [tune]
+#       tune.title.must_equal "Straight From The Jacket"
+
+
+#       # if ActiveRecord::VERSION::STRING !~ /^3.0/
+#       #   # saving saves association.
+#       #   form.save
+#       #
+#       #   disc.reload
+#       #   tune = disc.tunes[0]
+#       #   disc.tunes.must_equal [tune]
+#       #   tune.title.must_equal "Straight From The Jacket"
+#       # end
+#     end
+
+
+#     describe "modifying 1., adding 2." do
+#       let (:tune) { Tune.new(:title => "Part 2") }
+#       let (:disc) { Disc.create.tap { |a| a.tunes << tune } }
+
+#       it do
+#         form = DiscForm.new(disc)
+
+#         id = disc.tunes[0].id
+#         assert id > 0
+
+#         form.validate("tunes" => [{"title" => "Part Two"}, {"title" => "Check For A Pulse"}])
+
+#         # form populated.
+#         form.tunes.size.must_equal 2
+#         form.tunes[0].model.must_be_kind_of Tune
+#         form.tunes[1].model.must_be_kind_of Tune
+
+#         # model NOT populated.
+#         disc.tunes.must_equal [tune]
+
+
+#         form.sync
+
+#         # form populated.
+#         form.tunes.size.must_equal 2
+
+#         # model also populated.
+#         disc.tunes.size.must_equal 2
+
+#         # corrected title
+#         disc.tunes[0].title.must_equal "Part Two"
+#         # ..but same tune.
+#         disc.tunes[0].id.must_equal id
+
+#         # and a new tune.
+#         disc.tunes[1].title.must_equal "Check For A Pulse"
+#         disc.tunes[1].persisted?.must_equal true # TODO: with << strategy, this shouldn't be saved.
+#       end
+
+#       describe 'using nested_models_attributes to modify nested collection' do
+#         class ActiveModelDiscForm < Reform::Form
+#           include Reform::Form::ActiveModel
+#           include Reform::Form::ActiveModel::FormBuilderMethods
+
+#           property :title
+
+#           collection :tunes, :populate_if_empty => Tune do
+#             property :title
+#           end
+#         end
+
+#         let (:disc) { Disc.create(:title => 'Greatest Hits') }
+#         let (:form) { ActiveModelDiscForm.new(disc) }
+
+#         it do
+#           form.validate('tunes_attributes' => {'0' => {'title' => 'Tango'}})
+
+#           # form populated.
+#           form.tunes.size.must_equal 1
+#           form.tunes[0].model.must_be_kind_of Tune
+#           form.tunes[0].title.must_equal 'Tango'
+
+#           # model NOT populated.
+#           disc.tunes.must_equal []
+
+#           form.save
+
+#           # nested model persisted.
+#           first_tune = disc.tunes[0]
+#           assert first_tune.id > 0
+
+#           # form populated.
+#           form.tunes.size.must_equal 1
+
+#           # model also populated.
+#           disc.tunes.size.must_equal 1
+#           disc.tunes[0].title.must_equal 'Tango'
+
+#           form = ActiveModelDiscForm.new(disc)
+#           form.validate('tunes_attributes' => {'0' => {'id' => first_tune.id, 'title' => 'Tango nuevo'}, '1' => {'title' => 'Waltz'}})
+
+#           # form populated.
+#           form.tunes.size.must_equal 2
+#           form.tunes[0].model.must_be_kind_of Tune
+#           form.tunes[1].model.must_be_kind_of Tune
+#           form.tunes[0].title.must_equal 'Tango nuevo'
+#           form.tunes[1].title.must_equal 'Waltz'
+
+#           # model NOT populated.
+#           disc.tunes.size.must_equal 1
+#           disc.tunes[0].title.must_equal 'Tango'
+
+#           form.save
+
+#           # form populated.
+#           form.tunes.size.must_equal 2
+
+#           # model also populated.
+#           disc.tunes.size.must_equal 2
+#           disc.tunes[0].id.must_equal first_tune.id
+#           disc.tunes[0].persisted?.must_equal true
+#           disc.tunes[1].persisted?.must_equal true
+#           disc.tunes[0].title.must_equal 'Tango nuevo'
+#           disc.tunes[1].title.must_equal 'Waltz'
+#         end
+#       end
+#     end
+
+#     # it do
+#     #   a=Disc.new
+#     #   a.tunes << Tune.new(title: "Old What's His Name") # Tune does not get persisted.
+
+#     #   a.tunes[1] = Tune.new(title: "Permanent Rust")
+
+#     #   puts "@@@"
+#     #   puts a.tunes.inspect
+
+#     #   puts "---"
+#     #   a.save
+#     #   puts a.tunes.inspect
+
+#     #   b = a.tunes.first
+
+#     #   a.tunes = [Tune.new(title:"Biomag")]
+#     #   puts "\\\\"
+#     #   a.save
+#     #   a.reload
+#     #   puts a.tunes.inspect
+
+#     #   b.reload
+#     #   puts "#{b.inspect}, #{b.persisted?}"
+
+
+#     #   a.tunes = [a.tunes.first, Tune.new(title: "Count Down")]
+#     #   b = a.tunes.first
+#     #   puts ":::::"
+#     #   a.save
+#     #   a.reload
+#     #   puts a.tunes.inspect
+
+#     #   b.reload
+#     #   puts "#{b.inspect}, #{b.persisted?}"
+#     # end
+#   end
+# end