reform 2.1.0 → 2.2.0.rc1

data/Rakefile

@@ -5,36 +5,6 @@ task :default => [:test]
 Rake::TestTask.new(:test) do |test|
   test.libs << 'test'
   test.test_files = FileList['test/*_test.rb'] + FileList["test/validation/*_test.rb"]
-
-#   test.test_files = ["test/changed_test.rb",
-#   "test/coercion_test.rb",
-#   "test/feature_test.rb",
-
-#   "test/contract_test.rb",
-
-#   "test/populate_test.rb", "test/prepopulator_test.rb",
-
-#   "test/readable_test.rb","test/setup_test.rb","test/skip_if_test.rb",
-
-#   "test/validate_test.rb", "test/save_test.rb",
-
-#   "test/writeable_test.rb","test/virtual_test.rb",
-
-#   "test/form_builder_test.rb", "test/active_model_test.rb",
-
-#   "test/readonly_test.rb",
-#   "test/inherit_test.rb",
-#   "test/uniqueness_test.rb",
-#   "test/from_test.rb",
-#   "test/composition_test.rb",
-#   "test/form_option_test.rb",
-#   "test/form_test.rb",
-#   "test/deserialize_test.rb",
-#   "test/module_test.rb"
-# ]
-
-
-
   test.verbose = true
 end
 
@@ -42,4 +12,4 @@ Rake::TestTask.new(:test_rails) do |test|
   test.libs << 'test'
   test.test_files = FileList['test/rails/*_test.rb']
   test.verbose = true
-end
+end

data/gemfiles/{Gemfile.rails-3.1 → Gemfile.disposable-0.3}

@@ -3,5 +3,4 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in reform.gemspec
 gemspec :path => '../'
 
-gem 'railties', '~> 3.1.0'
-gem 'activerecord', '~> 3.1.0'
+gem 'minitest'

data/lib/reform.rb

@@ -1,17 +1,8 @@
 module Reform
-  def self.rails3_0?
-    ::ActiveModel::VERSION::MAJOR == 3 and ::ActiveModel::VERSION::MINOR == 0
-  end
 end
 
 require "disposable"
 require "reform/contract"
 require "reform/form"
 require "reform/form/composition"
-require "reform/form/active_model"
 require "reform/form/module"
-
-
-if defined?(Rails)
-  require "reform/rails"
-end

data/lib/reform/contract.rb

@@ -29,7 +29,7 @@ module Reform
 
     # FIXME: test me.
     def self.properties(*args)
-      options = args.extract_options!
+      options = args.pop if args.last.is_a?(Hash)
       args.each { |name| property(name, options.dup) }
     end
 
@@ -40,6 +40,10 @@ module Reform
     require "reform/validation"
     include Reform::Validation # ::validates and #valid?
 
+    # FIXME: this is only for #to_nested_hash, #sync shouldn't be part of Contract.
+    require "disposable/twin/sync"
+    include Disposable::Twin::Sync
+
 
 
     # module ValidatesWarning

data/lib/reform/form.rb

@@ -71,9 +71,6 @@ module Reform
     end
     extend Property
 
-
-    require "reform/form/multi_parameter_attributes"
-
     require "disposable/twin/changed"
     feature Disposable::Twin::Changed
 
@@ -91,4 +88,4 @@ module Reform
       Representable::Pipeline::Stop
     end
   end
-end
+end

data/lib/reform/form/composition.rb

@@ -1,11 +1,10 @@
-require "reform/form/active_model"
 require "disposable/twin/composition"
 
 module Reform::Form::Composition
   # Automatically creates a Composition object for you when initializing the form.
   def self.included(base)
     base.class_eval do
-      extend Reform::Form::ActiveModel::ClassMethods # ::model.
+      # extend Reform::Form::ActiveModel::ClassMethods # ::model.
       extend ClassMethods
       include Disposable::Twin::Composition
     end

data/lib/reform/form/dry.rb

@@ -3,8 +3,12 @@ require "dry/validation/schema/form"
 require "reform/validation"
 
 module Reform::Form::Dry
-  module Validations
+  def self.included(includer)
+    includer.send :include, Validations
+    includer.extend Validations::ClassMethods
+  end
 
+  module Validations
     def build_errors
       Reform::Contract::Errors.new(self)
     end
@@ -21,33 +25,42 @@ module Reform::Form::Dry
 
     class Group
       def initialize
-        @validator = Class.new(ValidatorSchema)
+        @schemas = []
       end
 
       def instance_exec(&block)
-        @validator.class_eval(&block)
+        @schemas << block
+        @validator = Builder.new(@schemas.dup).validation_graph
       end
 
       def call(fields, reform_errors, form)
-        validator = @validator.new(form)
-
-        # a message item looks like: {:confirm_password=>[["confirm_password size cannot be less than 2"], "9"]}
-        validator.call(fields).messages.each do |field, dry_error|
-          dry_error[0].each do |attr_error|
+        # a message item looks like: {:confirm_password=>["confirm_password size cannot be less than 2"]}
+        @validator.with(form: form).call(fields).messages.each do |field, dry_error|
+          dry_error.each do |attr_error|
             reform_errors.add(field, attr_error)
           end
         end
       end
-    end
 
-    class ValidatorSchema < Dry::Validation::Schema::Form
-      def initialize(form)
-        @form = form
-        super()
-      end
+      class Builder < Array
+        def initialize(array)
+          super(array)
+          @validator = Dry::Validation.Form({}, &shift)
+        end
 
-      def form
-        @form
+        def validation_graph
+          build_graph(@validator)
+        end
+
+
+        private
+
+        def build_graph(validator)
+          if empty?
+            return validator
+          end
+          build_graph(Dry::Validation.Schema(validator, {}, &shift))
+        end
       end
     end
   end

data/lib/reform/form/module.rb

@@ -1,10 +1,22 @@
 # Include this in every module that gets further included.
 module Reform::Form::Module
+  # DISCUSS: could this be part of Declarative?
   def self.included(base)
     base.extend ClassMethods
+    base.extend Declarative::Heritage::DSL # ::heritage
+    # base.extend Declarative::Heritage::Included # ::included
+    base.extend Included
+  end
 
-    base.extend Declarative::Heritage::DSL      # ::heritage
-    base.extend Declarative::Heritage::Included # ::included
+  module Included
+    # Gets imported into your module and will be run when including it.
+    def included(includer)
+      super
+      # first, replay all declaratives like ::property on includer.
+      heritage.(includer) # this normally happens via Heritage::Included.
+      # then, include optional accessors.
+      includer.send(:include, self::InstanceMethods) if const_defined?(:InstanceMethods)
+    end
   end
 
   module ClassMethods
@@ -12,4 +24,4 @@ module Reform::Form::Module
       heritage.record(method, *args, &block)
     end
   end
-end
+end

data/lib/reform/form/validate.rb

@@ -9,7 +9,7 @@ module Reform::Form::Validate
         # TODO: Schema should provide property names as plain list.
         properties = options[:binding][:nested].definitions.collect { |dfn| dfn[:name] }
 
-        properties.each { |name| params[name].present? and return false }
+        properties.each { |name| (!params[name].nil? && params[name] != "") and return false }
         true # skip
       end
     end

data/lib/reform/validation.rb

@@ -7,7 +7,7 @@ module Reform::Validation
     end
 
     # DSL.
-    def validation(name, options={}, &block)
+    def validation(name=:default, options={}, &block)
       heritage.record(:validation, name, options, &block)
 
       group = validation_groups.add(name, options)
@@ -33,8 +33,8 @@ module Reform::Validation
   end
 
   def valid?
-    Groups::Result.new(self.class.validation_groups).(@fields, errors, self)
+    Groups::Result.new(self.class.validation_groups).(to_nested_hash, errors, self)
   end
 end
 
-require "reform/validation/groups"
+require "reform/validation/groups"

data/lib/reform/version.rb

@@ -1,3 +1,3 @@
 module Reform
-  VERSION = "2.1.0"
+  VERSION = "2.2.0.rc1"
 end

data/reform.gemspec

@@ -17,21 +17,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency             "disposable",     ">= 0.2.2", "< 0.3.0"
+  spec.add_dependency             "disposable",     ">= 0.3.0", "< 0.4.0"
   spec.add_dependency             "uber",           "~> 0.0.11"
   spec.add_dependency             "representable",  ">= 2.4.0", "< 3.1.0"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
-  spec.add_development_dependency "activerecord"
-  spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "virtus"
-  spec.add_development_dependency "rails"
-  spec.add_development_dependency "mongoid"
+  spec.add_development_dependency "dry-types"
   spec.add_development_dependency "multi_json"
-
-  spec.add_development_dependency "lotus-validations"
-  spec.add_development_dependency "dry-validation", ">= 0.4.0"
-  spec.add_development_dependency "actionpack"
+  spec.add_development_dependency "dry-validation", ">= 0.7.0"
 end

data/test/coercion_test.rb

@@ -2,8 +2,8 @@ require "test_helper"
 require "reform/form/coercion"
 
 class CoercionTest < BaseTest
-  class Irreversible < Virtus::Attribute
-    def coerce(value)
+  class Irreversible
+    def self.call(value)
       value*2
     end
   end
@@ -11,16 +11,16 @@ class CoercionTest < BaseTest
   class Form < Reform::Form
     feature Coercion
 
-    property :released_at, :type => DateTime
+    property :released_at, type: Types::Form::DateTime
 
     property :hit do
-      property :length, :type => Integer
-      property :good,   :type => Virtus::Attribute::Boolean
+      property :length, type: Types::Form::Int
+      property :good,   type: Types::Form::Bool
     end
 
     property :band do
       property :label do
-        property :value, :type => Irreversible
+        property :value, type: Irreversible
       end
     end
   end
@@ -63,4 +63,4 @@ class CoercionTest < BaseTest
   end
 
   # save
-end
+end

data/test/composition_test.rb

@@ -16,7 +16,11 @@ class FormCompositionTest < MiniTest::Spec
     property :requester,      :on => :requester
     property :captcha,        :on => :song, :virtual => true
 
-    validates :name, :title, :channel, :presence => true
+    validation do
+      key(:name).required
+      key(:name).required
+      key(:title).required
+    end
 
     property :band,           :on => :song do
       property :title

data/test/contract_test.rb

@@ -11,15 +11,21 @@ class ContractTest < MiniTest::Spec
 
   class AlbumForm < Reform::Contract
     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
-        validates :name, presence: true
         property :name
+        validation do
+          key(:name).required
+        end
       end
     end
 
@@ -43,4 +49,4 @@ class ContractTest < MiniTest::Spec
     it { AlbumForm.options_for(:name).extend(Declarative::Inspect).inspect.must_equal "#<Disposable::Twin::Definition: @options={:private_name=>:name, :name=>\"name\"}>" }
     it { AlbumForm.new(album).options_for(:name).extend(Declarative::Inspect).inspect.must_equal "#<Disposable::Twin::Definition: @options={:private_name=>:name, :name=>\"name\"}>" }
   end
-end
+end

data/test/deserialize_test.rb

@@ -39,7 +39,7 @@ class DeserializeTest < MiniTest::Spec
     artist_id = artist.object_id
 
     form = JsonAlbumForm.new(Album.new("Best Of", artist))
-    json = {title: "Apocalypse Soon", artist: {name: "Mute"}}.to_json
+    json = MultiJson.dump({title: "Apocalypse Soon", artist: {name: "Mute"}})
 
     form.validate(json)
 
@@ -85,7 +85,7 @@ class ValidateWithBlockTest < MiniTest::Spec
   it do
     album = Album.new
     form  = AlbumForm.new(album)
-    json  = {title: "Apocalypse Soon", artist: {name: "Mute"}}.to_json
+    json  = MultiJson.dump({title: "Apocalypse Soon", artist: {name: "Mute"}})
 
     deserializer = Disposable::Rescheme.from(AlbumForm,
       include:          [Representable::JSON],
@@ -101,4 +101,4 @@ class ValidateWithBlockTest < MiniTest::Spec
     form.title.must_equal "Apocalypse Soon"
     form.artist.name.must_equal "Mute"
   end
-end
+end

data/test/errors_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 class ErrorsTest < MiniTest::Spec
   class AlbumForm < Reform::Form
@@ -6,31 +6,51 @@ class ErrorsTest < MiniTest::Spec
 
     property :hit do
       property :title
-      validates :title, :presence => true
+      validation do
+        key(:title).required
+      end
     end
 
     collection :songs do
       property :title
-      validates :title, :presence => true
+      validation do
+        key(:title).required
+      end
     end
 
     property :band do # yepp, people do crazy stuff like that.
       property :name
       property :label do
         property :name
-        validates :name, :presence => true
+        validation do
+          key(:name).required
+        end
       end
       # TODO: make band a required object.
 
-      validate :music_taste_ok?
+      validation do
+        key(:name).required(:music_taste_ok?)
+
+        configure do
+          config.messages_file = "test/validation/errors.yml"
 
-    private
-      def music_taste_ok?
-        errors.add(:base, "You are a bad person") if name == 'Nickelback'
+          def music_taste_ok?(value)
+            value != "Nickelback"
+            # errors.add(:base, "You are a bad person") if name == "Nickelback"
+          end
+        end
       end
+      # validate :music_taste_ok?
+
+    # private
+    #   def music_taste_ok?
+    #     errors.add(:base, "You are a bad person") if name == "Nickelback"
+    #   end
     end
 
-    validates :title, :presence => true
+    validation do
+      key(:title).required
+    end
   end
 
   let (:album) do
@@ -55,28 +75,28 @@ class ErrorsTest < MiniTest::Spec
 
     it do
       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"]
+        :title  => ["must be filled"],
+        :"hit.title"=>["must be filled"],
+        :"songs.title"=>["must be filled"],
+        :"band.label.name"=>["is missing"]
       })
     end
 
     it do
-      #form.errors.must_equal({:title  => ["can't be blank"]})
+      #form.errors.must_equal({:title  => ["must be filled"]})
       # TODO: this should only contain local errors?
     end
 
     # nested forms keep their own Errors:
-    it { form.hit.errors.messages.must_equal({:title=>["can't be blank"]}) }
-    it { form.songs[0].errors.messages.must_equal({:title=>["can't be blank"]}) }
+    it { form.hit.errors.messages.must_equal({:title=>["must be filled"]}) }
+    it { form.songs[0].errors.messages.must_equal({:title=>["must be filled"]}) }
 
     it do
       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"]
+        :title        => ["must be filled"],
+        :"hit.title"  => ["must be filled"],
+        :"songs.title"=> ["must be filled"],
+        :"band.label.name"=>["is missing"]
       })
     end
   end
@@ -85,7 +105,7 @@ class ErrorsTest < MiniTest::Spec
   describe "#validate with main form invalid" do
     it do
       form.validate("title"=>"", "band"=>{"label"=>{:name => "Fat Wreck"}}).must_equal false
-      form.errors.messages.must_equal({:title=>["can't be blank"]})
+      form.errors.messages.must_equal({:title=>["must be filled"]})
     end
   end
 
@@ -94,7 +114,7 @@ class ErrorsTest < MiniTest::Spec
     before { @result = form.validate("hit"=>{"title" => ""}, "band"=>{"label"=>{:name => "Fat Wreck"}}) }
 
     it { @result.must_equal false }
-    it { form.errors.messages.must_equal({:"hit.title"=>["can't be blank"]}) }
+    it { form.errors.messages.must_equal({:"hit.title"=>["must be filled"]}) }
   end
 
 
@@ -102,7 +122,7 @@ class ErrorsTest < MiniTest::Spec
     before { @result = form.validate("songs"=>[{"title" => ""}], "band"=>{"label"=>{:name => "Fat Wreck"}}) }
 
     it { @result.must_equal false }
-    it { form.errors.messages.must_equal({:"songs.title"=>["can't be blank"]}) }
+    it { form.errors.messages.must_equal({:"songs.title"=>["must be filled"]}) }
   end
 
 
@@ -110,14 +130,14 @@ class ErrorsTest < MiniTest::Spec
     before { @result = form.validate("songs"=>[{"title" => ""}], "band" => {"label" => {}}) }
 
     it { @result.must_equal false }
-    it { form.errors.messages.must_equal({:"songs.title"=>["can't be blank"], :"band.label.name"=>["can't be blank"]}) }
+    it { form.errors.messages.must_equal({:"songs.title"=>["must be filled"], :"band.label.name"=>["is missing"]}) }
   end
 
   describe "#validate with nested form using :base invalid" do
-    it "xxx" do
+    it 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"]})
+      form.errors.messages.must_equal({:"band.name"=>["You are a bad person"]})
     end
   end
 
@@ -140,6 +160,6 @@ class ErrorsTest < MiniTest::Spec
     before { form.validate("songs"=>[{"title" => ""}], "band" => {"label" => {}}) }
 
     # to_s is aliased to messages
-    it { form.errors.to_s.must_equal "{:\"songs.title\"=>[\"can't be blank\"], :\"band.label.name\"=>[\"can't be blank\"]}" }
+    it { form.errors.to_s.must_equal "{:\"songs.title\"=>[\"must be filled\"], :\"band.label.name\"=>[\"is missing\"]}" }
   end
-end
+end