0
@@ -1,2 +1,7 @@
0
 ActiveRecord::Base.class_eval { include AttributeFu::Associations }
0
-ActionView::Helpers::FormBuilder.class_eval { include AttributeFu::AssociatedFormHelper }
0
\ No newline at end of file
0
+ActionView::Helpers::FormBuilder.class_eval { include AttributeFu::AssociatedFormHelper }
0
+
0
+# copy the required javascript file (if it hasn't been copied already)
0
+target_dir = "#{RAILS_ROOT}/public/javascripts"
0
+FileUtils.mkdir_p(target_dir) unless File.directory?(target_dir)
0
+FileUtils.cp(File.join(File.dirname(__FILE__), 'javascripts/jquery.template.js'), "#{RAILS_ROOT}/public/javascripts") unless File.exists?("#{RAILS_ROOT}/public/javascripts/jquery.template.js")
0
\ No newline at end of file

0
@@ -28,7 +28,7 @@ module AttributeFu
0
       else
0
         @new_objects ||= {}
0
         @new_objects[associated_name] ||= -1 # we want naming to start at 0
0
-        identifier = !conf.nil? && conf[:javascript] ? '#{number}' : @new_objects[associated_name]+=1
0
+        identifier = !conf.nil? && conf[:javascript] ? '${number}' : @new_objects[associated_name]+=1
0
         
0
         name << "[new][#{identifier}]"
0
       end
0
@@ -54,7 +54,7 @@ module AttributeFu
0
       css_selector = options.delete(:selector) || ".#{@object.class.name.split("::").last.underscore}"
0
       function     = options.delete(:function) || ""
0
       
0
-      function << "$(this).up(&quot;#{css_selector}&quot;).remove()"
0
+      function << "$(this).parent(&quot;#{css_selector}&quot;).remove()"
0
       
0
       @template.link_to_function(name, function, *args.push(options))
0
     end
0
@@ -83,14 +83,14 @@ module AttributeFu
0
       
0
       opts.symbolize_keys!
0
       partial          = opts.delete(:partial)    || associated_name
0
-      container        = opts.delete(:expression) || "'#{opts.delete(:container) || associated_name.pluralize}'"
0
+      container        = opts.delete(:expression) || "'#{opts.delete(:container) || '#'+associated_name.pluralize}'"
0
       
0
       form_builder     = self # because the value of self changes in the block
0
       
0
-      @template.link_to_function(name, opts) do |page|
0
-        page << "if (typeof #{variable} == 'undefined') #{variable} = 0;"
0
-        page << "new Insertion.Bottom(#{container}, new Template("+form_builder.render_associated_form(object, :fields_for => { :javascript => true }, :partial => partial).to_json+").evaluate({'number': --#{variable}}))"
0
-      end
0
+      function = "if (typeof #{variable} == 'undefined') #{variable} = 0; 
0
+                    $(#{container}).append($.template("+[self.render_associated_form(object, :fields_for => { :javascript => true }, :partial => partial)].flatten.first.to_json+"), { number: --#{variable}});"
0
+                    
0
+      @template.link_to_function(name, function, opts)
0
     end
0
     
0
     # Renders the form of an associated object, wrapping it in a fields_for_associated call.

0
@@ -60,13 +60,15 @@ module AttributeFu
0
       end
0
       
0
       def save_managed_associations #:nodoc:
0
-        managed_association_attributes.keys.each do |association_id|
0
-          association = send(association_id)
0
-          association.each(&:save)
0
-          
0
-          unless (objects_to_remove = instance_variable_get removal_variable_name(association_id)).nil?
0
-            objects_to_remove.each { |remove_id| association.delete association.detect { |obj| obj.id.to_s == remove_id.to_s } }
0
-            instance_variable_set removal_variable_name(association_id), nil
0
+        if managed_association_attributes != nil
0
+          managed_association_attributes.keys.each do |association_id|
0
+            association = send(association_id)
0
+            association.each(&:save)
0
+
0
+            unless (objects_to_remove = instance_variable_get removal_variable_name(association_id)).nil?
0
+              objects_to_remove.each { |remove_id| association.delete association.detect { |obj| obj.id.to_s == remove_id.to_s } }
0
+              instance_variable_set removal_variable_name(association_id), nil
0
+            end
0
           end
0
         end
0
       end

0
@@ -76,7 +76,7 @@ class AssociatedFormHelperTest < Test::Unit::TestCase
0
       end
0
 
0
       should "infer the name of the current @object in fields_for" do
0
-        assert_match "$(this).up(&quot;.comment&quot;).remove()", @erbout
0
+        assert_match "$(this).parent(&quot;.comment&quot;).remove()", @erbout
0
       end
0
     end
0
     
0
@@ -86,7 +86,7 @@ class AssociatedFormHelperTest < Test::Unit::TestCase
0
       end
0
 
0
       should "use the alternate selector" do
0
-        assert_match "$(this).up(&quot;.blah&quot;).remove()", @erbout
0
+        assert_match "$(this).parent(&quot;.blah&quot;).remove()", @erbout
0
       end
0
     end
0
     
0
@@ -97,7 +97,7 @@ class AssociatedFormHelperTest < Test::Unit::TestCase
0
       end
0
 
0
       should "still infer the name of the current @object in fields_for, and create the function as usual" do
0
-        assert_match "$(this).up(&quot;.comment&quot;).remove()", @erbout
0
+        assert_match "$(this).parent(&quot;.comment&quot;).remove()", @erbout
0
       end
0
       
0
       should "append the secondary function" do
0
@@ -119,7 +119,7 @@ class AssociatedFormHelperTest < Test::Unit::TestCase
0
     end
0
     
0
     should "use placeholders instead of numbers" do
0
-      assert_match 'photo[comment_attributes][new][#{number}]', @erbout
0
+      assert_match 'photo[comment_attributes][new][${number}]', @erbout
0
     end
0
   end
0
   
0
@@ -141,12 +141,12 @@ class AssociatedFormHelperTest < Test::Unit::TestCase
0
     end
0
     
0
     should "insert into the bottom of the parent container by default" do
0
-      assert_match "Insertion.Bottom('comments'", @erbout
0
+      assert_match "$('#comments'", @erbout
0
     end
0
     
0
     should "wrap the partial in a prototype template" do
0
-      assert_match "new Template", @erbout
0
-      assert_match "evaluate", @erbout
0
+      assert_match "$.template", @erbout
0
+      assert_match "{ number:", @erbout
0
     end
0
     
0
     should "name the variable correctly" do
0
@@ -160,7 +160,7 @@ class AssociatedFormHelperTest < Test::Unit::TestCase
0
     should "produce the following link" do
0
       # this is a way of testing the whole link
0
       assert_equal %{
0
-        <a class=\"something\" href=\"#\" onclick=\"if (typeof attribute_fu_comment_count == 'undefined') attribute_fu_comment_count = 0;\nnew Insertion.Bottom('comments', new Template(null).evaluate({'number': --attribute_fu_comment_count})); return false;\">Add Comment</a>
0
+        <a class=\"something\" href=\"#\" onclick=\"if (typeof attribute_fu_comment_count == 'undefined') attribute_fu_comment_count = 0; \n                    $('#comments').append($.template(null), { number: --attribute_fu_comment_count});; return false;\">Add Comment</a>
0
       }.strip, @erbout
0
     end
0
   end
0
@@ -172,7 +172,7 @@ class AssociatedFormHelperTest < Test::Unit::TestCase
0
       _erbout = ''
0
       fields_for(:photo) do |f|
0
         f.stubs(:render_associated_form).with(comment, :fields_for => {:javascript => true}, :partial => 'some_other_partial')
0
-        _erbout.concat f.add_associated_link("Add Comment", comment, :container => 'something_comments', :partial => 'some_other_partial')
0
+        _erbout.concat f.add_associated_link("Add Comment", comment, :container => '#something_comments', :partial => 'some_other_partial')
0
       end
0
       
0
       @erbout = _erbout
0
@@ -183,12 +183,12 @@ class AssociatedFormHelperTest < Test::Unit::TestCase
0
     end
0
     
0
     should "insert into the bottom of the container specified" do
0
-      assert_match "Insertion.Bottom('something_comments'", @erbout
0
+      assert_match "$('#something_comments'", @erbout
0
     end
0
     
0
     should "wrap the partial in a prototype template" do
0
-      assert_match "new Template", @erbout
0
-      assert_match "evaluate", @erbout
0
+      assert_match "$.template", @erbout
0
+      assert_match "{ number:", @erbout
0
     end
0
     
0
     should "name the variable correctly" do
0
@@ -198,48 +198,47 @@ class AssociatedFormHelperTest < Test::Unit::TestCase
0
     should "produce the following link" do
0
       # this is a way of testing the whole link
0
       assert_equal %{
0
-        <a href=\"#\" onclick=\"if (typeof attribute_fu_comment_count == 'undefined') attribute_fu_comment_count = 0;\nnew Insertion.Bottom('something_comments', new Template(null).evaluate({'number': --attribute_fu_comment_count})); return false;\">Add Comment</a>
0
+        <a href=\"#\" onclick=\"if (typeof attribute_fu_comment_count == 'undefined') attribute_fu_comment_count = 0; \n                    $('#something_comments').append($.template(null), { number: --attribute_fu_comment_count});; return false;\">Add Comment</a>
0
       }.strip, @erbout
0
     end
0
   end
0
   
0
-  context "add associated link with expression parameter" do
0
-    setup do
0
-      comment = @photo.comments.build
0
-      
0
-      _erbout = ''
0
-      fields_for(:photo) do |f|
0
-        f.stubs(:render_associated_form).with(comment, :fields_for => {:javascript => true}, :partial => 'some_other_partial')
0
-        _erbout.concat f.add_associated_link("Add Comment", comment, :expression => '$(this).up(".something_comments")', :partial => 'some_other_partial')
0
-      end
0
-      
0
-      @erbout = _erbout
0
-    end
0
-
0
-    should "create link" do
0
-      assert_match ">Add Comment</a>", @erbout
0
-    end
0
-    
0
-    should "use the javascript expression provided instead of passing the ID in" do
0
-      assert_match "Insertion.Bottom($(this).up(&quot;.something_comments&quot;)", @erbout
0
-    end
0
-    
0
-    should "wrap the partial in a prototype template" do
0
-      assert_match "new Template", @erbout
0
-      assert_match "evaluate", @erbout
0
-    end
0
-    
0
-    should "name the variable correctly" do
0
-      assert_match "attribute_fu_comment_count", @erbout
0
-    end
0
-    
0
-    should "produce the following link" do
0
-      # this is a way of testing the whole link
0
-      assert_equal %{
0
-        <a href=\"#\" onclick=\"if (typeof attribute_fu_comment_count == 'undefined') attribute_fu_comment_count = 0;\nnew Insertion.Bottom($(this).up(&quot;.something_comments&quot;), new Template(null).evaluate({'number': --attribute_fu_comment_count})); return false;\">Add Comment</a>
0
-      }.strip, @erbout
0
-    end    
0
-  end
0
+  # context "add associated link with expression parameter" do
0
+  #   setup do
0
+  #     comment = @photo.comments.build
0
+  #     
0
+  #     _erbout = ''
0
+  #     fields_for(:photo) do |f|
0
+  #       f.stubs(:render_associated_form).with(comment, :fields_for => {:javascript => true}, :partial => 'some_other_partial')
0
+  #       _erbout.concat f.add_associated_link("Add Comment", comment, :expression => '$(this).up(".something_comments")', :partial => 'some_other_partial')
0
+  #     end
0
+  #     
0
+  #     @erbout = _erbout
0
+  #   end
0
+  # 
0
+  #   should "create link" do
0
+  #     assert_match ">Add Comment</a>", @erbout
0
+  #   end
0
+  #   
0
+  #   should "use the javascript expression provided instead of passing the ID in" do
0
+  #     assert_match "$.template($(this).up(&quot;.something_comments&quot;)", @erbout
0
+  #   end
0
+  #   
0
+  #   should "wrap the partial in a JQ template" do
0
+  #     assert_match "$.template", @erbout
0
+  #   end
0
+  #   
0
+  #   should "name the variable correctly" do
0
+  #     assert_match "attribute_fu_comment_count", @erbout
0
+  #   end
0
+  #   
0
+  #   should "produce the following link" do
0
+  #     # this is a way of testing the whole link
0
+  #     assert_equal %{
0
+  #       <a href=\"#\" onclick=\"if (typeof attribute_fu_comment_count == 'undefined') attribute_fu_comment_count = 0;\nnew Insertion.Bottom($(this).up(&quot;.something_comments&quot;), new Template(null).evaluate({'number': --attribute_fu_comment_count})); return false;\">Add Comment</a>
0
+  #     }.strip, @erbout
0
+  #   end    
0
+  # end
0
   
0
   context "render_associated_form" do
0
     setup do