From 732f9c68ccc425fc00c8e7fa764452f086a93193 Mon Sep 17 00:00:00 2001
From: Hao Liu <hao@powershop.co.nz>
Date: Fri, 21 Nov 2014 11:09:42 +1300
Subject: [PATCH 01/32] Add save! to raise exception if things go wrong

---
 lib/active_form/base.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/active_form/base.rb b/lib/active_form/base.rb
index 21f77bb..9ae7eda 100644
--- a/lib/active_form/base.rb
+++ b/lib/active_form/base.rb
@@ -42,6 +42,10 @@ def save
       end
     end
 
+    def save!
+      save or raise ActiveRecord::RecordInvalid.new(self)
+    end
+
     def valid?
       super
       model.valid?
@@ -155,4 +159,4 @@ def collect_errors_from(validatable_object)
     end
   end
 
-end
\ No newline at end of file
+end

From 2739020cdc3e952cd511323d69075fd39dbb67af Mon Sep 17 00:00:00 2001
From: Will Bryant <will.bryant@gmail.com>
Date: Tue, 7 Jul 2015 11:41:26 +1200
Subject: [PATCH 02/32] revert whitespace change for easier merging

---
 lib/active_form/base.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/active_form/base.rb b/lib/active_form/base.rb
index 9ae7eda..9f4431c 100644
--- a/lib/active_form/base.rb
+++ b/lib/active_form/base.rb
@@ -159,4 +159,4 @@ def collect_errors_from(validatable_object)
     end
   end
 
-end
+end
\ No newline at end of file

From f17dd6bf80c3dede32a093bb7e658bfb4201f830 Mon Sep 17 00:00:00 2001
From: Nicolas Rodriguez <nrodriguez@jbox-web.com>
Date: Tue, 5 Jul 2016 03:01:15 +0200
Subject: [PATCH 03/32] Remove Gemfile.lock

---
 Gemfile.lock | 96 ----------------------------------------------------
 1 file changed, 96 deletions(-)
 delete mode 100644 Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
deleted file mode 100644
index a4aa4c3..0000000
--- a/Gemfile.lock
+++ /dev/null
@@ -1,96 +0,0 @@
-PATH
-  remote: .
-  specs:
-    actionform (0.0.1)
-      rails (~> 4.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (4.1.8)
-      actionpack (= 4.1.8)
-      actionview (= 4.1.8)
-      mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.8)
-      actionview (= 4.1.8)
-      activesupport (= 4.1.8)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    actionview (4.1.8)
-      activesupport (= 4.1.8)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-    activemodel (4.1.8)
-      activesupport (= 4.1.8)
-      builder (~> 3.1)
-    activerecord (4.1.8)
-      activemodel (= 4.1.8)
-      activesupport (= 4.1.8)
-      arel (~> 5.0.0)
-    activesupport (4.1.8)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    arel (5.0.1.20140414130214)
-    builder (3.2.2)
-    erubis (2.7.0)
-    hike (1.2.3)
-    i18n (0.6.11)
-    jquery-rails (3.1.1)
-      railties (>= 3.0, < 5.0)
-      thor (>= 0.14, < 2.0)
-    json (1.8.1)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    mime-types (2.4.3)
-    minitest (5.5.0)
-    multi_json (1.10.1)
-    rack (1.5.2)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (4.1.8)
-      actionmailer (= 4.1.8)
-      actionpack (= 4.1.8)
-      actionview (= 4.1.8)
-      activemodel (= 4.1.8)
-      activerecord (= 4.1.8)
-      activesupport (= 4.1.8)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.8)
-      sprockets-rails (~> 2.0)
-    railties (4.1.8)
-      actionpack (= 4.1.8)
-      activesupport (= 4.1.8)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
-    simple_form (3.0.2)
-      actionpack (~> 4.0)
-      activemodel (~> 4.0)
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.4)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.9)
-    thor (0.19.1)
-    thread_safe (0.3.4)
-    tilt (1.4.1)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  actionform!
-  jquery-rails
-  rake (~> 10.3.2)
-  simple_form
-  sqlite3

From 209dfb383ccf03a558f01119e9a35daf7608e350 Mon Sep 17 00:00:00 2001
From: Nicolas Rodriguez <nrodriguez@jbox-web.com>
Date: Tue, 5 Jul 2016 03:01:30 +0200
Subject: [PATCH 04/32] Fix deprecation warnings

---
 test/dummy/config/environments/test.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/dummy/config/environments/test.rb b/test/dummy/config/environments/test.rb
index 053f5b6..3cfff16 100644
--- a/test/dummy/config/environments/test.rb
+++ b/test/dummy/config/environments/test.rb
@@ -13,7 +13,7 @@
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  config.serve_static_files   = true
   config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.
@@ -36,4 +36,7 @@
 
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
+
+  # Test order
+  config.active_support.test_order = :random
 end

From ccdfa229d27ab8d8b1255f9f02c2b08fddee608e Mon Sep 17 00:00:00 2001
From: Nicolas Rodriguez <nrodriguez@jbox-web.com>
Date: Tue, 5 Jul 2016 03:01:48 +0200
Subject: [PATCH 05/32] Fix method signature for SimpleForm

---
 test/dummy/config/initializers/simple_form.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/dummy/config/initializers/simple_form.rb b/test/dummy/config/initializers/simple_form.rb
index 4937a4d..82a938e 100644
--- a/test/dummy/config/initializers/simple_form.rb
+++ b/test/dummy/config/initializers/simple_form.rb
@@ -78,7 +78,7 @@
   # config.collection_value_methods = [ :id, :to_s ]
 
   # How the label text should be generated altogether with the required text.
-  config.label_text = lambda { |label, required| "#{label} #{required}" }
+  config.label_text = lambda { |label, required, explicit_label| "#{label} #{required}" }
 
   # You can define the class to use on all labels. Default is nil.
   # config.label_class = nil
@@ -121,4 +121,4 @@
 
   # Default class for buttons
   config.button_class = 'btn'
-end
\ No newline at end of file
+end

From a102adc65941fced0008a07eb2dd3c5763cb7576 Mon Sep 17 00:00:00 2001
From: Nicolas Rodriguez <nrodriguez@jbox-web.com>
Date: Tue, 5 Jul 2016 03:02:24 +0200
Subject: [PATCH 06/32] Fix attributes order in SimpleForm forms

---
 test/forms/nested_model_rendering_test.rb | 149 +++++++++++-----------
 1 file changed, 76 insertions(+), 73 deletions(-)

diff --git a/test/forms/nested_model_rendering_test.rb b/test/forms/nested_model_rendering_test.rb
index f5c01dc..c85789c 100644
--- a/test/forms/nested_model_rendering_test.rb
+++ b/test/forms/nested_model_rendering_test.rb
@@ -32,16 +32,19 @@ def form_for(*)
     assert_match(/method="post"/, output_buffer)
 
     assert_match(/<label for="user_name">Name<\/label>/, output_buffer)
-    assert_match(/<input id="user_name" name="user\[name\]" type="text" \/>/, output_buffer)
+    assert_match(/<input type="text" name="user\[name\]" id="user_name" \/>/, output_buffer)
+
     assert_match(/<label for="user_age">Age<\/label>/, output_buffer)
-    assert_match(/input id="user_age" name="user\[age\]" type="number" \/>/, output_buffer)
+    assert_match(/<input type="number" name="user\[age\]" id="user_age" \/>/, output_buffer)
+
     assert_match(/<label for="user_gender">Gender<\/label>/, output_buffer)
-    assert_match(/<select id="user_gender" name="user\[gender\]">/, output_buffer)
+
+    assert_match(/<select name="user\[gender\]" id="user_gender">/, output_buffer)
     assert_match(/<option value="0">Male<\/option>/, output_buffer)
     assert_match(/<option value="1">Female<\/option>/, output_buffer)
     assert_match(/<\/select>/, output_buffer)
 
-    assert_match(/<input name="commit" type="submit" value="Create User" \/>/, output_buffer)
+    assert_match(/<input type="submit" name="commit" value="Create User" \/>/, output_buffer)
   end
 
   test "form_for renders correctly a existing instance of UserFormFixture" do
@@ -69,16 +72,16 @@ def form_for(*)
     assert_match(/method="post"/, output_buffer)
 
     assert_match(/<label for="user_name">Name<\/label>/, output_buffer)
-    assert_match(/<input id="user_name" name="user\[name\]" type="text" value="#{user_form.name}" \/>/, output_buffer)
+    assert_match(/<input type="text" value="#{user_form.name}" name="user\[name\]" id="user_name" \/>/, output_buffer)
     assert_match(/<label for="user_age">Age<\/label>/, output_buffer)
-    assert_match(/<input id="user_age" name="user\[age\]" type="number" value="#{user_form.age}" \/>/, output_buffer)
+    assert_match(/<input type="number" value="#{user_form.age}" name="user\[age\]" id="user_age" \/>/, output_buffer)
     assert_match(/<label for="user_gender">Gender<\/label>/, output_buffer)
-    assert_match(/<select id="user_gender" name="user\[gender\]">/, output_buffer)
+    assert_match(/<select name="user\[gender\]" id="user_gender">/, output_buffer)
     assert_match(/<option selected="selected" value="0">Male<\/option>/, output_buffer)
     assert_match(/<option value="1">Female<\/option>/, output_buffer)
     assert_match(/<\/select>/, output_buffer)
 
-    assert_match(/<input name="commit" type="submit" value="Update User" \/>/, output_buffer)
+    assert_match(/<input type="submit" name="commit" value="Update User" \/>/, output_buffer)
   end
 
   test "form_for renders correctly a new instance of UserWithEmailFormFixture" do
@@ -109,19 +112,19 @@ def form_for(*)
     assert_match(/method="post"/, output_buffer)
 
     assert_match(/<label for="user_name">Name<\/label>/, output_buffer)
-    assert_match(/<input id="user_name" name="user\[name\]" type="text" \/>/, output_buffer)
+    assert_match(/<input type="text" name="user\[name\]" id="user_name" \/>/, output_buffer)
     assert_match(/<label for="user_age">Age<\/label>/, output_buffer)
-    assert_match(/input id="user_age" name="user\[age\]" type="number" \/>/, output_buffer)
+    assert_match(/input type="number" name="user\[age\]" id="user_age" \/>/, output_buffer)
     assert_match(/<label for="user_gender">Gender<\/label>/, output_buffer)
-    assert_match(/<select id="user_gender" name="user\[gender\]">/, output_buffer)
+    assert_match(/<select name="user\[gender\]" id="user_gender">/, output_buffer)
     assert_match(/<option value="0">Male<\/option>/, output_buffer)
     assert_match(/<option value="1">Female<\/option>/, output_buffer)
     assert_match(/<\/select>/, output_buffer)
 
     assert_match(/<label for="user_email_attributes_address">Address<\/label>/, output_buffer)
-    assert_match(/<input id="user_email_attributes_address" name="user\[email_attributes\]\[address\]" type="text" \/>/, output_buffer)
+    assert_match(/<input type="text" name="user\[email_attributes\]\[address\]" id="user_email_attributes_address" \/>/, output_buffer)
 
-    assert_match(/<input name="commit" type="submit" value="Create User" \/>/, output_buffer)
+    assert_match(/<input type="submit" name="commit" value="Create User" \/>/, output_buffer)
   end
 
   test "form_for renders correctly a existing instance of UserWithEmailFormFixture" do
@@ -154,20 +157,20 @@ def form_for(*)
     assert_match(/method="post"/, output_buffer)
 
     assert_match(/<label for="user_name">Name<\/label>/, output_buffer)
-    assert_match(/<input id="user_name" name="user\[name\]" type="text" value="#{user_form.name}" \/>/, output_buffer)
+    assert_match(/<input type="text" value="#{user_form.name}" name="user\[name\]" id="user_name" \/>/, output_buffer)
     assert_match(/<label for="user_age">Age<\/label>/, output_buffer)
-    assert_match(/<input id="user_age" name="user\[age\]" type="number" value="#{user_form.age}" \/>/, output_buffer)
+    assert_match(/<input type="number" value="#{user_form.age}" name="user\[age\]" id="user_age" \/>/, output_buffer)
     assert_match(/<label for="user_gender">Gender<\/label>/, output_buffer)
-    assert_match(/<select id="user_gender" name="user\[gender\]">/, output_buffer)
+    assert_match(/<select name="user\[gender\]" id="user_gender">/, output_buffer)
     assert_match(/<option selected="selected" value="0">Male<\/option>/, output_buffer)
     assert_match(/<option value="1">Female<\/option>/, output_buffer)
     assert_match(/<\/select>/, output_buffer)
 
     assert_match(/<label for="user_email_attributes_address">Address<\/label>/, output_buffer)
-    assert_match(/<input id="user_email_attributes_address" name="user\[email_attributes\]\[address\]" type="text" value="#{user_form.email.address}" \/>/, output_buffer)
-    assert_match(/<input id="user_email_attributes_id" name="user\[email_attributes\]\[id\]" type="hidden" value="#{user_form.email.id}" \/>/, output_buffer)
+    assert_match(/<input type="text" value="#{user_form.email.address}" name="user\[email_attributes\]\[address\]" id="user_email_attributes_address" \/>/, output_buffer)
+    assert_match(/<input type="hidden" value="#{user_form.email.id}" name="user\[email_attributes\]\[id\]" id="user_email_attributes_id" \/>/, output_buffer)
 
-    assert_match(/<input name="commit" type="submit" value="Update User" \/>/, output_buffer)
+    assert_match(/<input type="submit" name="commit" value="Update User" \/>/, output_buffer)
   end
 
   test "form_for renders correctly a new instance of UserWithEmailAndProfileFormFixture" do
@@ -206,24 +209,24 @@ def form_for(*)
     assert_match(/method="post"/, output_buffer)
 
     assert_match(/<label for="user_name">Name<\/label>/, output_buffer)
-    assert_match(/<input id="user_name" name="user\[name\]" type="text" \/>/, output_buffer)
+    assert_match(/<input type="text" name="user\[name\]" id="user_name" \/>/, output_buffer)
     assert_match(/<label for="user_age">Age<\/label>/, output_buffer)
-    assert_match(/input id="user_age" name="user\[age\]" type="number" \/>/, output_buffer)
+    assert_match(/input type="number" name="user\[age\]" id="user_age" \/>/, output_buffer)
     assert_match(/<label for="user_gender">Gender<\/label>/, output_buffer)
-    assert_match(/<select id="user_gender" name="user\[gender\]">/, output_buffer)
+    assert_match(/<select name="user\[gender\]" id="user_gender">/, output_buffer)
     assert_match(/<option value="0">Male<\/option>/, output_buffer)
     assert_match(/<option value="1">Female<\/option>/, output_buffer)
     assert_match(/<\/select>/, output_buffer)
 
     assert_match(/<label for="user_email_attributes_address">Address<\/label>/, output_buffer)
-    assert_match(/<input id="user_email_attributes_address" name="user\[email_attributes\]\[address\]" type="text" \/>/, output_buffer)
+    assert_match(/<input type="text" name="user\[email_attributes\]\[address\]" id="user_email_attributes_address" \/>/, output_buffer)
 
     assert_match(/<label for="user_profile_attributes_twitter_name">Twitter name<\/label>/, output_buffer)
-    assert_match(/<input id="user_profile_attributes_twitter_name" name="user\[profile_attributes\]\[twitter_name\]" type="text" \/>/, output_buffer)
+    assert_match(/<input type="text" name="user\[profile_attributes\]\[twitter_name\]" id="user_profile_attributes_twitter_name" \/>/, output_buffer)
     assert_match(/<label for="user_profile_attributes_github_name">Github name<\/label>/, output_buffer)
-    assert_match(/<input id="user_profile_attributes_github_name" name="user\[profile_attributes\]\[github_name\]" type="text" \/>/, output_buffer)
+    assert_match(/<input type="text" name="user\[profile_attributes\]\[github_name\]" id="user_profile_attributes_github_name" \/>/, output_buffer)
 
-    assert_match(/<input name="commit" type="submit" value="Create User" \/>/, output_buffer)
+    assert_match(/<input type="submit" name="commit" value="Create User" \/>/, output_buffer)
   end
 
   test "form_for renders correctly an existing instance of UserWithEmailAndProfileFormFixture" do
@@ -264,26 +267,26 @@ def form_for(*)
     assert_match(/method="post"/, output_buffer)
 
     assert_match(/<label for="user_name">Name<\/label>/, output_buffer)
-    assert_match(/<input id="user_name" name="user\[name\]" type="text" value="#{user_form.name}" \/>/, output_buffer)
+    assert_match(/<input type="text" value="#{user_form.name}" name="user\[name\]" id="user_name" \/>/, output_buffer)
     assert_match(/<label for="user_age">Age<\/label>/, output_buffer)
-    assert_match(/<input id="user_age" name="user\[age\]" type="number" value="#{user_form.age}" \/>/, output_buffer)
+    assert_match(/<input type="number" value="#{user_form.age}" name="user\[age\]" id="user_age" \/>/, output_buffer)
     assert_match(/<label for="user_gender">Gender<\/label>/, output_buffer)
-    assert_match(/<select id="user_gender" name="user\[gender\]">/, output_buffer)
+    assert_match(/<select name="user\[gender\]" id="user_gender">/, output_buffer)
     assert_match(/<option selected="selected" value="0">Male<\/option>/, output_buffer)
     assert_match(/<option value="1">Female<\/option>/, output_buffer)
     assert_match(/<\/select>/, output_buffer)
 
     assert_match(/<label for="user_email_attributes_address">Address<\/label>/, output_buffer)
-    assert_match(/<input id="user_email_attributes_address" name="user\[email_attributes\]\[address\]" type="text" value="#{user_form.email.address}" \/>/, output_buffer)
-    assert_match(/<input id="user_email_attributes_id" name="user\[email_attributes\]\[id\]" type="hidden" value="#{user_form.email.id}" \/>/, output_buffer)
+    assert_match(/<input type="text" value="#{user_form.email.address}" name="user\[email_attributes\]\[address\]" id="user_email_attributes_address" \/>/, output_buffer)
+    assert_match(/<input type="hidden" value="#{user_form.email.id}" name="user\[email_attributes\]\[id\]" id="user_email_attributes_id" \/>/, output_buffer)
 
     assert_match(/<label for="user_profile_attributes_twitter_name">Twitter name<\/label>/, output_buffer)
-    assert_match(/<input id="user_profile_attributes_twitter_name" name="user\[profile_attributes\]\[twitter_name\]" type="text" value="#{user_form.profile.twitter_name}" \/>/, output_buffer)
+    assert_match(/<input type="text" value="#{user_form.profile.twitter_name}" name="user\[profile_attributes\]\[twitter_name\]" id="user_profile_attributes_twitter_name" \/>/, output_buffer)
     assert_match(/<label for="user_profile_attributes_github_name">Github name<\/label>/, output_buffer)
-    assert_match(/<input id="user_profile_attributes_github_name" name="user\[profile_attributes\]\[github_name\]" type="text" value="#{user_form.profile.github_name}" \/>/, output_buffer)
-    assert_match(/<input id="user_profile_attributes_id" name="user\[profile_attributes\]\[id\]" type="hidden" value="#{user_form.profile.id}" \/>/, output_buffer)
+    assert_match(/<input type="text" value="#{user_form.profile.github_name}" name="user\[profile_attributes\]\[github_name\]" id="user_profile_attributes_github_name" \/>/, output_buffer)
+    assert_match(/<input type="hidden" value="#{user_form.profile.id}" name="user\[profile_attributes\]\[id\]" id="user_profile_attributes_id" \/>/, output_buffer)
 
-    assert_match(/<input name="commit" type="submit" value="Update User" \/>/, output_buffer)
+    assert_match(/<input type="submit" name="commit" value="Update User" \/>/, output_buffer)
   end
 
   test "form_for renders correctly a new instance of SongsFormFixture" do
@@ -321,19 +324,19 @@ def form_for(*)
     assert_match(/method="post"/, output_buffer)
 
     assert_match(/<label for="song_title">Title<\/label>/, output_buffer)
-    assert_match(/<input id="song_title" name="song\[title\]" type="text" \/>/, output_buffer)
+    assert_match(/<input type="text" name="song\[title\]" id="song_title" \/>/, output_buffer)
     assert_match(/<label for="song_length">Length<\/label>/, output_buffer)
-    assert_match(/input id="song_length" name="song\[length\]" type="text" \/>/, output_buffer)
+    assert_match(/input type="text" name="song\[length\]" id="song_length" \/>/, output_buffer)
 
     assert_match(/<label for="song_artist_attributes_name">Name<\/label>/, output_buffer)
-    assert_match(/<input id="song_artist_attributes_name" name="song\[artist_attributes\]\[name\]" type="text" \/>/, output_buffer)
+    assert_match(/<input type="text" name="song\[artist_attributes\]\[name\]" id="song_artist_attributes_name" \/>/, output_buffer)
 
     assert_match(/<label for="song_artist_attributes_producer_attributes_name">Name<\/label>/, output_buffer)
-    assert_match(/<input id="song_artist_attributes_producer_attributes_name" name="song\[artist_attributes\]\[producer_attributes\]\[name\]" type="text" \/>/, output_buffer)
+    assert_match(/<input type="text" name="song\[artist_attributes\]\[producer_attributes\]\[name\]" id="song_artist_attributes_producer_attributes_name" \/>/, output_buffer)
     assert_match(/<label for="song_artist_attributes_producer_attributes_studio">Studio<\/label>/, output_buffer)
-    assert_match(/<input id="song_artist_attributes_producer_attributes_studio" name="song\[artist_attributes\]\[producer_attributes\]\[studio\]" type="text" \/>/, output_buffer)
+    assert_match(/<input type="text" name="song\[artist_attributes\]\[producer_attributes\]\[studio\]" id="song_artist_attributes_producer_attributes_studio" \/>/, output_buffer)
 
-    assert_match(/<input name="commit" type="submit" value="Create Song" \/>/, output_buffer)
+    assert_match(/<input type="submit" name="commit" value="Create Song" \/>/, output_buffer)
   end
 
   test "form_for renders correctly a existing instance of SongsFormFixture" do
@@ -373,21 +376,21 @@ def form_for(*)
     assert_match(/method="post"/, output_buffer)
 
     assert_match(/<label for="song_title">Title<\/label>/, output_buffer)
-    assert_match(/<input id="song_title" name="song\[title\]" type="text" value="#{song_form.title}" \/>/, output_buffer)
+    assert_match(/<input type="text" value="#{song_form.title}" name="song\[title\]" id="song_title" \/>/, output_buffer)
     assert_match(/<label for="song_length">Length<\/label>/, output_buffer)
-    assert_match(/input id="song_length" name="song\[length\]" type="text" value="#{song_form.length}" \/>/, output_buffer)
+    assert_match(/input type="text" value="#{song_form.length}" name="song\[length\]" id="song_length" \/>/, output_buffer)
 
     assert_match(/<label for="song_artist_attributes_name">Name<\/label>/, output_buffer)
-    assert_match(/<input id="song_artist_attributes_name" name="song\[artist_attributes\]\[name\]" type="text" value="#{artist.name}" \/>/, output_buffer)
-    assert_match(/<input id="song_artist_attributes_id" name="song\[artist_attributes\]\[id\]" type="hidden" value="#{artist.id}" \/>/, output_buffer)
+    assert_match(/<input type="text" value="#{artist.name}" name="song\[artist_attributes\]\[name\]" id="song_artist_attributes_name" \/>/, output_buffer)
+    assert_match(/<input type="hidden" value="#{artist.id}" name="song\[artist_attributes\]\[id\]" id="song_artist_attributes_id" \/>/, output_buffer)
 
     assert_match(/<label for="song_artist_attributes_producer_attributes_name">Name<\/label>/, output_buffer)
-    assert_match(/<input id="song_artist_attributes_producer_attributes_name" name="song\[artist_attributes\]\[producer_attributes\]\[name\]" type="text" value="#{producer.name}" \/>/, output_buffer)
+    assert_match(/<input type="text" value="#{producer.name}" name="song\[artist_attributes\]\[producer_attributes\]\[name\]" id="song_artist_attributes_producer_attributes_name" \/>/, output_buffer)
     assert_match(/<label for="song_artist_attributes_producer_attributes_studio">Studio<\/label>/, output_buffer)
-    assert_match(/<input id="song_artist_attributes_producer_attributes_studio" name="song\[artist_attributes\]\[producer_attributes\]\[studio\]" type="text" value="#{producer.studio}" \/>/, output_buffer)
-    assert_match(/<input id="song_artist_attributes_producer_attributes_id" name="song\[artist_attributes\]\[producer_attributes\]\[id\]" type="hidden" value="#{producer.id}" \/>/, output_buffer)
+    assert_match(/<input type="text" value="#{producer.studio}" name="song\[artist_attributes\]\[producer_attributes\]\[studio\]" id="song_artist_attributes_producer_attributes_studio" \/>/, output_buffer)
+    assert_match(/<input type="hidden" value="#{producer.id}" name="song\[artist_attributes\]\[producer_attributes\]\[id\]" id="song_artist_attributes_producer_attributes_id" \/>/, output_buffer)
 
-    assert_match(/<input name="commit" type="submit" value="Update Song" \/>/, output_buffer)
+    assert_match(/<input type="submit" name="commit" value="Update Song" \/>/, output_buffer)
   end
 
   test "form_for renders correctly a new instance of ConferenceFormFixture" do
@@ -428,23 +431,23 @@ def form_for(*)
     assert_match(/method="post"/, output_buffer)
 
     assert_match(/<label for="conference_name">Name<\/label>/, output_buffer)
-    assert_match(/<input id="conference_name" name="conference\[name\]" type="text" \/>/, output_buffer)
+    assert_match(/<input type="text" name="conference\[name\]" id="conference_name" \/>/, output_buffer)
     assert_match(/<label for="conference_city">City<\/label>/, output_buffer)
-    assert_match(/<input id="conference_city" name="conference\[city\]" type="text" \/>/, output_buffer)
+    assert_match(/<input type="text" name="conference\[city\]" id="conference_city" \/>/, output_buffer)
 
     assert_match(/<label for="conference_speaker_attributes_name">Name<\/label>/, output_buffer)
-    assert_match(/<input id="conference_speaker_attributes_name" name="conference\[speaker_attributes\]\[name\]" type="text" \/>/, output_buffer)
+    assert_match(/<input type="text" name="conference\[speaker_attributes\]\[name\]" id="conference_speaker_attributes_name" \/>/, output_buffer)
     assert_match(/<label for="conference_speaker_attributes_occupation">Occupation<\/label>/, output_buffer)
-    assert_match(/<input id="conference_speaker_attributes_occupation" name="conference\[speaker_attributes\]\[occupation\]" type="text" \/>/, output_buffer)
+    assert_match(/<input type="text" name="conference\[speaker_attributes\]\[occupation\]" id="conference_speaker_attributes_occupation" \/>/, output_buffer)
 
     [0, 1].each do |i|
       assert_match(/<label for="conference_speaker_attributes_presentations_attributes_#{i}_topic">Topic<\/label>/, output_buffer)
-      assert_match(/<input id="conference_speaker_attributes_presentations_attributes_#{i}_topic" name="conference\[speaker_attributes\]\[presentations_attributes\]\[#{i}\]\[topic\]" type="text" \/>/, output_buffer)
+      assert_match(/<input type="text" name="conference\[speaker_attributes\]\[presentations_attributes\]\[#{i}\]\[topic\]" id="conference_speaker_attributes_presentations_attributes_#{i}_topic" \/>/, output_buffer)
       assert_match(/<label for="conference_speaker_attributes_presentations_attributes_#{i}_duration">Duration<\/label>/, output_buffer)
-      assert_match(/<input id="conference_speaker_attributes_presentations_attributes_#{i}_duration" name="conference\[speaker_attributes\]\[presentations_attributes\]\[#{i}\]\[duration\]" type="text" \/>/, output_buffer)
+      assert_match(/<input type="text" name="conference\[speaker_attributes\]\[presentations_attributes\]\[#{i}\]\[duration\]" id="conference_speaker_attributes_presentations_attributes_#{i}_duration" \/>/, output_buffer)
     end
 
-    assert_match(/<input name="commit" type="submit" value="Create Conference" \/>/, output_buffer)
+    assert_match(/<input type="submit" name="commit" value="Create Conference" \/>/, output_buffer)
   end
 
   test "form_for renders correct a existing instance of ConferenceFormFixture" do
@@ -487,24 +490,24 @@ def form_for(*)
     assert_match(/method="post"/, output_buffer)
 
     assert_match(/<label for="conference_name">Name<\/label>/, output_buffer)
-    assert_match(/<input id="conference_name" name="conference\[name\]" type="text" value="#{conference_form.name}" \/>/, output_buffer)
+    assert_match(/<input type="text" value="#{conference_form.name}" name="conference\[name\]" id="conference_name" \/>/, output_buffer)
     assert_match(/<label for="conference_city">City<\/label>/, output_buffer)
-    assert_match(/<input id="conference_city" name="conference\[city\]" type="text" value="#{conference_form.city}" \/>/, output_buffer)
+    assert_match(/<input type="text" value="#{conference_form.city}" name="conference\[city\]" id="conference_city" \/>/, output_buffer)
 
     assert_match(/<label for="conference_speaker_attributes_name">Name<\/label>/, output_buffer)
-    assert_match(/<input id="conference_speaker_attributes_name" name="conference\[speaker_attributes\]\[name\]" type="text" value="#{speaker.name}" \/>/, output_buffer)
+    assert_match(/<input type="text" value="#{speaker.name}" name="conference\[speaker_attributes\]\[name\]" id="conference_speaker_attributes_name" \/>/, output_buffer)
     assert_match(/<label for="conference_speaker_attributes_occupation">Occupation<\/label>/, output_buffer)
-    assert_match(/<input id="conference_speaker_attributes_occupation" name="conference\[speaker_attributes\]\[occupation\]" type="text" value="#{speaker.occupation}" \/>/, output_buffer)
-    assert_match(/<input id="conference_speaker_attributes_id" name="conference\[speaker_attributes\]\[id\]" type="hidden" value="#{speaker.id}" \/>/, output_buffer)
+    assert_match(/<input type="text" value="#{speaker.occupation}" name="conference\[speaker_attributes\]\[occupation\]" id="conference_speaker_attributes_occupation" \/>/, output_buffer)
+    assert_match(/<input type="hidden" value="#{speaker.id}" name="conference\[speaker_attributes\]\[id\]" id="conference_speaker_attributes_id" \/>/, output_buffer)
 
     [0, 1].each do |i|
       assert_match(/<label for="conference_speaker_attributes_presentations_attributes_#{i}_topic">Topic<\/label>/, output_buffer)
-      assert_match(/<input id="conference_speaker_attributes_presentations_attributes_#{i}_topic" name="conference\[speaker_attributes\]\[presentations_attributes\]\[#{i}\]\[topic\]" type="text" value="#{presentations[i].topic}" \/>/, output_buffer)
+      assert_match(/<input type="text" value="#{presentations[i].topic}" name="conference\[speaker_attributes\]\[presentations_attributes\]\[#{i}\]\[topic\]" id="conference_speaker_attributes_presentations_attributes_#{i}_topic" \/>/, output_buffer)
       assert_match(/<label for="conference_speaker_attributes_presentations_attributes_#{i}_duration">Duration<\/label>/, output_buffer)
-      assert_match(/<input id="conference_speaker_attributes_presentations_attributes_#{i}_duration" name="conference\[speaker_attributes\]\[presentations_attributes\]\[#{i}\]\[duration\]" type="text" value="#{presentations[i].duration}" \/>/, output_buffer)
+      assert_match(/<input type="text" value="#{presentations[i].duration}" name="conference\[speaker_attributes\]\[presentations_attributes\]\[#{i}\]\[duration\]" id="conference_speaker_attributes_presentations_attributes_#{i}_duration" \/>/, output_buffer)
     end
 
-    assert_match(/<input name="commit" type="submit" value="Update Conference" \/>/, output_buffer)
+    assert_match(/<input type="submit" name="commit" value="Update Conference" \/>/, output_buffer)
   end
 
   test "form_for renders correctly a new instance of SurveyFormFixture" do
@@ -535,17 +538,17 @@ def form_for(*)
     assert_match(/method="post"/, output_buffer)
 
     assert_match(/<label for="survey_name">Name<\/label>/, output_buffer)
-    assert_match(/<input id="survey_name" name="survey\[name\]" type="text" \/>/, output_buffer)
+    assert_match(/<input type="text" name="survey\[name\]" id="survey_name" \/>/, output_buffer)
 
     assert_match(/<label for="survey_questions_attributes_0_content">Content<\/label>/, output_buffer)
-    assert_match(/<input id="survey_questions_attributes_0_content" name="survey\[questions_attributes\]\[0\]\[content\]" type="text" \/>/, output_buffer)
+    assert_match(/<input type="text" name="survey\[questions_attributes\]\[0\]\[content\]" id="survey_questions_attributes_0_content" \/>/, output_buffer)
 
     [0, 1].each do |i|
       assert_match(/<label for="survey_questions_attributes_0_answers_attributes_#{i}_content">Content<\/label>/, output_buffer)
-      assert_match(/<input id="survey_questions_attributes_0_answers_attributes_#{i}_content" name="survey\[questions_attributes\]\[0\]\[answers_attributes\]\[#{i}\]\[content\]" type="text" \/>/, output_buffer)
+      assert_match(/<input type="text" name="survey\[questions_attributes\]\[0\]\[answers_attributes\]\[#{i}\]\[content\]" id="survey_questions_attributes_0_answers_attributes_#{i}_content" \/>/, output_buffer)
     end
 
-    assert_match(/<input name="commit" type="submit" value="Create Survey" \/>/, output_buffer)
+    assert_match(/<input type="submit" name="commit" value="Create Survey" \/>/, output_buffer)
   end
 
   test "form_for renders correctly a existing instance of SurveyFormFixture" do
@@ -578,17 +581,17 @@ def form_for(*)
     assert_match(/method="post"/, output_buffer)
 
     assert_match(/<label for="survey_name">Name<\/label>/, output_buffer)
-    assert_match(/<input id="survey_name" name="survey\[name\]" type="text" value="#{survey_form.name}" \/>/, output_buffer)
+    assert_match(/<input type="text" value="#{survey_form.name}" name="survey\[name\]" id="survey_name" \/>/, output_buffer)
 
     assert_match(/<label for="survey_questions_attributes_0_content">Content<\/label>/, output_buffer)
-    assert_match(/<input id="survey_questions_attributes_0_content" name="survey\[questions_attributes\]\[0\]\[content\]" type="text" value="Which language allows closures\?" \/>/, output_buffer)
-    assert_match(/<input id="survey_questions_attributes_0_id" name="survey\[questions_attributes\]\[0\]\[id\]" type="hidden" value="#{questions[0].id}" \/>/, output_buffer)
+    assert_match(/<input type="text" value="Which language allows closures\?" name="survey\[questions_attributes\]\[0\]\[content\]" id="survey_questions_attributes_0_content" \/>/, output_buffer)
+    assert_match(/<input type="hidden" value="#{questions[0].id}" name="survey\[questions_attributes\]\[0\]\[id\]" id="survey_questions_attributes_0_id" \/>/, output_buffer)
 
     [0, 1].each do |i|
       assert_match(/<label for="survey_questions_attributes_0_answers_attributes_#{i}_content">Content<\/label>/, output_buffer)
-      assert_match(/<input id="survey_questions_attributes_0_answers_attributes_#{i}_content" name="survey\[questions_attributes\]\[0\]\[answers_attributes\]\[#{i}\]\[content\]" type="text" value="#{questions[0].answers[i].content}" \/>/, output_buffer)
+      assert_match(/<input type="text" value="#{questions[0].answers[i].content}" name="survey\[questions_attributes\]\[0\]\[answers_attributes\]\[#{i}\]\[content\]" id="survey_questions_attributes_0_answers_attributes_#{i}_content" \/>/, output_buffer)
     end
 
-    assert_match(/<input name="commit" type="submit" value="Update Survey" \/>/, output_buffer)
+    assert_match(/<input type="submit" name="commit" value="Update Survey" \/>/, output_buffer)
   end
 end

From 939862e79d9f8c9983334779565648f8f6ee15d5 Mon Sep 17 00:00:00 2001
From: JBox Admin <admin@jbox-web.com>
Date: Tue, 5 Jul 2016 03:08:27 +0200
Subject: [PATCH 07/32] Update README.md

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 5ab3a4a..073dcac 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-# Action Form
+## 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)
+[![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)
 
 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.
 

From faac7ecb1fb5df85df49cfa398ef4c5de7f4f91d Mon Sep 17 00:00:00 2001
From: Nicolas Rodriguez <nrodriguez@jbox-web.com>
Date: Tue, 5 Jul 2016 03:09:24 +0200
Subject: [PATCH 08/32] Update License file

---
 LICENSE     | 19 +++++++++++++++++++
 MIT-LICENSE | 20 --------------------
 2 files changed, 19 insertions(+), 20 deletions(-)
 create mode 100644 LICENSE
 delete mode 100644 MIT-LICENSE

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..72dc60d
--- /dev/null
+++ b/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.
diff --git a/MIT-LICENSE b/MIT-LICENSE
deleted file mode 100644
index ea966ec..0000000
--- a/MIT-LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright 2014 YOURNAME
-
-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.

From e4777ddd437a0a7ef999678e540838a831aa4602 Mon Sep 17 00:00:00 2001
From: Nicolas Rodriguez <nrodriguez@jbox-web.com>
Date: Tue, 5 Jul 2016 03:15:25 +0200
Subject: [PATCH 09/32] Update .gitignore

---
 .gitignore | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 24e4b0e..7c277f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,17 @@
-.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
+
+# 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

From e89309044c6e7b79113c2092c59c0bbb90e5f647 Mon Sep 17 00:00:00 2001
From: Nicolas Rodriguez <nrodriguez@jbox-web.com>
Date: Tue, 5 Jul 2016 03:15:43 +0200
Subject: [PATCH 10/32] Fix deprecation warnings

---
 test/dummy/db/migrate/20140729162110_create_users.rb         | 2 +-
 test/dummy/db/migrate/20140729162246_create_emails.rb        | 2 +-
 test/dummy/db/migrate/20140729162335_create_profiles.rb      | 2 +-
 test/dummy/db/migrate/20140729164623_create_songs.rb         | 2 +-
 test/dummy/db/migrate/20140729164653_create_artists.rb       | 2 +-
 test/dummy/db/migrate/20140729164713_create_producers.rb     | 2 +-
 test/dummy/db/migrate/20140729165425_create_conferences.rb   | 2 +-
 test/dummy/db/migrate/20140729165445_create_speakers.rb      | 2 +-
 test/dummy/db/migrate/20140729165506_create_presentations.rb | 2 +-
 test/dummy/db/migrate/20140729170014_create_surveys.rb       | 2 +-
 test/dummy/db/migrate/20140729170034_create_questions.rb     | 2 +-
 test/dummy/db/migrate/20140729170112_create_answers.rb       | 2 +-
 test/dummy/db/migrate/20140806122636_create_projects.rb      | 2 +-
 test/dummy/db/migrate/20140806122735_create_tasks.rb         | 2 +-
 test/dummy/db/migrate/20140806122805_create_sub_tasks.rb     | 2 +-
 test/dummy/db/migrate/20140806122834_create_people.rb        | 2 +-
 test/dummy/db/migrate/20140806122945_create_tags.rb          | 2 +-
 test/dummy/db/migrate/20140806123008_create_project_tags.rb  | 2 +-
 test/dummy/db/migrate/20140820071344_create_assignments.rb   | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/test/dummy/db/migrate/20140729162110_create_users.rb b/test/dummy/db/migrate/20140729162110_create_users.rb
index 1a6785a..e0131aa 100644
--- a/test/dummy/db/migrate/20140729162110_create_users.rb
+++ b/test/dummy/db/migrate/20140729162110_create_users.rb
@@ -5,7 +5,7 @@ def change
       t.integer :age
       t.integer :gender
 
-      t.timestamps
+      t.timestamps, null: false
     end
   end
 end
diff --git a/test/dummy/db/migrate/20140729162246_create_emails.rb b/test/dummy/db/migrate/20140729162246_create_emails.rb
index 21f5452..52e776b 100644
--- a/test/dummy/db/migrate/20140729162246_create_emails.rb
+++ b/test/dummy/db/migrate/20140729162246_create_emails.rb
@@ -4,7 +4,7 @@ def change
       t.string :address
       t.references :user, index: true
 
-      t.timestamps
+      t.timestamps, null: false
     end
   end
 end
diff --git a/test/dummy/db/migrate/20140729162335_create_profiles.rb b/test/dummy/db/migrate/20140729162335_create_profiles.rb
index fb8aee9..f4c6884 100644
--- a/test/dummy/db/migrate/20140729162335_create_profiles.rb
+++ b/test/dummy/db/migrate/20140729162335_create_profiles.rb
@@ -5,7 +5,7 @@ def change
       t.string :github_name
       t.references :user, index: true
 
-      t.timestamps
+      t.timestamps, null: false
     end
   end
 end
diff --git a/test/dummy/db/migrate/20140729164623_create_songs.rb b/test/dummy/db/migrate/20140729164623_create_songs.rb
index 4b7a6fe..2dcf1b6 100644
--- a/test/dummy/db/migrate/20140729164623_create_songs.rb
+++ b/test/dummy/db/migrate/20140729164623_create_songs.rb
@@ -4,7 +4,7 @@ def change
       t.string :title
       t.string :length
 
-      t.timestamps
+      t.timestamps, null: false
     end
   end
 end
diff --git a/test/dummy/db/migrate/20140729164653_create_artists.rb b/test/dummy/db/migrate/20140729164653_create_artists.rb
index ff53396..fe72acc 100644
--- a/test/dummy/db/migrate/20140729164653_create_artists.rb
+++ b/test/dummy/db/migrate/20140729164653_create_artists.rb
@@ -4,7 +4,7 @@ def change
       t.string :name
       t.references :song, index: true
 
-      t.timestamps
+      t.timestamps, null: false
     end
   end
 end
diff --git a/test/dummy/db/migrate/20140729164713_create_producers.rb b/test/dummy/db/migrate/20140729164713_create_producers.rb
index 5ee5364..629b11a 100644
--- a/test/dummy/db/migrate/20140729164713_create_producers.rb
+++ b/test/dummy/db/migrate/20140729164713_create_producers.rb
@@ -5,7 +5,7 @@ def change
       t.string :studio
       t.references :artist, index: true
 
-      t.timestamps
+      t.timestamps, null: false
     end
   end
 end
diff --git a/test/dummy/db/migrate/20140729165425_create_conferences.rb b/test/dummy/db/migrate/20140729165425_create_conferences.rb
index b00f221..641ab8c 100644
--- a/test/dummy/db/migrate/20140729165425_create_conferences.rb
+++ b/test/dummy/db/migrate/20140729165425_create_conferences.rb
@@ -4,7 +4,7 @@ def change
       t.string :name
       t.string :city
 
-      t.timestamps
+      t.timestamps, null: false
     end
   end
 end
diff --git a/test/dummy/db/migrate/20140729165445_create_speakers.rb b/test/dummy/db/migrate/20140729165445_create_speakers.rb
index 703c9f5..1a2cc86 100644
--- a/test/dummy/db/migrate/20140729165445_create_speakers.rb
+++ b/test/dummy/db/migrate/20140729165445_create_speakers.rb
@@ -5,7 +5,7 @@ def change
       t.string :occupation
       t.references :conference, index: true
 
-      t.timestamps
+      t.timestamps, null: false
     end
   end
 end
diff --git a/test/dummy/db/migrate/20140729165506_create_presentations.rb b/test/dummy/db/migrate/20140729165506_create_presentations.rb
index 478decb..6be121d 100644
--- a/test/dummy/db/migrate/20140729165506_create_presentations.rb
+++ b/test/dummy/db/migrate/20140729165506_create_presentations.rb
@@ -5,7 +5,7 @@ def change
       t.string :duration
       t.references :speaker, index: true
 
-      t.timestamps
+      t.timestamps, null: false
     end
   end
 end
diff --git a/test/dummy/db/migrate/20140729170014_create_surveys.rb b/test/dummy/db/migrate/20140729170014_create_surveys.rb
index 4ccf117..8abad26 100644
--- a/test/dummy/db/migrate/20140729170014_create_surveys.rb
+++ b/test/dummy/db/migrate/20140729170014_create_surveys.rb
@@ -3,7 +3,7 @@ def change
     create_table :surveys do |t|
       t.string :name
 
-      t.timestamps
+      t.timestamps, null: false
     end
   end
 end
diff --git a/test/dummy/db/migrate/20140729170034_create_questions.rb b/test/dummy/db/migrate/20140729170034_create_questions.rb
index 70a0c2a..9376b9a 100644
--- a/test/dummy/db/migrate/20140729170034_create_questions.rb
+++ b/test/dummy/db/migrate/20140729170034_create_questions.rb
@@ -4,7 +4,7 @@ def change
       t.text :content
       t.references :survey, index: true
 
-      t.timestamps
+      t.timestamps, null: false
     end
   end
 end
diff --git a/test/dummy/db/migrate/20140729170112_create_answers.rb b/test/dummy/db/migrate/20140729170112_create_answers.rb
index b042ed6..0b36a93 100644
--- a/test/dummy/db/migrate/20140729170112_create_answers.rb
+++ b/test/dummy/db/migrate/20140729170112_create_answers.rb
@@ -4,7 +4,7 @@ def change
       t.text :content
       t.references :question, index: true
 
-      t.timestamps
+      t.timestamps, null: false
     end
   end
 end
diff --git a/test/dummy/db/migrate/20140806122636_create_projects.rb b/test/dummy/db/migrate/20140806122636_create_projects.rb
index 8c93aba..2326137 100644
--- a/test/dummy/db/migrate/20140806122636_create_projects.rb
+++ b/test/dummy/db/migrate/20140806122636_create_projects.rb
@@ -4,7 +4,7 @@ def change
       t.string :name
       t.string :description
 
-      t.timestamps
+      t.timestamps, null: false
     end
   end
 end
diff --git a/test/dummy/db/migrate/20140806122735_create_tasks.rb b/test/dummy/db/migrate/20140806122735_create_tasks.rb
index 2665660..5f83bd8 100644
--- a/test/dummy/db/migrate/20140806122735_create_tasks.rb
+++ b/test/dummy/db/migrate/20140806122735_create_tasks.rb
@@ -6,7 +6,7 @@ def change
       t.boolean :done
       t.references :project, index: true
 
-      t.timestamps
+      t.timestamps, null: false
     end
   end
 end
diff --git a/test/dummy/db/migrate/20140806122805_create_sub_tasks.rb b/test/dummy/db/migrate/20140806122805_create_sub_tasks.rb
index afdff0b..27c9a9e 100644
--- a/test/dummy/db/migrate/20140806122805_create_sub_tasks.rb
+++ b/test/dummy/db/migrate/20140806122805_create_sub_tasks.rb
@@ -6,7 +6,7 @@ def change
       t.boolean :done
       t.references :task, index: true
 
-      t.timestamps
+      t.timestamps, null: false
     end
   end
 end
diff --git a/test/dummy/db/migrate/20140806122834_create_people.rb b/test/dummy/db/migrate/20140806122834_create_people.rb
index 1350fe9..179f4c9 100644
--- a/test/dummy/db/migrate/20140806122834_create_people.rb
+++ b/test/dummy/db/migrate/20140806122834_create_people.rb
@@ -6,7 +6,7 @@ def change
       t.string :description
       t.references :project, index: true
 
-      t.timestamps
+      t.timestamps, null: false
     end
   end
 end
diff --git a/test/dummy/db/migrate/20140806122945_create_tags.rb b/test/dummy/db/migrate/20140806122945_create_tags.rb
index 048be7c..f57d7da 100644
--- a/test/dummy/db/migrate/20140806122945_create_tags.rb
+++ b/test/dummy/db/migrate/20140806122945_create_tags.rb
@@ -3,7 +3,7 @@ def change
     create_table :tags do |t|
       t.string :name
 
-      t.timestamps
+      t.timestamps, null: false
     end
   end
 end
diff --git a/test/dummy/db/migrate/20140806123008_create_project_tags.rb b/test/dummy/db/migrate/20140806123008_create_project_tags.rb
index cc784eb..9944156 100644
--- a/test/dummy/db/migrate/20140806123008_create_project_tags.rb
+++ b/test/dummy/db/migrate/20140806123008_create_project_tags.rb
@@ -4,7 +4,7 @@ def change
       t.references :project, index: true
       t.references :tag, index: true
 
-      t.timestamps
+      t.timestamps, null: false
     end
   end
 end
diff --git a/test/dummy/db/migrate/20140820071344_create_assignments.rb b/test/dummy/db/migrate/20140820071344_create_assignments.rb
index fc240cf..2246b44 100644
--- a/test/dummy/db/migrate/20140820071344_create_assignments.rb
+++ b/test/dummy/db/migrate/20140820071344_create_assignments.rb
@@ -3,7 +3,7 @@ def change
     create_table :assignments do |t|
       t.string :name
 
-      t.timestamps
+      t.timestamps, null: false
     end
   end
 end

From 1590bf4c4939bbdf0f0a6d0c08eef6d5e2f34353 Mon Sep 17 00:00:00 2001
From: Nicolas Rodriguez <nrodriguez@jbox-web.com>
Date: Tue, 5 Jul 2016 03:20:20 +0200
Subject: [PATCH 11/32] Oopss.. typo

---
 test/dummy/db/migrate/20140729162110_create_users.rb         | 2 +-
 test/dummy/db/migrate/20140729162246_create_emails.rb        | 2 +-
 test/dummy/db/migrate/20140729162335_create_profiles.rb      | 2 +-
 test/dummy/db/migrate/20140729164623_create_songs.rb         | 2 +-
 test/dummy/db/migrate/20140729164653_create_artists.rb       | 2 +-
 test/dummy/db/migrate/20140729164713_create_producers.rb     | 2 +-
 test/dummy/db/migrate/20140729165425_create_conferences.rb   | 2 +-
 test/dummy/db/migrate/20140729165445_create_speakers.rb      | 2 +-
 test/dummy/db/migrate/20140729165506_create_presentations.rb | 2 +-
 test/dummy/db/migrate/20140729170014_create_surveys.rb       | 2 +-
 test/dummy/db/migrate/20140729170034_create_questions.rb     | 2 +-
 test/dummy/db/migrate/20140729170112_create_answers.rb       | 2 +-
 test/dummy/db/migrate/20140806122636_create_projects.rb      | 2 +-
 test/dummy/db/migrate/20140806122735_create_tasks.rb         | 2 +-
 test/dummy/db/migrate/20140806122805_create_sub_tasks.rb     | 2 +-
 test/dummy/db/migrate/20140806122834_create_people.rb        | 2 +-
 test/dummy/db/migrate/20140806122945_create_tags.rb          | 2 +-
 test/dummy/db/migrate/20140806123008_create_project_tags.rb  | 2 +-
 test/dummy/db/migrate/20140820071344_create_assignments.rb   | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/test/dummy/db/migrate/20140729162110_create_users.rb b/test/dummy/db/migrate/20140729162110_create_users.rb
index e0131aa..581e280 100644
--- a/test/dummy/db/migrate/20140729162110_create_users.rb
+++ b/test/dummy/db/migrate/20140729162110_create_users.rb
@@ -5,7 +5,7 @@ def change
       t.integer :age
       t.integer :gender
 
-      t.timestamps, null: false
+      t.timestamps null: false
     end
   end
 end
diff --git a/test/dummy/db/migrate/20140729162246_create_emails.rb b/test/dummy/db/migrate/20140729162246_create_emails.rb
index 52e776b..179cbd6 100644
--- a/test/dummy/db/migrate/20140729162246_create_emails.rb
+++ b/test/dummy/db/migrate/20140729162246_create_emails.rb
@@ -4,7 +4,7 @@ def change
       t.string :address
       t.references :user, index: true
 
-      t.timestamps, null: false
+      t.timestamps null: false
     end
   end
 end
diff --git a/test/dummy/db/migrate/20140729162335_create_profiles.rb b/test/dummy/db/migrate/20140729162335_create_profiles.rb
index f4c6884..b8e30fe 100644
--- a/test/dummy/db/migrate/20140729162335_create_profiles.rb
+++ b/test/dummy/db/migrate/20140729162335_create_profiles.rb
@@ -5,7 +5,7 @@ def change
       t.string :github_name
       t.references :user, index: true
 
-      t.timestamps, null: false
+      t.timestamps null: false
     end
   end
 end
diff --git a/test/dummy/db/migrate/20140729164623_create_songs.rb b/test/dummy/db/migrate/20140729164623_create_songs.rb
index 2dcf1b6..42f39af 100644
--- a/test/dummy/db/migrate/20140729164623_create_songs.rb
+++ b/test/dummy/db/migrate/20140729164623_create_songs.rb
@@ -4,7 +4,7 @@ def change
       t.string :title
       t.string :length
 
-      t.timestamps, null: false
+      t.timestamps null: false
     end
   end
 end
diff --git a/test/dummy/db/migrate/20140729164653_create_artists.rb b/test/dummy/db/migrate/20140729164653_create_artists.rb
index fe72acc..9536d3b 100644
--- a/test/dummy/db/migrate/20140729164653_create_artists.rb
+++ b/test/dummy/db/migrate/20140729164653_create_artists.rb
@@ -4,7 +4,7 @@ def change
       t.string :name
       t.references :song, index: true
 
-      t.timestamps, null: false
+      t.timestamps null: false
     end
   end
 end
diff --git a/test/dummy/db/migrate/20140729164713_create_producers.rb b/test/dummy/db/migrate/20140729164713_create_producers.rb
index 629b11a..2456ec8 100644
--- a/test/dummy/db/migrate/20140729164713_create_producers.rb
+++ b/test/dummy/db/migrate/20140729164713_create_producers.rb
@@ -5,7 +5,7 @@ def change
       t.string :studio
       t.references :artist, index: true
 
-      t.timestamps, null: false
+      t.timestamps null: false
     end
   end
 end
diff --git a/test/dummy/db/migrate/20140729165425_create_conferences.rb b/test/dummy/db/migrate/20140729165425_create_conferences.rb
index 641ab8c..f645624 100644
--- a/test/dummy/db/migrate/20140729165425_create_conferences.rb
+++ b/test/dummy/db/migrate/20140729165425_create_conferences.rb
@@ -4,7 +4,7 @@ def change
       t.string :name
       t.string :city
 
-      t.timestamps, null: false
+      t.timestamps null: false
     end
   end
 end
diff --git a/test/dummy/db/migrate/20140729165445_create_speakers.rb b/test/dummy/db/migrate/20140729165445_create_speakers.rb
index 1a2cc86..acb3d49 100644
--- a/test/dummy/db/migrate/20140729165445_create_speakers.rb
+++ b/test/dummy/db/migrate/20140729165445_create_speakers.rb
@@ -5,7 +5,7 @@ def change
       t.string :occupation
       t.references :conference, index: true
 
-      t.timestamps, null: false
+      t.timestamps null: false
     end
   end
 end
diff --git a/test/dummy/db/migrate/20140729165506_create_presentations.rb b/test/dummy/db/migrate/20140729165506_create_presentations.rb
index 6be121d..87f03c7 100644
--- a/test/dummy/db/migrate/20140729165506_create_presentations.rb
+++ b/test/dummy/db/migrate/20140729165506_create_presentations.rb
@@ -5,7 +5,7 @@ def change
       t.string :duration
       t.references :speaker, index: true
 
-      t.timestamps, null: false
+      t.timestamps null: false
     end
   end
 end
diff --git a/test/dummy/db/migrate/20140729170014_create_surveys.rb b/test/dummy/db/migrate/20140729170014_create_surveys.rb
index 8abad26..c9bb4b5 100644
--- a/test/dummy/db/migrate/20140729170014_create_surveys.rb
+++ b/test/dummy/db/migrate/20140729170014_create_surveys.rb
@@ -3,7 +3,7 @@ def change
     create_table :surveys do |t|
       t.string :name
 
-      t.timestamps, null: false
+      t.timestamps null: false
     end
   end
 end
diff --git a/test/dummy/db/migrate/20140729170034_create_questions.rb b/test/dummy/db/migrate/20140729170034_create_questions.rb
index 9376b9a..3db8bc1 100644
--- a/test/dummy/db/migrate/20140729170034_create_questions.rb
+++ b/test/dummy/db/migrate/20140729170034_create_questions.rb
@@ -4,7 +4,7 @@ def change
       t.text :content
       t.references :survey, index: true
 
-      t.timestamps, null: false
+      t.timestamps null: false
     end
   end
 end
diff --git a/test/dummy/db/migrate/20140729170112_create_answers.rb b/test/dummy/db/migrate/20140729170112_create_answers.rb
index 0b36a93..a7dfeae 100644
--- a/test/dummy/db/migrate/20140729170112_create_answers.rb
+++ b/test/dummy/db/migrate/20140729170112_create_answers.rb
@@ -4,7 +4,7 @@ def change
       t.text :content
       t.references :question, index: true
 
-      t.timestamps, null: false
+      t.timestamps null: false
     end
   end
 end
diff --git a/test/dummy/db/migrate/20140806122636_create_projects.rb b/test/dummy/db/migrate/20140806122636_create_projects.rb
index 2326137..a2905bc 100644
--- a/test/dummy/db/migrate/20140806122636_create_projects.rb
+++ b/test/dummy/db/migrate/20140806122636_create_projects.rb
@@ -4,7 +4,7 @@ def change
       t.string :name
       t.string :description
 
-      t.timestamps, null: false
+      t.timestamps null: false
     end
   end
 end
diff --git a/test/dummy/db/migrate/20140806122735_create_tasks.rb b/test/dummy/db/migrate/20140806122735_create_tasks.rb
index 5f83bd8..1b762bf 100644
--- a/test/dummy/db/migrate/20140806122735_create_tasks.rb
+++ b/test/dummy/db/migrate/20140806122735_create_tasks.rb
@@ -6,7 +6,7 @@ def change
       t.boolean :done
       t.references :project, index: true
 
-      t.timestamps, null: false
+      t.timestamps null: false
     end
   end
 end
diff --git a/test/dummy/db/migrate/20140806122805_create_sub_tasks.rb b/test/dummy/db/migrate/20140806122805_create_sub_tasks.rb
index 27c9a9e..4e6bc23 100644
--- a/test/dummy/db/migrate/20140806122805_create_sub_tasks.rb
+++ b/test/dummy/db/migrate/20140806122805_create_sub_tasks.rb
@@ -6,7 +6,7 @@ def change
       t.boolean :done
       t.references :task, index: true
 
-      t.timestamps, null: false
+      t.timestamps null: false
     end
   end
 end
diff --git a/test/dummy/db/migrate/20140806122834_create_people.rb b/test/dummy/db/migrate/20140806122834_create_people.rb
index 179f4c9..462a442 100644
--- a/test/dummy/db/migrate/20140806122834_create_people.rb
+++ b/test/dummy/db/migrate/20140806122834_create_people.rb
@@ -6,7 +6,7 @@ def change
       t.string :description
       t.references :project, index: true
 
-      t.timestamps, null: false
+      t.timestamps null: false
     end
   end
 end
diff --git a/test/dummy/db/migrate/20140806122945_create_tags.rb b/test/dummy/db/migrate/20140806122945_create_tags.rb
index f57d7da..965cd7a 100644
--- a/test/dummy/db/migrate/20140806122945_create_tags.rb
+++ b/test/dummy/db/migrate/20140806122945_create_tags.rb
@@ -3,7 +3,7 @@ def change
     create_table :tags do |t|
       t.string :name
 
-      t.timestamps, null: false
+      t.timestamps null: false
     end
   end
 end
diff --git a/test/dummy/db/migrate/20140806123008_create_project_tags.rb b/test/dummy/db/migrate/20140806123008_create_project_tags.rb
index 9944156..93c61f1 100644
--- a/test/dummy/db/migrate/20140806123008_create_project_tags.rb
+++ b/test/dummy/db/migrate/20140806123008_create_project_tags.rb
@@ -4,7 +4,7 @@ def change
       t.references :project, index: true
       t.references :tag, index: true
 
-      t.timestamps, null: false
+      t.timestamps null: false
     end
   end
 end
diff --git a/test/dummy/db/migrate/20140820071344_create_assignments.rb b/test/dummy/db/migrate/20140820071344_create_assignments.rb
index 2246b44..fa0e823 100644
--- a/test/dummy/db/migrate/20140820071344_create_assignments.rb
+++ b/test/dummy/db/migrate/20140820071344_create_assignments.rb
@@ -3,7 +3,7 @@ def change
     create_table :assignments do |t|
       t.string :name
 
-      t.timestamps, null: false
+      t.timestamps null: false
     end
   end
 end

From 7a9dfb5d80c74bc7baf647ec6cea80a21d80faf4 Mon Sep 17 00:00:00 2001
From: Nicolas Rodriguez <nrodriguez@jbox-web.com>
Date: Tue, 5 Jul 2016 03:22:22 +0200
Subject: [PATCH 12/32] Remove empty lines

---
 Rakefile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Rakefile b/Rakefile
index 996df19..38f77df 100644
--- a/Rakefile
+++ b/Rakefile
@@ -14,9 +14,6 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-
-
-
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
@@ -28,5 +25,4 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
-
 task default: :test

From f39ef86f1bee5fdfa3b4f26c2faa3341285e04be Mon Sep 17 00:00:00 2001
From: Nicolas Rodriguez <nrodriguez@jbox-web.com>
Date: Tue, 5 Jul 2016 03:40:45 +0200
Subject: [PATCH 13/32] Setup tests with Appraisals

---
 .gitignore               |  1 +
 .travis.yml              |  9 +++++++--
 Appraisals               |  7 +++++++
 Gemfile                  |  6 ++++++
 Rakefile                 |  4 ++++
 actionform.gemspec       |  2 +-
 gemfiles/rails_4.gemfile | 15 +++++++++++++++
 gemfiles/rails_5.gemfile | 15 +++++++++++++++
 8 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 Appraisals
 create mode 100644 gemfiles/rails_4.gemfile
 create mode 100644 gemfiles/rails_5.gemfile

diff --git a/.gitignore b/.gitignore
index 7c277f4..e8b77d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 
 # Ignore Gemfile.lock
 /Gemfile.lock
+/gemfiles/*.gemfile.lock
 
 # Ignore test files
 /coverage
diff --git a/.travis.yml b/.travis.yml
index 1b6366a..64b3905 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,12 @@
 language: ruby
+sudo: false
+cache: bundler
 rvm:
-  - 2.1
-  - 2.2
+  - 2.3.1
+  - 2.2.5
+gemfile:
+  - gemfiles/rails_5.gemfile
+  - gemfiles/rails_4.gemfile
 script:
   - cd test/dummy/
   - RAILS_ENV=test bundle exec rake db:migrate
diff --git a/Appraisals b/Appraisals
new file mode 100644
index 0000000..1203a3d
--- /dev/null
+++ b/Appraisals
@@ -0,0 +1,7 @@
+appraise 'rails-4' do
+  gem 'rails', '~> 4.2.6'
+end
+
+appraise 'rails-5' do
+  gem 'rails', '~> 5.0.0'
+end
diff --git a/Gemfile b/Gemfile
index 59cffb6..3a06b67 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,3 +4,9 @@ gemspec
 
 gem 'jquery-rails'
 gem 'simple_form'
+
+group :development do
+  gem 'bundler'
+  gem 'rake'
+  gem 'appraisal'
+end
diff --git a/Rakefile b/Rakefile
index 38f77df..d76aa52 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,3 +1,7 @@
+#!/usr/bin/env rake
+
+require 'rubygems'
+
 begin
   require 'bundler/setup'
 rescue LoadError
diff --git a/actionform.gemspec b/actionform.gemspec
index 888c65d..8976380 100644
--- a/actionform.gemspec
+++ b/actionform.gemspec
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   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.1', '< 6'
 
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'rake', '~> 10.3.2'
diff --git a/gemfiles/rails_4.gemfile b/gemfiles/rails_4.gemfile
new file mode 100644
index 0000000..b0a5695
--- /dev/null
+++ b/gemfiles/rails_4.gemfile
@@ -0,0 +1,15 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "jquery-rails"
+gem "simple_form"
+gem "rails", "~> 4.2.6"
+
+group :development do
+  gem "bundler"
+  gem "rake"
+  gem "appraisal"
+end
+
+gemspec :path => "../"
diff --git a/gemfiles/rails_5.gemfile b/gemfiles/rails_5.gemfile
new file mode 100644
index 0000000..ebca4ed
--- /dev/null
+++ b/gemfiles/rails_5.gemfile
@@ -0,0 +1,15 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "jquery-rails"
+gem "simple_form"
+gem "rails", "~> 5.0.0"
+
+group :development do
+  gem "bundler"
+  gem "rake"
+  gem "appraisal"
+end
+
+gemspec :path => "../"

From a7bb4c0f248bcd72bb73a7d2489459dd15b3ceba Mon Sep 17 00:00:00 2001
From: Nicolas Rodriguez <nrodriguez@jbox-web.com>
Date: Tue, 5 Jul 2016 03:41:06 +0200
Subject: [PATCH 14/32] Fix warning

---
 lib/action_form/form.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/action_form/form.rb b/lib/action_form/form.rb
index b343219..2463a7a 100644
--- a/lib/action_form/form.rb
+++ b/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

From 323815407aa0331b5717327d2da0d5727a2b2e3f Mon Sep 17 00:00:00 2001
From: Nicolas Rodriguez <nrodriguez@jbox-web.com>
Date: Tue, 5 Jul 2016 04:16:45 +0200
Subject: [PATCH 15/32] Add code coverage

---
 Gemfile                  |  4 ++++
 actionform.gemspec       |  1 +
 gemfiles/rails_4.gemfile |  4 ++++
 gemfiles/rails_5.gemfile |  4 ++++
 test/test_helper.rb      | 22 +++++++++++++++++++---
 5 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3a06b67..3b3b0e1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,3 +10,7 @@ group :development do
   gem 'rake'
   gem 'appraisal'
 end
+
+group :test do
+  gem 'codeclimate-test-reporter', require: nil
+end
diff --git a/actionform.gemspec b/actionform.gemspec
index 8976380..9b16ec8 100644
--- a/actionform.gemspec
+++ b/actionform.gemspec
@@ -19,4 +19,5 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'rake', '~> 10.3.2'
+  s.add_development_dependency 'simplecov'
 end
diff --git a/gemfiles/rails_4.gemfile b/gemfiles/rails_4.gemfile
index b0a5695..df921ed 100644
--- a/gemfiles/rails_4.gemfile
+++ b/gemfiles/rails_4.gemfile
@@ -12,4 +12,8 @@ group :development do
   gem "appraisal"
 end
 
+group :test do
+  gem "codeclimate-test-reporter", :require => nil
+end
+
 gemspec :path => "../"
diff --git a/gemfiles/rails_5.gemfile b/gemfiles/rails_5.gemfile
index ebca4ed..1a637e1 100644
--- a/gemfiles/rails_5.gemfile
+++ b/gemfiles/rails_5.gemfile
@@ -12,4 +12,8 @@ group :development do
   gem "appraisal"
 end
 
+group :test do
+  gem "codeclimate-test-reporter", :require => nil
+end
+
 gemspec :path => "../"
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 8f83bce..778185a 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,7 +1,23 @@
-ENV["RAILS_ENV"] = "test"
+require 'simplecov'
+require 'codeclimate-test-reporter'
 
-require File.expand_path("../dummy/config/environment.rb",  __FILE__)
-require "rails/test_help"
+# Configure SimpleCov
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
+  SimpleCov::Formatter::HTMLFormatter,
+  CodeClimate::TestReporter::Formatter
+])
+
+SimpleCov.start do
+  add_filter do |source_file|
+    source_file.filename.to_s.include?('test')
+  end
+end
+
+
+ENV['RAILS_ENV'] ||= 'test'
+
+require File.expand_path('../dummy/config/environment.rb',  __FILE__)
+require 'rails/test_help'
 
 Rails.backtrace_cleaner.remove_silencers!
 

From 72d9cb0c24e53fd8cc7afa31006f1c8ed827be92 Mon Sep 17 00:00:00 2001
From: JBox Admin <admin@jbox-web.com>
Date: Tue, 5 Jul 2016 04:20:19 +0200
Subject: [PATCH 16/32] Update README.md

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 073dcac..3cb1ee6 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,9 @@
 [![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)
+[![Issue Count](https://codeclimate.com/github/jbox-web/actionform/badges/issue_count.svg)](https://codeclimate.com/github/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.
 

From 56542ca6513f5c6aac1f5b0035d8c6547e1d737e Mon Sep 17 00:00:00 2001
From: JBox Admin <admin@jbox-web.com>
Date: Tue, 5 Jul 2016 04:24:20 +0200
Subject: [PATCH 17/32] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 3cb1ee6..9d667a7 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,7 @@
 [![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)
 [![Issue Count](https://codeclimate.com/github/jbox-web/actionform/badges/issue_count.svg)](https://codeclimate.com/github/jbox-web/actionform)
+[![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.
 

From 2acfb0391540a95f067e5cb0a913dde7c76d31d4 Mon Sep 17 00:00:00 2001
From: JBox Admin <admin@jbox-web.com>
Date: Tue, 5 Jul 2016 04:25:12 +0200
Subject: [PATCH 18/32] Update README.md

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 9d667a7..f490afc 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,6 @@
 [![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)
-[![Issue Count](https://codeclimate.com/github/jbox-web/actionform/badges/issue_count.svg)](https://codeclimate.com/github/jbox-web/actionform)
 [![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.

From 30fe7b4e4000422f957f1cc75f09f35d1c11db46 Mon Sep 17 00:00:00 2001
From: Nicolas Rodriguez <nrodriguez@jbox-web.com>
Date: Tue, 5 Jul 2016 05:04:44 +0200
Subject: [PATCH 19/32] Fix tests with Rails 5 (part1)

---
 Appraisals                                    |   1 +
 gemfiles/rails_5.gemfile                      |   1 +
 test/dummy/config/environments/test.rb        |   9 +-
 .../assignments_controller_test.rb            |  57 ++--
 .../conferences_controller_test.rb            | 165 +++++-----
 .../controllers/projects_controller_test.rb   |  12 +-
 .../test/controllers/songs_controller_test.rb |  71 +++--
 .../controllers/surveys_controller_test.rb    | 297 ++++++++++--------
 .../test/controllers/users_controller_test.rb | 105 ++++---
 test/test_helper.rb                           |  19 ++
 10 files changed, 413 insertions(+), 324 deletions(-)

diff --git a/Appraisals b/Appraisals
index 1203a3d..76006fa 100644
--- a/Appraisals
+++ b/Appraisals
@@ -4,4 +4,5 @@ end
 
 appraise 'rails-5' do
   gem 'rails', '~> 5.0.0'
+  gem 'rails-controller-testing'
 end
diff --git a/gemfiles/rails_5.gemfile b/gemfiles/rails_5.gemfile
index 1a637e1..2ddc82f 100644
--- a/gemfiles/rails_5.gemfile
+++ b/gemfiles/rails_5.gemfile
@@ -5,6 +5,7 @@ source "https://rubygems.org"
 gem "jquery-rails"
 gem "simple_form"
 gem "rails", "~> 5.0.0"
+gem "rails-controller-testing"
 
 group :development do
   gem "bundler"
diff --git a/test/dummy/config/environments/test.rb b/test/dummy/config/environments/test.rb
index 3cfff16..8c7edd1 100644
--- a/test/dummy/config/environments/test.rb
+++ b/test/dummy/config/environments/test.rb
@@ -13,8 +13,13 @@
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_files   = true
-  config.static_cache_control = 'public, max-age=3600'
+  if Rails.version[0] == '4'
+    config.serve_static_files   = true
+    config.static_cache_control = 'public, max-age=3600'
+  else
+    config.public_file_server.enabled = true
+    config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
+  end
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
diff --git a/test/dummy/test/controllers/assignments_controller_test.rb b/test/dummy/test/controllers/assignments_controller_test.rb
index d2b916d..d025d31 100644
--- a/test/dummy/test/controllers/assignments_controller_test.rb
+++ b/test/dummy/test/controllers/assignments_controller_test.rb
@@ -20,15 +20,18 @@ class AssignmentsControllerTest < ActionController::TestCase
 
   test "should create assignment" do
     assert_difference('Assignment.count') do
-      post :create, assignment: {
-        name: "Life",
-
-        tasks_attributes: {
-          "0" => { name: "Eat" },
-          "1" => { name: "Pray" },
-          "2" => { name: "Love" },
+      params = {
+        assignment: {
+          name: "Life",
+
+          tasks_attributes: {
+            "0" => { name: "Eat" },
+            "1" => { name: "Pray" },
+            "2" => { name: "Love" },
+          }
         }
       }
+      post :create, wrapped_params(params)
     end
 
     assignment_form = assigns(:assignment_form)
@@ -53,15 +56,18 @@ class AssignmentsControllerTest < ActionController::TestCase
     assignment = assignments(:yard)
 
     assert_difference('Assignment.count', 0) do
-      post :create, assignment: {
-        name: assignment.name,
-
-        tasks_attributes: {
-          "0" => { name: nil },
-          "1" => { name: nil },
-          "2" => { name: nil },
+      params = {
+        assignment: {
+          name: assignment.name,
+
+          tasks_attributes: {
+            "0" => { name: nil },
+            "1" => { name: nil },
+            "2" => { name: nil },
+          }
         }
       }
+      post :create, wrapped_params(params)
     end
 
     assignment_form = assigns(:assignment_form)
@@ -75,26 +81,29 @@ class AssignmentsControllerTest < ActionController::TestCase
   end
 
   test "should show assignment" do
-    get :show, id: @assignment
+    get :show, wrapped_params(id: @assignment)
     assert_response :success
   end
 
   test "should get edit" do
-    get :edit, id: @assignment
+    get :edit, wrapped_params(id: @assignment)
     assert_response :success
   end
 
   test "should update assignment" do
     assert_difference('Assignment.count', 0) do
-      patch :update, id: @assignment, assignment: {
-        name: "Car service",
-
-        tasks_attributes: {
-          "0" => { name: "Wash tires", id: tasks(:rake).id },
-          "1" => { name: "Clean inside", id: tasks(:paint).id },
-          "2" => { name: "Check breaks", id: tasks(:clean).id },
+      params = {
+        id: @assignment, assignment: {
+          name: "Car service",
+
+          tasks_attributes: {
+            "0" => { name: "Wash tires", id: tasks(:rake).id },
+            "1" => { name: "Clean inside", id: tasks(:paint).id },
+            "2" => { name: "Check breaks", id: tasks(:clean).id },
+          }
         }
       }
+      patch :update, wrapped_params(params)
     end
 
     assignment_form = assigns(:assignment_form)
@@ -112,7 +121,7 @@ class AssignmentsControllerTest < ActionController::TestCase
 
   test "should destroy assignment" do
     assert_difference('Assignment.count', -1) do
-      delete :destroy, id: @assignment
+      delete :destroy, wrapped_params(id: @assignment)
     end
 
     assert_redirected_to assignments_path
diff --git a/test/dummy/test/controllers/conferences_controller_test.rb b/test/dummy/test/controllers/conferences_controller_test.rb
index b631832..66c2e8a 100644
--- a/test/dummy/test/controllers/conferences_controller_test.rb
+++ b/test/dummy/test/controllers/conferences_controller_test.rb
@@ -20,20 +20,23 @@ class ConferencesControllerTest < ActionController::TestCase
 
   test "should create conference" do
     assert_difference('Conference.count') do
-      post :create, conference: {
-        name: "Euruco",
-        city: "Athens",
-
-        speaker_attributes: {
-          name: "Petros Markou",
-          occupation: "Developer",
-
-          presentations_attributes: {
-            "0" => { topic: "Ruby OOP", duration: "1h" },
-            "1" => { topic: "Ruby Closures", duration: "1h" },
+      params = {
+        conference: {
+          name: "Euruco",
+          city: "Athens",
+
+          speaker_attributes: {
+            name: "Petros Markou",
+            occupation: "Developer",
+
+            presentations_attributes: {
+              "0" => { topic: "Ruby OOP", duration: "1h" },
+              "1" => { topic: "Ruby Closures", duration: "1h" },
+            }
           }
         }
       }
+      post :create, wrapped_params(params)
     end
 
     conference_form = assigns(:conference_form)
@@ -43,10 +46,10 @@ class ConferencesControllerTest < ActionController::TestCase
 
     assert_equal "Euruco", conference_form.name
     assert_equal "Athens", conference_form.city
-    
+
     assert_equal "Petros Markou", conference_form.speaker.name
     assert_equal "Developer", conference_form.speaker.occupation
-    
+
     assert_equal "Ruby OOP", conference_form.speaker.presentations[0].topic
     assert_equal "1h", conference_form.speaker.presentations[0].duration
     assert_equal "Ruby Closures", conference_form.speaker.presentations[1].topic
@@ -56,27 +59,30 @@ class ConferencesControllerTest < ActionController::TestCase
     conference_form.speaker.presentations.each do |presentation|
       presentation.persisted?
     end
-    
+
     assert_equal "Conference: #{conference_form.name} was successfully created.", flash[:notice]
   end
 
   test "should create dynamically added presentation to speaker" do
     assert_difference('Conference.count') do
-      post :create, conference: {
-        name: "Euruco",
-        city: "Athens",
-
-        speaker_attributes: {
-          name: "Petros Markou",
-          occupation: "Developer",
-
-          presentations_attributes: {
-            "0" => { topic: "Ruby OOP", duration: "1h" },
-            "1" => { topic: "Ruby Closures", duration: "1h" },
-            "12312" => { topic: "Ruby Metaprogramming", duration: "2h" }
+      params = {
+        conference: {
+          name: "Euruco",
+          city: "Athens",
+
+          speaker_attributes: {
+            name: "Petros Markou",
+            occupation: "Developer",
+
+            presentations_attributes: {
+              "0" => { topic: "Ruby OOP", duration: "1h" },
+              "1" => { topic: "Ruby Closures", duration: "1h" },
+              "12312" => { topic: "Ruby Metaprogramming", duration: "2h" }
+            }
           }
         }
       }
+      post :create, wrapped_params(params)
     end
 
     conference_form = assigns(:conference_form)
@@ -86,12 +92,12 @@ class ConferencesControllerTest < ActionController::TestCase
 
     assert_equal "Euruco", conference_form.name
     assert_equal "Athens", conference_form.city
-    
+
     assert_equal "Petros Markou", conference_form.speaker.name
     assert_equal "Developer", conference_form.speaker.occupation
 
     assert_equal 3, conference_form.speaker.presentations.size
-    
+
     assert_equal "Ruby OOP", conference_form.speaker.presentations[0].topic
     assert_equal "1h", conference_form.speaker.presentations[0].duration
     assert_equal "Ruby Closures", conference_form.speaker.presentations[1].topic
@@ -103,7 +109,7 @@ class ConferencesControllerTest < ActionController::TestCase
     conference_form.speaker.presentations.each do |presentation|
       presentation.persisted?
     end
-    
+
     assert_equal "Conference: #{conference_form.name} was successfully created.", flash[:notice]
   end
 
@@ -111,29 +117,32 @@ class ConferencesControllerTest < ActionController::TestCase
     conference = conferences(:ruby)
 
     assert_difference(['Conference.count', 'Speaker.count'], 0) do
-      post :create, conference: {
-        name: conference.name,
-        city: nil,
-
-        speaker_attributes: {
-          name: conference.speaker.name,
-          occupation: "Developer",
-
-          presentations_attributes: {
-            "0" => { topic: nil, duration: "1h" },
-            "1" => { topic: "Ruby Closures", duration: nil },
+      params = {
+        conference: {
+          name: conference.name,
+          city: nil,
+
+          speaker_attributes: {
+            name: conference.speaker.name,
+            occupation: "Developer",
+
+            presentations_attributes: {
+              "0" => { topic: nil, duration: "1h" },
+              "1" => { topic: "Ruby Closures", duration: nil },
+            }
           }
         }
       }
+      post :create, wrapped_params(params)
     end
 
     conference_form = assigns(:conference_form)
 
     assert_not conference_form.valid?
 
-    assert_includes conference_form.errors.messages[:name], "has already been taken"  
+    assert_includes conference_form.errors.messages[:name], "has already been taken"
     assert_includes conference_form.errors.messages[:city], "can't be blank"
-    
+
     assert_includes conference_form.speaker.errors.messages[:name], "has already been taken"
 
     assert_includes conference_form.speaker.presentations[0].errors.messages[:topic], "can't be blank"
@@ -141,90 +150,96 @@ class ConferencesControllerTest < ActionController::TestCase
   end
 
   test "should show conference" do
-    get :show, id: @conference
+    get :show, wrapped_params(id: @conference)
     assert_response :success
   end
 
   test "should get edit" do
-    get :edit, id: @conference
+    get :edit, wrapped_params(id: @conference)
     assert_response :success
   end
 
   test "should update conference" do
     assert_difference('Conference.count', 0) do
-      patch :update, id: @conference, conference: {
-        name: "GoGaruco",
-        city: "Golden State",
-
-        speaker_attributes: {
-          name: "John Doe",
-          occupation: "Developer",
-
-          presentations_attributes: {
-            "0" => { topic: "Rails OOP", duration: "1h", id: presentations(:ruby_oop).id },
-            "1" => { topic: "Rails Patterns", duration: "1h", id: presentations(:ruby_closures).id },
+      params = {
+        id: @conference, conference: {
+          name: "GoGaruco",
+          city: "Golden State",
+
+          speaker_attributes: {
+            name: "John Doe",
+            occupation: "Developer",
+
+            presentations_attributes: {
+              "0" => { topic: "Rails OOP", duration: "1h", id: presentations(:ruby_oop).id },
+              "1" => { topic: "Rails Patterns", duration: "1h", id: presentations(:ruby_closures).id },
+            }
           }
         }
       }
+      patch :update, wrapped_params(params)
     end
 
     conference_form = assigns(:conference_form)
 
     assert_redirected_to conference_path(conference_form)
-    
+
     assert_equal "GoGaruco", conference_form.name
     assert_equal "Golden State", conference_form.city
-    
+
     assert_equal "John Doe", conference_form.speaker.name
     assert_equal "Developer", conference_form.speaker.occupation
-    
+
     assert_equal "Rails Patterns", conference_form.speaker.presentations[0].topic
     assert_equal "1h", conference_form.speaker.presentations[0].duration
     assert_equal "Rails OOP", conference_form.speaker.presentations[1].topic
     assert_equal "1h", conference_form.speaker.presentations[1].duration
-    
+
     assert_equal "Conference: #{conference_form.name} was successfully updated.", flash[:notice]
   end
 
   test "should destroy dynamically removed presentation from speaker" do
     assert_difference('Conference.count', 0) do
-      patch :update, id: @conference, conference: {
-        name: "GoGaruco",
-        city: "Golden State",
-
-        speaker_attributes: {
-          name: "John Doe",
-          occupation: "Developer",
-
-          presentations_attributes: {
-            "0" => { topic: "Rails OOP", duration: "1h", id: presentations(:ruby_oop).id },
-            "1" => { topic: "Rails Patterns", duration: "1h", id: presentations(:ruby_closures).id, _destroy: "1" },
+      params = {
+        id: @conference, conference: {
+          name: "GoGaruco",
+          city: "Golden State",
+
+          speaker_attributes: {
+            name: "John Doe",
+            occupation: "Developer",
+
+            presentations_attributes: {
+              "0" => { topic: "Rails OOP", duration: "1h", id: presentations(:ruby_oop).id },
+              "1" => { topic: "Rails Patterns", duration: "1h", id: presentations(:ruby_closures).id, _destroy: "1" },
+            }
           }
         }
       }
+      patch :update, wrapped_params(params)
     end
 
     conference_form = assigns(:conference_form)
 
     assert_redirected_to conference_path(conference_form)
-    
+
     assert_equal "GoGaruco", conference_form.name
     assert_equal "Golden State", conference_form.city
-    
+
     assert_equal "John Doe", conference_form.speaker.name
     assert_equal "Developer", conference_form.speaker.occupation
-    
+
     assert_equal "Rails OOP", conference_form.speaker.presentations[0].topic
     assert_equal "1h", conference_form.speaker.presentations[0].duration
 
     assert_equal 1, conference_form.speaker.presentations.size
-    
+
     assert_equal "Conference: #{conference_form.name} was successfully updated.", flash[:notice]
   end
 
   test "should destroy conference" do
     assert_difference('Conference.count', -1) do
-      delete :destroy, id: @conference
+      delete :destroy, wrapped_params(id: @conference)
     end
 
     assert_redirected_to conferences_path
diff --git a/test/dummy/test/controllers/projects_controller_test.rb b/test/dummy/test/controllers/projects_controller_test.rb
index d2d0ca0..361b612 100644
--- a/test/dummy/test/controllers/projects_controller_test.rb
+++ b/test/dummy/test/controllers/projects_controller_test.rb
@@ -2,7 +2,7 @@
 
 class ProjectsControllerTest < ActionController::TestCase
   fixtures :projects
-  
+
   setup do
     @project = projects(:yard)
   end
@@ -20,30 +20,30 @@ class ProjectsControllerTest < ActionController::TestCase
 
   test "should create project" do
     assert_difference('Project.count') do
-      post :create, project: { description: @project.description, name: @project.name }
+      post :create, wrapped_params(project: { description: @project.description, name: @project.name })
     end
 
     assert_redirected_to project_path(assigns(:project))
   end
 
   test "should show project" do
-    get :show, id: @project
+    get :show, wrapped_params(id: @project)
     assert_response :success
   end
 
   test "should get edit" do
-    get :edit, id: @project
+    get :edit, wrapped_params(id: @project)
     assert_response :success
   end
 
   test "should update project" do
-    patch :update, id: @project, project: { description: @project.description, name: @project.name }
+    patch :update, wrapped_params(id: @project, project: { description: @project.description, name: @project.name })
     assert_redirected_to project_path(assigns(:project))
   end
 
   test "should destroy project" do
     assert_difference('Project.count', -1) do
-      delete :destroy, id: @project
+      delete :destroy, wrapped_params(id: @project)
     end
 
     assert_redirected_to projects_path
diff --git a/test/dummy/test/controllers/songs_controller_test.rb b/test/dummy/test/controllers/songs_controller_test.rb
index 3e04a8c..11bd96f 100644
--- a/test/dummy/test/controllers/songs_controller_test.rb
+++ b/test/dummy/test/controllers/songs_controller_test.rb
@@ -20,19 +20,22 @@ class SongsControllerTest < ActionController::TestCase
 
   test "should create song" do
     assert_difference(['Song.count', 'Artist.count', 'Producer.count']) do
-      post :create, song: {
-        title: "Diamonds",
-        length: "360",
-
-        artist_attributes: {
-          name: "Karras",
-
-          producer_attributes: {
-            name: "Phoebos",
-            studio: "MADog"
+      params = {
+        song: {
+          title: "Diamonds",
+          length: "360",
+
+          artist_attributes: {
+            name: "Karras",
+
+            producer_attributes: {
+              name: "Phoebos",
+              studio: "MADog"
+            }
           }
         }
       }
+      post :create, wrapped_params(params)
     end
 
     song_form = assigns(:song_form)
@@ -56,19 +59,22 @@ class SongsControllerTest < ActionController::TestCase
 
   test "should not create song with invalid params" do
     assert_difference(['Song.count', 'Artist.count', 'Producer.count'], 0) do
-      post :create, song: {
-        title: nil,
-        length: nil,
-
-        artist_attributes: {
-          name: nil,
+      params = {
+        song: {
+          title: nil,
+          length: nil,
 
-          producer_attributes: {
+          artist_attributes: {
             name: nil,
-            studio: nil
+
+            producer_attributes: {
+              name: nil,
+              studio: nil
+            }
           }
         }
       }
+      post :create, wrapped_params(params)
     end
 
     song_form = assigns(:song_form)
@@ -89,30 +95,33 @@ class SongsControllerTest < ActionController::TestCase
   end
 
   test "should show song" do
-    get :show, id: @song
+    get :show, wrapped_params(id: @song)
     assert_response :success
   end
 
   test "should get edit" do
-    get :edit, id: @song
+    get :edit, wrapped_params(id: @song)
     assert_response :success
   end
 
   test "should update song" do
     assert_difference(['Song.count', 'Artist.count', 'Producer.count'], 0) do
-      patch :update, id: @song, song: {
-        title: "Run this town",
-        length: "355",
-
-        artist_attributes: {
-          name: "Rihanna",
-
-          producer_attributes: {
-            name: "Eminem",
-            studio: "Marshall"
+      params = {
+        id: @song, song: {
+          title: "Run this town",
+          length: "355",
+
+          artist_attributes: {
+            name: "Rihanna",
+
+            producer_attributes: {
+              name: "Eminem",
+              studio: "Marshall"
+            }
           }
         }
       }
+      patch :update, wrapped_params(params)
     end
 
     song_form = assigns(:song_form)
@@ -132,7 +141,7 @@ class SongsControllerTest < ActionController::TestCase
 
   test "should destroy song" do
     assert_difference('Song.count', -1) do
-      delete :destroy, id: @song
+      delete :destroy, wrapped_params(id: @song)
     end
 
     assert_redirected_to songs_path
diff --git a/test/dummy/test/controllers/surveys_controller_test.rb b/test/dummy/test/controllers/surveys_controller_test.rb
index fa1bfcc..c02a77d 100644
--- a/test/dummy/test/controllers/surveys_controller_test.rb
+++ b/test/dummy/test/controllers/surveys_controller_test.rb
@@ -2,7 +2,7 @@
 
 class SurveysControllerTest < ActionController::TestCase
   fixtures :surveys, :questions, :answers
-  
+
   setup do
     @survey = surveys(:programming)
   end
@@ -20,31 +20,34 @@ class SurveysControllerTest < ActionController::TestCase
 
   test "should create survey" do
     assert_difference('Survey.count') do
-      post :create, survey: {
-        name: "Programming languages",
-
-        questions_attributes: {
-          "0" => {
-            content: "Which language allows closures?",
-
-            answers_attributes: {
-              "0" => { content: "Ruby Programming Language" },
-              "1" => { content: "CSharp Programming Language" },
+      params = {
+        survey: {
+          name: "Programming languages",
+
+          questions_attributes: {
+            "0" => {
+              content: "Which language allows closures?",
+
+              answers_attributes: {
+                "0" => { content: "Ruby Programming Language" },
+                "1" => { content: "CSharp Programming Language" },
+              }
             }
           }
         }
       }
+      post :create, wrapped_params(params)
     end
 
     survey_form = assigns(:survey_form)
 
     assert survey_form.valid?
     assert_redirected_to survey_path(assigns(:survey_form))
-    
+
     assert_equal "Programming languages", survey_form.name
-    
+
     assert_equal "Which language allows closures?", survey_form.questions[0].content
-    
+
     assert_equal "Ruby Programming Language", survey_form.questions[0].answers[0].content
     assert_equal "CSharp Programming Language", survey_form.questions[0].answers[1].content
 
@@ -55,48 +58,51 @@ class SurveysControllerTest < ActionController::TestCase
         assert answer.persisted?
       end
     end
-    
+
     assert_equal "Survey: #{survey_form.name} was successfully created.", flash[:notice]
   end
 
   test "should create dynamically added question to a survey" do
     assert_difference('Survey.count') do
-      post :create, survey: {
-        name: "Programming languages",
-
-        questions_attributes: {
-          "0" => {
-            content: "Which language allows closures?",
-
-            answers_attributes: {
-              "0" => { content: "Ruby Programming Language" },
-              "1" => { content: "CSharp Programming Language" },
-            }
-          },
-
-          "12343" => {
-            content: "Which language allows objects?",
-
-            answers_attributes: {
-              "0" => { content: "Ruby Programming Language" },
-              "1" => { content: "C Programming Language" },
+      params = {
+        survey: {
+          name: "Programming languages",
+
+          questions_attributes: {
+            "0" => {
+              content: "Which language allows closures?",
+
+              answers_attributes: {
+                "0" => { content: "Ruby Programming Language" },
+                "1" => { content: "CSharp Programming Language" },
+              }
+            },
+
+            "12343" => {
+              content: "Which language allows objects?",
+
+              answers_attributes: {
+                "0" => { content: "Ruby Programming Language" },
+                "1" => { content: "C Programming Language" },
+              }
             }
           }
         }
       }
+      post :create, wrapped_params(params)
     end
 
     survey_form = assigns(:survey_form)
 
     assert survey_form.valid?
     assert_redirected_to survey_path(assigns(:survey_form))
-    
+
     assert_equal "Programming languages", survey_form.name
 
     assert_equal 2, survey_form.questions.size
-    
+
     assert_equal "Which language allows closures?", survey_form.questions[0].content
-    
+
     assert_equal "Ruby Programming Language", survey_form.questions[0].answers[0].content
     assert_equal "CSharp Programming Language", survey_form.questions[0].answers[1].content
 
@@ -112,40 +118,43 @@ class SurveysControllerTest < ActionController::TestCase
         assert answer.persisted?
       end
     end
-    
+
     assert_equal "Survey: #{survey_form.name} was successfully created.", flash[:notice]
   end
 
   test "should create dynamically added answer to a question" do
     assert_difference('Survey.count') do
-      post :create, survey: {
-        name: "Programming languages",
-
-        questions_attributes: {
-          "0" => {
-            content: "Which language allows closures?",
-
-            answers_attributes: {
-              "0" => { content: "Ruby Programming Language" },
-              "1" => { content: "CSharp Programming Language" },
-              "12322" => { content: "C Programming Language" }
+      params = {
+        survey: {
+          name: "Programming languages",
+
+          questions_attributes: {
+            "0" => {
+              content: "Which language allows closures?",
+
+              answers_attributes: {
+                "0" => { content: "Ruby Programming Language" },
+                "1" => { content: "CSharp Programming Language" },
+                "12322" => { content: "C Programming Language" }
+              }
             }
           }
         }
       }
+      post :create, wrapped_params(params)
     end
 
     survey_form = assigns(:survey_form)
 
     assert survey_form.valid?
     assert_redirected_to survey_path(assigns(:survey_form))
-    
+
     assert_equal "Programming languages", survey_form.name
-    
+
     assert_equal "Which language allows closures?", survey_form.questions[0].content
 
     assert_equal 3, survey_form.questions[0].answers.size
-    
+
     assert_equal "Ruby Programming Language", survey_form.questions[0].answers[0].content
     assert_equal "CSharp Programming Language", survey_form.questions[0].answers[1].content
     assert_equal "C Programming Language", survey_form.questions[0].answers[2].content
@@ -157,32 +166,35 @@ class SurveysControllerTest < ActionController::TestCase
         assert answer.persisted?
       end
     end
-    
+
     assert_equal "Survey: #{survey_form.name} was successfully created.", flash[:notice]
   end
 
   test "should not create survey with invalid params" do
     assert_difference('Survey.count', 0) do
-      post :create, survey: {
-        name: surveys(:programming).name,
-
-        questions_attributes: {
-          "0" => {
-            content: nil,
-
-            answers_attributes: {
-              "0" => { content: "Ruby Programming Language" },
-              "1" => { content: nil },
+      params = {
+        survey: {
+          name: surveys(:programming).name,
+
+          questions_attributes: {
+            "0" => {
+              content: nil,
+
+              answers_attributes: {
+                "0" => { content: "Ruby Programming Language" },
+                "1" => { content: nil },
+              }
             }
           }
         }
       }
+      post :create, wrapped_params(params)
     end
 
     survey_form = assigns(:survey_form)
 
     assert_not survey_form.valid?
-    
+
     assert_includes survey_form.errors.messages[:name], "has already been taken"
 
     assert_includes survey_form.questions[0].errors.messages[:content], "can't be blank"
@@ -191,45 +203,48 @@ class SurveysControllerTest < ActionController::TestCase
   end
 
   test "should show survey" do
-    get :show, id: @survey
+    get :show, wrapped_params(id: @survey)
     assert_response :success
   end
 
   test "should get edit" do
-    get :edit, id: @survey
+    get :edit, wrapped_params(id: @survey)
     assert_response :success
   end
 
   test "should update survey" do
     assert_difference('Survey.count', 0) do
-      patch :update, id: @survey, survey: {
-        name: "Native languages",
-
-        questions_attributes: {
-          "0" => {
-            content: "Which language is spoken in England?",
-            id: questions(:one).id,
-
-            answers_attributes: {
-              "0" => { content: "The English Language", id: answers(:ruby).id },
-              "1" => { content: "The Latin Language", id: answers(:cs).id },
-            }
-          },
+      params = {
+        id: @survey, survey: {
+          name: "Native languages",
+
+          questions_attributes: {
+            "0" => {
+              content: "Which language is spoken in England?",
+              id: questions(:one).id,
+
+              answers_attributes: {
+                "0" => { content: "The English Language", id: answers(:ruby).id },
+                "1" => { content: "The Latin Language", id: answers(:cs).id },
+              }
+            },
+          }
         }
       }
+      patch :update, wrapped_params(params)
     end
 
     survey_form = assigns(:survey_form)
 
     assert_redirected_to survey_path(survey_form)
-    
+
     assert_equal "Native languages", survey_form.name
-    
+
     assert_equal "Which language is spoken in England?", survey_form.questions[0].content
-    
+
     assert_equal "The Latin Language", survey_form.questions[0].answers[0].content
     assert_equal "The English Language", survey_form.questions[0].answers[1].content
-    
+
     assert_equal "Survey: #{survey_form.name} was successfully updated.", flash[:notice]
   end
 
@@ -244,47 +259,50 @@ class SurveysControllerTest < ActionController::TestCase
     survey.save
 
     assert_difference('Survey.count', 0) do
-      patch :update, id: survey, survey: {
-        name: "Native languages",
-
-        questions_attributes: {
-          "0" => {
-            content: "Which language is spoken in England?",
-            id: survey.questions[0].id,
-
-            answers_attributes: {
-              "0" => { content: "The English Language", id: survey.questions[0].answers[0].id },
-              "1" => { content: "The Latin Language", id: survey.questions[0].answers[1].id },
-            }
-          },
-
-          "1" => {
-            content: "Which language is spoken in America?",
-            id: survey.questions[1].id,
-            _destroy: "1",
-
-            answers_attributes: {
-              "0" => { content: "The English Language", id: survey.questions[1].answers[0].id },
-              "1" => { content: "The American Language", id: survey.questions[1].answers[1].id },
+      params = {
+        id: survey, survey: {
+          name: "Native languages",
+
+          questions_attributes: {
+            "0" => {
+              content: "Which language is spoken in England?",
+              id: survey.questions[0].id,
+
+              answers_attributes: {
+                "0" => { content: "The English Language", id: survey.questions[0].answers[0].id },
+                "1" => { content: "The Latin Language", id: survey.questions[0].answers[1].id },
+              }
+            },
+
+            "1" => {
+              content: "Which language is spoken in America?",
+              id: survey.questions[1].id,
+              _destroy: "1",
+
+              answers_attributes: {
+                "0" => { content: "The English Language", id: survey.questions[1].answers[0].id },
+                "1" => { content: "The American Language", id: survey.questions[1].answers[1].id },
+              }
             }
           }
         }
       }
+      patch :update, wrapped_params(params)
     end
 
     survey_form = assigns(:survey_form)
 
     assert_redirected_to survey_path(survey_form)
-    
+
     assert_equal "Native languages", survey_form.name
-    
+
     assert_equal "Which language is spoken in England?", survey_form.questions[0].content
 
     assert_equal 1, survey_form.questions.size
-    
+
     assert_equal "The English Language", survey_form.questions[0].answers[0].content
     assert_equal "The Latin Language", survey_form.questions[0].answers[1].content
-    
+
     assert_equal "Survey: #{survey_form.name} was successfully updated.", flash[:notice]
   end
 
@@ -301,63 +319,66 @@ class SurveysControllerTest < ActionController::TestCase
     survey.save
 
     assert_difference('Survey.count', 0) do
-      patch :update, id: survey, survey: {
-        name: "Native languages",
-
-        questions_attributes: {
-          "0" => {
-            content: "Which language is spoken in England?",
-            id: survey.questions[0].id,
-
-            answers_attributes: {
-              "0" => { content: "The English Language", id: survey.questions[0].answers[0].id },
-              "1" => { content: "The Latin Language", id: survey.questions[0].answers[1].id },
-              "2" => { content: "The French Language", id: survey.questions[0].answers[2].id, _destroy: "1" }
-            }
-          },
-
-          "1" => {
-            content: "Which language is spoken in America?",
-            id: survey.questions[1].id,
-
-            answers_attributes: {
-              "0" => { content: "The English Language", id: survey.questions[1].answers[0].id },
-              "1" => { content: "The American Language", id: survey.questions[1].answers[1].id },
-              "2" => { content: "The Italian Language", id: survey.questions[1].answers[2].id, _destroy: "1" }
+      params = {
+        id: survey, survey: {
+          name: "Native languages",
+
+          questions_attributes: {
+            "0" => {
+              content: "Which language is spoken in England?",
+              id: survey.questions[0].id,
+
+              answers_attributes: {
+                "0" => { content: "The English Language", id: survey.questions[0].answers[0].id },
+                "1" => { content: "The Latin Language", id: survey.questions[0].answers[1].id },
+                "2" => { content: "The French Language", id: survey.questions[0].answers[2].id, _destroy: "1" }
+              }
+            },
+
+            "1" => {
+              content: "Which language is spoken in America?",
+              id: survey.questions[1].id,
+
+              answers_attributes: {
+                "0" => { content: "The English Language", id: survey.questions[1].answers[0].id },
+                "1" => { content: "The American Language", id: survey.questions[1].answers[1].id },
+                "2" => { content: "The Italian Language", id: survey.questions[1].answers[2].id, _destroy: "1" }
+              }
             }
           }
         }
       }
+      patch :update, wrapped_params(params)
     end
 
     survey_form = assigns(:survey_form)
 
     assert_redirected_to survey_path(survey_form)
-    
+
     assert_equal "Native languages", survey_form.name
 
     assert_equal 2, survey_form.questions.size
-    
+
     assert_equal "Which language is spoken in England?", survey_form.questions[0].content
 
     assert_equal 2, survey_form.questions[0].answers.size
-    
+
     assert_equal "The English Language", survey_form.questions[0].answers[0].content
     assert_equal "The Latin Language", survey_form.questions[0].answers[1].content
 
     assert_equal "Which language is spoken in America?", survey_form.questions[1].content
 
     assert_equal 2, survey_form.questions[1].answers.size
-    
+
     assert_equal "The English Language", survey_form.questions[1].answers[0].content
     assert_equal "The American Language", survey_form.questions[1].answers[1].content
-    
+
     assert_equal "Survey: #{survey_form.name} was successfully updated.", flash[:notice]
   end
 
   test "should destroy survey" do
     assert_difference('Survey.count', -1) do
-      delete :destroy, id: @survey
+      delete :destroy, wrapped_params(id: @survey)
     end
 
     assert_redirected_to surveys_path
diff --git a/test/dummy/test/controllers/users_controller_test.rb b/test/dummy/test/controllers/users_controller_test.rb
index 4550e96..0b1c694 100644
--- a/test/dummy/test/controllers/users_controller_test.rb
+++ b/test/dummy/test/controllers/users_controller_test.rb
@@ -2,7 +2,7 @@
 
 class UsersControllerTest < ActionController::TestCase
   fixtures :users, :emails, :profiles
-  
+
   setup do
     @user = users(:peter)
   end
@@ -20,33 +20,36 @@ class UsersControllerTest < ActionController::TestCase
 
   test "should create user" do
     assert_difference(['User.count', 'Email.count', 'Profile.count']) do
-      post :create, user: {
-        age: "23",
-        gender: "0",
-        name: "petrakos",
-
-        email_attributes: {
-          address: "petrakos@gmail.com"  
-        },
-
-        profile_attributes: {
-          twitter_name: "t_peter",
-          github_name: "g_peter"
+      params = {
+        user: {
+          age: "23",
+          gender: "0",
+          name: "petrakos",
+
+          email_attributes: {
+            address: "petrakos@gmail.com"
+          },
+
+          profile_attributes: {
+            twitter_name: "t_peter",
+            github_name: "g_peter"
+          }
         }
       }
+      post :create, wrapped_params(params)
     end
 
     user_form = assigns(:user_form)
 
     assert user_form.valid?
     assert_redirected_to user_path(user_form)
-    
+
     assert_equal "petrakos", user_form.name
     assert_equal 23, user_form.age
     assert_equal 0, user_form.gender
-    
+
     assert_equal "petrakos@gmail.com", user_form.email.address
-    
+
     assert_equal "t_peter", user_form.profile.twitter_name
     assert_equal "g_peter", user_form.profile.github_name
 
@@ -57,26 +60,29 @@ class UsersControllerTest < ActionController::TestCase
     peter = users(:peter)
 
     assert_difference(['User.count', 'Email.count', 'Profile.count'], 0) do
-      post :create, user: {
-        name: peter.name,
-        age: nil,
-        gender: "0",
-
-        email_attributes: {
-          address: peter.email.address
-        },
-
-        profile_attributes: {
-          twitter_name: peter.profile.twitter_name,
-          github_name: peter.profile.github_name
+      params = {
+        user: {
+          name: peter.name,
+          age: nil,
+          gender: "0",
+
+          email_attributes: {
+            address: peter.email.address
+          },
+
+          profile_attributes: {
+            twitter_name: peter.profile.twitter_name,
+            github_name: peter.profile.github_name
+          }
         }
       }
+      post :create, wrapped_params(params)
     end
 
     user_form = assigns(:user_form)
 
     assert_not user_form.valid?
-    
+
     assert_includes user_form.errors.messages[:name], "has already been taken"
     assert_includes user_form.errors.messages[:age], "can't be blank"
 
@@ -87,50 +93,53 @@ class UsersControllerTest < ActionController::TestCase
   end
 
   test "should show user" do
-    get :show, id: @user
+    get :show, wrapped_params(id: @user)
     assert_response :success
   end
 
   test "should get edit" do
-    get :edit, id: @user
+    get :edit, wrapped_params(id: @user)
     assert_response :success
   end
 
   test "should update user" do
     assert_difference(['User.count', 'Email.count', 'Profile.count'], 0) do
-      patch :update, id: @user, user: {
-        age: @user.age,
-        gender: @user.gender,
-        name: "petrakos",
-
-        email_attributes: {
-          address: "petrakos@gmail.com"
-        },
-
-        profile_attributes: {
-          twitter_name: "t_peter",
-          github_name: "g_peter"
+      params = {
+        id: @user, user: {
+          age: @user.age,
+          gender: @user.gender,
+          name: "petrakos",
+
+          email_attributes: {
+            address: "petrakos@gmail.com"
+          },
+
+          profile_attributes: {
+            twitter_name: "t_peter",
+            github_name: "g_peter"
+          }
         }
       }
+      patch :update, wrapped_params(params)
     end
 
     user_form = assigns(:user_form)
 
     assert_redirected_to user_path(user_form)
-    
+
     assert_equal "petrakos", user_form.name
-    
+
     assert_equal "petrakos@gmail.com", user_form.email.address
-    
+
     assert_equal "t_peter", user_form.profile.twitter_name
     assert_equal "g_peter", user_form.profile.github_name
-    
+
     assert_equal "User: #{user_form.name} was successfully updated.", flash[:notice]
   end
 
   test "should destroy user" do
     assert_difference('User.count', -1) do
-      delete :destroy, id: @user
+      delete :destroy, wrapped_params(id: @user)
     end
 
     assert_redirected_to users_path
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 778185a..0ad9cbb 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -26,3 +26,22 @@
 if ActiveSupport::TestCase.method_defined?(:fixture_path=)
   ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
 end
+
+
+def wrapped_params(params)
+  if rails_4?
+    params
+  elsif rails_5?
+    { params: params }
+  end
+end
+
+
+def rails_4?
+  Rails.version[0] == '4'
+end
+
+
+def rails_5?
+  Rails.version[0] == '5'
+end

From 6275c7b4e86af77c36e25aac6e4d25f704afa9cc Mon Sep 17 00:00:00 2001
From: Nicolas Rodriguez <nrodriguez@jbox-web.com>
Date: Tue, 5 Jul 2016 05:10:46 +0200
Subject: [PATCH 20/32] Fix warning

---
 test/dummy/db/migrate/20140729162110_create_users.rb            | 2 +-
 test/dummy/db/migrate/20140729162246_create_emails.rb           | 2 +-
 test/dummy/db/migrate/20140729162335_create_profiles.rb         | 2 +-
 test/dummy/db/migrate/20140729164623_create_songs.rb            | 2 +-
 test/dummy/db/migrate/20140729164653_create_artists.rb          | 2 +-
 test/dummy/db/migrate/20140729164713_create_producers.rb        | 2 +-
 test/dummy/db/migrate/20140729165425_create_conferences.rb      | 2 +-
 test/dummy/db/migrate/20140729165445_create_speakers.rb         | 2 +-
 test/dummy/db/migrate/20140729165506_create_presentations.rb    | 2 +-
 test/dummy/db/migrate/20140729170014_create_surveys.rb          | 2 +-
 test/dummy/db/migrate/20140729170034_create_questions.rb        | 2 +-
 test/dummy/db/migrate/20140729170112_create_answers.rb          | 2 +-
 test/dummy/db/migrate/20140806122636_create_projects.rb         | 2 +-
 test/dummy/db/migrate/20140806122735_create_tasks.rb            | 2 +-
 test/dummy/db/migrate/20140806122805_create_sub_tasks.rb        | 2 +-
 test/dummy/db/migrate/20140806122834_create_people.rb           | 2 +-
 test/dummy/db/migrate/20140806122911_add_owner_to_projects.rb   | 2 +-
 test/dummy/db/migrate/20140806122945_create_tags.rb             | 2 +-
 test/dummy/db/migrate/20140806123008_create_project_tags.rb     | 2 +-
 test/dummy/db/migrate/20140820071344_create_assignments.rb      | 2 +-
 .../db/migrate/20140821074917_add_assignment_ref_to_tasks.rb    | 2 +-
 21 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/test/dummy/db/migrate/20140729162110_create_users.rb b/test/dummy/db/migrate/20140729162110_create_users.rb
index 581e280..92b6272 100644
--- a/test/dummy/db/migrate/20140729162110_create_users.rb
+++ b/test/dummy/db/migrate/20140729162110_create_users.rb
@@ -1,4 +1,4 @@
-class CreateUsers < ActiveRecord::Migration
+class CreateUsers < ActiveRecord::Migration[4.2]
   def change
     create_table :users do |t|
       t.string :name
diff --git a/test/dummy/db/migrate/20140729162246_create_emails.rb b/test/dummy/db/migrate/20140729162246_create_emails.rb
index 179cbd6..ad591f5 100644
--- a/test/dummy/db/migrate/20140729162246_create_emails.rb
+++ b/test/dummy/db/migrate/20140729162246_create_emails.rb
@@ -1,4 +1,4 @@
-class CreateEmails < ActiveRecord::Migration
+class CreateEmails < ActiveRecord::Migration[4.2]
   def change
     create_table :emails do |t|
       t.string :address
diff --git a/test/dummy/db/migrate/20140729162335_create_profiles.rb b/test/dummy/db/migrate/20140729162335_create_profiles.rb
index b8e30fe..6ca648e 100644
--- a/test/dummy/db/migrate/20140729162335_create_profiles.rb
+++ b/test/dummy/db/migrate/20140729162335_create_profiles.rb
@@ -1,4 +1,4 @@
-class CreateProfiles < ActiveRecord::Migration
+class CreateProfiles < ActiveRecord::Migration[4.2]
   def change
     create_table :profiles do |t|
       t.string :twitter_name
diff --git a/test/dummy/db/migrate/20140729164623_create_songs.rb b/test/dummy/db/migrate/20140729164623_create_songs.rb
index 42f39af..b17a6f9 100644
--- a/test/dummy/db/migrate/20140729164623_create_songs.rb
+++ b/test/dummy/db/migrate/20140729164623_create_songs.rb
@@ -1,4 +1,4 @@
-class CreateSongs < ActiveRecord::Migration
+class CreateSongs < ActiveRecord::Migration[4.2]
   def change
     create_table :songs do |t|
       t.string :title
diff --git a/test/dummy/db/migrate/20140729164653_create_artists.rb b/test/dummy/db/migrate/20140729164653_create_artists.rb
index 9536d3b..d9c9ff8 100644
--- a/test/dummy/db/migrate/20140729164653_create_artists.rb
+++ b/test/dummy/db/migrate/20140729164653_create_artists.rb
@@ -1,4 +1,4 @@
-class CreateArtists < ActiveRecord::Migration
+class CreateArtists < ActiveRecord::Migration[4.2]
   def change
     create_table :artists do |t|
       t.string :name
diff --git a/test/dummy/db/migrate/20140729164713_create_producers.rb b/test/dummy/db/migrate/20140729164713_create_producers.rb
index 2456ec8..9d67365 100644
--- a/test/dummy/db/migrate/20140729164713_create_producers.rb
+++ b/test/dummy/db/migrate/20140729164713_create_producers.rb
@@ -1,4 +1,4 @@
-class CreateProducers < ActiveRecord::Migration
+class CreateProducers < ActiveRecord::Migration[4.2]
   def change
     create_table :producers do |t|
       t.string :name
diff --git a/test/dummy/db/migrate/20140729165425_create_conferences.rb b/test/dummy/db/migrate/20140729165425_create_conferences.rb
index f645624..c6eb06c 100644
--- a/test/dummy/db/migrate/20140729165425_create_conferences.rb
+++ b/test/dummy/db/migrate/20140729165425_create_conferences.rb
@@ -1,4 +1,4 @@
-class CreateConferences < ActiveRecord::Migration
+class CreateConferences < ActiveRecord::Migration[4.2]
   def change
     create_table :conferences do |t|
       t.string :name
diff --git a/test/dummy/db/migrate/20140729165445_create_speakers.rb b/test/dummy/db/migrate/20140729165445_create_speakers.rb
index acb3d49..b4e3ff2 100644
--- a/test/dummy/db/migrate/20140729165445_create_speakers.rb
+++ b/test/dummy/db/migrate/20140729165445_create_speakers.rb
@@ -1,4 +1,4 @@
-class CreateSpeakers < ActiveRecord::Migration
+class CreateSpeakers < ActiveRecord::Migration[4.2]
   def change
     create_table :speakers do |t|
       t.string :name
diff --git a/test/dummy/db/migrate/20140729165506_create_presentations.rb b/test/dummy/db/migrate/20140729165506_create_presentations.rb
index 87f03c7..d0d87a9 100644
--- a/test/dummy/db/migrate/20140729165506_create_presentations.rb
+++ b/test/dummy/db/migrate/20140729165506_create_presentations.rb
@@ -1,4 +1,4 @@
-class CreatePresentations < ActiveRecord::Migration
+class CreatePresentations < ActiveRecord::Migration[4.2]
   def change
     create_table :presentations do |t|
       t.string :topic
diff --git a/test/dummy/db/migrate/20140729170014_create_surveys.rb b/test/dummy/db/migrate/20140729170014_create_surveys.rb
index c9bb4b5..1b7938a 100644
--- a/test/dummy/db/migrate/20140729170014_create_surveys.rb
+++ b/test/dummy/db/migrate/20140729170014_create_surveys.rb
@@ -1,4 +1,4 @@
-class CreateSurveys < ActiveRecord::Migration
+class CreateSurveys < ActiveRecord::Migration[4.2]
   def change
     create_table :surveys do |t|
       t.string :name
diff --git a/test/dummy/db/migrate/20140729170034_create_questions.rb b/test/dummy/db/migrate/20140729170034_create_questions.rb
index 3db8bc1..01e3f8e 100644
--- a/test/dummy/db/migrate/20140729170034_create_questions.rb
+++ b/test/dummy/db/migrate/20140729170034_create_questions.rb
@@ -1,4 +1,4 @@
-class CreateQuestions < ActiveRecord::Migration
+class CreateQuestions < ActiveRecord::Migration[4.2]
   def change
     create_table :questions do |t|
       t.text :content
diff --git a/test/dummy/db/migrate/20140729170112_create_answers.rb b/test/dummy/db/migrate/20140729170112_create_answers.rb
index a7dfeae..113900f 100644
--- a/test/dummy/db/migrate/20140729170112_create_answers.rb
+++ b/test/dummy/db/migrate/20140729170112_create_answers.rb
@@ -1,4 +1,4 @@
-class CreateAnswers < ActiveRecord::Migration
+class CreateAnswers < ActiveRecord::Migration[4.2]
   def change
     create_table :answers do |t|
       t.text :content
diff --git a/test/dummy/db/migrate/20140806122636_create_projects.rb b/test/dummy/db/migrate/20140806122636_create_projects.rb
index a2905bc..746a9d0 100644
--- a/test/dummy/db/migrate/20140806122636_create_projects.rb
+++ b/test/dummy/db/migrate/20140806122636_create_projects.rb
@@ -1,4 +1,4 @@
-class CreateProjects < ActiveRecord::Migration
+class CreateProjects < ActiveRecord::Migration[4.2]
   def change
     create_table :projects do |t|
       t.string :name
diff --git a/test/dummy/db/migrate/20140806122735_create_tasks.rb b/test/dummy/db/migrate/20140806122735_create_tasks.rb
index 1b762bf..46bdea8 100644
--- a/test/dummy/db/migrate/20140806122735_create_tasks.rb
+++ b/test/dummy/db/migrate/20140806122735_create_tasks.rb
@@ -1,4 +1,4 @@
-class CreateTasks < ActiveRecord::Migration
+class CreateTasks < ActiveRecord::Migration[4.2]
   def change
     create_table :tasks do |t|
       t.string :name
diff --git a/test/dummy/db/migrate/20140806122805_create_sub_tasks.rb b/test/dummy/db/migrate/20140806122805_create_sub_tasks.rb
index 4e6bc23..499357f 100644
--- a/test/dummy/db/migrate/20140806122805_create_sub_tasks.rb
+++ b/test/dummy/db/migrate/20140806122805_create_sub_tasks.rb
@@ -1,4 +1,4 @@
-class CreateSubTasks < ActiveRecord::Migration
+class CreateSubTasks < ActiveRecord::Migration[4.2]
   def change
     create_table :sub_tasks do |t|
       t.string :name
diff --git a/test/dummy/db/migrate/20140806122834_create_people.rb b/test/dummy/db/migrate/20140806122834_create_people.rb
index 462a442..b83b83d 100644
--- a/test/dummy/db/migrate/20140806122834_create_people.rb
+++ b/test/dummy/db/migrate/20140806122834_create_people.rb
@@ -1,4 +1,4 @@
-class CreatePeople < ActiveRecord::Migration
+class CreatePeople < ActiveRecord::Migration[4.2]
   def change
     create_table :people do |t|
       t.string :name
diff --git a/test/dummy/db/migrate/20140806122911_add_owner_to_projects.rb b/test/dummy/db/migrate/20140806122911_add_owner_to_projects.rb
index 6a50a5d..3bb752e 100644
--- a/test/dummy/db/migrate/20140806122911_add_owner_to_projects.rb
+++ b/test/dummy/db/migrate/20140806122911_add_owner_to_projects.rb
@@ -1,4 +1,4 @@
-class AddOwnerToProjects < ActiveRecord::Migration
+class AddOwnerToProjects < ActiveRecord::Migration[4.2]
   def change
     add_column :projects, :owner_id, :integer
   end
diff --git a/test/dummy/db/migrate/20140806122945_create_tags.rb b/test/dummy/db/migrate/20140806122945_create_tags.rb
index 965cd7a..b7506fa 100644
--- a/test/dummy/db/migrate/20140806122945_create_tags.rb
+++ b/test/dummy/db/migrate/20140806122945_create_tags.rb
@@ -1,4 +1,4 @@
-class CreateTags < ActiveRecord::Migration
+class CreateTags < ActiveRecord::Migration[4.2]
   def change
     create_table :tags do |t|
       t.string :name
diff --git a/test/dummy/db/migrate/20140806123008_create_project_tags.rb b/test/dummy/db/migrate/20140806123008_create_project_tags.rb
index 93c61f1..bc529db 100644
--- a/test/dummy/db/migrate/20140806123008_create_project_tags.rb
+++ b/test/dummy/db/migrate/20140806123008_create_project_tags.rb
@@ -1,4 +1,4 @@
-class CreateProjectTags < ActiveRecord::Migration
+class CreateProjectTags < ActiveRecord::Migration[4.2]
   def change
     create_table :project_tags do |t|
       t.references :project, index: true
diff --git a/test/dummy/db/migrate/20140820071344_create_assignments.rb b/test/dummy/db/migrate/20140820071344_create_assignments.rb
index fa0e823..5882208 100644
--- a/test/dummy/db/migrate/20140820071344_create_assignments.rb
+++ b/test/dummy/db/migrate/20140820071344_create_assignments.rb
@@ -1,4 +1,4 @@
-class CreateAssignments < ActiveRecord::Migration
+class CreateAssignments < ActiveRecord::Migration[4.2]
   def change
     create_table :assignments do |t|
       t.string :name
diff --git a/test/dummy/db/migrate/20140821074917_add_assignment_ref_to_tasks.rb b/test/dummy/db/migrate/20140821074917_add_assignment_ref_to_tasks.rb
index c89afc4..9958cda 100644
--- a/test/dummy/db/migrate/20140821074917_add_assignment_ref_to_tasks.rb
+++ b/test/dummy/db/migrate/20140821074917_add_assignment_ref_to_tasks.rb
@@ -1,4 +1,4 @@
-class AddAssignmentRefToTasks < ActiveRecord::Migration
+class AddAssignmentRefToTasks < ActiveRecord::Migration[4.2]
   def change
     add_reference :tasks, :assignment, index: true
   end

From b6f4535f2107c04567313667814ef07741e6ce00 Mon Sep 17 00:00:00 2001
From: Nicolas Rodriguez <nrodriguez@jbox-web.com>
Date: Tue, 5 Jul 2016 19:23:15 +0200
Subject: [PATCH 21/32] Fix tests for Rails5

---
 gemfiles/rails_5.gemfile                              |  1 +
 lib/action_form/form_collection.rb                    |  6 +++++-
 lib/action_form/form_helpers.rb                       |  6 +++---
 test/dummy/test/fixtures/user_form_fixture.rb         |  8 ++++++++
 .../test/fixtures/user_with_email_form_fixture.rb     | 11 +++++++++++
 .../test/forms/nested_model_rendering_test2.rb}       |  0
 6 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 test/dummy/test/fixtures/user_form_fixture.rb
 create mode 100644 test/dummy/test/fixtures/user_with_email_form_fixture.rb
 rename test/{forms/nested_model_rendering_test.rb => dummy/test/forms/nested_model_rendering_test2.rb} (100%)

diff --git a/gemfiles/rails_5.gemfile b/gemfiles/rails_5.gemfile
index 2ddc82f..566505a 100644
--- a/gemfiles/rails_5.gemfile
+++ b/gemfiles/rails_5.gemfile
@@ -15,6 +15,7 @@ end
 
 group :test do
   gem "codeclimate-test-reporter", :require => nil
+  gem "rails-controller-testing"
 end
 
 gemspec :path => "../"
diff --git a/lib/action_form/form_collection.rb b/lib/action_form/form_collection.rb
index 8bc4e41..c4749cf 100644
--- a/lib/action_form/form_collection.rb
+++ b/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
@@ -173,4 +174,7 @@ def create_form
     end
   end
 
+  def rails_5?
+    Rails.version[0] == '5'
+  end
 end
diff --git a/lib/action_form/form_helpers.rb b/lib/action_form/form_helpers.rb
index 6b1b932..b05e3df 100644
--- a/lib/action_form/form_helpers.rb
+++ b/lib/action_form/form_helpers.rb
@@ -15,7 +15,7 @@ def submit(params)
     def valid?
       super
       model.valid?
-      
+
       collect_errors_from(model)
       aggregate_form_errors
 
@@ -23,7 +23,7 @@ def valid?
     end
 
     def nested_params?(value)
-      value.is_a?(Hash)
+      value.is_a?(Hash) || value.is_a?(ActionController::Parameters)
     end
 
     def find_association_name_in(key)
@@ -60,4 +60,4 @@ def collect_errors_from(validatable_object)
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/test/dummy/test/fixtures/user_form_fixture.rb b/test/dummy/test/fixtures/user_form_fixture.rb
new file mode 100644
index 0000000..740e7dc
--- /dev/null
+++ b/test/dummy/test/fixtures/user_form_fixture.rb
@@ -0,0 +1,8 @@
+class UserFormFixture < ActionForm::Base
+  self.main_model = :user
+
+  attributes :name, :age, :gender, required: true
+
+  validates :name, length: { in: 6..20 }
+  validates :age, numericality: { only_integer: true }
+end
\ No newline at end of file
diff --git a/test/dummy/test/fixtures/user_with_email_form_fixture.rb b/test/dummy/test/fixtures/user_with_email_form_fixture.rb
new file mode 100644
index 0000000..b3bbd1a
--- /dev/null
+++ b/test/dummy/test/fixtures/user_with_email_form_fixture.rb
@@ -0,0 +1,11 @@
+class UserWithEmailFormFixture < ActionForm::Base
+  self.main_model = :user
+  attributes :name, :age, :gender, required: true
+
+  association :email do
+    attribute :address, required: true
+  end
+
+  validates :name, length: { in: 6..20 }
+  validates :age, numericality: { only_integer: true }
+end
\ No newline at end of file
diff --git a/test/forms/nested_model_rendering_test.rb b/test/dummy/test/forms/nested_model_rendering_test2.rb
similarity index 100%
rename from test/forms/nested_model_rendering_test.rb
rename to test/dummy/test/forms/nested_model_rendering_test2.rb

From da36952efcdf3118b73cf9ff080f740fdc38b392 Mon Sep 17 00:00:00 2001
From: Nicolas Rodriguez <nrodriguez@jbox-web.com>
Date: Tue, 5 Jul 2016 19:31:53 +0200
Subject: [PATCH 22/32] Revert "Fix warning"

This reverts commit 6275c7b4e86af77c36e25aac6e4d25f704afa9cc.
---
 test/dummy/db/migrate/20140729162110_create_users.rb            | 2 +-
 test/dummy/db/migrate/20140729162246_create_emails.rb           | 2 +-
 test/dummy/db/migrate/20140729162335_create_profiles.rb         | 2 +-
 test/dummy/db/migrate/20140729164623_create_songs.rb            | 2 +-
 test/dummy/db/migrate/20140729164653_create_artists.rb          | 2 +-
 test/dummy/db/migrate/20140729164713_create_producers.rb        | 2 +-
 test/dummy/db/migrate/20140729165425_create_conferences.rb      | 2 +-
 test/dummy/db/migrate/20140729165445_create_speakers.rb         | 2 +-
 test/dummy/db/migrate/20140729165506_create_presentations.rb    | 2 +-
 test/dummy/db/migrate/20140729170014_create_surveys.rb          | 2 +-
 test/dummy/db/migrate/20140729170034_create_questions.rb        | 2 +-
 test/dummy/db/migrate/20140729170112_create_answers.rb          | 2 +-
 test/dummy/db/migrate/20140806122636_create_projects.rb         | 2 +-
 test/dummy/db/migrate/20140806122735_create_tasks.rb            | 2 +-
 test/dummy/db/migrate/20140806122805_create_sub_tasks.rb        | 2 +-
 test/dummy/db/migrate/20140806122834_create_people.rb           | 2 +-
 test/dummy/db/migrate/20140806122911_add_owner_to_projects.rb   | 2 +-
 test/dummy/db/migrate/20140806122945_create_tags.rb             | 2 +-
 test/dummy/db/migrate/20140806123008_create_project_tags.rb     | 2 +-
 test/dummy/db/migrate/20140820071344_create_assignments.rb      | 2 +-
 .../db/migrate/20140821074917_add_assignment_ref_to_tasks.rb    | 2 +-
 21 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/test/dummy/db/migrate/20140729162110_create_users.rb b/test/dummy/db/migrate/20140729162110_create_users.rb
index 92b6272..581e280 100644
--- a/test/dummy/db/migrate/20140729162110_create_users.rb
+++ b/test/dummy/db/migrate/20140729162110_create_users.rb
@@ -1,4 +1,4 @@
-class CreateUsers < ActiveRecord::Migration[4.2]
+class CreateUsers < ActiveRecord::Migration
   def change
     create_table :users do |t|
       t.string :name
diff --git a/test/dummy/db/migrate/20140729162246_create_emails.rb b/test/dummy/db/migrate/20140729162246_create_emails.rb
index ad591f5..179cbd6 100644
--- a/test/dummy/db/migrate/20140729162246_create_emails.rb
+++ b/test/dummy/db/migrate/20140729162246_create_emails.rb
@@ -1,4 +1,4 @@
-class CreateEmails < ActiveRecord::Migration[4.2]
+class CreateEmails < ActiveRecord::Migration
   def change
     create_table :emails do |t|
       t.string :address
diff --git a/test/dummy/db/migrate/20140729162335_create_profiles.rb b/test/dummy/db/migrate/20140729162335_create_profiles.rb
index 6ca648e..b8e30fe 100644
--- a/test/dummy/db/migrate/20140729162335_create_profiles.rb
+++ b/test/dummy/db/migrate/20140729162335_create_profiles.rb
@@ -1,4 +1,4 @@
-class CreateProfiles < ActiveRecord::Migration[4.2]
+class CreateProfiles < ActiveRecord::Migration
   def change
     create_table :profiles do |t|
       t.string :twitter_name
diff --git a/test/dummy/db/migrate/20140729164623_create_songs.rb b/test/dummy/db/migrate/20140729164623_create_songs.rb
index b17a6f9..42f39af 100644
--- a/test/dummy/db/migrate/20140729164623_create_songs.rb
+++ b/test/dummy/db/migrate/20140729164623_create_songs.rb
@@ -1,4 +1,4 @@
-class CreateSongs < ActiveRecord::Migration[4.2]
+class CreateSongs < ActiveRecord::Migration
   def change
     create_table :songs do |t|
       t.string :title
diff --git a/test/dummy/db/migrate/20140729164653_create_artists.rb b/test/dummy/db/migrate/20140729164653_create_artists.rb
index d9c9ff8..9536d3b 100644
--- a/test/dummy/db/migrate/20140729164653_create_artists.rb
+++ b/test/dummy/db/migrate/20140729164653_create_artists.rb
@@ -1,4 +1,4 @@
-class CreateArtists < ActiveRecord::Migration[4.2]
+class CreateArtists < ActiveRecord::Migration
   def change
     create_table :artists do |t|
       t.string :name
diff --git a/test/dummy/db/migrate/20140729164713_create_producers.rb b/test/dummy/db/migrate/20140729164713_create_producers.rb
index 9d67365..2456ec8 100644
--- a/test/dummy/db/migrate/20140729164713_create_producers.rb
+++ b/test/dummy/db/migrate/20140729164713_create_producers.rb
@@ -1,4 +1,4 @@
-class CreateProducers < ActiveRecord::Migration[4.2]
+class CreateProducers < ActiveRecord::Migration
   def change
     create_table :producers do |t|
       t.string :name
diff --git a/test/dummy/db/migrate/20140729165425_create_conferences.rb b/test/dummy/db/migrate/20140729165425_create_conferences.rb
index c6eb06c..f645624 100644
--- a/test/dummy/db/migrate/20140729165425_create_conferences.rb
+++ b/test/dummy/db/migrate/20140729165425_create_conferences.rb
@@ -1,4 +1,4 @@
-class CreateConferences < ActiveRecord::Migration[4.2]
+class CreateConferences < ActiveRecord::Migration
   def change
     create_table :conferences do |t|
       t.string :name
diff --git a/test/dummy/db/migrate/20140729165445_create_speakers.rb b/test/dummy/db/migrate/20140729165445_create_speakers.rb
index b4e3ff2..acb3d49 100644
--- a/test/dummy/db/migrate/20140729165445_create_speakers.rb
+++ b/test/dummy/db/migrate/20140729165445_create_speakers.rb
@@ -1,4 +1,4 @@
-class CreateSpeakers < ActiveRecord::Migration[4.2]
+class CreateSpeakers < ActiveRecord::Migration
   def change
     create_table :speakers do |t|
       t.string :name
diff --git a/test/dummy/db/migrate/20140729165506_create_presentations.rb b/test/dummy/db/migrate/20140729165506_create_presentations.rb
index d0d87a9..87f03c7 100644
--- a/test/dummy/db/migrate/20140729165506_create_presentations.rb
+++ b/test/dummy/db/migrate/20140729165506_create_presentations.rb
@@ -1,4 +1,4 @@
-class CreatePresentations < ActiveRecord::Migration[4.2]
+class CreatePresentations < ActiveRecord::Migration
   def change
     create_table :presentations do |t|
       t.string :topic
diff --git a/test/dummy/db/migrate/20140729170014_create_surveys.rb b/test/dummy/db/migrate/20140729170014_create_surveys.rb
index 1b7938a..c9bb4b5 100644
--- a/test/dummy/db/migrate/20140729170014_create_surveys.rb
+++ b/test/dummy/db/migrate/20140729170014_create_surveys.rb
@@ -1,4 +1,4 @@
-class CreateSurveys < ActiveRecord::Migration[4.2]
+class CreateSurveys < ActiveRecord::Migration
   def change
     create_table :surveys do |t|
       t.string :name
diff --git a/test/dummy/db/migrate/20140729170034_create_questions.rb b/test/dummy/db/migrate/20140729170034_create_questions.rb
index 01e3f8e..3db8bc1 100644
--- a/test/dummy/db/migrate/20140729170034_create_questions.rb
+++ b/test/dummy/db/migrate/20140729170034_create_questions.rb
@@ -1,4 +1,4 @@
-class CreateQuestions < ActiveRecord::Migration[4.2]
+class CreateQuestions < ActiveRecord::Migration
   def change
     create_table :questions do |t|
       t.text :content
diff --git a/test/dummy/db/migrate/20140729170112_create_answers.rb b/test/dummy/db/migrate/20140729170112_create_answers.rb
index 113900f..a7dfeae 100644
--- a/test/dummy/db/migrate/20140729170112_create_answers.rb
+++ b/test/dummy/db/migrate/20140729170112_create_answers.rb
@@ -1,4 +1,4 @@
-class CreateAnswers < ActiveRecord::Migration[4.2]
+class CreateAnswers < ActiveRecord::Migration
   def change
     create_table :answers do |t|
       t.text :content
diff --git a/test/dummy/db/migrate/20140806122636_create_projects.rb b/test/dummy/db/migrate/20140806122636_create_projects.rb
index 746a9d0..a2905bc 100644
--- a/test/dummy/db/migrate/20140806122636_create_projects.rb
+++ b/test/dummy/db/migrate/20140806122636_create_projects.rb
@@ -1,4 +1,4 @@
-class CreateProjects < ActiveRecord::Migration[4.2]
+class CreateProjects < ActiveRecord::Migration
   def change
     create_table :projects do |t|
       t.string :name
diff --git a/test/dummy/db/migrate/20140806122735_create_tasks.rb b/test/dummy/db/migrate/20140806122735_create_tasks.rb
index 46bdea8..1b762bf 100644
--- a/test/dummy/db/migrate/20140806122735_create_tasks.rb
+++ b/test/dummy/db/migrate/20140806122735_create_tasks.rb
@@ -1,4 +1,4 @@
-class CreateTasks < ActiveRecord::Migration[4.2]
+class CreateTasks < ActiveRecord::Migration
   def change
     create_table :tasks do |t|
       t.string :name
diff --git a/test/dummy/db/migrate/20140806122805_create_sub_tasks.rb b/test/dummy/db/migrate/20140806122805_create_sub_tasks.rb
index 499357f..4e6bc23 100644
--- a/test/dummy/db/migrate/20140806122805_create_sub_tasks.rb
+++ b/test/dummy/db/migrate/20140806122805_create_sub_tasks.rb
@@ -1,4 +1,4 @@
-class CreateSubTasks < ActiveRecord::Migration[4.2]
+class CreateSubTasks < ActiveRecord::Migration
   def change
     create_table :sub_tasks do |t|
       t.string :name
diff --git a/test/dummy/db/migrate/20140806122834_create_people.rb b/test/dummy/db/migrate/20140806122834_create_people.rb
index b83b83d..462a442 100644
--- a/test/dummy/db/migrate/20140806122834_create_people.rb
+++ b/test/dummy/db/migrate/20140806122834_create_people.rb
@@ -1,4 +1,4 @@
-class CreatePeople < ActiveRecord::Migration[4.2]
+class CreatePeople < ActiveRecord::Migration
   def change
     create_table :people do |t|
       t.string :name
diff --git a/test/dummy/db/migrate/20140806122911_add_owner_to_projects.rb b/test/dummy/db/migrate/20140806122911_add_owner_to_projects.rb
index 3bb752e..6a50a5d 100644
--- a/test/dummy/db/migrate/20140806122911_add_owner_to_projects.rb
+++ b/test/dummy/db/migrate/20140806122911_add_owner_to_projects.rb
@@ -1,4 +1,4 @@
-class AddOwnerToProjects < ActiveRecord::Migration[4.2]
+class AddOwnerToProjects < ActiveRecord::Migration
   def change
     add_column :projects, :owner_id, :integer
   end
diff --git a/test/dummy/db/migrate/20140806122945_create_tags.rb b/test/dummy/db/migrate/20140806122945_create_tags.rb
index b7506fa..965cd7a 100644
--- a/test/dummy/db/migrate/20140806122945_create_tags.rb
+++ b/test/dummy/db/migrate/20140806122945_create_tags.rb
@@ -1,4 +1,4 @@
-class CreateTags < ActiveRecord::Migration[4.2]
+class CreateTags < ActiveRecord::Migration
   def change
     create_table :tags do |t|
       t.string :name
diff --git a/test/dummy/db/migrate/20140806123008_create_project_tags.rb b/test/dummy/db/migrate/20140806123008_create_project_tags.rb
index bc529db..93c61f1 100644
--- a/test/dummy/db/migrate/20140806123008_create_project_tags.rb
+++ b/test/dummy/db/migrate/20140806123008_create_project_tags.rb
@@ -1,4 +1,4 @@
-class CreateProjectTags < ActiveRecord::Migration[4.2]
+class CreateProjectTags < ActiveRecord::Migration
   def change
     create_table :project_tags do |t|
       t.references :project, index: true
diff --git a/test/dummy/db/migrate/20140820071344_create_assignments.rb b/test/dummy/db/migrate/20140820071344_create_assignments.rb
index 5882208..fa0e823 100644
--- a/test/dummy/db/migrate/20140820071344_create_assignments.rb
+++ b/test/dummy/db/migrate/20140820071344_create_assignments.rb
@@ -1,4 +1,4 @@
-class CreateAssignments < ActiveRecord::Migration[4.2]
+class CreateAssignments < ActiveRecord::Migration
   def change
     create_table :assignments do |t|
       t.string :name
diff --git a/test/dummy/db/migrate/20140821074917_add_assignment_ref_to_tasks.rb b/test/dummy/db/migrate/20140821074917_add_assignment_ref_to_tasks.rb
index 9958cda..c89afc4 100644
--- a/test/dummy/db/migrate/20140821074917_add_assignment_ref_to_tasks.rb
+++ b/test/dummy/db/migrate/20140821074917_add_assignment_ref_to_tasks.rb
@@ -1,4 +1,4 @@
-class AddAssignmentRefToTasks < ActiveRecord::Migration[4.2]
+class AddAssignmentRefToTasks < ActiveRecord::Migration
   def change
     add_reference :tasks, :assignment, index: true
   end

From b69e05a1cd88e19dc96615e3b43669ee040271c1 Mon Sep 17 00:00:00 2001
From: Nicolas Rodriguez <nrodriguez@jbox-web.com>
Date: Tue, 5 Jul 2016 20:38:10 +0200
Subject: [PATCH 23/32] Reduce Rails versions range in gemspec

---
 actionform.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actionform.gemspec b/actionform.gemspec
index 9b16ec8..2166054 100644
--- a/actionform.gemspec
+++ b/actionform.gemspec
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.files       = Dir['{app,config,db,lib}/**/*', 'MIT-LICENSE', 'Rakefile', 'README.md']
   s.test_files  = Dir['test/**/*']
 
-  s.add_dependency 'rails', '>= 4.1', '< 6'
+  s.add_dependency 'rails', '>= 4.1', '< 5.1'
 
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'rake', '~> 10.3.2'

From 6ec2f5fd7f21f2a14c03e782fe8715f3491b36d6 Mon Sep 17 00:00:00 2001
From: Nicolas Rodriguez <nrodriguez@jbox-web.com>
Date: Tue, 5 Jul 2016 22:24:35 +0200
Subject: [PATCH 24/32] Becareful of module namespace

---
 lib/action_form/form_collection.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/action_form/form_collection.rb b/lib/action_form/form_collection.rb
index c4749cf..6f3170b 100644
--- a/lib/action_form/form_collection.rb
+++ b/lib/action_form/form_collection.rb
@@ -172,9 +172,9 @@ def create_form
       forms << new_form
       new_form
     end
-  end
 
-  def rails_5?
-    Rails.version[0] == '5'
+    def rails_5?
+      Rails.version[0] == '5'
+    end
   end
 end

From 612d09d30fcef88c13d40a73624f08e1a3dbe78f Mon Sep 17 00:00:00 2001
From: Nicolas Rodriguez <nrodriguez@jbox-web.com>
Date: Sun, 10 Jul 2016 03:12:38 +0200
Subject: [PATCH 25/32] Add comment

---
 Rakefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Rakefile b/Rakefile
index d76aa52..7cedae2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -10,6 +10,7 @@ end
 
 require 'rdoc/task'
 
+desc 'Generate documentation.'
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'ActionForm'

From c1cf72eadd39955e490bc2ae1df3b4e42e8f5711 Mon Sep 17 00:00:00 2001
From: Nicolas Rodriguez <nrodriguez@jbox-web.com>
Date: Sun, 10 Jul 2016 03:17:31 +0200
Subject: [PATCH 26/32] ActionForm should not depend on SimpleForm (only for
 tests)

---
 Gemfile                  | 2 +-
 gemfiles/rails_4.gemfile | 2 +-
 gemfiles/rails_5.gemfile | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3b3b0e1..e7d1aca 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,6 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'jquery-rails'
-gem 'simple_form'
 
 group :development do
   gem 'bundler'
@@ -12,5 +11,6 @@ group :development do
 end
 
 group :test do
+  gem 'simple_form'
   gem 'codeclimate-test-reporter', require: nil
 end
diff --git a/gemfiles/rails_4.gemfile b/gemfiles/rails_4.gemfile
index df921ed..5ed3a29 100644
--- a/gemfiles/rails_4.gemfile
+++ b/gemfiles/rails_4.gemfile
@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "jquery-rails"
-gem "simple_form"
 gem "rails", "~> 4.2.6"
 
 group :development do
@@ -13,6 +12,7 @@ group :development do
 end
 
 group :test do
+  gem "simple_form"
   gem "codeclimate-test-reporter", :require => nil
 end
 
diff --git a/gemfiles/rails_5.gemfile b/gemfiles/rails_5.gemfile
index 566505a..a762cc9 100644
--- a/gemfiles/rails_5.gemfile
+++ b/gemfiles/rails_5.gemfile
@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "jquery-rails"
-gem "simple_form"
 gem "rails", "~> 5.0.0"
 gem "rails-controller-testing"
 
@@ -14,8 +13,8 @@ group :development do
 end
 
 group :test do
+  gem "simple_form"
   gem "codeclimate-test-reporter", :require => nil
-  gem "rails-controller-testing"
 end
 
 gemspec :path => "../"

From c4382c0b680231a568ba565c8042e4aa991cffc9 Mon Sep 17 00:00:00 2001
From: Nicolas Rodriguez <nicolas.rodriguez@fraudbuster.mobi>
Date: Wed, 18 Jan 2017 17:41:32 +0100
Subject: [PATCH 27/32] Fix CodeClimate error

---
 test/test_helper.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 0ad9cbb..89a0981 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -3,8 +3,7 @@
 
 # Configure SimpleCov
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
-  SimpleCov::Formatter::HTMLFormatter,
-  CodeClimate::TestReporter::Formatter
+  SimpleCov::Formatter::HTMLFormatter
 ])
 
 SimpleCov.start do

From be5c214351b7e790ab1995c5030ef651c0d60130 Mon Sep 17 00:00:00 2001
From: Nicolas Rodriguez <nicolas.rodriguez@fraudbuster.mobi>
Date: Wed, 18 Jan 2017 17:41:46 +0100
Subject: [PATCH 28/32] Test with latest Ruby version

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 64b3905..d861572 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,8 @@ language: ruby
 sudo: false
 cache: bundler
 rvm:
-  - 2.3.1
-  - 2.2.5
+  - 2.3.3
+  - 2.2.6
 gemfile:
   - gemfiles/rails_5.gemfile
   - gemfiles/rails_4.gemfile

From 1ce4cdd52a2c93e6cdfc967a6d0a8464b8edf82d Mon Sep 17 00:00:00 2001
From: Nicolas Rodriguez <nicoladmin@free.fr>
Date: Fri, 24 Mar 2017 12:00:57 +0100
Subject: [PATCH 29/32] Fix CodeClimate reporter

---
 .travis.yml         | 2 ++
 test/test_helper.rb | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d861572..09d9d81 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,3 +12,5 @@ script:
   - RAILS_ENV=test bundle exec rake db:migrate
   - cd ../..
   - bundle exec rake
+after_success:
+  - bundle exec codeclimate-test-reporter
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 89a0981..482e3dc 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,5 +1,4 @@
 require 'simplecov'
-require 'codeclimate-test-reporter'
 
 # Configure SimpleCov
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([

From 52afb96c621f8cd385ce8f7ca58cb2f5b1148860 Mon Sep 17 00:00:00 2001
From: Nicolas Rodriguez <nicoladmin@free.fr>
Date: Fri, 24 Mar 2017 12:01:14 +0100
Subject: [PATCH 30/32] Test with latest Ruby version

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 09d9d81..696100e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@ language: ruby
 sudo: false
 cache: bundler
 rvm:
+  - 2.4.1
   - 2.3.3
   - 2.2.6
 gemfile:

From b6376ac7901329cd686e9d7513e4e2526b85fbc0 Mon Sep 17 00:00:00 2001
From: Nicolas <nicoladmin@free.fr>
Date: Mon, 3 Apr 2017 00:47:04 +0200
Subject: [PATCH 31/32] Test with latest Ruby versions

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 696100e..df0ec58 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,8 @@ sudo: false
 cache: bundler
 rvm:
   - 2.4.1
-  - 2.3.3
-  - 2.2.6
+  - 2.3.4
+  - 2.2.7
 gemfile:
   - gemfiles/rails_5.gemfile
   - gemfiles/rails_4.gemfile

From 1860a358a8d61981197992c6e7214dee21b7018d Mon Sep 17 00:00:00 2001
From: Nicolas Rodriguez <nrodriguez@jbox-web.com>
Date: Fri, 28 Apr 2017 02:23:20 +0200
Subject: [PATCH 32/32] Test with maintained versions of Rails

---
 .travis.yml                  |  5 +++--
 Appraisals                   | 16 ++++++++++------
 Gemfile                      |  6 ------
 actionform.gemspec           | 18 +++++++++++-------
 gemfiles/rails_4.2.8.gemfile | 13 +++++++++++++
 gemfiles/rails_4.gemfile     | 19 -------------------
 gemfiles/rails_5.0.2.gemfile | 14 ++++++++++++++
 gemfiles/rails_5.1.0.gemfile | 14 ++++++++++++++
 gemfiles/rails_5.gemfile     | 20 --------------------
 9 files changed, 65 insertions(+), 60 deletions(-)
 create mode 100644 gemfiles/rails_4.2.8.gemfile
 delete mode 100644 gemfiles/rails_4.gemfile
 create mode 100644 gemfiles/rails_5.0.2.gemfile
 create mode 100644 gemfiles/rails_5.1.0.gemfile
 delete mode 100644 gemfiles/rails_5.gemfile

diff --git a/.travis.yml b/.travis.yml
index df0ec58..575b833 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,9 @@ rvm:
   - 2.3.4
   - 2.2.7
 gemfile:
-  - gemfiles/rails_5.gemfile
-  - gemfiles/rails_4.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
diff --git a/Appraisals b/Appraisals
index 76006fa..796ffe9 100644
--- a/Appraisals
+++ b/Appraisals
@@ -1,8 +1,12 @@
-appraise 'rails-4' do
-  gem 'rails', '~> 4.2.6'
-end
+RAILS_VERSIONS = %w(
+  4.2.8
+  5.0.2
+  5.1.0
+)
 
-appraise 'rails-5' do
-  gem 'rails', '~> 5.0.0'
-  gem 'rails-controller-testing'
+RAILS_VERSIONS.each do |version|
+  appraise "rails_#{version}" do
+    gem 'rails', version
+    gem 'rails-controller-testing' if version != '4.2.8'
+  end
 end
diff --git a/Gemfile b/Gemfile
index e7d1aca..2eab805 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,12 +4,6 @@ gemspec
 
 gem 'jquery-rails'
 
-group :development do
-  gem 'bundler'
-  gem 'rake'
-  gem 'appraisal'
-end
-
 group :test do
   gem 'simple_form'
   gem 'codeclimate-test-reporter', require: nil
diff --git a/actionform.gemspec b/actionform.gemspec
index 2166054..c027d2b 100644
--- a/actionform.gemspec
+++ b/actionform.gemspec
@@ -1,23 +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       = ['markoupetr@gmail.com']
-  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', '< 5.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
diff --git a/gemfiles/rails_4.2.8.gemfile b/gemfiles/rails_4.2.8.gemfile
new file mode 100644
index 0000000..a2fa69b
--- /dev/null
+++ b/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: "../"
diff --git a/gemfiles/rails_4.gemfile b/gemfiles/rails_4.gemfile
deleted file mode 100644
index 5ed3a29..0000000
--- a/gemfiles/rails_4.gemfile
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "jquery-rails"
-gem "rails", "~> 4.2.6"
-
-group :development do
-  gem "bundler"
-  gem "rake"
-  gem "appraisal"
-end
-
-group :test do
-  gem "simple_form"
-  gem "codeclimate-test-reporter", :require => nil
-end
-
-gemspec :path => "../"
diff --git a/gemfiles/rails_5.0.2.gemfile b/gemfiles/rails_5.0.2.gemfile
new file mode 100644
index 0000000..f9f86a8
--- /dev/null
+++ b/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: "../"
diff --git a/gemfiles/rails_5.1.0.gemfile b/gemfiles/rails_5.1.0.gemfile
new file mode 100644
index 0000000..07f7e8d
--- /dev/null
+++ b/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: "../"
diff --git a/gemfiles/rails_5.gemfile b/gemfiles/rails_5.gemfile
deleted file mode 100644
index a762cc9..0000000
--- a/gemfiles/rails_5.gemfile
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "jquery-rails"
-gem "rails", "~> 5.0.0"
-gem "rails-controller-testing"
-
-group :development do
-  gem "bundler"
-  gem "rake"
-  gem "appraisal"
-end
-
-group :test do
-  gem "simple_form"
-  gem "codeclimate-test-reporter", :require => nil
-end
-
-gemspec :path => "../"