bbenezech-nested_form 0.0.5 → 0.0.6

data/CHANGELOG.rdoc

@@ -1,3 +1,13 @@
+0.0.6
+
+Index blueprint by full name instead of just association name. 
+This was a design flaw: 
+A -> B
+A -> C
+B -> D
+C -> D
+When editing A, adding a D in C, B's D would show up instead, with name pointing to B.
+
 0.0.5
 
 JS update (id generation)

data/lib/nested_form/builder_mixin.rb

@@ -14,14 +14,17 @@ module NestedForm
     def link_to_add(*args, &block)
       options = args.extract_options!.symbolize_keys
       association = args.pop
+      parent_names = (object_name.scan(/([a-z_]+_attributes)/)).flatten
+      blueprint_name = (parent_names << association).join('_') + '_fields_blueprint'
       options[:class] = [options[:class], "add_nested_fields"].compact.join(" ")
       options["data-association"] = association
+      options["data-blueprint_name"] = blueprint_name
       args << (options.delete(:href) || "javascript:void(0)")
       args << options
       @fields ||= {}
-      @template.after_nested_form(association) do
+      @template.after_nested_form(blueprint_name) do
         model_object = object.class.reflect_on_association(association).klass.new
-        output = %Q[<div id="#{association}_fields_blueprint" style="display: none" class="fields_blueprint">].html_safe
+        output = %Q[<div id="#{blueprint_name}" style="display:none" class="fields_blueprint">].html_safe
         output << fields_for(association, model_object, :child_index => "new_#{association}", &@fields[association])
         output.safe_concat('</div>')
         output

data/lib/nested_form/view_helper.rb

@@ -21,11 +21,11 @@ module NestedForm
       end
     end
 
-    def after_nested_form(association, &block)
+    def after_nested_form(blueprint_name, &block)
       @associations ||= []
       @after_nested_form_callbacks ||= []
-      unless @associations.include?(association)
-        @associations << association
+      unless @associations.include?(blueprint_name)
+        @associations << blueprint_name
         @after_nested_form_callbacks << block
       end
     end

data/spec/dummy/app/assets/javascripts/jquery_nested_form.js

@@ -7,10 +7,10 @@ jQuery(function($) {
   NestedFormEvents.prototype = {
     addFields: function(e) {
       // Setup
-      var link    = e.currentTarget;
-      var assoc   = $(link).attr('data-association');            // Name of child
-      var content = $('#' + assoc + '_fields_blueprint').html(); // Fields template
-
+      var link           = e.currentTarget;
+      var assoc          = $(link).attr('data-association');            // Name of child
+      var blueprint_name = $(link).attr('data-blueprint_name');         // Blueprint name/id for that association
+      var content        = $('#' + blueprint_name).html();              // Fields template
       // Make a unique ID for the new child
       var regexp  = new RegExp('new_' + assoc, 'g');
       var new_id  = new Date().getTime();

data/vendor/assets/javascripts/jquery_nested_form.js

@@ -7,10 +7,10 @@ jQuery(function($) {
   NestedFormEvents.prototype = {
     addFields: function(e) {
       // Setup
-      var link    = e.currentTarget;
-      var assoc   = $(link).attr('data-association');            // Name of child
-      var content = $('#' + assoc + '_fields_blueprint').html(); // Fields template
-
+      var link           = e.currentTarget;
+      var assoc          = $(link).attr('data-association');            // Name of child
+      var blueprint_name = $(link).attr('data-blueprint_name');         // Blueprint name/id for that association
+      var content        = $('#' + blueprint_name).html();              // Fields template
       // Make a unique ID for the new child
       var regexp  = new RegExp('new_' + assoc, 'g');
       var new_id  = new Date().getTime();

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bbenezech-nested_form
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-22 00:00:00.000000000 Z
+date: 2012-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70169599342280 !ruby/object:Gem::Requirement
+  requirement: &70268850811300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70169599342280
+  version_requirements: *70268850811300
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70169599338560 !ruby/object:Gem::Requirement
+  requirement: &70268850810140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,9 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70169599338560
+  version_requirements: *70268850810140
 description: Gem to conveniently handle multiple models in a single form with Rails
-  3 and jQuery or Prototype. Version maintained by fxposter.
+  3 and jQuery or Prototype. Version maintained by fxposter, with some patches aimed
+  at RailsAdmin.
 email: ryan@railscasts.com
 executables: []
 extensions: []
@@ -124,5 +125,5 @@ rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Gem to conveniently handle multiple models in a single form. Version maintained
-  by fxposter.
+  by fxposter, with some patches aimed at RailsAdmin.
 test_files: []