Merge pull request #20 from m-Peter/master

Sync up changes from Peter's repo to the main one.

Author: guilleiguaran

app/assets/javascripts/link_helpers.js

@@ -1,109 +1,61 @@
 (function($) {
 
-  var element_counter = 0;
-
   var create_new_id = function() {
-    return (new Date().getTime() + element_counter++);
-  }
-
-  var newcontent_braced = function(id) {
-    return '[' + id + ']$1';
-  }
-
-  var newcontent_underscord = function(id) {
-    return '_' + id + '_$1';
+    return new Date().getTime();
   }
 
   $(document).on('click', '.add_fields', function(e) {
     e.preventDefault();
-    var $this                 = $(this),
-        assoc                 = $this.data('association'),
-        assocs                = $this.data('associations'),
-        content               = $this.data('association-insertion-template'),
-        insertionMethod       = $this.data('association-insertion-method') || $this.data('association-insertion-position') || 'before',
-        insertionNode         = $this.data('association-insertion-node'),
-        insertionTraversal    = $this.data('association-insertion-traversal'),
-        count                 = parseInt($this.data('count'), 10),
-        regexp_braced         = new RegExp('\\[new_' + assoc + '\\](.*?\\s)', 'g'),
-        regexp_underscord     = new RegExp('_new_' + assoc + '_(\\w*)', 'g'),
-        new_id                = create_new_id(),
-        new_content           = content.replace(regexp_braced, newcontent_braced(new_id)),
-        new_contents          = [];
-
-
-    if (new_content == content) {
-      regexp_braced     = new RegExp('\\[new_' + assocs + '\\](.*?\\s)', 'g');
-      regexp_underscord = new RegExp('_new_' + assocs + '_(\\w*)', 'g');
-      new_content       = content.replace(regexp_braced, newcontent_braced(new_id));
-    }
-
-    new_content = new_content.replace(regexp_underscord, newcontent_underscord(new_id));
-    new_contents = [new_content];
-
-    count = (isNaN(count) ? 1 : Math.max(count, 1));
-    count -= 1;
-
-    while (count) {
-      new_id      = create_new_id();
-      new_content = content.replace(regexp_braced, newcontent_braced(new_id));
-      new_content = new_content.replace(regexp_underscord, newcontent_underscord(new_id));
-      new_contents.push(new_content);
-
-      count -= 1;
-    }
+    
+    var $link = $(this);
+    var assoc = $link.data('association');
+    var content = $link.data('association-insertion-template');
+    var insertionMethod = $link.data('association-insertion-method') || $link.data('association-insertion-position') || 'before';
+    var insertionNode = $link.data('association-insertion-node');
+    var insertionTraversal = $link.data('association-insertion-traversal');
+    var new_id = create_new_id();
+    var regex = new RegExp("new_" + assoc, "g");
+    var new_content = content.replace(regex, new_id);
 
     if (insertionNode){
       if (insertionTraversal){
-        insertionNode = $this[insertionTraversal](insertionNode);
+        insertionNode = $link[insertionTraversal](insertionNode);
       } else {
-        insertionNode = insertionNode == "this" ? $this : $(insertionNode);
+        insertionNode = insertionNode == "this" ? $link : $(insertionNode);
       }
     } else {
-      insertionNode = $this.parent();
+      insertionNode = $link.parent();
     }
 
-    $.each(new_contents, function(i, node) {
-      var contentNode = $(node);
+    var contentNode = $(new_content);
+    insertionNode.trigger('before-insert', [contentNode]);
 
-      insertionNode.trigger('cocoon:before-insert', [contentNode]);
+    var addedContent = insertionNode[insertionMethod](contentNode);
 
-      // allow any of the jquery dom manipulation methods (after, before, append, prepend, etc)
-      // to be called on the node.  allows the insertion node to be the parent of the inserted
-      // code and doesn't force it to be a sibling like after/before does. default: 'before'
-      var addedContent = insertionNode[insertionMethod](contentNode);
-
-      insertionNode.trigger('cocoon:after-insert', [contentNode]);
-    });
+    insertionNode.trigger('after-insert', [contentNode]);
   });
 
   $(document).on('click', '.remove_fields.dynamic, .remove_fields.existing', function(e) {
-    var $this = $(this),
-        wrapper_class = $this.data('wrapper-class') || 'nested-fields',
-        node_to_delete = $this.closest('.' + wrapper_class),
-        trigger_node = node_to_delete.parent();
-
     e.preventDefault();
 
-    trigger_node.trigger('cocoon:before-remove', [node_to_delete]);
+    var $link = $(this);
+    var wrapper_class = $link.data('wrapper-class') || 'nested-fields';
+    var node_to_delete = $link.closest('.' + wrapper_class);
+    var trigger_node = node_to_delete.parent();
+
+    trigger_node.trigger('before-remove', [node_to_delete]);
 
     var timeout = trigger_node.data('remove-timeout') || 0;
 
     setTimeout(function() {
-      if ($this.hasClass('dynamic')) {
+      if ($link.hasClass('dynamic')) {
           node_to_delete.remove();
       } else {
-          $this.prev("input[type=hidden]").val("1");
+          $link.prev("input[type=hidden]").val("1");
           node_to_delete.hide();
       }
-      trigger_node.trigger('cocoon:after-remove', [node_to_delete]);
+      trigger_node.trigger('after-remove', [node_to_delete]);
     }, timeout);
   });
 
-  $('.remove_fields.existing.destroyed').each(function(i, obj) {
-    var $this = $(this),
-        wrapper_class = $this.data('wrapper-class') || 'nested-fields';
-
-    $this.closest('.' + wrapper_class).hide();
-  });
-
 })(jQuery);

lib/active_form/view_helpers.rb

@@ -1,19 +1,15 @@
 module ActiveForm
   module ViewHelpers
 
-    def link_to_remove_association(*args)
-      name         = args[0]
-      f            = args[1]
-      html_options = args[2] || {}
-      is_existing = f.object.persisted?
-
+    def link_to_remove_association(name, f, html_options={})
       classes = []
       classes << "remove_fields"
-      classes << (is_existing ? 'existing' : 'dynamic')
-      #classes << 'destroyed' if f.object.marked_for_destruction?
-      html_options[:class] = [html_options[:class], classes.join(' ')].compact.join(' ')
 
+      is_existing = f.object.persisted?
+      classes << (is_existing ? 'existing' : 'dynamic')
+      
       wrapper_class = html_options.delete(:wrapper_class)
+      html_options[:class] = [html_options[:class], classes.join(' ')].compact.join(' ')
       html_options[:'data-wrapper-class'] = wrapper_class if wrapper_class.present?
 
       if is_existing
@@ -23,38 +19,33 @@ def link_to_remove_association(*args)
       end
     end
 
-    def render_association(association, f, new_object, form_name, render_options={}, custom_partial=nil)
+    def render_association(association, f, new_object, render_options={}, custom_partial=nil)
       partial = get_partial_path(custom_partial, association)
-      locals =  render_options.delete(:locals) || {}
-      method_name = f.respond_to?(:semantic_fields_for) ? :semantic_fields_for : (f.respond_to?(:simple_fields_for) ? :simple_fields_for : :fields_for)
+      
+      if f.respond_to?(:semantic_fields_for)
+        method_name = :semantic_fields_for
+      elsif f.respond_to?(:simple_fields_for)
+        method_name = :simple_fields_for
+      else
+        method_name = :fields_for
+      end
 
       f.send(method_name, association, new_object, {:child_index => "new_#{association}"}.merge(render_options)) do |builder|
-        partial_options = {form_name.to_sym => builder, :dynamic => true}.merge(locals)
-        render(partial, partial_options)
+        render(partial: partial, locals: {:f => builder})
       end
     end
 
-    def link_to_add_association(*args)
-      name         = args[0]
-      f            = args[1]
-      association  = args[2]
-      html_options = args[3] || {}
-
-      render_options   = html_options.delete(:render_options)
+    def link_to_add_association(name, f, association, html_options={})
+      render_options = html_options.delete(:render_options)
       render_options ||= {}
       override_partial = html_options.delete(:partial)
-      form_parameter_name = html_options.delete(:form_name) || 'f'
-      count = html_options.delete(:count).to_i
 
       html_options[:class] = [html_options[:class], "add_fields"].compact.join(' ')
-      html_options[:'data-association'] = association.to_s.singularize
-      html_options[:'data-associations'] = association.to_s.pluralize
+      html_options[:'data-association'] = association.to_s
 
       new_object = create_object(f, association)
 
-      html_options[:'data-association-insertion-template'] = CGI.escapeHTML(render_association(association, f, new_object, form_parameter_name, render_options, override_partial).to_str).html_safe
-
-      html_options[:'data-count'] = count if count > 0
+      html_options[:'data-association-insertion-template'] = CGI.escapeHTML(render_association(association, f, new_object, render_options, override_partial).to_str).html_safe
 
       link_to(name, '#', html_options)
     end

lib/generators/active_form/install_generator.rb

@@ -0,0 +1,27 @@
+require 'rails/generators'
+require 'rails/generators/base'
+
+module ActiveForm
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+
+      desc "Creates a forms directory into your app and test directories and includes the necessary JS file."
+
+      def create_forms_app_directory
+        empty_directory "app/forms"
+      end
+
+      def create_forms_test_directory
+        if File.directory?("spec")
+          empty_directory "spec/forms"
+        else
+          empty_directory "test/forms"
+        end
+      end
+
+      def include_js_file
+        insert_into_file "app/assets/javascripts/application.js", "//= require link_helpers", :before => "//= require_tree ."
+      end
+    end
+  end
+end

test/dummy/app/assets/javascripts/projects.js

@@ -3,12 +3,12 @@ $(document).ready(function() {
       data("association-insertion-position", 'before').
       data("association-insertion-node", 'this');
 
-    $('#owner').bind('cocoon:after-insert',
+    $('#owner').bind('after-insert',
          function() {
            $("#owner_from_list").hide();
            $("#owner a.add_fields").hide();
          });
-    $('#owner').bind("cocoon:after-remove",
+    $('#owner').bind("after-remove",
          function() {
            $("#owner_from_list").show();
            $("#owner a.add_fields").show();
@@ -18,27 +18,27 @@ $(document).ready(function() {
       data("association-insertion-position", 'before').
       data("association-insertion-node", 'this');
 
-    $('#tags').bind('cocoon:after-insert',
+    $('#tags').bind('after-insert',
          function(e, tag) {
              $(".project-tag-fields a.add_fields").
                  data("association-insertion-position", 'before').
                  data("association-insertion-node", 'this');
-             $('.project-tag-fields').bind('cocoon:after-insert',
+             $('.project-tag-fields').bind('after-insert',
                   function() {
                     $(this).children("#tag_from_list").remove();
                     $(this).children("a.add_fields").hide();
                   });
          });
 
-    $('#tasks').bind('cocoon:before-insert', function(e,task_to_be_added) {
+    $('#tasks').bind('before-insert', function(e,task_to_be_added) {
         task_to_be_added.fadeIn('slow');
     });
 
-    $('#tasks').bind('cocoon:after-insert', function(e, added_task) {
+    $('#tasks').bind('after-insert', function(e, added_task) {
         //added_task.css("background","red");
     });
 
-    $('#tasks').bind('cocoon:before-remove', function(e, task) {
+    $('#tasks').bind('before-remove', function(e, task) {
         $(this).data('remove-timeout', 1000);
         task.fadeOut('slow');
     })

test/dummy/app/forms/project_form.rb

@@ -10,7 +10,7 @@ class ProjectForm < ActiveForm::Base
     end
   end
 
-  association :contributors do
+  association :contributors, records: 2 do
     attributes :name, :description, :role
   end
 

test/dummy/app/forms/survey_form.rb

@@ -2,7 +2,7 @@ class SurveyForm < ActiveForm::Base
   self.main_model = :survey
   attribute :name, required: true
 
-  association :questions, records: 1 do
+  association :questions do
     attribute :content, required: true
 
     association :answers, records: 2 do

test/forms/user_form_fixture.rb test/fixtures/user_form_fixture.rbtest/forms/user_form_fixture.rb renamed to test/fixtures/user_form_fixture.rb

@@ -1,13 +1,12 @@
 require 'test_helper'
-require_relative 'conference_form_fixture'
 
 class ConferenceFormTest < ActiveSupport::TestCase
   include ActiveModel::Lint::Tests
   fixtures :conferences, :speakers, :presentations
 
   def setup
     @conference = Conference.new
-    @form = ConferenceFormFixture.new(@conference)
+    @form = ConferenceForm.new(@conference)
     @model = @form
   end
 
@@ -66,7 +65,7 @@ def setup
   test "presentations sub-form fetches parent and association objects" do
     conference = conferences(:ruby)
 
-    form = ConferenceFormFixture.new(conference)
+    form = ConferenceForm.new(conference)
 
     assert_equal conference.name, form.name
     assert_equal 2, form.speaker.presentations.size
@@ -279,7 +278,7 @@ def setup
 
   test "main form updates its model and the models in nested sub-forms" do
     conference = conferences(:ruby)
-    form = ConferenceFormFixture.new(conference)
+    form = ConferenceForm.new(conference)
     params = {
       name: "GoGaruco",
       city: "Golden State",
@@ -316,7 +315,7 @@ def setup
 
   test "main form updates its model and saves dynamically added models in nested sub-forms" do
     conference = conferences(:ruby)
-    form = ConferenceFormFixture.new(conference)
+    form = ConferenceForm.new(conference)
     params = {
       name: "GoGaruco",
       city: "Golden State",
@@ -356,7 +355,7 @@ def setup
 
   test "main form deletes models in nested sub-forms" do
     conference = conferences(:ruby)
-    form = ConferenceFormFixture.new(conference)
+    form = ConferenceForm.new(conference)
     params = {
       name: "GoGaruco",
       city: "Golden State",
@@ -396,7 +395,7 @@ def setup
 
   test "main form deletes and adds models in nested sub-forms" do
     conference = conferences(:ruby)
-    form = ConferenceFormFixture.new(conference)
+    form = ConferenceForm.new(conference)
     params = {
       name: "GoGaruco",
       city: "Golden State",