aform 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe5b2d60a9140c2a2477d80b1c6eb8a9a1d7efe7
-  data.tar.gz: 64377b994360f01535d6d94e9933dd026cb6bda9
+  metadata.gz: 93ff36848be09d703e47acb5b73764f97f235ce5
+  data.tar.gz: bcbac1680a8d4ced2f1bfcaa74170b4ab0ec0052
 SHA512:
-  metadata.gz: 7aca61c011ecbfa66e5b810fa514e3a09ef786b57f0a93fbe97ee156ac86bc25832997f37d556693f11b7c2bddaa4bb8e8e98960dac5128d34c838dc70d7c196
-  data.tar.gz: 4dd679c64d3cda49eab1ca903d8071bf3eaf06fab3b9923c399ad62c69c3751807e62bbcd4d72b9f30f2aa2033e906ff1346b625ca00db86e668dc01bc23e6bc
+  metadata.gz: f55367787834ae50febed73521daf8a8642a413d91224ed1bdba7924f189fe072d31021603495fa03b99d2e0c6be6abfa5f90442ba8d529edc3cd66d5c630896
+  data.tar.gz: adf3e582fbc4a2fee4d7895af355a6180d044f00bd083dfac303e4c8cc636a986204cbf438061d26a21967483266444e1d66f409fae42d059cfaaf5c65c684f7

data/lib/aform/errors.rb

@@ -14,7 +14,8 @@ module Aform
       if nf = form.nested_forms
         nf.inject({}) do |memo, (k,v)|
           messages = v.each_with_index.inject({}) do |m, (e, i)|
-            m.merge(i => e.form_model.errors.messages.merge(nested_messages(e)))
+            errors = e.form_model.errors.messages.merge(nested_messages(e))
+            errors.present? ? m.merge(i => errors) : m
           end
           memo.merge(k => messages)
         end

data/lib/aform/form.rb

@@ -1,8 +1,6 @@
 module Aform
   class Form
-    class_attribute :params
-    class_attribute :validations
-    class_attribute :nested_form_klasses
+    class_attribute :params, :pkey, :validations, :nested_form_klasses
 
     attr_reader :form_model, :attributes, :nested_forms, :model, :nested_models, :parent
 
@@ -41,6 +39,10 @@ module Aform
     end
 
     class << self
+      def primary_key(key)
+        self.pkey = key
+      end
+
       def param(*args)
         self.params ||= []
         options = args.extract_options!
@@ -85,7 +87,7 @@ module Aform
             attributes[k].each do |attrs|
               @nested_forms ||= {}
               @nested_forms[k] ||= []
-              model = nested_ar_model(k, attrs)
+              model = nested_ar_model(k, attrs, v.pkey)
               @nested_forms[k] << v.new(model, attrs, self, @model_klass, @model_builder,
                                         @errors_klass, @form_saver, @transaction_klass)
             end
@@ -94,13 +96,10 @@ module Aform
       end
     end
 
-    def nested_ar_model(association, attrs)
+    def nested_ar_model(association, attrs, key = :id)
+      key = key || :id
       klass = association.to_s.classify.constantize
-      if attrs.has_key? :id
-        klass.find(attrs[:id])
-      else
-        klass.new
-      end
+      klass.find_by(key => attrs[key]) || klass.new
     end
   end
 end

data/lib/aform/model.rb

@@ -14,13 +14,17 @@ class Aform::Model
     ActiveModel::Name.new(self, nil, "Aform::Model")
   end
 
+  def self.validates_uniqueness_of(*attr_names)
+    validates_with UniquenessValidator, _merge_attributes(attr_names)
+  end
+
   # AR saves children with parent if it's new object
   # but dont save children with parent when children is updated
   def save(association = nil)
+    @object.assign_attributes(@attributes)
     if @destroy
       @object.destroy
     else
-      @object.assign_attributes(@attributes)
       association << @object if association
       @object.save
     end

data/lib/aform/uniqueness_validator.rb

@@ -0,0 +1,10 @@
+require 'active_record'
+class UniquenessValidator < ::ActiveRecord::Validations::UniquenessValidator
+  def validate_each(form, attribute, value)
+    object = form.instance_variable_get(:@object)
+    @klass = object.class
+    super(object, attribute, value).tap do |res|
+      form.errors.add(attribute, object.errors.first.last) if object.errors.present?
+    end
+  end
+end

data/lib/aform/version.rb

@@ -1,3 +1,3 @@
 module Aform
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/aform.rb

@@ -9,6 +9,7 @@ require 'aform/model'
 require 'aform/builder'
 require 'aform/errors'
 require 'aform/form_saver'
+require 'aform/uniqueness_validator'
 
 module Aform
   # Your code goes here...

data/test/integration/active_record_test.rb

@@ -150,4 +150,35 @@ describe "saving" do
       post.author.must_equal("John Doe and Mr. Author")
     end
   end
+
+  context "validate uniqueness" do
+    class Other2PostForm < Aform::Form
+      param :title
+      validates :title, uniqueness: true
+
+      has_many :comments do
+        param :message, :author
+        validates_uniqueness_of :message
+      end
+    end
+
+    before do
+      Post.create!(title: "test")
+      Comment.create!(message: "test")
+    end
+
+    after do
+      Post.delete_all
+      Comment.delete_all
+    end
+
+    it "inherits attribute from parent" do
+      post = Post.new
+      attrs = {title: "test", comments: [{message: "test"}]}
+      form = Other2PostForm.new(post, attrs)
+      form.save.must_equal false
+      form.errors.must_equal({:title=>["has already been taken"],
+                              :comments=>{0=>{:message=>["has already been taken"]}}})
+    end
+  end
 end

data/test/model_test.rb

@@ -111,11 +111,16 @@ describe Aform::Model do
     end
 
     context "when marked for destruction" do
-      let(:form_model) { subject.new(ar_model, _destroy: true)}
+      let(:form_model) { subject.new(ar_model, name: "name", count: 2, _destroy: true)}
       it "removes element" do
         ar_model.expects(:destroy).returns(true)
         form_model.nested_save
       end
+
+      it "calls `ar_model.assign_attributes`" do
+        ar_model.expects(:assign_attributes).with(name: "name", count: 2).returns(true)
+        form_model.nested_save
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aform
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Anton Versal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-15 00:00:00.000000000 Z
+date: 2014-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -183,6 +183,7 @@ files:
 - lib/aform/form.rb
 - lib/aform/form_saver.rb
 - lib/aform/model.rb
+- lib/aform/uniqueness_validator.rb
 - lib/aform/version.rb
 - test/errors_test.rb
 - test/form_saver_test.rb