reform 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0358800d71c3327b87d9d9659d789f67bd2195d
-  data.tar.gz: bd6cba76f1f1b7a03b7a7d59599e7342b5bb9641
+  metadata.gz: e447e702b5effb25c8b881fb6c3056e57d39b5f9
+  data.tar.gz: 83ab3bdb3a48858fa273ea8985eb04bdee24e5d5
 SHA512:
-  metadata.gz: 0df0530d354cca49618404e00466349af4c91b80021e7af1d69d2fb6302fd49a31727a4264d6628c3cb5c1f22b9f4c43a43e6da42ac1f2f8633659b14ff414c8
-  data.tar.gz: 19c46cbabfbf81c5936417e209fdc4528f56a6847d9a541d542ca1fa00f7f0a5064653347dd759d6ffaab3a696d8037e40a007bdec332d97134f22339784f1d1
+  metadata.gz: 6891ad8debef392f1ac60f79c962bb42004325b15aa0d5ef460c1456ec03152c12dacf0e933193f2b0630042af1bc4a86ea9f564ab69e2f2d369cc3517a9dea0
+  data.tar.gz: 4a4014071fb1f71da66d6124ba79f007d1e09bd2854ba6f989e299e931c158a5500408c171eb7f714704b930246d3ff5df46cd00a9d87d00ec49ef501d4201c9

data/CHANGES.md

@@ -1,3 +1,8 @@
+## 0.2.7
+
+* Last release supporting Representable 1.7.
+* In ActiveModel/ActiveRecord: The model name is now correctly infered even if the name is something like `Song::Form`.
+
 ## 0.2.6
 
 * Maintenance release cause I'm stupid.
@@ -6,6 +11,7 @@
 
 * Allow proper form inheritance. When having `HitForm < SongForm < Reform::Form` the `HitForm` class will contain `SongForm`'s properties in addition to its own fields.
 * `::model` is now inherited properly.
+* Allow instantiation of nested form with emtpy nested properties.
 
 ## 0.2.4
 

data/README.md

@@ -4,6 +4,10 @@ Decouple your models from forms. Reform gives you a form object with validations
 
 Although reform can be used in any Ruby framework, it comes with [Rails support](#rails-integration), works with [simple_form and other form gems](#formbuilder-support), allows nesting forms to implement [has_one](#nesting-forms-1-1-relations) and [has_many](#nesting-forms-1-n-relations) relationships, can [compose a form](#compositions) from multiple objects and gives you [coercion](#coercion).
 
+# Development Status
+
+Dear Reform users - you know I love all of you. Reform is currently being improved by myself. I am definitely *not* resisting all of the feature requests (especially about nesting, model validations, automatic model setup when validating has_many, etc.) but working hard to make it better. Expect a new Reform version _and_ better README mid-late April and please refrain from telling me how lazy I am. Thanks and see you soon!!! :heart:
+
 
 ## Installation
 
@@ -77,6 +81,10 @@ class SongsController
 
 Reform uses the validations you provided in the form - and nothing else.
 
+Note that Reform only updates values of the internal form attributes - the underlying model is still treated as immutuable and *remains unchanged*.
+
+This allows rendering the form after `validate` with the data that has been submitted. However, don't get confused, the model's values are still the old, original values and are only changed after a `#save` or `#sync` operation.
+
 
 ## Saving Forms
 

data/lib/reform/form.rb

@@ -76,6 +76,7 @@ module Reform
         res = valid?  # this validates on <Fields> using AM::Validations, currently.
         #inject(true) do |res, form| # FIXME: replace that!
         mapper.new(@fields).nested_forms do |attr, form| #.collect { |attr, form| nested[attr.from] = form }
+          next unless form # FIXME: this happens when the model's reader returns nil (property :song => nil). this shouldn't be considered by nested_forms!
           res = validate_for(form, res, attr.from)
         end
 
@@ -119,6 +120,7 @@ module Reform
 
     def errors
       @errors ||= Errors.new(self)
+      @errors
     end
 
     attr_accessor :model
@@ -173,11 +175,14 @@ module Reform
 
             attr.options.merge!(
               :getter   => lambda do |*|
-                nested_model  = send(attr.getter) # decorated.hit # TODO: use bin.get
+                # FIXME: this is where i have to fix stuff.
+                nested_model  = send(attr.getter) # or next # decorated.hit # TODO: use bin.get # DISCUSS: next moves on if property empty. this should be handled with representable's built-in mechanics.
 
                 if attr.options[:form_collection]
-                  Forms.new(nested_model.collect { |mdl| form_class.new(mdl)})
+                  nested_model ||= []
+                  Forms.new(nested_model.collect { |mdl| form_class.new(mdl)}, attr.options)
                 else
+                  next unless nested_model # DISCUSS: do we want that?
                   form_class.new(nested_model)
                 end
               end,
@@ -264,12 +269,16 @@ module Reform
     require "representable/hash/collection"
     require 'active_model'
     class Forms < Array # DISCUSS: this should be a Form subclass.
+      def initialize(ary, options)
+        super(ary)
+        @options = options
+      end
+
       include Form::ValidateMethods
 
+      # TODO: make valid?(errors) the only public method.
       def valid?
-        inject(true) do |res, form|
-          res = validate_for(form, res)
-        end
+       res= validate_cardinality & validate_items
       end
 
       def errors
@@ -279,6 +288,22 @@ module Reform
       # this gives us each { to_hash }
       include Representable::Hash::Collection
       items :parse_strategy => :sync, :instance => true
+
+    private
+      def validate_items
+        inject(true) do |res, form|
+          res = validate_for(form, res)
+        end
+      end
+
+      def validate_cardinality
+        return true unless @options[:cardinality]
+        # TODO: use AM's cardinality validator here.
+        res = size >= @options[:cardinality][:minimum].to_i
+
+        errors.add(:size, "#{@options[:as]} size is 0 but must be #{@options[:cardinality].inspect}") unless res
+        res
+      end
     end
   end
 

data/lib/reform/form/active_model.rb

@@ -78,7 +78,7 @@ module Reform::Form::ActiveModel
       if model_options
         form_name = model_options.first.to_s.camelize
       else
-        form_name = name.sub(/Form$/, "")
+        form_name = name.sub(/(::)?Form$/, "") # Song::Form => "Song"
       end
 
       active_model_name_for(form_name)

data/lib/reform/version.rb

@@ -1,3 +1,3 @@
 module Reform
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/reform.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency             "representable",  ">= 1.7.5"
+  spec.add_dependency             "representable",  "~> 1.7.5"
   spec.add_dependency             "uber",           "~> 0.0.4"
   spec.add_dependency             "activemodel"
   spec.add_development_dependency "bundler",        "~> 1.3"

data/test/active_model_test.rb

@@ -30,7 +30,7 @@ class NewActiveModelTest < MiniTest::Spec # TODO: move to test/rails/
 
     it { class_with_model.model_name.must_be_kind_of ActiveModel::Name }
     it { class_with_model.model_name.to_s.must_equal "Album" }
-    
+
 
     let (:subclass_of_class_with_model) {
       Class.new(class_with_model)
@@ -40,6 +40,16 @@ class NewActiveModelTest < MiniTest::Spec # TODO: move to test/rails/
     it { subclass_of_class_with_model.model_name.to_s.must_equal 'Album' }
 
 
+    describe "class named Song::Form" do
+      it do
+        class Form < Reform::Form
+          include Reform::Form::ActiveModel
+          self
+        end.model_name.to_s.must_equal "NewActiveModelTest"
+      end
+    end
+
+
     describe "inline with model" do
       let (:form_class) {
         Class.new(Reform::Form) do
@@ -52,7 +62,7 @@ class NewActiveModelTest < MiniTest::Spec # TODO: move to test/rails/
         end
       }
 
-      let (:inline) { form_class.new(OpenStruct.new).song }
+      let (:inline) { form_class.new(OpenStruct.new(:song => Object.new)).song }
 
       it { inline.class.model_name.must_be_kind_of ActiveModel::Name }
       it { inline.class.model_name.to_s.must_equal "Hit" }

data/test/nested_form_test.rb

@@ -41,11 +41,51 @@ class NestedFormTest < MiniTest::Spec
     form.to_hash.must_equal({"hit"=>{"title"=>"Downtown"}, "title" => "Blackhawks Over Los Angeles", "songs"=>[{"title"=>"Calling"}]})
   end
 
+
   it "creates nested forms" do
     form.hit.must_be_kind_of Reform::Form
     form.songs.must_be_kind_of Reform::Form::Forms
   end
 
+  describe "#initialize" do
+    describe "with empty object and no cardinality" do
+      let(:form) { AlbumForm.new(OpenStruct.new) }
+
+      it "allows initialization with empty properties" do
+        form
+      end
+
+      it "allows #validate" do
+        form.validate({})
+        form.errors.messages.must_equal(:title=>["can't be blank"])
+      end
+      # it "must support #validate when initialized with empty properties" do
+      #   form.validate({})
+      #   form.errors.messages.must_equal(:title=>["can't be blank"], :"hit.title"=>["can't be blank"], :"songs.title"=>["can't be blank"])
+      # end
+      # it "must support #validate with attributes when initialized with empty properties" do
+      #   form.validate("hit"=>{"title"=>"Downtown"}, "title" => "Blackhawks Over Los Angeles", "songs"=>[{"title"=>"Calling"}])
+      #   form.title.must_eql "Blackhawks Over Los Angeles"
+      #   form.errors.messages.must_equal([])
+      # end
+    end
+
+    describe "with empty object and cardinality" do
+      subject { Class.new(Reform::Form) do
+        # collection :songs, :validates => {:length => {:minimum => 1}}
+        collection :songs, :cardinality => {:minimum => 1} do
+          property :title
+        end
+      end.new(OpenStruct.new) }
+
+      it "whatxxx" do
+        subject.validate({}).must_equal false
+        subject.errors.messages.must_equal(:"songs.size"=>["songs size is 0 but must be {:minimum=>1}"])
+      end
+    end
+  end
+
+
   describe "rendering" do
     it { form.title.must_equal "Blackhawks Over Los Angeles" }
     it { form.hit.title.must_equal "Downtown" }
@@ -171,4 +211,4 @@ class NestedFormTest < MiniTest::Spec
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reform
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Nick Sutterer
@@ -9,76 +9,76 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-15 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: representable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.5
 - !ruby/object:Gem::Dependency
   name: uber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.1.0
 - !ruby/object:Gem::Dependency
@@ -99,56 +99,56 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Freeing your AR models from form logic.
@@ -159,8 +159,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - LICENSE.txt
@@ -229,17 +229,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Decouples your models from form by giving you form objects with validation,