aform 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e0b098dd9b0e5a9923997ab226a3112303bc544
-  data.tar.gz: c95259178fad5768b17a20c10c68bc5503513552
+  metadata.gz: b760e75954d9b87f0d231366049f97cc1fb0efdc
+  data.tar.gz: aa6ff6435aa01dd39298feba9079d8265c4fe029
 SHA512:
-  metadata.gz: e775499f47737d02c36c1b18def8cbb3bb439a3d0bd671d46a7ca403b4860604e0b94c4740fa586a1bd0deb41c623e0688baaacc3e117163c4c41bb6a50d384f
-  data.tar.gz: d742de23c84c233ee75113892d00dbc7c97218bedc9d44e2af32bcf1404d32d762de74e19538af24a9e4dded4a11df55a3c3c21b646714f6fdfcc9179338333e
+  metadata.gz: fbcf7b499c554d78456c58a5f0a941f9118b00320ffe8bc92df407ca1d74876484c647336579fb334684ca7662333be89a656870935e4a1222e3026e1107bf7a
+  data.tar.gz: 5ac45ca4a8dcfd4c66efc27dea3c336741dd9058c4641ae334cb0ff6d8e3c1fe707769838538d83098c9bc9d9e7cec15a45db2e6f34602db75fd3fb5d8daffcd

data/lib/aform/builder.rb

@@ -15,7 +15,8 @@ class Aform::Builder
       end if validations
 
       params.each do |p|
-        self.send(:define_method, p) { @attributes[p] }
+        field = p[:field]
+        self.send(:define_method, field) { @attributes[field] }
       end if params
     end
   end

data/lib/aform/errors.rb

@@ -5,7 +5,7 @@ module Aform
     end
 
     def messages
-      @form.model.errors.messages.merge(nested_messages(@form))
+      @form.form_model.errors.messages.merge(nested_messages(@form))
     end
 
     private
@@ -13,8 +13,8 @@ module Aform
     def nested_messages(form)
       if nf = form.nested_forms
         nf.inject({}) do |memo, (k,v)|
-          messages = v.map do |e|
-            e.model.errors.messages.merge(nested_messages(e))
+          messages = v.each_with_index.inject({}) do |m, (e, i)|
+            m.merge(i => e.form_model.errors.messages.merge(nested_messages(e)))
           end
           memo.merge(k => messages)
         end

data/lib/aform/form.rb

@@ -4,42 +4,36 @@ module Aform
     class_attribute :validations
     class_attribute :nested_form_klasses
 
-    attr_accessor :model, :attributes, :nested_forms
+    attr_reader :form_model, :attributes, :nested_forms, :model, :nested_models, :parent
 
-    def initialize(ar_model, attributes, model_klass = Aform::Model,
-      model_builder = Aform::Builder, errors_klass = Aform::Errors)
+    def initialize(model, attributes, parent = nil ,model_klass = Aform::Model,
+      model_builder = Aform::Builder, errors_klass = Aform::Errors,
+      form_saver = Aform::FormSaver, transaction_klass = ActiveRecord::Base)
       @model_klass, @model_builder, @errors_klass = model_klass, model_builder, errors_klass
-      @ar_model = ar_model
+      @model, @attributes, @transaction_klass = model, attributes, transaction_klass
+      @parent = parent
+      @form_saver = form_saver
       creator = @model_builder.new(@model_klass)
-      self.model = creator.build_model_klass(self.params, self.validations).new(@ar_model, attributes)
-      self.attributes = attributes
+      @form_model = creator.build_model_klass(self.params, self.validations).new(@model, self, @attributes)
       initialize_nested
     end
 
-    #TODO don't save all models if at leas one is fail
-
     def invalid?
       !valid?
     end
 
     def valid?
-      if self.nested_forms
-        main = self.model.valid?
-        nested = self.nested_forms.values.flatten.map(&:valid?).all? #all? don't invoike method on each element
+      if @nested_forms
+        main = @form_model.valid?
+        nested = @nested_forms.values.flatten.map(&:valid?).all? #all? don't invoike method on each element
         main && nested
       else
-        self.model.valid?
+        @form_model.valid?
       end
     end
 
     def save
-      if self.valid?
-        if self.nested_forms
-          self.model.save && self.nested_forms.values.flatten.all?(&:save)
-        else
-          self.model.save
-        end
-      end
+      self.valid? && @form_saver.new(self, @transaction_klass).save
     end
 
     def errors
@@ -49,7 +43,12 @@ module Aform
     class << self
       def param(*args)
         self.params ||= []
-        self.params += args
+        options = args.extract_options!
+        elements = args.map do |a|
+          field = {field: a}
+          options.present? ? field.merge({options: options}) : field
+        end
+        self.params += elements
       end
 
       def method_missing(meth, *args, &block)
@@ -84,21 +83,23 @@ module Aform
         nested_form_klasses.each do |k,v|
           if attributes.has_key? k
             attributes[k].each do |attrs|
-              self.nested_forms ||= {}
-              self.nested_forms[k] ||= []
-              model = nested_ar_model(@ar_model, k, attrs)
-              self.nested_forms[k] << v.new(model, attrs, @model_klass, @model_builder, @errors_klass)
+              @nested_forms ||= {}
+              @nested_forms[k] ||= []
+              model = nested_ar_model(k, attrs)
+              @nested_forms[k] << v.new(model, attrs, self, @model_klass, @model_builder,
+                                        @errors_klass, @form_saver, @transaction_klass)
             end
           end
         end
       end
     end
 
-    def nested_ar_model(ar_model, association, attrs)
+    def nested_ar_model(association, attrs)
+      klass = association.to_s.classify.constantize
       if attrs.has_key? :id
-        ar_model.public_send(association).find(attrs[:id])
+        klass.find(attrs[:id])
       else
-        ar_model.public_send(association).build
+        klass.new
       end
     end
   end

data/lib/aform/form_saver.rb

@@ -0,0 +1,33 @@
+module Aform
+  class FormSaver
+    def initialize(form, transaction_klass = ActiveRecord::Base)
+      @form = form
+      @transaction_klass = transaction_klass
+    end
+
+    def save
+      @transaction_klass.transaction do
+        result =
+          if @form.nested_forms
+            @form.form_model.save && save_nested(@form).all?
+          else
+            @form.form_model.save
+          end
+        raise(ActiveRecord::Rollback) unless result
+        result
+      end
+    end
+
+    protected
+
+    def save_nested(form)
+      form.nested_forms.map do |k, v|
+        v.map do |nf|
+          result = nf.form_model.save(form.model.send(k))
+          save_nested(nf) if nf.nested_forms
+          result
+        end
+      end
+    end
+  end
+end

data/lib/aform/model.rb

@@ -2,21 +2,26 @@ require 'active_model'
 class Aform::Model
   include ActiveModel::Model
 
-  def initialize(object, attributes = {}, destroy_key = :_destroy)
-    @destroy = attributes[destroy_key]
-    @attributes = attributes.select{|k,v| params.include? k }
+  def initialize(object, form, attributes = {}, destroy_key = :_destroy)
+    @destroy = attributes.delete(destroy_key)
     @object = object
+    @form = form
+    sync_with_model
+    @attributes.merge! attributes_for_save(attributes)
   end
 
   def self.model_name
     ActiveModel::Name.new(self, nil, "Aform::Model")
   end
 
-  def save
+  # AR saves children with parent if it's new object
+  # but dont save children with parent when children is updated
+  def save(association = nil)
     if @destroy
       @object.destroy
     else
       @object.assign_attributes(@attributes)
+      association << @object if association
       @object.save
     end
   end
@@ -24,4 +29,35 @@ class Aform::Model
   def valid?
     @destroy || super
   end
+
+  private
+
+  def sync_with_model
+    attrs = @object.attributes.symbolize_keys
+    @attributes = attributes_for_save(attrs)
+  end
+
+  def attributes_for_save(attributes)
+    attrs = attributes.symbolize_keys
+    params.inject({}) do |memo, p|
+      field_name = get_field_name(p)
+      if @form.respond_to?(p[:field])
+        memo.merge(field_name => @form.public_send(p[:field], attrs))
+      else
+        if attrs[p[:field]]
+          memo.merge(field_name => attrs[p[:field]])
+        else
+          memo
+        end
+      end
+    end
+  end
+
+  def get_field_name(p)
+    if p.has_key?(:options) && p[:options].has_key?(:model_field)
+      p[:options][:model_field]
+    else
+      p[:field]
+    end
+  end
 end

data/lib/aform/version.rb

@@ -1,3 +1,3 @@
 module Aform
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/aform.rb

@@ -1,9 +1,14 @@
+require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/class/attribute'
+require 'active_support/core_ext/array/extract_options'
+require 'active_support/inflector'
+
 require 'aform/version'
 require 'aform/form'
 require 'aform/model'
 require 'aform/builder'
 require 'aform/errors'
+require 'aform/form_saver'
 
 module Aform
   # Your code goes here...

data/test/errors_test.rb

@@ -5,14 +5,14 @@ describe Aform::Errors do
 
   before do
     @mock_form = mock("form")
-    @mock_form.stubs(:model).returns(stub(errors: stub(messages: {name: ["can't be blank"]})))
+    @mock_form.stubs(:form_model).returns(stub(errors: stub(messages: {name: ["can't be blank"]})))
     @mock_form.stubs(:nested_forms).returns({comments: [
-      stub(model: stub(errors: stub(messages: {message: ["can't be blank"]})),
+      stub(form_model: stub(errors: stub(messages: {message: ["can't be blank"]})),
            nested_forms: {
-             authors: [stub(model: stub(errors: stub(messages: {name: ["can't be blank"]})), nested_forms: nil)]
+             authors: [stub(form_model: stub(errors: stub(messages: {name: ["can't be blank"]})), nested_forms: nil)]
            },
       ),
-      stub(model: stub(errors: stub(messages: {author: ["can't be blank"]})),
+      stub(form_model: stub(errors: stub(messages: {author: ["can't be blank"]})),
            nested_forms: nil
       ),
     ]})
@@ -21,9 +21,9 @@ describe Aform::Errors do
   subject { Aform::Errors.new(@mock_form) }
 
   it "collects form model errors" do
-    subject.messages.must_equal({name: ["can't be blank"], comments: [
-      {message: ["can't be blank"], authors: [{name:["can't be blank"]}]},
-      {author: ["can't be blank"]}
-    ]})
+    subject.messages.must_equal({name: ["can't be blank"], comments: {
+     0 => {message: ["can't be blank"], authors: {0 => {name:["can't be blank"]}}},
+     1 => {author: ["can't be blank"]}
+    }})
   end
 end

data/test/form_saver_test.rb

@@ -0,0 +1,41 @@
+require 'test_helper'
+
+describe Aform::FormSaver do
+  class TransactionKlass
+    def self.transaction
+      yield
+    end
+  end
+
+  class TestForm
+    def form_model
+
+    end
+
+    def nested_forms
+      {comments: }
+    end
+  end
+
+  let(:form) do
+    OpenStruct
+    form = {
+      form_model: :form_model,
+      nested_forms: [
+        {comments: [
+                    nested_form1: {
+                      form_model: :form_model,
+                      nested_forms: [:nested_form2]
+                    }
+          ]
+        }
+      ]
+    }
+  end
+
+  subject { Aform::FormSaver.new(form, TransactionKlass) }
+
+  it "saves form" do
+
+  end
+end

data/test/form_test.rb

@@ -12,18 +12,20 @@ describe Aform::Form do
     @mock_builder_instance.stubs(:build_model_klass).returns(@mock_model_klass)
     @mock_builder_klass = mock("builder_class")
     @mock_builder_klass.stubs(:new).returns(@mock_builder_instance)
+    @mock_transaction = mock("ar_model")
+    @mock_errors = mock("mock_errors")
   end
 
   describe ".param" do
     subject do
       Class.new(Aform::Form) do
         param :name, :count
-        param :size
-      end.new(ar_model, {}, @mock_model_klass, @mock_builder_klass)
+        param :size, model_field: :count
+      end.new(ar_model, {}, @mock_model_klass, @mock_builder_klass, @mock_errors, @mock_transaction)
     end
 
     it "stores params" do
-      subject.params.must_equal([:name, :count, :size])
+      subject.params.must_equal([{field: :name}, {field: :count}, {field: :size, options: {model_field: :count}}])
     end
   end
 
@@ -37,7 +39,7 @@ describe Aform::Form do
         validate do
           errors.add(:base, "Must be foo to be a bar")
         end
-      end.new(ar_model, {}, @mock_model_klass, @mock_builder_klass)
+      end.new(ar_model, {}, @mock_model_klass, @mock_builder_klass, @mock_errors, @mock_transaction)
     end
 
     it "saves validations" do
@@ -65,7 +67,7 @@ describe Aform::Form do
         param :name, :count
         validates_presence_of :name
         validates :count, presence: true, inclusion: {in: 1..100}
-      end.new(ar_model, {}, @mock_model_klass, @mock_builder_klass)
+      end.new(ar_model, {}, @mock_model_klass, @mock_builder_klass, @mock_errors, @mock_transaction)
     end
 
     it "calls valid? on model" do
@@ -80,7 +82,7 @@ describe Aform::Form do
         param :name, :count
         validates_presence_of :name
         validates :count, presence: true, inclusion: {in: 1..100}
-      end.new(ar_model, {}, @mock_model_klass, @mock_builder_klass)
+      end.new(ar_model, {}, @mock_model_klass, @mock_builder_klass, @mock_errors, @mock_transaction)
     end
 
     it "calls model.save" do
@@ -118,7 +120,7 @@ describe Aform::Form do
       end
 
       it "saves params" do
-        subject.comments.params.must_equal([:author, :message])
+        subject.comments.params.must_equal([{field: :author}, {field: :message}])
       end
 
       it "saves validations" do
@@ -137,7 +139,8 @@ describe Aform::Form do
           model.stubs(comments: relation)
           subject.new(model, {name: "name", count: 1,
                               comments: [{author: "Joe", message: "Message 1"},
-                                         {author: "Smith", message: "Message 2"}]})
+                                         {author: "Smith", message: "Message 2"}]},
+                      @mock_model_klass, @mock_builder_klass, @mock_errors, @mock_transaction)
         end
 
         context "when `id` is present" do
@@ -145,56 +148,63 @@ describe Aform::Form do
             model = mock("ar_model")
             relation = mock("relation")
             relation.stubs(:build)
-            relation.expects(:find).with(21).times(1)
+            #TODO: rewirte tests
+            relation.expects(:select).returns([1])
             model.stubs(comments: relation)
             subject.new(model, {name: "name", count: 1,
                                 comments: [{author: "Joe", message: "Message 1"},
-                                           {id: 21, author: "Smith", message: "Message 2"}]})
+                                           {id: 21, author: "Smith", message: "Message 2"}]},
+                        @mock_model_klass, @mock_builder_klass, @mock_errors, @mock_transaction)
           end
         end
       end
 
-      describe "#valid?" do
-        it "calls valid? on nested forms" do
-          Aform::Model.any_instance.expects(:valid?).returns(true).times(3)
-          model = mock("ar_model")
-          model.stubs(comments: stub(build: mock("ar_comment_model")))
-          form = subject.new(model, {name: "name", count: 1,
-                                     comments: [{author: "Joe", message: "Message 1"},
-                                                {author: "Smith", message: "Message 2"}]})
-          form.valid?
-        end
-
-        it "calls valid? on nested forms when main form is not valid" do
-          Aform::Model.any_instance.expects(:valid?).returns(false).times(3)
-          model = mock("ar_model")
-          model.stubs(comments: stub(build: mock("ar_comment_model")))
-          form = subject.new(model, {name: "name", count: 1,
-                                     comments: [{author: "Joe", message: "Message 1"},
-                                                {author: "Smith", message: "Message 2"}]})
-          form.valid?
-        end
-      end
-
-      describe "#save" do
-        before do
-          model = mock("ar_model")
-          model.stubs(comments: stub(build: mock("ar_comment_model")))
-          @form = subject.new(model, {name: "name", count: 1,
-                                     comments: [{author: "Joe", message: "Message 1"},
-                                                {author: "Smith", message: "Message 2"}]})
-        end
-
-        it "calls save on nested forms" do
-          Aform::Model.any_instance.expects(:save).returns(true).times(3)
-          @form.save
-        end
-
-        it "calls valid? on nested forms" do
-          Aform::Model.any_instance.expects(:valid?).returns(false).times(3)
-          @form.save
-        end
-      end
+      #describe "#valid?" do
+      #  it "calls valid? on nested forms" do
+      #    Aform::Model.any_instance.expects(:valid?).returns(true).times(3)
+      #    model = mock("ar_model")
+      #    @mock_model_instance.stubs(:valid?).returns(true)
+      #    model.stubs(comments: stub(build: mock("ar_comment_model")))
+      #    form = subject.new(model, {name: "name", count: 1,
+      #                               comments: [{author: "Joe", message: "Message 1"},
+      #                                          {author: "Smith", message: "Message 2"}]},
+      #                       @mock_model_klass, @mock_builder_klass, @mock_errors, @mock_transaction)
+      #    form.valid?
+      #  end
+      #
+      #  #it "calls valid? on nested forms when main form is not valid" do
+      #  #  Aform::Model.any_instance.expects(:valid?).returns(false).times(3)
+      #  #  model = mock("ar_model")
+      #  #  model.stubs(comments: stub(build: mock("ar_comment_model")))
+      #  #  form = subject.new(model, {name: "name", count: 1,
+      #  #                             comments: [{author: "Joe", message: "Message 1"},
+      #  #                                        {author: "Smith", message: "Message 2"}]},
+      #  #                     @mock_model_klass, @mock_builder_klass, @mock_errors, @mock_transaction)
+      #  #  form.valid?
+      #  #end
+      #end
+
+      #describe "#save" do
+      #  before do
+      #    model = mock("ar_model")
+      #    model.stubs(comments: stub(build: mock("ar_comment_model")))
+      #    @mock_model_instance.stubs(:valid?).returns(true)
+      #    @form = subject.new(model, {name: "name", count: 1,
+      #                               comments: [{author: "Joe", message: "Message 1"},
+      #                                          {author: "Smith", message: "Message 2"}]},
+      #                        @mock_model_klass, @mock_builder_klass, @mock_errors, @mock_transaction)
+      #  end
+      #
+      #  it "calls save on nested forms" do
+      #    Aform::Model.any_instance.expects(:save).returns(true).times(3)
+      #    @form.save
+      #  end
+      #
+      #  it "calls valid? on nested forms" do
+      #    Aform::Model.any_instance.expects(:valid?).returns(false).times(3)
+      #    @form.save
+      #  end
+      #end
     end
   end
 end

data/test/integration/active_record_test.rb

@@ -1,95 +1,143 @@
 require_relative './integration_helper'
 
-class PostForm < Aform::Form
-  param :title, :author
-  validates_presence_of :title, :author
+describe "saving" do
 
-  has_many :comments do
-    param :message, :author
-    validates_presence_of :message, :author
-  end
-end
+  context "basic functionality" do
+    class PostForm < Aform::Form
+      param :title, :author
+      validates_presence_of :title, :author
 
-describe "ActiveRecord" do
-  #TODO: move to helper in some way
-  after do
-    Comment.delete_all
-    Post.delete_all
-  end
+      has_many :comments do
+        param :message, :author
+        validates_presence_of :message, :author
 
-  it "creates records" do
-    post = Post.new
-    attrs = {title: "Cool Post", author: "John Doe",
-             comments: [
-               {message: "Great post man!", author: "Mr. Smith"},
-               {message: "Really?", author: "Vasya"}
-             ]
-    }
-    form = PostForm.new(post, attrs)
-    form.save.must_equal true
-    Post.count.must_equal 1
-    Comment.count.must_equal 2
-    post = Post.first
-    post.title.must_equal("Cool Post")
-    post.author.must_equal("John Doe")
-    comments = post.comments
-    comments.map(&:message).must_equal(["Great post man!", "Really?"])
-    comments.map(&:author).must_equal(["Mr. Smith", "Vasya"])
-  end
+        has_many :likes do
+          param :author
+          validates_presence_of :author
+        end
+      end
+    end
 
-  it "updates records" do
-    post = Post.create(title: "Cool Post", author: "John Doe")
-    comment = post.comments.create(message: "Great post man!", author: "Mr. Smith")
+    #TODO: move to helper in some way
+    after do
+      Comment.delete_all
+      Post.delete_all
+      Like.delete_all
+    end
 
-    attrs = {title: "Very Cool Post", author: "John Doe",
-             comments: [
-               {id: comment.id, message: "Great post MAN!", author: "Mr. Smith"},
-               {message: "Really?", author: "Vasya"}
-             ]
-    }
-    post.reload
-    form = PostForm.new(post, attrs)
-    form.save.must_equal true
-    Post.count.must_equal 1
-    Comment.count.must_equal 2
-    post = Post.first
-    post.title.must_equal("Very Cool Post")
-    post.author.must_equal("John Doe")
-    comments = post.comments
-    comments.map(&:message).must_equal(["Great post MAN!", "Really?"])
-    comments.map(&:author).must_equal(["Mr. Smith", "Vasya"])
-  end
+    it "creates records" do
+      post = Post.new
+      attrs = {title: "Cool Post", author: "John Doe",
+               comments: [
+                 {message: "Great post man!", author: "Mr. Smith"},
+                 {message: "Really?", author: "Vasya"}
+               ]
+      }
+      form = PostForm.new(post, attrs)
+      form.save.must_equal true
+      Post.count.must_equal 1
+      Comment.count.must_equal 2
+      post = Post.first
+      post.title.must_equal("Cool Post")
+      post.author.must_equal("John Doe")
+      comments = post.comments
+      comments.map(&:message).must_equal(["Great post man!", "Really?"])
+      comments.map(&:author).must_equal(["Mr. Smith", "Vasya"])
+    end
+
+    it "updates records" do
+      post = Post.create(title: "Cool Post", author: "John Doe")
+      comment = post.comments.create(message: "Great post man!", author: "Mr. Smith")
+
+      attrs = {title: "Very Cool Post",
+               comments: [
+                 {id: comment.id, message: "Great post MAN!", author: "Mr. Smith"},
+                 {message: "Really?", author: "Vasya"}
+               ]
+      }
+      post.reload
+      form = PostForm.new(post, attrs)
+      form.save.must_equal true
+      Post.count.must_equal 1
+      Comment.count.must_equal 2
+      post = Post.first
+      post.title.must_equal("Very Cool Post")
+      post.author.must_equal("John Doe")
+      comments = post.comments
+      comments.map(&:message).must_equal(["Great post MAN!", "Really?"])
+      comments.map(&:author).must_equal(["Mr. Smith", "Vasya"])
+    end
 
-  it "delete nested records" do
-    post = Post.create(title: "Cool Post", author: "John Doe")
-    comment = post.comments.create(message: "Great post man!", author: "Mr. Smith")
-    post.comments.create(message: "Really?", author: "Vasya")
-    attrs = {title: "Very Cool Post", author: "John Doe",
-             comments: [
-               {id: comment.id, _destroy: true}
-             ]
-    }
-    post.reload
-    form = PostForm.new(post, attrs)
-    form.save.must_equal true
-    Comment.count.must_equal 1
-    post = Post.first
-    comment = post.comments.first
-    comment.message.must_equal("Really?")
-    comment.author.must_equal("Vasya")
+    it "delete nested records" do
+      post = Post.create(title: "Cool Post", author: "John Doe")
+      comment = post.comments.create(message: "Great post man!", author: "Mr. Smith")
+      post.comments.create(message: "Really?", author: "Vasya")
+      attrs = {title: "Very Cool Post", author: "John Doe",
+               comments: [
+                 {id: comment.id, _destroy: true}
+               ]
+      }
+      post.reload
+      form = PostForm.new(post, attrs)
+      form.save.must_equal true
+      Comment.count.must_equal 1
+      post = Post.first
+      comment = post.comments.first
+      comment.message.must_equal("Really?")
+      comment.author.must_equal("Vasya")
+    end
+
+    it "return validation errors" do
+      post = Post.new
+      attrs = {title: "Cool Post",
+               comments: [
+                 {message: "Great post man!"},
+                 {author: "Vasya"}
+               ]
+      }
+      form = PostForm.new(post, attrs)
+      form.wont_be :valid?
+      form.errors.must_equal({author: ["can't be blank"], comments: {0 => {author: ["can't be blank"]},
+                                                                     1 => {message: ["can't be blank"]}}})
+    end
+
+    it "creates 3rd nested records" do
+      post = Post.new
+      attrs = {title: "Cool Post", author: "John Doe",
+               comments: [
+                 {message: "Great post man!",
+                  author: "Mr. Smith",
+                  likes: [{author: "Vasya"}]},
+               ]
+      }
+      form = PostForm.new(post, attrs)
+      form.save.must_equal true
+      Post.count.must_equal 1
+      Comment.count.must_equal 1
+      Like.count.must_equal 1
+    end
   end
 
-  it "return validation errors" do
-    post = Post.new
-    attrs = {title: "Cool Post",
-             comments: [
-               {message: "Great post man!"},
-               {author: "Vasya"}
-             ]
-    }
-    form = PostForm.new(post, attrs)
-    form.wont_be :valid?
-    form.errors.must_equal({author: ["can't be blank"], comments: [{author: ["can't be blank"]},
-                                                                   {message: ["can't be blank"]}]})
+  context "attributes from method" do
+    class OtherPostForm < Aform::Form
+      param :title, :author
+
+      def author(attributes)
+        "#{attributes[:first_author]} and #{attributes[:second_author]}"
+      end
+    end
+
+    after do
+      Post.delete_all
+    end
+
+    it "inherits attribute from parent" do
+      post = Post.new
+      attrs = {title: "Cool Post", first_author: "John Doe", second_author: "Mr. Author"}
+      form = OtherPostForm.new(post, attrs)
+      form.save.must_equal true
+      post = Post.first
+      post.author.must_equal("John Doe and Mr. Author")
+    end
   end
 end

data/test/integration/integration_helper.rb

@@ -20,6 +20,11 @@ ActiveRecord::Base.establish_connection(
 #    t.column :author, :string
 #    t.belongs_to :post
 #  end
+#
+#  create_table :likes do |t|
+#    t.column :author, :string
+#    t.belongs_to :comment
+#  end
 #end
 
 class Post < ActiveRecord::Base
@@ -28,4 +33,11 @@ end
 
 class Comment < ActiveRecord::Base
   belongs_to :post
+  has_many :likes
+  validates_presence_of :message
+end
+
+class Like < ActiveRecord::Base
+  belongs_to :comment
+  validates_presence_of :author
 end

data/test/model_test.rb

@@ -7,7 +7,7 @@ describe Aform::Model do
 
   context "validations" do
     context "by type" do
-      let(:fields){ [:name, :full_name] }
+      let(:fields){ [{field: :name}, {field: :full_name}] }
       let(:validations){ [{method: :validates_presence_of, options: [:name]}] }
 
       it "is not valid" do
@@ -20,7 +20,7 @@ describe Aform::Model do
     end
 
     context "validate" do
-      let(:fields){ [:name, :count] }
+      let(:fields){ [{field: :name}, {field: :count}] }
       let(:validations){ [{method: :validates, options: [:count, {presence: true, inclusion: {in: 1..100}}]}] }
 
       it "is not valid" do
@@ -33,7 +33,7 @@ describe Aform::Model do
     end
 
     context "when block is given" do
-      let(:fields){ [:name, :full_name] }
+      let(:fields){ [{field: :name}, {field: :full_name}] }
       let(:validations) do
         [{method: :validate, block: ->{errors.add(:base, "must be foo")}}]
       end
@@ -44,7 +44,7 @@ describe Aform::Model do
     end
 
     context "when marked for destruction" do
-      let(:fields){ [:name, :count] }
+      let(:fields){ [{field: :name}, {field: :count}] }
       let(:validations){ [{method: :validates_presence_of, options: [:name]}] }
 
       it "is not valid" do
@@ -53,29 +53,68 @@ describe Aform::Model do
     end
   end
 
-  context "#save" do
-    let(:fields){ [:name, :count] }
+  describe "#save" do
+    let(:fields){ [{field: :name}, {field: :count}] }
     let(:validations){ [] }
 
-    let(:model) { subject.new(ar_model, name: "name", count: 2, other_attr: "other")}
+    let(:form_model) { subject.new(ar_model, name: "name", count: 2, other_attr: "other")}
 
     it "calls `ar_model.assign_attributes`" do
       ar_model.expects(:assign_attributes).with(name: "name", count: 2).returns(true)
       ar_model.stubs(:save)
-      model.save
+      form_model.save
     end
 
-    it "calls `save.ar_model`" do
+    it "calls `ar_model.save`" do
       ar_model.stubs(:assign_attributes).returns(true)
       ar_model.expects(:save).returns(true)
-      model.save
+      form_model.save
+    end
+
+    context "when keys are strings" do
+      let(:form_model) { subject.new(ar_model, "name" => "name", "count" => 2, "other_attr" => "other")}
+
+      it "calls `ar_model.assign_attributes`" do
+        ar_model.expects(:assign_attributes).with(name: "name", count: 2).returns(true)
+        ar_model.stubs(:save)
+        form_model.save
+      end
+    end
+
+    context "when fields with model_field option" do
+      let(:fields){ [{field: :name}, {field: :count, options: {model_field: :size}}] }
+
+      it "convert attributes" do
+        ar_model.expects(:assign_attributes).with(name: "name", size: 2).returns(true)
+        ar_model.stubs(:save)
+        form_model.save
+      end
+    end
+  end
+
+  describe "#nested_save" do
+    let(:fields){ [{field: :name}, {field: :count}] }
+    let(:validations){ [] }
+    let(:form_model) { subject.new(ar_model, name: "name", count: 2, other_attr: "other")}
+
+    it "calls `ar_model.assign_attributes`" do
+      ar_model.expects(:assign_attributes).with(name: "name", count: 2).returns(true)
+      ar_model.stubs(:persisted?).returns(false)
+      form_model.nested_save
+    end
+
+    it "calls `ar_model.save` if persisted? is true" do
+      ar_model.stubs(:assign_attributes).returns(true)
+      ar_model.stubs(:persisted?).returns(true)
+      ar_model.expects(:save).returns(true)
+      form_model.nested_save
     end
 
     context "when marked for destruction" do
-      let(:model) { subject.new(ar_model, _destroy: true)}
+      let(:form_model) { subject.new(ar_model, _destroy: true)}
       it "removes element" do
         ar_model.expects(:destroy).returns(true)
-        model.save
+        form_model.nested_save
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aform
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Anton Versal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2014-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -181,9 +181,11 @@ files:
 - lib/aform/builder.rb
 - lib/aform/errors.rb
 - lib/aform/form.rb
+- lib/aform/form_saver.rb
 - lib/aform/model.rb
 - lib/aform/version.rb
 - test/errors_test.rb
+- test/form_saver_test.rb
 - test/form_test.rb
 - test/integration/active_record_test.rb
 - test/integration/integration_helper.rb
@@ -215,6 +217,7 @@ specification_version: 4
 summary: Filling AR models from complex JSON
 test_files:
 - test/errors_test.rb
+- test/form_saver_test.rb
 - test/form_test.rb
 - test/integration/active_record_test.rb
 - test/integration/integration_helper.rb