Add save! to raise exception if things go wrong

.gitignore

@@ -1,9 +1,18 @@
-.bundle/
-log/*.log
-pkg/
-test/dummy/db/*.sqlite3
-test/dummy/db/*.sqlite3-journal
-test/dummy/log/*.log
-test/dummy/tmp/
-test/dummy/.sass-cache
-tmp
+# Ignore bundler config.
+/.bundle
+
+# Ignore Gemfile.lock
+/Gemfile.lock
+/gemfiles/*.gemfile.lock
+
+# Ignore test files
+/coverage
+
+# Ignore dummy app files
+/test/dummy/db/*.sqlite3
+/test/dummy/db/*.sqlite3-journal
+/test/dummy/log/*.log
+/test/dummy/tmp/
+
+# Temp files
+/tmp

.travis.yml

@@ -1,9 +1,18 @@
 language: ruby
+sudo: false
+cache: bundler
 rvm:
-  - 2.1
-  - 2.2
+  - 2.4.1
+  - 2.3.4
+  - 2.2.7
+gemfile:
+  - gemfiles/rails_4.2.8.gemfile
+  - gemfiles/rails_5.0.2.gemfile
+  - gemfiles/rails_5.1.0.gemfile
 script:
   - cd test/dummy/
   - RAILS_ENV=test bundle exec rake db:migrate
   - cd ../..
   - bundle exec rake
+after_success:
+  - bundle exec codeclimate-test-reporter

Appraisals

@@ -0,0 +1,12 @@
+RAILS_VERSIONS = %w(
+  4.2.8
+  5.0.2
+  5.1.0
+)
+
+RAILS_VERSIONS.each do |version|
+  appraise "rails_#{version}" do
+    gem 'rails', version
+    gem 'rails-controller-testing' if version != '4.2.8'
+  end
+end

Gemfile

@@ -3,4 +3,8 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'jquery-rails'
-gem 'simple_form'
+
+group :test do
+  gem 'simple_form'
+  gem 'codeclimate-test-reporter', require: nil
+end

LICENSE

@@ -0,0 +1,19 @@
+The MIT License (MIT)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

README.md

@@ -1,8 +1,11 @@
-# Action Form
-
-# DISCLAIMER: This project is an experiment and should not be used in applications.
-
-[![Build Status](https://api.travis-ci.org/railsgsoc/actionform.svg?branch=master)](https://travis-ci.org/railsgsoc/actionform)
+## Action Form
+
+[![GitHub license](https://img.shields.io/github/license/jbox-web/actionform.svg)](https://github.com/jbox-web/actionform/blob/master/LICENSE)
+[![GitHub release](https://img.shields.io/github/release/jbox-web/actionform.svg)](https://github.com/jbox-web/actionform/releases/latest)
+[![Build Status](https://travis-ci.org/jbox-web/actionform.svg?branch=master)](https://travis-ci.org/jbox-web/actionform)
+[![Code Climate](https://codeclimate.com/github/jbox-web/actionform/badges/gpa.svg)](https://codeclimate.com/github/jbox-web/actionform)
+[![Test Coverage](https://codeclimate.com/github/jbox-web/actionform/badges/coverage.svg)](https://codeclimate.com/github/jbox-web/actionform/coverage)
+[![Dependency Status](https://gemnasium.com/badges/github.com/jbox-web/actionform.svg)](https://gemnasium.com/github.com/jbox-web/actionform)
 
 Set your models free from the `accepts_nested_attributes_for` helper. Action Form provides an object-oriented approach to represent your forms by building a form object, rather than relying on Active Record internals for doing this. Form objects provide an API to describe the models involved in the form, their attributes and validations. A form object deals with create/update actions of nested objects in a more seamless way.
 

Rakefile

@@ -1,3 +1,7 @@
+#!/usr/bin/env rake
+
+require 'rubygems'
+
 begin
   require 'bundler/setup'
 rescue LoadError
@@ -6,6 +10,7 @@ end
 
 require 'rdoc/task'
 
+desc 'Generate documentation.'
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'ActionForm'
@@ -14,9 +19,6 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-
-
-
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
@@ -28,5 +30,4 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
-
 task default: :test

actionform.gemspec

@@ -1,22 +1,27 @@
+# -*- encoding: utf-8 -*-
 $:.push File.expand_path('../lib', __FILE__)
-
 require 'action_form/version'
 
 Gem::Specification.new do |s|
   s.name        = 'actionform'
   s.version     = ActionForm::VERSION
+  s.platform    = Gem::Platform::RUBY
   s.authors     = ['Petros Markou']
   s.email       = ['[email protected]']
-  s.homepage    = 'https://github.com/rails/actionform'
+  s.homepage    = 'https://github.com/jbox-web/actionform'
   s.summary     = 'Create nested forms with ease.'
   s.description = 'An alternative layer to accepts_nested_attributes_for by using Form Models.'
   s.license     = 'MIT'
 
-  s.files       = Dir['{app,config,db,lib}/**/*', 'MIT-LICENSE', 'Rakefile', 'README.md']
-  s.test_files  = Dir['test/**/*']
-
-  s.add_dependency 'rails', '~> 4.1'
+  s.add_dependency 'rails', '>= 4.2'
 
   s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'rake', '~> 10.3.2'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'appraisal'
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ['lib']
 end

gemfiles/rails_4.2.8.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "jquery-rails"
+gem "rails", "4.2.8"
+
+group :test do
+  gem "simple_form"
+  gem "codeclimate-test-reporter", require: nil
+end
+
+gemspec path: "../"

gemfiles/rails_5.0.2.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "jquery-rails"
+gem "rails", "5.0.2"
+gem "rails-controller-testing"
+
+group :test do
+  gem "simple_form"
+  gem "codeclimate-test-reporter", require: nil
+end
+
+gemspec path: "../"

gemfiles/rails_5.1.0.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "jquery-rails"
+gem "rails", "5.1.0"
+gem "rails-controller-testing"
+
+group :test do
+  gem "simple_form"
+  gem "codeclimate-test-reporter", require: nil
+end
+
+gemspec path: "../"

lib/action_form/base.rb

@@ -21,6 +21,10 @@ def get_model(assoc_name)
       form.get_model(assoc_name)
     end
 
+    def save!
+      save or raise ActiveRecord::RecordInvalid.new(self)
+    end
+
     def save
       if valid?
         run_callbacks :save do

lib/action_form/form.rb

@@ -13,7 +13,7 @@ def initialize(assoc_name, parent, proc, model=nil)
       @forms = []
       @proc = proc
       enable_autosave
-      instance_eval &proc
+      instance_eval(&proc)
     end
 
     def class

lib/action_form/form_collection.rb

@@ -20,6 +20,7 @@ def update_models
 
     def submit(params)
       params.each do |key, value|
+        value = value.to_h if value.is_a?(ActionController::Parameters) && rails_5?
         if parent.persisted?
           create_or_update_record(value)
         else
@@ -120,7 +121,7 @@ def assign_forms
     end
 
     def dynamic_key?(i)
-      i > forms.size
+      i >= forms.size
     end
 
     def aggregate_form_errors
@@ -171,6 +172,9 @@ def create_form
       forms << new_form
       new_form
     end
-  end
 
+    def rails_5?
+      Rails.version[0] == '5'
+    end
+  end
 end