aform 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a00654d7e27e53fa05173608a7f0630ebe6b771
-  data.tar.gz: c76a97771dd6d28f781b3b49c243b3634eebc0ca
+  metadata.gz: b539a689687d10ce372376c984749ac30cbe65cc
+  data.tar.gz: addef8dbcb1055f19ce403ae320c4e37532d6ee3
 SHA512:
-  metadata.gz: 82eb7f0087485fdc85a79bfdee55c7f1f24ebf0d8169a53c510a1889e36d337c45829d20d3afdca609f6fcfc792b2ba498fe685d2356060aa77d7b43d1a87d90
-  data.tar.gz: bc19d70163f31bbf851063a4518b11eec248e509b98ff7ea952214949f32420ca15d556d4b3c376ffeaac6e84713b46978d4ddc1cfd8ce469afff50c4a626291
+  metadata.gz: 5b6c8024ce914f97a27845459d2003c18d949974a86703a0e75949d38b1588aeb70da76533464eda580563396bea4942d36e9c6d7d37a7e679ea94a01d4e7f4b
+  data.tar.gz: 95fb5e0da238837daf95f78ca910f098b984d700b46d049873571ff20ca2f4214ca98a077fbdd90640a75a3e6d8a7f3df4edfd1273af0d64b1de770dc19b1e83

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - "2.0.0-p481"
+  - "2.1.2"
+before_script:
+  - bundle exec rake test:prepare
+script:
+  - bundle exec rake test
+  - bundle exec rake test:integration

data/README.md

@@ -1,4 +1,7 @@
 # Aform
+[![Build Status](https://travis-ci.org/antonversal/aform.svg?branch=master)](https://travis-ci.org/antonversal/aform)
+
+[![Code Quality](https://codeclimate.com/github/antonversal/aform.png)](https://codeclimate.com/github/antonversal/aform)
 
 TODO: Write a gem description
 

data/Rakefile

@@ -11,4 +11,34 @@ Rake::TestTask.new do |t|
   t.libs << 'test'
   t.name = "test:integration"
   t.pattern = 'test/integration/*_test.rb'
-end
+end
+
+namespace :test do
+  desc "Prepare test environment"
+  task :prepare do
+    require 'active_record'
+    ActiveRecord::Base.establish_connection(
+      :adapter => "sqlite3",
+      :database => "#{Dir.pwd}/database.sqlite3"
+    )
+
+    ActiveRecord::Schema.define do
+      create_table :posts do |t|
+        t.column :title, :string
+        t.column :author, :string
+        t.timestamps
+      end
+
+      create_table :comments do |t|
+        t.column :message, :string
+        t.column :author, :string
+        t.belongs_to :post
+      end
+
+      create_table :likes do |t|
+        t.column :author, :string
+        t.belongs_to :comment
+      end
+    end
+  end
+end

data/lib/aform/form.rb

@@ -2,12 +2,12 @@ module Aform
   class Form
     class_attribute :params, :pkey, :validations, :nested_form_klasses
 
-    attr_reader :form_model, :attributes, :nested_forms, :record, :parent
+    attr_reader :form_model, :attributes, :nested_forms, :model, :parent
 
-    def initialize(record, attributes, parent = nil, opts = {})
+    def initialize(model, attributes, parent = nil, opts = {})
       @opts = opts
       @attributes = attributes
-      @record = record
+      @model = model
       @parent = parent
       assign_opts_instances
       initialize_nested
@@ -83,7 +83,7 @@ module Aform
       @form_saver = @opts[:form_saver] || Aform::FormSaver.new(self)
       @form_model = @opts[:form_model] || Aform::Model.\
         build_klass(self.params, self.validations).\
-        new(record, self, attributes)
+        new(model, self, attributes)
     end
 
     def initialize_nested
@@ -92,7 +92,7 @@ module Aform
           nested_form_klasses.inject({}) do |memo, (k, v)|
             if attributes[k]
               nested = attributes[k].map do |attrs|
-                v.new(nested_record(k, attrs, v.pkey), attrs, self, @opts)
+                v.new(nested_model(k, attrs, v.pkey), attrs, self, @opts)
               end
               memo.merge(k => nested)
             else
@@ -102,9 +102,9 @@ module Aform
         end
     end
 
-    def nested_record(association, attrs, key)
+    def nested_model(association, attrs, key)
       key = key || :id
-      record.send(association).find_by(key => attrs[key]) || \
+      model.send(association).find_by(key => attrs[key]) || \
         association.to_s.classify.constantize.new
     end
   end

data/lib/aform/form_saver.rb

@@ -27,7 +27,7 @@ module Aform
     def save_nested(form)
       form.nested_forms.map do |k, v|
         v.map do |nf|
-          result = nf.form_model.save(form.record.send(k))
+          result = nf.form_model.save(form.model.send(k))
           save_nested(nf) if nf.nested_forms
           result
         end

data/lib/aform/version.rb

@@ -1,3 +1,3 @@
 module Aform
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/test/form_saver_test.rb

@@ -21,10 +21,10 @@ describe Aform::FormSaver do
                    form_model: form_model)
   end
 
-  def mock_form(nested_forms: nil, record: nil, save: true)
+  def mock_form(nested_forms: nil, model: nil, save: true)
     OpenStruct.new(nested_forms: nested_forms,
                    form_model: OpenStruct.new(save: save),
-                   record: record)
+                   model: model)
   end
 
   def form_saver(form)
@@ -49,14 +49,14 @@ describe Aform::FormSaver do
       it "success" do
         nested_forms = [mock_nested_form, mock_nested_form]
         form = mock_form(nested_forms: {comments: nested_forms},
-                         record: OpenStruct.new(comments: []))
+                         model: OpenStruct.new(comments: []))
         form_saver(form).save.must_equal(true)
       end
 
       it "failure" do
         nested_forms = [mock_nested_form(false), mock_nested_form]
         form = mock_form(nested_forms: {comments: nested_forms},
-                         record: OpenStruct.new(comments: []))
+                         model: OpenStruct.new(comments: []))
         form_saver(form).save.must_equal(false)
       end
     end

data/test/integration/integration_helper.rb

@@ -7,26 +7,6 @@ ActiveRecord::Base.establish_connection(
   :database => "#{Dir.pwd}/database.sqlite3"
 )
 
-#TODO: create task
-#ActiveRecord::Schema.define do
-#  create_table :posts do |t|
-#    t.column :title, :string
-#    t.column :author, :string
-#    t.timestamps
-#  end
-#
-#  create_table :comments do |t|
-#    t.column :message, :string
-#    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
   has_many :comments
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aform
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Anton Versal
@@ -172,6 +172,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md