nested_form 0.1.1 → 0.2.0

data/CHANGELOG.rdoc

@@ -1,9 +1,21 @@
+0.2.0 (February 7, 2012)
+
+* Integration tests (thanks fxposter) - issue #58
+
+* Improved simple_form and 3.1 support (thanks fxposter)
+
+* nested:fieldAdded event includes the newly added field (thanks harrigan)
+
+* other minor bug fixes
+
+
 0.1.1 (April 23, 2011)
 
 * Support HTML options and block in add/remove link - issue #31
 
 * Added new RegEx to generate new objects IDs correctly - issue #26 and issue #30
 
+
 0.1.0 (March 26, 2011)
 
 * Prefix new records with "new_" so there's no possible conflict with existing records - issue #21

data/README.rdoc

@@ -7,6 +7,29 @@ This gem only works with Rails 3. See the {rails2 branch}[https://github.com/rya
 An example project showing how this works is available in the {complex-nested-forms/nested_form branch}[https://github.com/ryanb/complex-form-examples/tree/nested_form].
 
 
+== Changes in this repo
+
+=== Enhanced jQuery javascript template
+
+Now you can override default behavior of inserting new subforms into your form (jQuery-only feature, sorry). For example:
+
+  window.nestedFormEvents.insertFields = function(content, assoc, link) {
+    return $(link).closest('form').find(assoc + '_fields').append($(content));
+  }
+  
+=== Rails 3.1 support (with asset pipeline)
+
+There's a small fix for Rails 3.1 form handling. 
+Also support of Rails 3.1 led me to huge refactor of specs setup (now using Helper specs from rspec-rails instead of custom implementation spec context).
+
+Formtastic is supported only with Rails 3.0, Rails 3.1 integration is not available now.
+
+Asset pipeline is supported. So you can use
+
+  //= require jquery_nested_form
+  // or
+  //= require prototype_nested_form
+
 == Setup
 
 Add it to your Gemfile then run +bundle+ to install it.
@@ -41,6 +64,11 @@ You will then be able to use +link_to_add+ and +link_to_remove+ helper methods o
   <p><%= f.link_to_add "Add a task", :tasks %></p>
 
 
+== SimpleForm and Formtastic Support
+
+Use <tt>simple_nested_form_for</tt> or <tt>semantic_nested_form_for</tt> for SimpleForm and Formtastic support respectively. This is feature is not yet in a Gem release but is in the Git repo.
+
+
 == Partials
 
 It is often desirable to move the nested fields into a partial to keep things organized. If you don't supply a block to fields_for it will look for a partial and use that.
@@ -57,10 +85,10 @@ If you are using jQuery, <tt>nested:fieldAdded</tt> and <tt>nested:fieldRemoved<
 
 == Special Thanks
 
-First of all, thanks ro Ryan Bates for this gem. Awesome work.
-
 This gem was originally based on the solution by Tim Riley in his {complex-form-examples fork}[https://github.com/timriley/complex-form-examples/tree/unobtrusive-jquery-deep-fix2].
 
 Thank you Andrew Manshin for the Rails 3 transition, {Andrea Singh}[https://github.com/madebydna] for converting to a gem and {Peter Giacomo Lombardo}[https://github.com/pglombardo] for Prototype support.
 
 Andrea also wrote a great {blog post}[http://blog.madebydna.com/all/code/2010/10/07/dynamic-nested-froms-with-the-nested-form-gem.html] on the internal workings of this gem.
+
+Thanks {Pavel Forkert}[https://github.com/fxposter] for the SimpleForm and Formtastic support.

data/Rakefile

@@ -1,10 +1,29 @@
 require 'rubygems'
+# require 'appraisal'
 require 'rake'
-require 'rspec/core/rake_task'
 
-desc "Run RSpec"
-RSpec::Core::RakeTask.new do |t|
-  t.verbose = false
+begin
+  require 'rspec/core/rake_task'
+  desc "Run RSpec"
+  RSpec::Core::RakeTask.new do |t|
+    t.verbose = false
+  end
+rescue LoadError
+  puts "You should run rake spec:install in order to install all corresponding gems!"
 end
 
 task :default => :spec
+namespace :spec do
+  task :install do
+    puts `bundle install --gemfile=gemfiles/Gemfile.rails3_0`
+    puts `bundle install --gemfile=gemfiles/Gemfile.rails3_1`
+  end
+  
+  task :all do
+    ENV['BUNDLE_GEMFILE'] = File.expand_path('../gemfiles/Gemfile.rails3_0', __FILE__)
+    Rake::Task["spec"].execute
+    
+    ENV['BUNDLE_GEMFILE'] = File.expand_path('../gemfiles/Gemfile.rails3_1', __FILE__)
+    Rake::Task["spec"].execute
+  end
+end

data/lib/generators/nested_form/install_generator.rb

@@ -2,7 +2,7 @@ module NestedForm
   module Generators
     class InstallGenerator < Rails::Generators::Base
       def self.source_root
-        File.dirname(__FILE__) + "/templates"
+        File.expand_path('../../../../vendor/assets/javascripts', __FILE__)
       end
 
       def copy_jquery_file

data/lib/nested_form/{builder.rb → builder_mixin.rb}

@@ -1,5 +1,5 @@
 module NestedForm
-  class Builder < ::ActionView::Helpers::FormBuilder
+  module BuilderMixin
     # Adds a link to insert a new associated records. The first argument is the name of the link, the second is the name of the association.
     #
     #   f.link_to_add("Add Task", :tasks)
@@ -48,12 +48,12 @@ module NestedForm
       hidden_field(:_destroy) + @template.link_to(*args, &block)
     end
 
-    def fields_for_with_nested_attributes(association_name, args, block)
+    def fields_for_with_nested_attributes(association_name, *args)
       # TODO Test this better
-      block ||= Proc.new { |fields| @template.render(:partial => "#{association_name.to_s.singularize}_fields", :locals => {:f => fields}) }
+      block = args.pop || Proc.new { |fields| @template.render(:partial => "#{association_name.to_s.singularize}_fields", :locals => {:f => fields}) }
       @fields ||= {}
       @fields[association_name] = block
-      super(association_name, args, block)
+      super(association_name, *(args << block))
     end
 
     def fields_for_nested_model(name, object, options, block)

data/lib/nested_form/builders.rb

@@ -0,0 +1,23 @@
+require 'nested_form/builder_mixin'
+
+module NestedForm
+  class Builder < ::ActionView::Helpers::FormBuilder
+    include ::NestedForm::BuilderMixin
+  end
+
+  begin
+    require 'simple_form'
+    class SimpleBuilder < ::SimpleForm::FormBuilder
+      include ::NestedForm::BuilderMixin
+    end
+  rescue LoadError
+  end
+
+  begin
+    require 'formtastic'
+    class FormtasticBuilder < (defined?(::Formtastic::FormBuilder) ? Formtastic::FormBuilder : ::Formtastic::SemanticFormBuilder)
+      include ::NestedForm::BuilderMixin
+    end
+  rescue LoadError
+  end
+end

data/lib/nested_form/engine.rb

@@ -0,0 +1,14 @@
+require 'rails'
+
+module NestedForm
+  class Engine < ::Rails::Engine
+    initializer 'nested_form' do |app|
+      ActiveSupport.on_load(:action_view) do
+        require "nested_form/view_helper"
+        class ActionView::Base
+          include NestedForm::ViewHelper
+        end
+      end
+    end
+  end
+end

data/lib/nested_form/view_helper.rb

@@ -1,13 +1,24 @@
+require 'nested_form/builders'
+
 module NestedForm
   module ViewHelper
     def nested_form_for(*args, &block)
       options = args.extract_options!.reverse_merge(:builder => NestedForm::Builder)
-      output = form_for(*(args << options), &block)
-      @after_nested_form_callbacks ||= []
-      fields = @after_nested_form_callbacks.map do |callback|
-        callback.call
+      form_for(*(args << options), &block) << after_nested_form_callbacks
+    end
+
+    if defined?(NestedForm::SimpleBuilder)
+      def simple_nested_form_for(*args, &block)
+        options = args.extract_options!.reverse_merge(:builder => NestedForm::SimpleBuilder)
+        simple_form_for(*(args << options), &block) << after_nested_form_callbacks
+      end
+    end
+
+    if defined?(NestedForm::FormtasticBuilder)
+      def semantic_nested_form_for(*args, &block)
+        options = args.extract_options!.reverse_merge(:builder => NestedForm::FormtasticBuilder)
+        semantic_form_for(*(args << options), &block) << after_nested_form_callbacks
       end
-      output << fields.join(" ").html_safe
     end
 
     def after_nested_form(association, &block)
@@ -18,9 +29,14 @@ module NestedForm
         @after_nested_form_callbacks << block
       end
     end
-  end
-end
 
-class ActionView::Base
-  include NestedForm::ViewHelper
+    private
+      def after_nested_form_callbacks
+        @after_nested_form_callbacks ||= []
+        fields = @after_nested_form_callbacks.map do |callback|
+          callback.call
+        end
+        fields.join(" ").html_safe
+      end
+  end
 end

data/lib/nested_form.rb

@@ -1,2 +1 @@
-require "nested_form/builder"
-require "nested_form/view_helper"
+require "nested_form/engine"

data/spec/dummy/Rakefile

@@ -0,0 +1,7 @@
+#!/usr/bin/env rake
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+Dummy::Application.load_tasks

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

@@ -0,0 +1,5 @@
+// This is a manifest file that'll be compiled into including all the files listed below.
+// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+// be included in the compiled file accessible from http://example.com/assets/application.js
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.