light_form 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9597a28e9e3f731a43a85decad5f11e955d9388
-  data.tar.gz: 822d5e8f7b73af2e7fcc75a459bc8ca65b8a9ece
+  metadata.gz: a9dd6b626e08abeb2968d7a51d35823eb0d312b3
+  data.tar.gz: af5d354b4a33a0d2452aca26796a22c1f1ba83af
 SHA512:
-  metadata.gz: 9ddd24343f88e82596363ae25e7801bfd51c4b19f95cec83df6ef1f5df6880600accfe6631f31ef6737580111c31ebf36d3c9d4d00ddbd16bb51b4f49dabd92b
-  data.tar.gz: 1a097f2c95930916766cc4555e49e8ce9e4ee94cfbe900e8df68582817899638391754484391b19e65986b343c3d9970eb47e0b4a006418ee55e50be63b8739e
+  metadata.gz: 2a01b0469a57d809f83415cadcb5e03b259a9d99ebbe077c613f61cd63c921df8f9de33704bcb405f1787ff933684fb9e5601eb14eabc68a22b09a8cf3d52ba4
+  data.tar.gz: e5fe1ce5c99618f33a98dc721b8adca47d8f5c50be5c0873cec7fade9588036863e30fffafa821e661759aa56d5e84df083fb207d27ac877eeecee318886df44

data/README.md

@@ -18,9 +18,64 @@ Or install it yourself as:
 
     $ gem install light_form
 
-## Usage
+## How it works
+Build form from specific params and custom validation:
 
-TODO: Write usage instructions here
+```ruby
+class Address
+  include ActiveModel::Model
+  attr_accessor :street, :post_code
+end
+
+class Child
+  include ActiveModel::Model
+  attr_accessor :name, :age
+end
+
+class PersonForm < LightForm::Form
+  properties :title, :first_name, :last_name
+  property :email, validates: { presence: true }
+  property :age, with: -> (v) { v.to_i }
+
+  property :address, model: Address do
+    properties :street, :post_code
+  end
+
+  property :children, collection: Child, uniq: true do
+    property :name, validates: { presence: true }
+    property :age, with: -> (v) { v.to_i }
+  end
+
+  property :interests, collection: true, uniq: true
+end
+
+person = PersonForm.new(
+  {
+    title: 'Mr', first_name: 'Pawel', last_name: 'Awesome', email: nil,
+    age: '31', address: { street: 'Best', post_code: '33333' },
+    children: [ {name: 'Emi', age: '2'}, {name: 'Emi', age: '2'}, {age: '2'} ],
+    interests: [ 'football', 'football', 'basketball', 'football' ]
+  }
+)
+
+person.valid? == false
+
+person.errors.as_json == {
+  children: [{1=>{name: ["can't be blank"]}}],
+  email: ["can't be blank"]
+}
+
+person.to_h == {
+  title: 'Mr',
+  first_name: 'Pawel',
+  last_name: 'Awesome',
+  email: nil,
+  age: 31,
+  address: <AddressModel:0x007faf0ba22238 @street='Best', @post_code='33333'>,
+  children: [<ChildModel:0x007faf0ba21ec8 @name='Emi', @age=2>, <ChildModel:0x007faf0ba21c70 @name='', @age=2>],
+  interests: ['football', 'basketball']
+}
+```
 
 ## Contributing
 

data/lib/light_form/property_methods.rb

@@ -75,18 +75,22 @@ module LightForm
 
     def valid?(context = nil)
       @errors = ActiveModel::Errors.new(self)
-      return [_check_validation, _valid_without_clear?(context)].all? unless errors_overriden?
+      return _form_valid?(context) unless errors_overriden?
       @_errors = @errors
       stored_method = method(:errors)
       errors_method = -> { @errors }
       define_singleton_method(:errors) { errors_method.call }
-      result, store, @_errors, @errors = [_check_validation, _valid_without_clear?(context)].all?, @_errors, @errors, store
+      result, _store, @_errors, @errors = _form_valid?(context), @_errors, @errors, _store
       define_singleton_method(:errors) { stored_method.call }
       result
     end
 
     private
 
+    def _form_valid?(context)
+      [_check_validation, _valid_without_clear?(context)].all?
+    end
+
     def _valid_without_clear?(context = nil)
       current_context, self.validation_context = validation_context, context
       run_validations!
@@ -98,20 +102,31 @@ module LightForm
       obj.errors if obj.respond_to?(:valid?) && !obj.valid?
     end
 
+    def _array_validation_errors(obj)
+      {}.tap do |errors_list|
+        obj.each_with_index do |item, idx|
+          next if !item.respond_to?(:valid?) || item.valid?
+          errors_list[idx] = item.errors.as_json
+        end
+        return if errors_list.empty?
+      end
+    end
+
     def _check_validation
+      # copy errors from lash to model for forms on view
       @errors = ActiveModel::Errors.new(self)
       properties = _properties.delete(_properties_sources.keys)
       properties.each do |prop|
         public_send(prop).tap do |subject|
-          items = subject.is_a?(Array) ? subject.map(&method(:_validation_errors)).compact : _validation_errors(subject)
-          @errors.add(prop, items) if items && !items.empty? # TODO resolve problem with [ nil, nil ] arrays of nil values
+          items = subject.is_a?(Array) ? _array_validation_errors(subject) : _validation_errors(subject)
+          @errors.add(prop, items) if items && !items.empty?
         end
       end
+
       _properties_sources.each do |prop, v|
         next unless v[:params]
         subject = v[:params].clone
-        # Resolve problem with nil in array
-        items = subject.is_a?(Array) ? subject.map(&method(:_validation_errors)) : _validation_errors(v[:params])
+        items = subject.is_a?(Array) ? _array_validation_errors(subject) : _validation_errors(v[:params])
         @errors.add(prop, items) if items && !items.empty?
       end
       @errors.empty?

data/lib/light_form/version.rb

@@ -1,3 +1,3 @@
 module LightForm
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/spec/lib/form_spec.rb

@@ -6,12 +6,30 @@ describe LightForm::Form do
       [:name, :age].map { |attr| public_send("#{attr}") }
     end
 
-    def ==(o)
-      eql?(o)
+    def ==(other)
+      eql?(other)
     end
 
-    def eql?(o)
-      o.class == self.class && o.equality_state == equality_state
+    def eql?(other)
+      other.class == self.class && other.equality_state == equality_state
+    end
+  end
+
+
+  class AddressModel
+    include ActiveModel::Model
+    attr_accessor :street, :post_code
+
+    def equality_state
+      [:street, :post_code].map { |attr| public_send("#{attr}") }
+    end
+
+    def ==(other)
+      eql?(other)
+    end
+
+    def eql?(other)
+      other.class == self.class && other.equality_state == equality_state
     end
   end
 
@@ -320,49 +338,54 @@ describe LightForm::Form do
         end
 
         expect(test_obj.valid?).to eq(false)
-        ap test_obj.errors
       end
 
       it 'to_h' do
-        test_obj = object_factory(attributes: attributes) do
-          property :ab do
-            property :cd do
-              property :child, model: ChildModel do
-                properties :name, :age
-              end
-            end
+        attrs = {
+          title: 'Mr',
+          first_name: 'Pawel',
+          last_name: 'Awesome',
+          email: nil,
+          age: '31',
+          address: { street: 'Best', post_code: '33333' },
+          children: [{ name: 'Emi', age: '2' }, { name: 'Emi', age: '2' }, { name: '', age: '2' }],
+          interests: %w(football football basketball football)
+        }
 
-            property :ef, collection: true do
-              property :name
-              property :age, with: -> (v) { v.to_i }
-            end
+        test_obj = object_factory(real_class_name: 'PersonForm', attributes: attrs) do
+          properties :title, :first_name, :last_name
+          property :email, validates: { presence: true }
+          property :age, with: -> (v) { v.to_i }
 
-            property :gh, collection: ChildModel, uniq: true do
-              properties :name, :age
-            end
+          property :address, model: AddressModel do
+            properties :street, :post_code
+          end
 
-            property :ij, collection: true, with: -> (v) { (v.nil? || v.empty?) ? [] : v }
+          property :children, collection: ChildModel, uniq: true do
+            property :name, validates: { presence: true }
+            property :age, with: -> (v) { v.to_i }
           end
+
+          property :interests, collection: true, uniq: true
         end
 
         expect(test_obj.to_h).to eq(
-          {
-            ab: {
-              cd: {
-                child: ChildModel.new(age: '1', name: 'pawel')
-              },
-              ef: [
-                { age: 31, name: 'Pawel' },
-                { age: 32, name: 'Sylwia' }
-              ],
-              gh: [
-                ChildModel.new(age: '31', name: 'Pawel'),
-                ChildModel.new(age: '32', name: 'Sylwia')
-              ],
-              ij: []
-            }
-          }
+          address: AddressModel.new(attrs[:address]),
+          age: 31,
+          children: [ChildModel.new(name: 'Emi', age: 2), ChildModel.new(name: '', age: 2)],
+          email: nil,
+          first_name: attrs[:first_name],
+          interests: %w(football basketball),
+          last_name: attrs[:last_name],
+          title: attrs[:title]
         )
+
+        expect(test_obj.valid?).to eq(false)
+        expect(test_obj.errors.as_json).to eq(
+          children: [{1=>{name: ["can't be blank"]}}],
+          email: ["can't be blank"]
+        )
+
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: light_form
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Pawel Niemczyk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport