nested_form 0.1.1 → 0.2.0

data/spec/nested_form/builder_spec.rb

@@ -1,40 +1,42 @@
 require "spec_helper"
 
-describe NestedForm::Builder do
-  describe "with no options" do
-    before(:each) do
-      @project = Project.new
-      @template = ActionView::Base.new
-      @template.output_buffer = ""
-      @builder = NestedForm::Builder.new(:item, @project, @template, {}, proc {})
-    end
+[NestedForm::Builder, NestedForm::SimpleBuilder, defined?(NestedForm::FormtasticBuilder) ? NestedForm::FormtasticBuilder : nil].compact.each do |builder|
+  describe builder do
+    describe "with no options" do
+      before(:each) do
+        @project = Project.new
+        @template = ActionView::Base.new
+        @template.output_buffer = ""
+        @builder = builder.new(:item, @project, @template, {}, proc {})
+      end
 
-    it "has an add link which behaves similar to a Rails link_to" do
-      @builder.link_to_add("Add", :tasks).should == '<a href="javascript:void(0)" class="add_nested_fields" data-association="tasks">Add</a>'
-      @builder.link_to_add("Add", :tasks, :class => "foo", :href => "url").should == '<a href="url" class="foo add_nested_fields" data-association="tasks">Add</a>'
-      @builder.link_to_add(:tasks) { "Add" }.should == '<a href="javascript:void(0)" class="add_nested_fields" data-association="tasks">Add</a>'
-    end
+      it "has an add link which behaves similar to a Rails link_to" do
+        @builder.link_to_add("Add", :tasks).should == '<a href="javascript:void(0)" class="add_nested_fields" data-association="tasks">Add</a>'
+        @builder.link_to_add("Add", :tasks, :class => "foo", :href => "url").should == '<a href="url" class="foo add_nested_fields" data-association="tasks">Add</a>'
+        @builder.link_to_add(:tasks) { "Add" }.should == '<a href="javascript:void(0)" class="add_nested_fields" data-association="tasks">Add</a>'
+      end
 
-    it "has a remove link which behaves similar to a Rails link_to" do
-      @builder.link_to_remove("Remove").should == '<input id="item__destroy" name="item[_destroy]" type="hidden" value="false" /><a href="javascript:void(0)" class="remove_nested_fields">Remove</a>'
-      @builder.link_to_remove("Remove", :class => "foo", :href => "url").should == '<input id="item__destroy" name="item[_destroy]" type="hidden" value="false" /><a href="url" class="foo remove_nested_fields">Remove</a>'
-      @builder.link_to_remove { "Remove" }.should == '<input id="item__destroy" name="item[_destroy]" type="hidden" value="false" /><a href="javascript:void(0)" class="remove_nested_fields">Remove</a>'
-    end
+      it "has a remove link which behaves similar to a Rails link_to" do
+        @builder.link_to_remove("Remove").should == '<input id="item__destroy" name="item[_destroy]" type="hidden" value="false" /><a href="javascript:void(0)" class="remove_nested_fields">Remove</a>'
+        @builder.link_to_remove("Remove", :class => "foo", :href => "url").should == '<input id="item__destroy" name="item[_destroy]" type="hidden" value="false" /><a href="url" class="foo remove_nested_fields">Remove</a>'
+        @builder.link_to_remove { "Remove" }.should == '<input id="item__destroy" name="item[_destroy]" type="hidden" value="false" /><a href="javascript:void(0)" class="remove_nested_fields">Remove</a>'
+      end
 
-    it "should wrap nested fields each in a div with class" do
-      2.times { @project.tasks.build }
-      @builder.fields_for(:tasks) do
-        "Task"
-      end.should == '<div class="fields">Task</div><div class="fields">Task</div>'
-    end
+      it "should wrap nested fields each in a div with class" do
+        2.times { @project.tasks.build }
+        @builder.fields_for(:tasks) do
+          "Task"
+        end.should == '<div class="fields">Task</div><div class="fields">Task</div>'
+      end
 
-    it "should add task fields to hidden div after form" do
-      pending
-      output = ""
-      mock(@template).after_nested_form(:tasks) { |arg, block| output << block.call }
-      @builder.fields_for(:tasks) { "Task" }
-      @builder.link_to_add("Add", :tasks)
-      output.should == '<div id="tasks_fields_blueprint" style="display: none"><div class="fields">Task</div></div>'
+      it "should add task fields to hidden div after form" do
+        pending
+        output = ""
+        mock(@template).after_nested_form(:tasks) { |arg, block| output << block.call }
+        @builder.fields_for(:tasks) { "Task" }
+        @builder.link_to_add("Add", :tasks)
+        output.should == '<div id="tasks_fields_blueprint" style="display: none"><div class="fields">Task</div></div>'
+      end
     end
   end
 end

data/spec/nested_form/view_helper_spec.rb

@@ -1,33 +1,47 @@
 require "spec_helper"
 
 describe NestedForm::ViewHelper do
+  include RSpec::Rails::HelperExampleGroup
+  
   before(:each) do
-    @template = ActionView::Base.new
-    @template.output_buffer = ""
-    @template.stubs(:url_for).returns("")
-    @template.stubs(:projects_path).returns("")
-    @template.stubs(:protect_against_forgery?).returns(false)
+    _routes.draw do
+      resources :projects
+    end
   end
 
   it "should pass nested form builder to form_for along with other options" do
     pending
-    mock.proxy(@template).form_for(:first, :as => :second, :other => :arg, :builder => NestedForm::Builder) do |form_html|
+    mock.proxy(_view).form_for(:first, :as => :second, :other => :arg, :builder => NestedForm::Builder) do |form_html|
       form_html
     end
-    @template.nested_form_for(:first, :as => :second, :other => :arg) {"form"}
+    _view.nested_form_for(:first, :as => :second, :other => :arg) {"form"}
   end
 
   it "should pass instance of NestedForm::Builder to nested_form_for block" do
-    @template.nested_form_for(Project.new) do |f|
+    _view.nested_form_for(Project.new) do |f|
       f.should be_instance_of(NestedForm::Builder)
     end
   end
 
+  it "should pass instance of NestedForm::SimpleBuilder to simple_nested_form_for block" do
+    _view.simple_nested_form_for(Project.new) do |f|
+      f.should be_instance_of(NestedForm::SimpleBuilder)
+    end
+  end
+
+  if defined?(NestedForm::FormtasticBuilder)
+    it "should pass instance of NestedForm::FormtasticBuilder to semantic_nested_form_for block" do
+      _view.semantic_nested_form_for(Project.new) do |f|
+        f.should be_instance_of(NestedForm::FormtasticBuilder)
+      end
+    end
+  end
+
   it "should append content to end of nested form" do
-    @template.after_nested_form(:tasks) { @template.concat("123") }
-    @template.after_nested_form(:milestones) { @template.concat("456") }
-    @template.nested_form_for(Project.new) {}
-    @template.output_buffer.should include("123456")
+    _view.after_nested_form(:tasks) { _view.concat("123") }
+    _view.after_nested_form(:milestones) { _view.concat("456") }
+    _view.nested_form_for(Project.new) {}
+    _view.output_buffer.should include("123456")
   end
 end
 

data/spec/spec_helper.rb

@@ -1,55 +1,16 @@
-require "rubygems"
-require "bundler/setup"
+# Configure Rails Environment
+ENV["RAILS_ENV"] = "test"
 
-require "action_view"
-require "active_record"
-
-Bundler.require(:default)
-
-# require 'active_model'
-# require 'active_record'
-# require 'action_controller'
-# require 'action_view'
-# require 'action_view/template'
-# require "active_support/all"
-
-# require 'nested_form/view_helper'
-# require 'nested_form/builder'
+require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+require 'rspec/rails'
+require 'capybara/rspec'
 
+Capybara.javascript_driver = :selenium
 RSpec.configure do |config|
   config.mock_with :mocha
 end
 
-class TablelessModel < ActiveRecord::Base
-  def self.columns() @columns ||= []; end
-
-  def self.column(name, sql_type = nil, default = nil, null = true)
-    columns << ActiveRecord::ConnectionAdapters::Column.new(name.to_s, default, sql_type.to_s, null)
-  end
-
-  def self.quoted_table_name
-    name.pluralize.underscore
-  end
-
-  def quoted_id
-    "0"
-  end
-end
-
-class Project < TablelessModel
-  column :name, :string
-  has_many :tasks
-  accepts_nested_attributes_for :tasks
-end
-
-class Task < TablelessModel
-  column :project_id, :integer
-  column :name, :string
-  belongs_to :project
-end
+Rails.backtrace_cleaner.remove_silencers!
 
-class Milestone < TablelessModel
-  column :task_id, :integer
-  column :name, :string
-  belongs_to :task
-end
+# Load support files
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

metadata

@@ -1,102 +1,127 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: nested_form
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  version: 0.1.1
 platform: ruby
-authors: 
+authors:
 - Ryan Bates
 - Andrea Singh
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-23 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-02-08 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: &2152812540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.1.0
+      - !ruby/object:Gem::Version
+        version: 2.6.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2152812540
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &2152812140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 3.0.0
-  type: :development
-  version_requirements: *id003
-description: Gem to conveniently handle multiple models in a single form with Rails 3 and jQuery or Prototype.
+  version_requirements: *2152812140
+description: Gem to conveniently handle multiple models in a single form with Rails
+  3 and jQuery or Prototype.
 email: ryan@railscasts.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/generators/nested_form/install_generator.rb
-- lib/generators/nested_form/templates/jquery_nested_form.js
-- lib/generators/nested_form/templates/prototype_nested_form.js
-- lib/nested_form/builder.rb
+- lib/nested_form/builder_mixin.rb
+- lib/nested_form/builders.rb
+- lib/nested_form/engine.rb
 - lib/nested_form/view_helper.rb
 - lib/nested_form.rb
+- spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/assets/javascripts/jquery.js
+- spec/dummy/app/assets/javascripts/jquery_nested_form.js
+- spec/dummy/app/assets/javascripts/projects.js
+- spec/dummy/app/assets/javascripts/prototype.js
+- spec/dummy/app/assets/javascripts/prototype_nested_form.js
+- spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/assets/stylesheets/projects.css
+- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/controllers/projects_controller.rb
+- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/helpers/projects_helper.rb
+- spec/dummy/app/models/milestone.rb
+- spec/dummy/app/models/project.rb
+- spec/dummy/app/models/task.rb
+- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/views/projects/new.html.erb
+- spec/dummy/config/application.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/environment.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/secret_token.rb
+- spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/routes.rb
+- spec/dummy/config.ru
+- spec/dummy/db/development.sqlite3
+- spec/dummy/db/migrate/20110710143903_initial_tables.rb
+- spec/dummy/db/schema.rb
+- spec/dummy/db/test.sqlite3
+- spec/dummy/public/404.html
+- spec/dummy/public/422.html
+- spec/dummy/public/500.html
+- spec/dummy/public/favicon.ico
+- spec/dummy/Rakefile
+- spec/dummy/script/rails
+- spec/dummy/test/functional/projects_controller_test.rb
+- spec/dummy/test/unit/helpers/projects_helper_test.rb
+- spec/form_spec.rb
 - spec/nested_form/builder_spec.rb
 - spec/nested_form/view_helper_spec.rb
 - spec/spec_helper.rb
 - CHANGELOG.rdoc
-- Gemfile
 - LICENSE
 - Rakefile
 - README.rdoc
-has_rdoc: true
 homepage: http://github.com/ryanb/nested_form
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.4
 requirements: []
-
 rubyforge_project: nested_form
-rubygems_version: 1.5.0
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Gem to conveniently handle multiple models in a single form.
 test_files: []
-

data/Gemfile

@@ -1,3 +0,0 @@
-source "http://rubygems.org"
-
-gemspec

data/lib/generators/nested_form/templates/jquery_nested_form.js

@@ -1,51 +0,0 @@
-jQuery(function($) {
-  $('form a.add_nested_fields').live('click', function() {
-    // Setup
-    var assoc   = $(this).attr('data-association');            // Name of child
-    var content = $('#' + assoc + '_fields_blueprint').html(); // Fields template
-
-    // Make the context correct by replacing new_<parents> with the generated ID
-    // of each of the parent objects
-    var context = ($(this).closest('.fields').find('input:first').attr('name') || '').replace(new RegExp('\[[a-z]+\]$'), '');
-
-    // context will be something like this for a brand new form:
-    // project[tasks_attributes][new_1255929127459][assignments_attributes][new_1255929128105]
-    // or for an edit form:
-    // project[tasks_attributes][0][assignments_attributes][1]
-    if(context) {
-      var parent_names = context.match(/[a-z_]+_attributes/g) || [];
-      var parent_ids   = context.match(/(new_)?[0-9]+/g) || [];
-
-      for(i = 0; i < parent_names.length; i++) {
-        if(parent_ids[i]) {
-          content = content.replace(
-            new RegExp('(_' + parent_names[i] + ')_.+?_', 'g'),
-            '$1_' + parent_ids[i] + '_');
-
-          content = content.replace(
-            new RegExp('(\\[' + parent_names[i] + '\\])\\[.+?\\]', 'g'),
-            '$1[' + parent_ids[i] + ']');
-        }
-      }
-    }
-
-    // Make a unique ID for the new child
-    var regexp  = new RegExp('new_' + assoc, 'g');
-    var new_id  = new Date().getTime();
-    content     = content.replace(regexp, "new_" + new_id);
-
-    $(this).before(content);
-    $(this).closest("form").trigger('nested:fieldAdded');
-    return false;
-  });
-
-  $('form a.remove_nested_fields').live('click', function() {
-    var hidden_field = $(this).prev('input[type=hidden]')[0];
-    if(hidden_field) {
-      hidden_field.value = '1';
-    }
-    $(this).closest('.fields').hide();
-    $(this).closest("form").trigger('nested:fieldRemoved');
-    return false;
-  });
-});