nofxx-formtastic 0.1.5 → 0.1.6

data/lib/formtastic.rb

@@ -342,19 +342,21 @@ module Formtastic #:nodoc:
       variable = "formtastic_next_#{associated_name}_id"
 
       opts.symbolize_keys!
-
       partial = opts.delete(:partial) || associated_name
       container = opts.delete(:expression) || "'#{opts.delete(:container) || '#'+associated_name.pluralize}'"
 
-      function = "if (typeof #{variable} == 'undefined') #{variable} = 0;
-        $(#{container}).append($.template(" +
-        [self.render_associated_form(object, :fields_for => { :javascript => true },
-        :partial => partial)].flatten.first.to_json+"), { number: --#{variable}});"
+      form = self.render_associated_form(object, :partial => partial)
+      form.gsub!(/attributes_(\d+)/, '__idx__')
+      form.gsub!(/\[(\d+)\]/, '__idxx__')
+
+      function = "if (typeof #{variable} == 'undefined') #{variable} = #{$1};
+        $(#{container}).append($.template(#{form.to_json}.replace(/__idx__/g, \"attributes_\" +
+        #{variable}).replace(/__idxx__/g, \"[\" + #{variable}++ + \"]\")))"
 
       template.link_to_function(name, function, opts)
     end
 
-   # Render associated form
+    # Render associated form
    def render_associated_form(associated, opts = {})
       associated = associated.is_a?(Array) ? associated : [associated] # preserve association proxy if this is one
 
@@ -369,7 +371,7 @@ module Formtastic #:nodoc:
 
         output = associated.map do |element|
           fields_for(association_name(name), element, (opts[:fields_for] || {}).merge(:name => name)) do |f|
-            template.render({:partial => "#{partial}", :locals => {local_assign_name.to_sym => f.object, :f => f}.merge(opts[:locals] || {})}.merge(opts[:render] || {}))
+            template.render({:partial => "#{partial}", :locals => {local_assign_name.to_sym => element, :f => f}.merge(opts[:locals] || {})}.merge(opts[:render] || {}))
           end
         end
       output.join
@@ -383,7 +385,7 @@ module Formtastic #:nodoc:
     end
 
     def extract_option_or_class_name(hash, option, object)
-      (hash.delete(option) || object.class.name.split('::').last.underscore).to_s
+      (hash.delete(option) || object.class.name.split('::').last.underscore)
     end
     # End attribute_fu magic #
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nofxx-formtastic
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Justin French
@@ -9,7 +9,7 @@ autorequire: formtastic
 bindir: bin
 cert_chain: []
 
-date: 2009-04-10 00:00:00 -07:00
+date: 2009-04-17 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -25,12 +25,10 @@ files:
 - MIT-LICENSE
 - README.textile
 - Rakefile
-- rails/init.rb
 - lib/formtastic.rb
-- lib/justin_french
 - lib/justin_french/formtastic.rb
-- lib/locale
 - lib/locale/en.yml
+- rails/init.rb
 - spec/formtastic_spec.rb
 - spec/spec.opts
 - spec/test_helper.rb
@@ -38,7 +36,6 @@ has_rdoc: true
 homepage: http://github.com/justinfrench/formtastic/tree/master
 post_install_message: 
 rdoc_options: 
-- --inline-source
 - --charset=UTF-8
 require_paths: 
 - lib
@@ -59,7 +56,8 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A Rails form builder plugin/gem with semantically rich and accessible markup
-test_files: []
-
+test_files: 
+- spec/formtastic_spec.rb
+- spec/test_helper.rb