reform 2.1.0 → 2.2.0.rc1

data/test/form_option_test.rb

@@ -6,7 +6,9 @@ class FormOptionTest < MiniTest::Spec
 
   class SongForm < Reform::Form
     property :title
-    validates :title, presence: true
+    validation do
+      key(:title).required
+    end
   end
 
   class AlbumForm < Reform::Form

data/test/form_test.rb

@@ -1,6 +1,8 @@
 require 'test_helper'
 
 class FormTest < MiniTest::Spec
+  Artist = Struct.new(:name)
+
   class AlbumForm < Reform::Form
     property :title
 
@@ -19,18 +21,6 @@ class FormTest < MiniTest::Spec
     end
   end
 
-  # combined property/validates syntax.
-  class SongForm < Reform::Form
-    property :composer
-    property :title, validates: {presence: true}
-    properties :genre, :band, validates: {presence: true}
-  end
-  it do
-    form = SongForm.new(OpenStruct.new)
-    form.validate({})
-    form.errors.to_s.must_equal "{:title=>[\"can't be blank\"], :genre=>[\"can't be blank\"], :band=>[\"can't be blank\"]}"
-  end
-
   describe "::dup" do
     let (:cloned) { AlbumForm.clone }
 
@@ -45,8 +35,23 @@ class FormTest < MiniTest::Spec
           "Album"
         end
       end
-      cloned.validates :title, presence: true
+
+      cloned.validation do
+        key(:title).required
+      end
+
       cloned.new(OpenStruct.new).validate({})
     end
   end
-end
+
+  describe "#initialize" do
+    class ArtistForm < Reform::Form
+      property :name
+      property :current_user, virtual: true
+    end
+
+    it "allows injecting :virtual options" do
+      ArtistForm.new(Artist.new, current_user: Object).current_user.must_equal Object
+    end
+  end
+end

data/test/module_test.rb

@@ -8,7 +8,9 @@ class ModuleInclusionTest < MiniTest::Spec
     property :band do
       property :title
 
-      validates :title, presence: true
+      validation do
+        key(:title).required
+      end
 
       def id # gets mixed into Form, too.
         2
@@ -19,9 +21,12 @@ class ModuleInclusionTest < MiniTest::Spec
       1
     end
 
-    validates :band, presence: true
+    validation do
+      key(:band).required
+    end
 
-    property :cool, type: Virtus::Attribute::Boolean # test coercion.
+    include Dry::Types.module # allows using Types::* in module.
+    property :cool, type: Form::Bool # test coercion.
   end
 
   # TODO: test if works, move stuff into inherit_schema!
@@ -30,9 +35,13 @@ class ModuleInclusionTest < MiniTest::Spec
 
     collection :airplays do
       property :station
-      validates :station, presence: true
+      validation do
+        key(:station).required
+      end
+    end
+    validation do
+      key(:airplays).required
     end
-    validates :airplays, presence: true
   end
 
 
@@ -63,7 +72,7 @@ class ModuleInclusionTest < MiniTest::Spec
   it do
     form = SongForm.new(OpenStruct.new)
     form.validate({})
-    form.errors.messages.must_equal({:band=>["can't be blank"]})
+    form.errors.messages.must_equal({:band=>["is missing"]})
   end
 
   # coercion works
@@ -80,8 +89,9 @@ class ModuleInclusionTest < MiniTest::Spec
     include BandPropertyForm
 
     property :name
-    validates :name, :presence => true
-
+    validation do
+      key(:name).required
+    end
   end
 
   class AlbumForm < Reform::Form
@@ -90,13 +100,43 @@ class ModuleInclusionTest < MiniTest::Spec
     # pp heritage
     property :band, :inherit => true do
       property :label
-      validates :label, :presence => true
+      validation do
+        key(:label).required
+      end
     end
   end
 
   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"]})
+    form.errors.messages.must_equal({:band=>["must be filled"], :"band.title"=>["is missing"], :"band.label"=>["is missing"], :name=>["is missing"]})
+  end
+
+
+  describe "module with custom accessors" do
+    module SongModule
+      include Reform::Form::Module
+
+      property :id    # no custom accessor for id.
+      property :title # has custom accessor.
+
+      module InstanceMethods
+        def title
+          super.upcase
+        end
+      end
+    end
+
+    class IncludingSongForm < Reform::Form
+      include SongModule
+    end
+
+    let (:song) { OpenStruct.new(id: 1, title: "Instant Mash") }
+
+    it do
+      IncludingSongForm.new(song).id.must_equal 1
+      IncludingSongForm.new(song).title.must_equal "INSTANT MASH"
+    end
   end
-end
+end
+

data/test/populate_test.rb

@@ -7,7 +7,9 @@ class PopulatorTest < MiniTest::Spec
 
   class AlbumForm < Reform::Form
     property :name, populator: ->(options) { self.name = options[:fragment].reverse }
-    validates :name, presence: true
+    validation do
+      key(:name).required
+    end
 
     collection :songs,
       populator: ->(options) {
@@ -16,11 +18,15 @@ class PopulatorTest < MiniTest::Spec
         (item = collection[index]) ? item : collection.insert(index, Song.new) } do
 
       property :title
-      validates :title, presence: true
+      validation do
+        key(:title).required
+      end
 
       property :composer, populator: ->(options) { options[:model] || self.composer= Artist.new } do
         property :name
-        validates :name, presence: true
+        validation do
+          key(:name).required
+        end
       end
     end
 
@@ -99,6 +105,8 @@ class PopulatorTest < MiniTest::Spec
 end
 
 class PopulateWithMethodTest < Minitest::Spec
+  Album = Struct.new(:title)
+
   class AlbumForm < Reform::Form
     property :title, populator: :title!
 
@@ -138,11 +146,15 @@ class PopulateIfEmptyTest < MiniTest::Spec
       populate_if_empty: Song do                                                # class name works.
 
       property :title
-      validates :title, presence: true
+      validation do
+        key(:title).required
+      end
 
       property :composer, populate_if_empty: :populate_composer! do # lambda works, too. in form context.
         property :name
-        validates :name, presence: true
+        validation do
+          key(:name).required
+        end
       end
 
     private
@@ -232,7 +244,9 @@ class PopulateIfEmptyWithDeletionTest < MiniTest::Spec
       populate_if_empty: Song, skip_if: :delete_song! do
 
       property :title
-      validates :title, presence: true
+      validation do
+        key(:title).required
+      end
     end
 
     def delete_song!(options)
@@ -253,4 +267,4 @@ class PopulateIfEmptyWithDeletionTest < MiniTest::Spec
     form.songs.size.must_equal 1
     form.songs[0].title.must_equal "Roxanne"
   end
-end
+end

data/test/reform_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 # TODO: this test should be removed.
-class ReformTest < ReformSpec
+class ReformTest < Minitest::Spec
   let (:comp) { OpenStruct.new(:name => "Duran Duran", :title => "Rio") }
 
   let (:form) { SongForm.new(comp) }
@@ -10,7 +10,9 @@ class ReformTest < ReformSpec
     property :name
     property :title
 
-    validates :name, :presence => true
+    validation do
+      key(:name).required
+    end
   end
 
   describe "(new) form with empty models" do
@@ -70,8 +72,10 @@ class ReformTest < ReformSpec
         property :name
         property :title
 
-        validates :name,  :presence => true
-        validates :title, :presence => true
+        validation do
+          key(:name).required
+          key(:title).required
+        end
       end
       let (:form) { ValidatingForm.new(comp) }
 
@@ -81,21 +85,22 @@ class ReformTest < ReformSpec
 
       it "populates errors" do
         form.validate({})
-        form.errors.messages.must_equal({:name=>["can't be blank"], :title=>["can't be blank"]})
+        form.errors.messages.must_equal({:name=>["is missing"], :title=>["is missing"]})
       end
     end
   end
 
+  # FIXME: add this test to reform-rails.
   describe "#errors" do
     before { form.validate({})}
 
-    it { form.errors.must_be_kind_of Reform::Form::ActiveModel::Errors }
+    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=>["can't be blank"]})
+      form.errors.messages.must_equal({:name=>["must be filled"]})
     end
   end
 
@@ -132,21 +137,20 @@ class ReformTest < ReformSpec
   end
 
 
-  unless (rails4_0? or rails3_2?)
-    describe "inheritance" do
-      class HitForm < SongForm
-        property :position
-        validates :position, :presence => true
-
+  describe "inheritance" do
+    class HitForm < SongForm
+      property :position
+      validation do
+        key(:position).required
       end
+    end
 
-      let (:form) { HitForm.new(OpenStruct.new()) }
-      it do
-        form.validate({"title" => "The Body"})
-        form.title.must_equal "The Body"
-        form.position.must_equal nil
-        form.errors.messages.must_equal({:name=>["can't be blank"], :position=>["can't be blank"]})
-      end
+    let (:form) { HitForm.new(OpenStruct.new()) }
+    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"]})
     end
   end
 end

data/test/save_test.rb

@@ -7,15 +7,21 @@ class SaveTest < BaseTest
 
   class AlbumForm < Reform::Form
     property :name
-    validates :name, presence: true
+    validation do
+      key(:name).required
+    end
 
     collection :songs do
       property :title
-      validates :title, presence: true
+      validation do
+        key(:title).required
+      end
 
       property :composer do
         property :name
-        validates :name, presence: true
+        validation do
+          key(:name).required
+        end
       end
     end
 
@@ -80,4 +86,4 @@ end
 #     song.length.must_equal nil
 #     song.id.must_equal "10: 120"
 #   end
-# end
+# end

data/test/skip_if_test.rb

@@ -5,9 +5,11 @@ class SkipIfTest < BaseTest
   class AlbumForm < Reform::Form
     property :title
 
-    property :hit, skip_if: lambda { |options| options[:fragment]["title"].blank? } do
+    property :hit, skip_if: lambda { |options| options[:fragment]["title"]=="" } do
       property :title
-      validates :title, presence: true
+      validation do
+        key(:title).required
+      end
     end
 
     collection :songs, skip_if: :skip_song?, populate_if_empty: BaseTest::Song do
@@ -69,4 +71,4 @@ class SkipIfAllBlankTest < BaseTest
     form.songs.size.must_equal 1
     form.songs[0].title.must_equal "Apathy"
   end
-end
+end

data/test/test_helper.rb

@@ -4,31 +4,6 @@ require "representable/debug"
 require "declarative/testing"
 require "pp"
 
-class ReformSpec < MiniTest::Spec
-  let (:duran)  { Struct.new(:name).new("Duran Duran") }
-  let (:rio)    { Struct.new(:title).new("Rio") }
-end
-
-require 'active_record'
-class Artist < ActiveRecord::Base
-end
-
-class Song < ActiveRecord::Base
-  belongs_to :artist
-end
-
-class Album < ActiveRecord::Base
-  has_many :songs
-end
-
-ActiveRecord::Base.establish_connection(
-  :adapter => "sqlite3",
-  :database => "#{Dir.pwd}/database.sqlite3"
-)
-
-
-#Artist.delete_all
-
 class BaseTest < MiniTest::Spec
   class AlbumForm < Reform::Form
     property :title
@@ -62,28 +37,13 @@ MiniTest::Spec.class_eval do
       @saved
     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
-
-  def self.rails3_2?
-    ::ActiveModel::VERSION::MAJOR == 3 and ::ActiveModel::VERSION::MINOR == 2
-  end
 end
 
-require "reform/form/active_model/validations"
+require "reform/form/dry"
 Reform::Contract.class_eval do
-  feature Reform::Form::ActiveModel::Validations
+  feature Reform::Form::Dry
 end
 # FIXME!
 Reform::Form.class_eval do
-  feature Reform::Form::ActiveModel::Validations
+  feature Reform::Form::Dry
 end
-
-I18n.load_path << Dir['test/dummy/config/locales/*.yml']
-I18n.backend.load_translations