cocoon 1.2.6 → 1.2.7

data/.travis.yml

@@ -3,7 +3,7 @@ script: "bundle exec rake"
 rvm:
   - 1.9.3
   - 2.0.0
-  - rbx-2.2.1
+  - rbx-2
 gemfile:
   - gemfiles/Gemfile.rails-3.2.13
   - Gemfile

data/Gemfile

@@ -3,11 +3,11 @@ source "http://rubygems.org"
 
 group :development, :test do
   gem "rails", ">=4.0.0"
-  gem "sqlite3"
+  gem "sqlite3", "1.3.8"
   gem "json_pure"
   gem "jeweler"
-  gem "rspec-rails", ">= 2.8.0"
-  gem "rspec",       ">= 2.8.0"
+  gem "rspec-rails", "~> 3.0.0"
+  gem "rspec",       "~> 3.0.0"
   gem "actionpack",  ">=4.0.0"
   gem "simplecov", :require => false
 

data/README.markdown

@@ -68,7 +68,7 @@ Your models are associated like this:
 ```ruby
 class Project < ActiveRecord::Base
   has_many :tasks
-  accepts_nested_attributes_for :tasks, :reject_if => :all_blank, :allow_destroy => true
+  accepts_nested_attributes_for :tasks, reject_if: :all_blank, allow_destroy: true
 end
 
 class Task < ActiveRecord::Base
@@ -83,10 +83,10 @@ named `_task_fields.html`.
 ### Strong Parameters Gotcha
 
 To destroy nested models, rails uses a virtual attribute called `_destroy`.
-When `_destroy` is set, the nested model will be deleted.
+When `_destroy` is set, the nested model will be deleted. If the record is persisted, rails performs `id` field lookup to destroy the real record, so if `id` wasn't specified, it will treat current set of parameters like a parameters for a new record.
 
 When using strong parameters (default in rails 4), you need to explicitly
-add `:_destroy` to the list of permitted parameters.
+add both `:id` and `:_destroy` to the list of permitted parameters.
 
 E.g. in your `ProjectsController`:
 
@@ -98,7 +98,7 @@ E.g. in your `ProjectsController`:
 
 ## Examples
 
-Cocoon's default configuration requires `link_to_add_association` and associated partials to 
+Cocoon's default configuration requires `link_to_add_association` and associated partials to
 be properly wrapped with elements. The examples below illustrate simple layouts.
 
 Please note these examples rely on the `haml` gem (instead of the default `erb` views).
@@ -115,7 +115,7 @@ In our `projects/_form` partial we'd write:
     %h3 Tasks
     #tasks
       = f.semantic_fields_for :tasks do |task|
-        = render 'task_fields', :f => task
+        = render 'task_fields', f: task
       .links
         = link_to_add_association 'add task', f, :tasks
     = f.actions do
@@ -128,7 +128,7 @@ And in our `_task_fields` partial we'd write:
 .nested-fields
   = f.inputs do
     = f.input :description
-    = f.input :done, :as => :boolean
+    = f.input :done, as: :boolean
     = link_to_remove_association "remove task", f
 ```
 
@@ -145,7 +145,7 @@ In our `projects/_form` partial we'd write:
   %h3 Tasks
   #tasks
     = f.simple_fields_for :tasks do |task|
-      = render 'task_fields', :f => task
+      = render 'task_fields', f: task
     .links
       = link_to_add_association 'add task', f, :tasks
   = f.submit
@@ -156,7 +156,7 @@ In our `_task_fields` partial we write:
 ```haml
 .nested-fields
   = f.input :description
-  = f.input :done, :as => :boolean
+  = f.input :done, as: :boolean
   = link_to_remove_association "remove task", f
 ```
 
@@ -179,7 +179,7 @@ In our `projects/_form` partial we'd write:
   %h3 Tasks
   #tasks
     = f.fields_for :tasks do |task|
-      = render 'task_fields', :f => task
+      = render 'task_fields', f: task
     .links
       = link_to_add_association 'add task', f, :tasks
   = f.submit
@@ -216,7 +216,7 @@ This should be called within the form builder.
 - html_options: extra html-options (see [`link_to`](http://api.rubyonrails.org/classes/ActionView/Helpers/UrlHelper.html#method-i-link_to)
   There are some special options, the first three allow to control the placement of the new link-data:
   - `data-association-insertion-traversal` : the jquery traversal method to allow node selection relative to the link. `closest`, `next`, `children`, etc. Default: absolute selection
-  - `data-association-insertion-node` : the jquery selector of the node
+  - `data-association-insertion-node` : the jquery selector of the node. Default: parent node
   - `data-association-insertion-method` : jquery method that inserts the new data. `before`, `after`, `append`, `prepend`, etc. Default: `before`
   - `data-association-insertion-position` : old method specifying where to insert new data.
       - this setting still works but `data-association-insertion-method` takes precedence. may be removed in a future version.
@@ -233,21 +233,21 @@ Optionally, you can omit the name and supply a block that is captured to render
 Inside the `html_options` you can add an option `:render_options`, and the containing hash will be handed down to the form builder for the inserted
 form.
 
-When using Twitter Bootstrap and SimpleForm together, `simple_fields_for` needs the option `:wrapper => 'inline'` which can
+When using Twitter Bootstrap and SimpleForm together, `simple_fields_for` needs the option `wrapper: 'inline'` which can
 be handed down as follows:
 
-(Note: In certain newer versions of simple_form, the option to use is `:wrapper => 'bootstrap'`.)
+(Note: In certain newer versions of simple_form, the option to use is `wrapper: 'bootstrap'`.)
 
 ```haml
 = link_to_add_association 'add something', f, :something,
-    :render_options => {:wrapper => 'inline' }
+    render_options: { wrapper: 'inline' }
 ```
 
 To specify locals that needed to handed down to the partial:
 
 ```haml
 = link_to_add_association 'add something', f, :something,
-    :render_options => {:locals => {:sherlock => 'Holmes' }}
+    render_options: {locals: { sherlock: 'Holmes' }}
 ```
 
 #### :partial
@@ -256,7 +256,7 @@ To override the default partial name, e.g. because it shared between multiple vi
 
 ```haml
 = link_to_add_association 'add something', f, :something,
-    :partial => 'shared/something_fields'
+    partial: 'shared/something_fields'
 ```
 
 #### :wrap_object
@@ -289,7 +289,7 @@ To use this:
 
 ```haml
 = link_to_add_association('add something', @form_obj, :comments,
-    :wrap_object => Proc.new {|comment| CommentDecorator.new(comment) })
+    wrap_object: Proc.new {|comment| CommentDecorator.new(comment) })
 ```
 
 Note that the `:wrap_object` expects an object that is _callable_, so any `Proc` will do. So you could as well use it to do some fancy extra initialisation (if needed).
@@ -298,8 +298,8 @@ E.g.
 
 
 ```haml
-= link_to_add_association('add something', @form_obj, :comments, 
-    :wrap_object => Proc.new { |comment| comment.name = current_user.name; comment })
+= link_to_add_association('add something', @form_obj, :comments,
+    wrap_object: Proc.new { |comment| comment.name = current_user.name; comment })
 ```
 
 #### :force_non_association_create
@@ -317,7 +317,7 @@ Example use:
 
 ```haml
 = link_to_add_association('add something', @form_obj, :comments,
-    :force_non_association_create => true)
+    force_non_association_create: true)
 ```
 
 By default `:force_non_association_create` is `false`.
@@ -335,9 +335,11 @@ It takes three parameters:
 
 Optionally you could also leave out the name and supply a block that is captured to give the name (if you want to do something more complicated).
 
-Optionally, you can add an html option called `wrapper_class` to use a different wrapper div instead of `.nested-class`.
+Optionally, you can add an html option called `wrapper_class` to use a different wrapper div instead of `.nested-fields`.
 The class should be added without a preceding dot (`.`).
 
+> Note: the javascript behind the generated link relies on the presence of a wrapper class (default `.nested-fields`) to function correctly.
+
 Example:
 ```haml
 = link_to_remove_association('remove this', @form_obj,
@@ -370,7 +372,7 @@ If in your view you have the following snippet to select an `owner`:
 ```haml
 #owner
   #owner_from_list
-    = f.association :owner, :collection => Person.all(:order => 'name'), :prompt => 'Choose an existing owner'
+    = f.association :owner, collection: Person.all(order: 'name'), prompt: 'Choose an existing owner'
   = link_to_add_association 'add a new person as owner', f, :owner
 ```
 
@@ -465,8 +467,41 @@ For the JavaScript to behave correctly, the partial should start with a containe
 
 There is no limit to the amount of nesting, though.
 
+## I18n
+
+As you seen in previous sections, the helper method `link_to_add_association` treats the first parameter as a name. Additionally, if it's skipped and the `form` object is passed as the first one, then **Cocoon** names it using **I18n**.
+
+It allows to invoke helper methods like this:
+
+```haml
+= link_to_add_association form_object, :tasks
+= link_to_remove_association form_object
+```
+
+instead of:
+
+```haml
+= link_to_add_association "Add task", form_object, :tasks
+= link_to_remove_association "remove task", form_object
+```
+
+**Cocoon** uses the name of `association` as a translations scope key. If custom translations for association is not present it fallbacks to default name. Example of translations tree:
+
+```yaml
+en:
+  cocoon:
+    defaults:
+      add: "Add record"
+      remove: "Remove record"
+    tasks:
+      add: "Add new task"
+      remove: "Remove old task"
+```
+
+Note that `link_to_remove_association` does not require `association` name as an argument. In order to get correct translation key, **Cocoon** tableizes `class` name of the target object of form builder (`form_object.object` from previous example).
+
 ## Note on Patches/Pull Requests
- 
+
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a
@@ -492,6 +527,6 @@ Copyright (c) 2010 Nathan Van der Auwera. See LICENSE for details.
 
 ## Not Related To Apache Cocoon
 
-Please note that this project is not related to the Apache Cocoon web framework project. 
+Please note that this project is not related to the Apache Cocoon web framework project.
 
 [Apache Cocoon](http://cocoon.apache.org/), Cocoon, and Apache are either registered trademarks or trademarks of the [Apache Software Foundation](http://www.apache.org/) in the United States and/or other countries.

data/VERSION

@@ -1 +1 @@
-1.2.6
+1.2.7

data/cocoon.gemspec

@@ -2,16 +2,14 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: cocoon 1.2.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "cocoon"
-  s.version = "1.2.6"
+  s.version = "1.2.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
   s.authors = ["Nathan Van der Auwera"]
-  s.date = "2014-03-18"
+  s.date = "2016-01-27"
   s.description = "Unobtrusive nested forms handling, using jQuery. Use this and discover cocoon-heaven."
   s.email = "nathan@dixis.com"
   s.extra_rdoc_files = [
@@ -75,24 +73,26 @@ Gem::Specification.new do |s|
     "spec/generators/install_generator_spec.rb",
     "spec/integration/navigation_spec.rb",
     "spec/spec_helper.rb",
+    "spec/support/i18n.rb",
     "spec/support/rails_version_helper.rb",
     "spec/support/shared_examples.rb"
   ]
   s.homepage = "http://github.com/nathanvda/cocoon"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.1"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.24"
   s.summary = "gem that enables easier nested forms with standard forms, formtastic and simple-form"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 4
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rails>, [">= 4.0.0"])
-      s.add_development_dependency(%q<sqlite3>, [">= 0"])
+      s.add_development_dependency(%q<sqlite3>, ["= 1.3.8"])
       s.add_development_dependency(%q<json_pure>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rspec-rails>, [">= 2.8.0"])
-      s.add_development_dependency(%q<rspec>, [">= 2.8.0"])
+      s.add_development_dependency(%q<rspec-rails>, ["~> 3.0.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 3.0.0"])
       s.add_development_dependency(%q<actionpack>, [">= 4.0.0"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<nokogiri>, [">= 0"])
@@ -104,11 +104,11 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rubinius-developer_tools>, [">= 0"])
     else
       s.add_dependency(%q<rails>, [">= 4.0.0"])
-      s.add_dependency(%q<sqlite3>, [">= 0"])
+      s.add_dependency(%q<sqlite3>, ["= 1.3.8"])
       s.add_dependency(%q<json_pure>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rspec-rails>, [">= 2.8.0"])
-      s.add_dependency(%q<rspec>, [">= 2.8.0"])
+      s.add_dependency(%q<rspec-rails>, ["~> 3.0.0"])
+      s.add_dependency(%q<rspec>, ["~> 3.0.0"])
       s.add_dependency(%q<actionpack>, [">= 4.0.0"])
       s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
@@ -121,11 +121,11 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<rails>, [">= 4.0.0"])
-    s.add_dependency(%q<sqlite3>, [">= 0"])
+    s.add_dependency(%q<sqlite3>, ["= 1.3.8"])
     s.add_dependency(%q<json_pure>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rspec-rails>, [">= 2.8.0"])
-    s.add_dependency(%q<rspec>, [">= 2.8.0"])
+    s.add_dependency(%q<rspec-rails>, ["~> 3.0.0"])
+    s.add_dependency(%q<rspec>, ["~> 3.0.0"])
     s.add_dependency(%q<actionpack>, [">= 4.0.0"])
     s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])

data/gemfiles/Gemfile.rails-3.2.13

@@ -3,11 +3,11 @@ source "http://rubygems.org"
 
 group :development, :test do
   gem "rails", "~> 3.2.0"
-  gem "sqlite3"
+  gem "sqlite3", "1.3.8"
   gem "json_pure"
   gem "jeweler"
-  gem "rspec-rails", ">= 2.8.0"
-  gem "rspec",       ">= 2.8.0"
+  gem "rspec-rails", "~> 3.0.0"
+  gem "rspec",       "~> 3.0.0"
   gem "actionpack",  "~> 3.2.0"
   gem "simplecov", :require => false
 

data/lib/cocoon/view_helpers.rb

@@ -15,14 +15,16 @@ module Cocoon
 
     def link_to_remove_association(*args, &block)
       if block_given?
-        f            = args.first
-        html_options = args.second || {}
-        name         = capture(&block)
-        link_to_remove_association(name, f, html_options)
+        link_to_remove_association(capture(&block), *args)
+      elsif args.first.respond_to?(:object)
+        form = args.first
+        association = form.object.class.to_s.tableize
+        name = I18n.translate("cocoon.#{association}.remove", default: I18n.translate('cocoon.defaults.remove'))
+
+        link_to_remove_association(name, *args)
       else
-        name         = args[0]
-        f            = args[1]
-        html_options = args[2] || {}
+        name, f, html_options = *args
+        html_options ||= {}
 
         is_dynamic = f.object.new_record?
 
@@ -43,7 +45,8 @@ module Cocoon
     def render_association(association, f, new_object, form_name, render_options={}, custom_partial=nil)
       partial = get_partial_path(custom_partial, association)
       locals =  render_options.delete(:locals) || {}
-      method_name = f.respond_to?(:semantic_fields_for) ? :semantic_fields_for : (f.respond_to?(:simple_fields_for) ? :simple_fields_for : :fields_for)
+      ancestors = f.class.ancestors.map{|c| c.to_s}
+      method_name = ancestors.include?('SimpleForm::FormBuilder') ? :simple_fields_for : (ancestors.include?('Formtastic::FormBuilder') ? :semantic_fields_for : :fields_for)
       f.send(method_name, association, new_object, {:child_index => "new_#{association}"}.merge(render_options)) do |builder|
         partial_options = {form_name.to_sym => builder, :dynamic => true}.merge(locals)
         render(partial, partial_options)
@@ -67,15 +70,15 @@ module Cocoon
 
     def link_to_add_association(*args, &block)
       if block_given?
-        f            = args[0]
-        association  = args[1]
-        html_options = args[2] || {}
-        link_to_add_association(capture(&block), f, association, html_options)
+        link_to_add_association(capture(&block), *args)
+      elsif args.first.respond_to?(:object)
+        association = args.second
+        name = I18n.translate("cocoon.#{association}.add", default: I18n.translate('cocoon.defaults.add'))
+
+        link_to_add_association(name, *args)
       else
-        name         = args[0]
-        f            = args[1]
-        association  = args[2]
-        html_options = args[3] || {}
+        name, f, association, html_options = *args
+        html_options ||= {}
 
         render_options   = html_options.delete(:render_options)
         render_options ||= {}

data/spec/cocoon_spec.rb

@@ -8,8 +8,8 @@ describe Cocoon do
 
   subject {TestClass.new}
 
-  it { should respond_to(:link_to_add_association) }
-  it { should respond_to(:link_to_remove_association) }
+  it { is_expected.to respond_to(:link_to_add_association) }
+  it { is_expected.to respond_to(:link_to_remove_association) }
 
   before(:each) do
     @tester = TestClass.new
@@ -20,7 +20,7 @@ describe Cocoon do
 
   context "link_to_add_association" do
     before(:each) do
-      @tester.stub(:render_association).and_return('form<tag>')
+      allow(@tester).to receive(:render_association).and_return('form<tag>')
     end
 
     context "without a block" do
@@ -33,6 +33,28 @@ describe Cocoon do
         it_behaves_like "a correctly rendered add link", {}
       end
 
+      context 'and no name given' do
+        context 'custom translation exists' do
+          before do
+            I18n.backend.store_translations(:en, :cocoon => { :comments => { :add => 'Add comment' } })
+
+            @html = @tester.link_to_add_association(@form_obj, :comments)
+          end
+
+          it_behaves_like "a correctly rendered add link", { text: 'Add comment' }
+        end
+
+        context 'uses default translation' do
+          before do
+            I18n.backend.store_translations(:en, :cocoon => { :defaults => { :add => 'Add' } })
+
+            @html = @tester.link_to_add_association(@form_obj, :comments)
+          end
+
+          it_behaves_like "a correctly rendered add link", { text: 'Add' }
+        end
+      end
+
       context "and given html options to pass them to link_to" do
         before do
           @html = @tester.link_to_add_association('add something', @form_obj, :comments, {:class => 'something silly'})
@@ -43,8 +65,8 @@ describe Cocoon do
 
       context "and explicitly specifying the wanted partial" do
         before do
-          @tester.unstub(:render_association)
-          @tester.should_receive(:render_association).with(anything(), anything(), anything(), "f", anything(), "shared/partial").and_return('partiallll')
+          allow(@tester).to receive(:render_association).and_call_original
+          expect(@tester).to receive(:render_association).with(anything(), anything(), anything(), "f", anything(), "shared/partial").and_return('partiallll')
           @html = @tester.link_to_add_association('add something', @form_obj, :comments, :partial => "shared/partial")
         end
 
@@ -52,15 +74,15 @@ describe Cocoon do
       end
 
       it "gives an opportunity to wrap/decorate created objects" do
-        @tester.unstub(:render_association)
-        @tester.should_receive(:render_association).with(anything(), anything(), kind_of(CommentDecorator), "f", anything(), anything()).and_return('partiallll')
+        allow(@tester).to receive(:render_association).and_call_original
+        expect(@tester).to receive(:render_association).with(anything(), anything(), kind_of(CommentDecorator), "f", anything(), anything()).and_return('partiallll')
         @tester.link_to_add_association('add something', @form_obj, :comments, :wrap_object => Proc.new {|comment| CommentDecorator.new(comment) })
       end
 
       context "force non association create" do
         context "default case: create object on association" do
           before do
-            @tester.should_receive(:create_object).with(anything, :comments , false)
+            expect(@tester).to receive(:create_object).with(anything, :comments , false)
             @html = @tester.link_to_add_association('add something', @form_obj, :comments)
           end
 
@@ -69,7 +91,7 @@ describe Cocoon do
 
         context "and explicitly specifying false is the same as default" do
           before do
-            @tester.should_receive(:create_object).with(anything, :comments , false)
+            expect(@tester).to receive(:create_object).with(anything, :comments , false)
             @html = @tester.link_to_add_association('add something', @form_obj, :comments, :force_non_association_create => false)
           end
           it_behaves_like "a correctly rendered add link", {}
@@ -77,7 +99,7 @@ describe Cocoon do
 
         context "specifying true will not create objects on association but using the conditions" do
           before do
-            @tester.should_receive(:create_object).with(anything, :comments , true)
+            expect(@tester).to receive(:create_object).with(anything, :comments , true)
             @html = @tester.link_to_add_association('add something', @form_obj, :comments, :force_non_association_create => true)
           end
           it_behaves_like "a correctly rendered add link", {}
@@ -127,8 +149,8 @@ describe Cocoon do
 
       context "and explicitly specifying the wanted partial" do
         before do
-          @tester.unstub(:render_association)
-          @tester.should_receive(:render_association).with(anything(), anything(), anything(), "f", anything(), "shared/partial").and_return('partiallll')
+          allow(@tester).to receive(:render_association).and_call_original
+          expect(@tester).to receive(:render_association).with(anything(), anything(), anything(), "f", anything(), "shared/partial").and_return('partiallll')
           @html = @tester.link_to_add_association( @form_obj, :comments, :class => 'floppy disk', :partial => "shared/partial") do
             "some long name"
           end
@@ -157,13 +179,13 @@ describe Cocoon do
     end
 
     it "tttt" do
-      @post.class.reflect_on_association(:people).klass.new.should be_a(Person)
+      expect(@post.class.reflect_on_association(:people).klass.new).to be_a(Person)
     end
 
     context "with extra render-options for rendering the child relation" do
       context "uses the correct plural" do
         before do
-          @tester.should_receive(:render_association).with(:people, @form_obj, anything, "f", {:wrapper => 'inline'}, nil)
+          expect(@tester).to receive(:render_association).with(:people, @form_obj, anything, "f", {:wrapper => 'inline'}, nil)
           @html = @tester.link_to_add_association('add something', @form_obj, :people, :render_options => {:wrapper => 'inline'})
         end
         it_behaves_like "a correctly rendered add link", {association: 'person', associations: 'people' }
@@ -173,18 +195,18 @@ describe Cocoon do
     context "passing locals to the partial" do
       context "when given: passes the locals to the partials" do
         before do
-          @tester.unstub(:render_association)
-          @form_obj.should_receive(:fields_for) { | association, new_object, options_hash, &block| block.call }
-          @tester.should_receive(:render).with("person_fields", {:f=>nil, :dynamic=>true, :alfred=>"Judoka"}).and_return ("partiallll")
+          allow(@tester).to receive(:render_association).and_call_original
+          expect(@form_obj).to receive(:fields_for) { | association, new_object, options_hash, &block| block.call }
+          expect(@tester).to receive(:render).with("person_fields", {:f=>nil, :dynamic=>true, :alfred=>"Judoka"}).and_return ("partiallll")
           @html = @tester.link_to_add_association('add something', @form_obj, :people, :render_options => {:wrapper => 'inline', :locals => {:alfred => 'Judoka'}})
         end
         it_behaves_like "a correctly rendered add link", {template: 'partiallll', association: 'person', associations: 'people' }
       end
       context "if no locals are given it still works" do
         before do
-          @tester.unstub(:render_association)
-          @form_obj.should_receive(:fields_for) { | association, new_object, options_hash, &block| block.call }
-          @tester.should_receive(:render).with("person_fields", {:f=>nil, :dynamic=>true}).and_return ("partiallll")
+          allow(@tester).to receive(:render_association).and_call_original
+          expect(@form_obj).to receive(:fields_for) { | association, new_object, options_hash, &block| block.call }
+          expect(@tester).to receive(:render).with("person_fields", {:f=>nil, :dynamic=>true}).and_return ("partiallll")
           @html = @tester.link_to_add_association('add something', @form_obj, :people, :render_options => {:wrapper => 'inline'})
         end
         it_behaves_like "a correctly rendered add link", {template: 'partiallll', association: 'person', associations: 'people' }
@@ -196,9 +218,9 @@ describe Cocoon do
     context "overruling the form parameter name" do
       context "when given a form_name it passes it correctly to the partials" do
         before do
-          @tester.unstub(:render_association)
-          @form_obj.should_receive(:fields_for) { | association, new_object, options_hash, &block| block.call }
-          @tester.should_receive(:render).with("person_fields", {:people_form => nil, :dynamic=>true}).and_return ("partiallll")
+          allow(@tester).to receive(:render_association).and_call_original
+          expect(@form_obj).to receive(:fields_for) { | association, new_object, options_hash, &block| block.call }
+          expect(@tester).to receive(:render).with("person_fields", {:people_form => nil, :dynamic=>true}).and_return ("partiallll")
           @html = @tester.link_to_add_association('add something', @form_obj, :people, :form_name => 'people_form')
         end
         it_behaves_like "a correctly rendered add link", {template: 'partiallll', association: 'person', associations: 'people' }
@@ -208,13 +230,14 @@ describe Cocoon do
 
     context "when using formtastic" do
       before(:each) do
-        @tester.unstub(:render_association)
-        @form_obj.stub(:semantic_fields_for).and_return('form<tagzzz>')
+        allow(@tester).to receive(:render_association).and_call_original
+        allow(@form_obj).to receive(:semantic_fields_for).and_return('form<tagzzz>')
       end
       context "calls semantic_fields_for and not fields_for" do
         before do
-          @form_obj.should_receive(:semantic_fields_for)
-          @form_obj.should_receive(:fields_for).never
+          allow(@form_obj).to receive_message_chain(:class, :ancestors) { ['Formtastic::FormBuilder'] }
+          expect(@form_obj).to receive(:semantic_fields_for)
+          expect(@form_obj).to receive(:fields_for).never
           @html = @tester.link_to_add_association('add something', @form_obj, :people)
         end
         it_behaves_like "a correctly rendered add link", {template: 'form<tagzzz>', association: 'person', associations: 'people' }
@@ -222,16 +245,17 @@ describe Cocoon do
     end
     context "when using simple_form" do
       before(:each) do
-        @tester.unstub(:render_association)
-        @form_obj.stub(:simple_fields_for).and_return('form<tagxxx>')
+        allow(@tester).to receive(:render_association).and_call_original
+        allow(@form_obj).to receive(:simple_fields_for).and_return('form<tagxxx>')
       end
       it "responds_to :simple_fields_for" do
-        @form_obj.should respond_to(:simple_fields_for)
+        expect(@form_obj).to respond_to(:simple_fields_for)
       end
       context "calls simple_fields_for and not fields_for" do
         before do
-          @form_obj.should_receive(:simple_fields_for)
-          @form_obj.should_receive(:fields_for).never
+          allow(@form_obj).to receive_message_chain(:class, :ancestors) { ['SimpleForm::FormBuilder'] }
+          expect(@form_obj).to receive(:simple_fields_for)
+          expect(@form_obj).to receive(:fields_for).never
           @html = @tester.link_to_add_association('add something', @form_obj, :people)
         end
         it_behaves_like "a correctly rendered add link", {template: 'form<tagxxx>', association: 'person', associations: 'people' }
@@ -257,14 +281,36 @@ describe Cocoon do
         it "is rendered inside a input element" do
           doc = Nokogiri::HTML(@html)
           removed = doc.at('input')
-          removed.attribute('id').value.should == "Post__destroy"
-          removed.attribute('name').value.should == "Post[_destroy]"
-          removed.attribute('value').value.should == "false"
+          expect(removed.attribute('id').value).to eq("Post__destroy")
+          expect(removed.attribute('name').value).to eq("Post[_destroy]")
+          expect(removed.attribute('value').value).to eq("false")
         end
 
         it_behaves_like "a correctly rendered remove link", {}
       end
 
+      context 'no name given' do
+        context 'custom translation exists' do
+          before do
+            I18n.backend.store_translations(:en, :cocoon => { :posts => { :remove => 'Remove post' } })
+
+            @html = @tester.link_to_remove_association(@form_obj)
+          end
+
+          it_behaves_like "a correctly rendered remove link", { text: 'Remove post' }
+        end
+
+        context 'uses default translation' do
+          before do
+            I18n.backend.store_translations(:en, :cocoon => { :defaults => { :remove => 'Remove' } })
+
+            @html = @tester.link_to_remove_association(@form_obj)
+          end
+
+          it_behaves_like "a correctly rendered remove link", { text: 'Remove' }
+        end
+      end
+
       context "accepts html options and pass them to link_to" do
         before do
           @html = @tester.link_to_remove_association('remove something', @form_obj, {:class => 'add_some_class', :'data-something' => 'bla'})
@@ -287,9 +333,9 @@ describe Cocoon do
       it "is rendered inside a input element" do
         doc = Nokogiri::HTML(@html)
         removed = doc.at('input')
-        removed.attribute('id').value.should == "Post__destroy"
-        removed.attribute('name').value.should == "Post[_destroy]"
-        removed.attribute('value').value.should == "true"
+        expect(removed.attribute('id').value).to eq("Post__destroy")
+        expect(removed.attribute('name').value).to eq("Post[_destroy]")
+        expect(removed.attribute('value').value).to eq("true")
       end
 
       it_behaves_like "a correctly rendered remove link", {class: 'remove_fields dynamic destroyed'}
@@ -336,7 +382,7 @@ describe Cocoon do
 
   context "create_object" do
     it "creates correct association with conditions" do
-      @tester.should_not_receive(:create_object_with_conditions)
+      expect(@tester).not_to receive(:create_object_with_conditions)
       # in rails4 we cannot create an associated object when the object has not been saved before
       # I submitted a bug for this: https://github.com/rails/rails/issues/11376
       if Rails.rails4?
@@ -344,16 +390,16 @@ describe Cocoon do
         @form_obj = double(:object => @post, :object_name => @post.class.name)
       end
       result = @tester.create_object(@form_obj, :admin_comments)
-      result.author.should == "Admin"
-      @form_obj.object.admin_comments.should be_empty
+      expect(result.author).to eq("Admin")
+      expect(@form_obj.object.admin_comments).to be_empty
     end
 
     it "creates correct association for belongs_to associations" do
       comment  = Comment.new
       form_obj = double(:object => Comment.new)
       result   = @tester.create_object(form_obj, :post)
-      result.should be_a Post
-      comment.post.should be_nil
+      expect(result).to be_a Post
+      expect(comment.post).to be_nil
     end
 
     it "raises an error if cannot reflect on association" do
@@ -362,30 +408,30 @@ describe Cocoon do
 
     it "creates an association if object responds to 'build_association' as singular" do
       object = Comment.new
-      object.should_receive(:build_custom_item).and_return 'custom'
-      @tester.create_object(double(:object => object), :custom_item).should == 'custom'
+      expect(object).to receive(:build_custom_item).and_return 'custom'
+      expect(@tester.create_object(double(:object => object), :custom_item)).to eq('custom')
     end
 
     it "creates an association if object responds to 'build_association' as plural" do
       object = Comment.new
-      object.should_receive(:build_custom_item).and_return 'custom'
-      @tester.create_object(double(:object => object), :custom_items).should == 'custom'
+      expect(object).to receive(:build_custom_item).and_return 'custom'
+      expect(@tester.create_object(double(:object => object), :custom_items)).to eq('custom')
     end
 
     it "can create using only conditions not the association" do
-      @tester.should_receive(:create_object_with_conditions).and_return('flappie')
-      @tester.create_object(@form_obj, :comments, true).should == 'flappie'
+      expect(@tester).to receive(:create_object_with_conditions).and_return('flappie')
+      expect(@tester.create_object(@form_obj, :comments, true)).to eq('flappie')
     end
   end
 
   context "get_partial_path" do
     it "generates the default partial name if no partial given" do
       result = @tester.get_partial_path(nil, :admin_comments)
-      result.should == "admin_comment_fields"
+      expect(result).to eq("admin_comment_fields")
     end
     it "uses the given partial name" do
       result = @tester.get_partial_path("comment_fields", :admin_comments)
-      result.should == "comment_fields"
+      expect(result).to eq("comment_fields")
     end
   end
 

data/spec/generators/install_generator_spec.rb

@@ -1,6 +1,4 @@
 require 'spec_helper'
-require 'rspec/mocks'
-require 'rspec/rails/mocks'
 
 require 'generator_spec/test_case'
 require 'generators/cocoon/install/install_generator'
@@ -13,18 +11,18 @@ describe Cocoon::Generators::InstallGenerator do
   context "in rails 3.0" do
     context "with no arguments" do
       before(:each) do
-        ::Rails.stub(:version) { '3.0.8' }
+        allow(::Rails).to receive(:version) { '3.0.8' }
         prepare_destination
         run_generator
       end
 
       it "stubs the version correctly" do
-        ::Rails.version[0..2].should == "3.0"
+        expect(::Rails.version[0..2]).to eq("3.0")
       end
 
       it "stubs the version correctly" do
         test_version = (::Rails.version[0..2].to_f >= 3.1)
-        test_version.should be_false
+        expect(test_version).to be_falsey
       end
 
       it "copies cocoon.js to the correct folder" do
@@ -36,7 +34,7 @@ describe Cocoon::Generators::InstallGenerator do
   context "in rails 3.1" do
     context "with no arguments" do
       before(:each) do
-        ::Rails.stub(:version) { '3.1.0' }
+        allow(::Rails).to receive(:version) { '3.1.0' }
         prepare_destination
         run_generator
       end

data/spec/integration/navigation_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe "Navigation" do
+describe "Navigation", :type => :request do
 #  include Capybara
   
   it "should be a valid app" do
-    ::Rails.application.should be_a(Dummy::Application)
+    expect(::Rails.application).to be_a(Dummy::Application)
   end
 end

data/spec/support/i18n.rb

@@ -0,0 +1,3 @@
+RSpec.configure do |config|
+  config.after(:each) { I18n.reload! }
+end

data/spec/support/shared_examples.rb

@@ -17,24 +17,24 @@ shared_examples_for "a correctly rendered add link" do |options|
       @link = doc.at('a')
     end
     it 'has a correct href' do
-      @link.attribute('href').value.should == @options[:href]
+      expect(@link.attribute('href').value).to eq(@options[:href])
     end
     it 'has a correct class' do
-      @link.attribute('class').value.should == @options[:class]
+      expect(@link.attribute('class').value).to eq(@options[:class])
     end
     it 'has a correct template' do
-      @link.attribute('data-association-insertion-template').value.should == @options[:template]
+      expect(@link.attribute('data-association-insertion-template').value).to eq(@options[:template])
     end
     it 'has a correct associations' do
-      @link.attribute('data-association').value.should == @options[:association]
-      @link.attribute('data-associations').value.should == @options[:associations]
+      expect(@link.attribute('data-association').value).to eq(@options[:association])
+      expect(@link.attribute('data-associations').value).to eq(@options[:associations])
     end
     it 'has the correct text' do
-      @link.text.should == @options[:text]
+      expect(@link.text).to eq(@options[:text])
     end
     it 'sets extra attributes correctly' do
       @options[:extra_attributes].each do |key, value|
-        @link.attribute(key).value.should == value
+        expect(@link.attribute(key).value).to eq(value)
       end
     end
 
@@ -56,17 +56,17 @@ shared_examples_for "a correctly rendered remove link" do |options|
       @link = doc.at('a')
     end
     it 'has a correct href' do
-      @link.attribute('href').value.should == @options[:href]
+      expect(@link.attribute('href').value).to eq(@options[:href])
     end
     it 'has a correct class' do
-      @link.attribute('class').value.should == @options[:class]
+      expect(@link.attribute('class').value).to eq(@options[:class])
     end
     it 'has the correct text' do
-      @link.text.should == @options[:text]
+      expect(@link.text).to eq(@options[:text])
     end
     it 'sets extra attributes correctly' do
       @options[:extra_attributes].each do |key, value|
-        @link.attribute(key).value.should == value
+        expect(@link.attribute(key).value).to eq(value)
       end
     end
   end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: cocoon
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
+  prerelease: 
 platform: ruby
 authors:
 - Nathan Van der Auwera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2016-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,20 +30,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.8
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,38 +78,39 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          Mi44LjA=
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          Mi44LjA=
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          Mi44LjA=
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          Mi44LjA=
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -108,6 +118,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -115,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -122,6 +134,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -129,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -136,6 +150,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -143,6 +158,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: generator_spec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -150,6 +166,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -157,6 +174,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubysl
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -164,6 +182,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -171,6 +190,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubysl-test-unit
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -178,6 +198,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -185,6 +206,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: psych
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -192,6 +214,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -199,6 +222,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: racc
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -206,6 +230,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -213,6 +238,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubinius-developer_tools
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -220,6 +246,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -289,31 +316,36 @@ files:
 - spec/generators/install_generator_spec.rb
 - spec/integration/navigation_spec.rb
 - spec/spec_helper.rb
+- spec/support/i18n.rb
 - spec/support/rails_version_helper.rb
 - spec/support/shared_examples.rb
 homepage: http://github.com/nathanvda/cocoon
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1378407659540710243
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: gem that enables easier nested forms with standard forms, formtastic and
   simple-form
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    M2MwYmFkNzAwZjhhYjA2NmEwMjMxMzMwY2Q0ZjNiNzU5YzFkZWE4YQ==
-  data.tar.gz: !binary |-
-    NmE1YTIwY2YzOTVkOTI1NzkzNGE4ZjIyZmUyZGI4ZTA0OTRkMmVhNg==
-SHA512:
-  metadata.gz: !binary |-
-    ZGZhNGU1N2FlNGZlOTFjYjVlZmNjZTFkMDIzYzE2OGNjMDJmZDljMTMxYTFh
-    MTIzYzkyNzExOWNlODljYzk0ZTQ2NmM3NzY2MDUyMmJiZjhmMGUzOWQ5Mzdh
-    YWRlNmM4NDZiMjdmZDdmNGEyYjVjOWYxYTc4ZjJkM2JhMWI0Yzg=
-  data.tar.gz: !binary |-
-    YzUxMTgzY2VlOWRiNzgyMDlhMWRmYTU5ZmJjNjI4YjBlYzAwYmRmZTRkMzM4
-    MDNlOGFiNDAyMTM5ZWJlZjkxMDc3ZWEwZGRiNmNkZTI3Njk1NWRkNjQzMjhj
-    MzkxODI0NDkyMmU1NjU0NDkwYTQwNzQzNzE5NzQwODMyM2JlNjY=