reform 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 037b79d11746474c6c396824536f8bd567e59879
-  data.tar.gz: 4d448833f2cde88977600d0e9cc85686550eeda8
+  metadata.gz: 23a355251cb556bceba19de085db87c09ad464b1
+  data.tar.gz: 6bb5c660b9a1192d869003d4f5cbfa60f30b5cb5
 SHA512:
-  metadata.gz: a40d0cde85b16d5b4f4fbfa06cde1549e961044986abda2a95cb0abc2a22224a8b0b7dd88a7e80706b9b78b1932056d0091d4c858f7d3e67b523ced40bdd1285
-  data.tar.gz: bc964b5838dabcaac8b47db139a6a6b86c624b133297af97489d6dd1f465bb375cb47c9186c52832ad4ebea03227095f0947629edfc3678090fd471e2e06ff66
+  metadata.gz: 4c9e1b8d28f8b696f78fb076e2897ba00a0a2becc2f2be97abe60d508bc7cf7dfcb2989230699e5b8af7d1112e0851536e3ffc3e2424323b9a5f41ab62d8d0c7
+  data.tar.gz: efa2c7b4482fa007dbc9a7a18b8d1c905c650afcd6b9b4bc03e1569c291aa345e28e6843868ea0bdd74b6e023555d973f34c653247ff4a0e540a5005e8a011bc

data/CHANGES.md

@@ -1,6 +1,11 @@
+## 2.0.2
+
+* Fix `unique: true` validation in combination with `Composition`.
+* Use newest Disposable 0.1.8 which does not set `:pass_options` anymore.
+
 ## 2.0.1
 
-* Fix `ActiveModel::Validations` where translations in custom validations would error. This is now handled by delegating back to the `Valiator` object in Reform.
+* Fix `ActiveModel::Validations` where translations in custom validations would error. This is now handled by delegating back to the `Validator` object in Reform.
 
 ## 2.0.0
 
@@ -342,4 +347,4 @@ The reason for this confusion is that you don't blog enough about Reform. Only a
 
 ## 0.1.0
 
-* Oh yeah.
+* Oh yeah.

data/README.md

@@ -28,7 +28,7 @@ class AlbumForm < Reform::Form
 end
 ```
 
-Fields are declared using `::property`. Validations work exactly as you know it from Rails or other frameworks. Note that validations no longer got into the model.
+Fields are declared using `::property`. Validations work exactly as you know it from Rails or other frameworks. Note that validations no longer go into the model.
 
 
 ## The API
@@ -802,7 +802,7 @@ class SongForm < Reform::Form
 end
 ```
 
-If you're not happy with the `model_name` result, configure it manually.
+If you're not happy with the `model_name` result, configure it manually via `::model`.
 
 ```ruby
 class CoverSongForm < Reform::Form
@@ -812,6 +812,8 @@ class CoverSongForm < Reform::Form
 end
 ```
 
+`::model` will configure ActiveModel's naming logic. With `Composition`, this configures the main model of the form and should be called once.
+
 This is especially helpful when your framework tries to render `cover_song_path` although you want to go with `song_path`.
 
 
@@ -853,7 +855,21 @@ class SongForm < Reform::Form
 
 ## Multiparameter Dates
 
-Composed multi-parameter dates as created by the Rails date helper are processed automatically. As soon as Reform detects an incoming `release_date(i1)` or the like it is gonna be converted into a date.
+Composed multi-parameter dates as created by the Rails date helper are processed automatically when `multi_params: true` is set for the date property and the `MultiParameterAttributes` feature is included. As soon as Reform detects an incoming `release_date(i1)` or the like it is gonna be converted into a date.
+
+```ruby
+class AlbumForm < Reform::Form
+  feature Reform::Form::ActiveModel::FormBuilderMethods
+  feature Reform::Form::MultiParameterAttributes
+
+  collection :songs do
+    feature Reform::Form::ActiveModel::FormBuilderMethods
+    property :title
+    property :release_date, :multi_params => true
+    validates :title, :presence => true
+  end
+end
+```
 
 Note that the date will be `nil` when one of the components (year/month/day) is missing.
 

data/lib/reform/contract.rb

@@ -25,6 +25,8 @@ module Reform
         options[:twin] = twin
       end
 
+      options[:pass_options] = true
+
       if validates_options = options[:validates]
         validates name, validates_options.dup # .dup for RAils 3.x.
       end
@@ -50,23 +52,6 @@ module Reform
     extend ValidatesWarning
 
   private
-    # DISCUSS: can we achieve that somehow via features in build_inline?
-    # TODO: check out if that is needed with Lotus::Validations and make it a AM feature.
-    def self.process_inline!(mod, definition)
-      _name = definition.name
-      mod.instance_eval do
-        @_name = _name.singularize.camelize
-        # this adds Form::name for AM::Validations and I18N.
-        # i have a feeling that this is also needed for Rails autoloader, which is scary.
-        # beside that, it is a nice way for debugging to find out which anonymous form class you're working on:
-        #   anonymous_nested_form.class.name
-        def name
-          @_name
-        end
-      end
-    end
-
-
     # DISCUSS: separate file?
     module Readonly
       def readonly?(name)

data/lib/reform/form.rb

@@ -49,7 +49,7 @@ module Reform
         # default:
         # add Sync populator to nested forms.
         # FIXME: this is, of course, ridiculous and needs a better structuring.
-        if (deserializer_options == {} || deserializer_options.keys == [:skip_parse]) && block_given? && !options[:inherit] # FIXME: hmm. not a fan of this: only add when no other option given?
+        if (deserializer_options == {} || deserializer_options.keys == [:skip_parse]) && definition[:twin] && !options[:inherit] # FIXME: hmm. not a fan of this: only add when no other option given?
           deserializer_options.merge!(instance: Populator::Sync.new(nil), setter: nil)
         end
 

data/lib/reform/form/active_model.rb

@@ -27,6 +27,21 @@ module Reform::Form::ActiveModel
       end
     end
 
+    # DISCUSS: can we achieve that somehow via features in build_inline?
+    def process_inline!(mod, definition)
+      _name = definition.name
+      mod.instance_eval do
+        @_name = _name.singularize.camelize
+        # this adds Form::name for AM::Validations and I18N.
+        # i have a feeling that this is also needed for Rails autoloader, which is scary.
+        # beside that, it is a nice way for debugging to find out which anonymous form class you're working on:
+        #   anonymous_nested_form.class.name
+        def name
+          @_name
+        end
+      end
+    end
+
 
     # Set a model name for this form if the infered is wrong.
     #

data/lib/reform/form/active_record.rb

@@ -1,3 +1,5 @@
+require "reform/form/orm"
+
 module Reform::Form::ActiveRecord
   def self.included(base)
     base.class_eval do

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

@@ -1,17 +1,20 @@
+# Reform's own implementation for uniqueness which does not write to model.
 class Reform::Form::UniqueValidator < ActiveModel::EachValidator
   def validate_each(form, attribute, value)
+    model = form.model_for_property(attribute)
+
     # search for models with attribute equals to form field value
-    query = form.model.class.where(attribute => value)
+    query = model.class.where(attribute => value)
 
     # if model persisted, excluded own model from query
-    query = query.merge(form.model.class.where("id <> ?", form.model.id)) if form.model.persisted?
+    query = query.merge(model.class.where("id <> ?", model.id)) if model.persisted?
 
     # if any models found, add error on attribute
     form.errors.add(attribute, "#{attribute} must be unique.") if query.any?
   end
 end
 
-# FIXME: ActiveModel loads validators via const_get(#{name}Validator). this magic forces us to
+# 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

data/lib/reform/version.rb

@@ -1,3 +1,3 @@
 module Reform
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/reform.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency             "disposable",     "~> 0.1.7"
+  spec.add_dependency             "disposable",     "~> 0.1.9"
   spec.add_dependency             "uber",           "~> 0.0.11"
 
   spec.add_development_dependency "bundler"

data/test/form_option_test.rb

@@ -14,6 +14,9 @@ class FormOptionTest < MiniTest::Spec
   end
 
   it do
-    AlbumForm.new(Album.new(Song.new("When It Comes To You"))).song.title.must_equal "When It Comes To You"
+    form = AlbumForm.new(Album.new(Song.new("When It Comes To You")))
+    form.song.title.must_equal "When It Comes To You"
+
+    form.validate(song: {title: "Run For Cover"})
   end
 end

data/test/lotus/lotus_test.rb

@@ -15,6 +15,10 @@ class LotusTest < Minitest::Spec
 
     property :title
     validates :title, presence: true
+
+    property :songs do
+      property :name
+    end
   end
 
   it do

data/test/unique_test.rb

@@ -1,9 +1,11 @@
 require "test_helper"
 
 require "reform/form/validation/unique_validator.rb"
+require "reform/form/active_record"
 
 class UniquenessValidatorOnCreateTest < MiniTest::Spec
   class SongForm < Reform::Form
+    include ActiveRecord
     property :title
     validates :title, unique: true
   end
@@ -21,8 +23,10 @@ class UniquenessValidatorOnCreateTest < MiniTest::Spec
   end
 end
 
+
 class UniquenessValidatorOnUpdateTest < MiniTest::Spec
   class SongForm < Reform::Form
+    include ActiveRecord
     property :title
     validates :title, unique: true
   end
@@ -39,3 +43,22 @@ class UniquenessValidatorOnUpdateTest < MiniTest::Spec
     form.validate("title" => "How Many Tears").must_equal true
   end
 end
+
+
+class UniqueWithCompositionTest < MiniTest::Spec
+  class SongForm < Reform::Form
+    include ActiveRecord
+    include Composition
+
+    property :title, on: :song
+    validates :title, unique: true
+  end
+
+  it do
+    Song.delete_all
+
+    form = SongForm.new(song: Song.new)
+    form.validate("title" => "How Many Tears").must_equal true
+    form.save
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reform
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Nick Sutterer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2015-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: disposable
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.1.9
 - !ruby/object:Gem::Dependency
   name: uber
   requirement: !ruby/object:Gem::Requirement