cocoon 1.2.14 → 1.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0b9ec469019818f643c8e77d1df9a52835be41a6
-  data.tar.gz: 9161b77e3cbb74476f9a96311f3998f0a51ab71f
+SHA256:
+  metadata.gz: 5ece48b77f3c2ade4038d9a745ecda7d23ec24d2e1b391a7900c1b040e9800a0
+  data.tar.gz: dfd2781be46692cc32726a785d379503c1f1aadd37a015f3d18e1955f2bc893b
 SHA512:
-  metadata.gz: 7df4a1e2dd0be9e9ef4ec2dc8d1abcbb10d6f34d0f13f964f1465bd6644400656bb6fb95d585a8bd2989a1d03d67e452fff2a26f9030cc9cf4c1b7686de252e3
-  data.tar.gz: 310faa12c4d2e4990d5bf2a1c5527e9dd67d6bd0a8f8e9603c5d707bf75c395e7093c3fe18afe8c878f044ffba32ab0b4b76d9485eba08d4c052d5cc9b9dd20d
+  metadata.gz: 278cc47c1d3cf4bc126f8609cbb4efa945fb59b864f495097e3a1f0d536b6353cc43da3d4e49d2cddbb65c660adfc057a50d3b8639d7acb5bcf1eed761937fd8
+  data.tar.gz: 8c9b316114c977cdf62aac3c172cb50bb74444714099751bd4915d8b970a105d6cca61ffe7c41f8369d7bdf2cb6f935ce92b852dba58b1c7e234f32d06daa9fe

data/.travis.yml

@@ -4,7 +4,17 @@ rvm:
   - 2.2.6
   - 2.3.2
   - 2.4.1
+  - 2.4.5
+  - 2.4.6
+  - 2.5.4
+  - 2.5.5
+  - 2.6.3
   - rbx-2
+
+before_install:
+    - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+    - gem install bundler -v '< 2'
+      
 gemfile:
   - gemfiles/Gemfile.rails-3.2.13
   - gemfiles/Gemfile.rails-4-r2
@@ -29,5 +39,25 @@ matrix:
     gemfile: gemfiles/Gemfile.rails-3.2.13
   - rvm: 2.4.1
     gemfile: gemfiles/Gemfile.rails-4-r2
+  - rvm: 2.4.6
+    gemfile: gemfiles/Gemfile.rails-3.2.13
+  - rvm: 2.4.6
+    gemfile: gemfiles/Gemfile.rails-4-r2
+  - rvm: 2.4.5
+    gemfile: gemfiles/Gemfile.rails-3.2.13
+  - rvm: 2.4.5
+    gemfile: gemfiles/Gemfile.rails-4-r2
+  - rvm: 2.5.4
+    gemfile: gemfiles/Gemfile.rails-3.2.13
+  - rvm: 2.5.4
+    gemfile: gemfiles/Gemfile.rails-4-r2
+  - rvm: 2.5.5
+    gemfile: gemfiles/Gemfile.rails-3.2.13
+  - rvm: 2.5.5
+    gemfile: gemfiles/Gemfile.rails-4-r2
+  - rvm: 2.6.3
+    gemfile: gemfiles/Gemfile.rails-3.2.13
+  - rvm: 2.6.3
+    gemfile: gemfiles/Gemfile.rails-4-r2
   allow_failures:
     - rvm: rbx-2

data/Gemfile

@@ -5,7 +5,8 @@ group :development, :test do
   gem "rails", "~> 4.2"
   gem "sqlite3", '1.3.13'
   gem "json_pure"
-  gem "jeweler", "~> 2.3"
+  gem "jeweler", git: 'git@github.com:technicalpickles/jeweler'
+  # gem "jeweler", "~> 2.3"
   gem "rspec-rails", "~> 3.0.0"
   gem "rspec",       "~> 3.0.0"
   gem "actionpack",  ">=4.0.0"

data/README.markdown

@@ -27,6 +27,23 @@ gem "cocoon"
 
 > Please note that for rails 4 you will need at least v1.2.0 or later.
 
+### Rails 6/Webpacker 
+
+Add the componanion package
+
+    yarn add @nathanvda/cocoon 
+    
+and then in your `app/javascripts/packs/application.js` you should add
+
+    require("jquery")
+    require("@nathanvda/cocoon")
+
+
+> Note: there are alternative npm packages, which might better suit your needs. 
+E.g. some offer the cocoon functionality without using jquery (search for `cocoon + vanilla` --I found three packages on npm already). 
+Obviously you are free to use those, however the code samples in this README will (still) rely on jquery.
+ 
+
 ### Rails 3.1+/Rails 4/Rails 5
 
 Add the following to `application.js` so it compiles to the asset pipeline:
@@ -218,10 +235,10 @@ This should be called within the form builder.
 
 `link_to_add_association` takes four parameters:
 
-- name: the text to show in the link
-- f: the form builder
-- association: the name of the association (plural) of which a new instance needs to be added (symbol or string).
-- html_options: extra html-options (see [`link_to`](http://api.rubyonrails.org/classes/ActionView/Helpers/UrlHelper.html#method-i-link_to)
+- **name**: the text to show in the link
+- **f**: the form builder
+- **association**: the name of the association (plural) of which a new instance needs to be added (symbol or string).
+- **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 as string, or a function that takes the `link_to_add_association` node as the parameter and returns a node. Default: parent node
@@ -339,9 +356,9 @@ This should be placed inside the partial `_<association-object-singular>_fields`
 
 It takes three parameters:
 
-- name: the text to show in the link
-- f: referring to the containing form-object
-- html_options: extra html-options (see `link_to`)
+- **name**: the text to show in the link
+- **f**: referring to the containing form-object
+- **html_options**: extra html-options (see `link_to`)
 
 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).
 

data/Rakefile

@@ -11,6 +11,9 @@ require 'rdoc/task'
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
+require 'erb'
+require 'JSON'
+
 
 RSpec::Core::RakeTask.new(:spec)
 
@@ -39,4 +42,48 @@ begin
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+end
+
+
+require 'bundler/gem_tasks'
+
+spec = Bundler.load_gemspec('./cocoon.gemspec')
+
+
+npm_src_dir = './npm'
+npm_dest_dir = './dist'
+CLOBBER.include 'dist'
+
+assets_dir = './app/assets/'
+
+npm_files = {
+    File.join(npm_dest_dir, 'cocoon.js') => File.join(assets_dir, 'javascripts', 'cocoon.js'),
+    File.join(npm_dest_dir, 'README.md') => File.join(npm_src_dir, 'README.md'),
+    File.join(npm_dest_dir, 'LICENSE') => './LICENSE'
+}
+
+namespace :npm do
+  npm_files.each do |dest, src|
+    file dest => src do
+      cp src, dest
+    end
+  end
+
+  task :'package-json' do
+    template = ERB.new(File.read(File.join(npm_src_dir, 'package.json.erb')))
+    content = template.result_with_hash(spec: spec)
+    File.write(File.join(npm_dest_dir, 'package.json'),
+               JSON.pretty_generate(JSON.parse(content)))
+  end
+
+  desc "Build nathanvda-cocoon-#{spec.version}.tgz into the pkg directory"
+  task build: (%i[package-json] + npm_files.keys) do
+    system("cd #{npm_dest_dir} && npm pack && mv ./nathanvda-cocoon-#{spec.version}.tgz ../pkg/")
+  end
+
+  desc "Build and push nathanvda-cocoon-#{spec.version}.tgz to https://npmjs.org"
+  task release: %i[build] do
+    system("npm publish ./pkg/nathanvda-cocoon-#{spec.version}.tgz --access public")
+  end
+end
+

data/VERSION

@@ -1 +1 @@
-1.2.14
+1.2.15

data/app/assets/javascripts/cocoon.js

@@ -39,6 +39,8 @@
 
   $(document).on('click', '.add_fields', function(e) {
     e.preventDefault();
+    e.stopPropagation();
+    
     var $this                 = $(this),
         assoc                 = $this.data('association'),
         assocs                = $this.data('associations'),

data/cocoon.gemspec

@@ -2,26 +2,27 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: cocoon 1.2.14 ruby lib
+# stub: cocoon 1.2.15 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "cocoon".freeze
-  s.version = "1.2.14"
+  s.version = "1.2.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Nathan Van der Auwera".freeze]
-  s.date = "2019-06-26"
+  s.date = "2020-09-08"
   s.description = "Unobtrusive nested forms handling, using jQuery. Use this and discover cocoon-heaven.".freeze
   s.email = "nathan@dixis.com".freeze
   s.extra_rdoc_files = [
+    "LICENSE",
     "README.markdown"
   ]
   s.files = [
     ".travis.yml",
     "Gemfile",
     "History.md",
-    "MIT-LICENSE",
+    "LICENSE",
     "README.markdown",
     "Rakefile",
     "VERSION",
@@ -33,6 +34,8 @@ Gem::Specification.new do |s|
     "lib/cocoon.rb",
     "lib/cocoon/view_helpers.rb",
     "lib/generators/cocoon/install/install_generator.rb",
+    "npm/README.md",
+    "npm/package.json.erb",
     "spec/cocoon_spec.rb",
     "spec/dummy/Rakefile",
     "spec/dummy/app/controllers/application_controller.rb",
@@ -83,7 +86,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/nathanvda/cocoon".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.6.11".freeze
+  s.rubygems_version = "3.0.8".freeze
   s.summary = "gem that enables easier nested forms with standard forms, formtastic and simple-form".freeze
 
   if s.respond_to? :specification_version then
@@ -93,7 +96,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rails>.freeze, ["~> 4.2"])
       s.add_development_dependency(%q<sqlite3>.freeze, ["= 1.3.13"])
       s.add_development_dependency(%q<json_pure>.freeze, [">= 0"])
-      s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.3"])
+      s.add_development_dependency(%q<jeweler>.freeze, [">= 0"])
       s.add_development_dependency(%q<rspec-rails>.freeze, ["~> 3.0.0"])
       s.add_development_dependency(%q<rspec>.freeze, ["~> 3.0.0"])
       s.add_development_dependency(%q<actionpack>.freeze, [">= 4.0.0"])
@@ -110,7 +113,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rails>.freeze, ["~> 4.2"])
       s.add_dependency(%q<sqlite3>.freeze, ["= 1.3.13"])
       s.add_dependency(%q<json_pure>.freeze, [">= 0"])
-      s.add_dependency(%q<jeweler>.freeze, ["~> 2.3"])
+      s.add_dependency(%q<jeweler>.freeze, [">= 0"])
       s.add_dependency(%q<rspec-rails>.freeze, ["~> 3.0.0"])
       s.add_dependency(%q<rspec>.freeze, ["~> 3.0.0"])
       s.add_dependency(%q<actionpack>.freeze, [">= 4.0.0"])
@@ -128,7 +131,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rails>.freeze, ["~> 4.2"])
     s.add_dependency(%q<sqlite3>.freeze, ["= 1.3.13"])
     s.add_dependency(%q<json_pure>.freeze, [">= 0"])
-    s.add_dependency(%q<jeweler>.freeze, ["~> 2.3"])
+    s.add_dependency(%q<jeweler>.freeze, [">= 0"])
     s.add_dependency(%q<rspec-rails>.freeze, ["~> 3.0.0"])
     s.add_dependency(%q<rspec>.freeze, ["~> 3.0.0"])
     s.add_dependency(%q<actionpack>.freeze, [">= 4.0.0"])

data/gemfiles/Gemfile.default

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

data/lib/cocoon/view_helpers.rb

@@ -42,8 +42,9 @@ module Cocoon
     end
 
     # :nodoc:
-    def render_association(association, f, new_object, form_name, render_options={}, custom_partial=nil)
+    def render_association(association, f, new_object, form_name, received_render_options={}, custom_partial=nil)
       partial = get_partial_path(custom_partial, association)
+      render_options = received_render_options.dup
       locals =  render_options.delete(:locals) || {}
       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)

data/npm/README.md

@@ -0,0 +1,8 @@
+# cocoon
+
+Cocoon is the companion javascript code for the 
+rails gem [cocoon](https://github.com/nathanvda/cocoon)
+which offers "dynamic" nested forms. 
+
+This code depends on jQuery.
+

data/npm/package.json.erb

@@ -0,0 +1,21 @@
+{
+  "name": "@nathanvda/cocoon",
+  "version": "<%= spec.version %>",
+  "license": "MIT",
+
+  "description": "Companion package for the cocoon Ruby gem.",
+  "homepage": "https://github.com/nathanvda/cocoon",
+  "repository": "https://github.com/nathanvda/cocoon",
+  "bugs": {
+    "url": "https://github.com/nathanvda/cocoon/issues"
+  },
+
+  "author": "nathan@dixis.com",
+
+  "main": "cocoon.js",
+  "files": ["cocoon.js", "README", "LICENSE", "package.json"],
+
+  "dependencies": {
+    "jquery": "^3.3.1"
+  }
+}

data/spec/cocoon_spec.rb

@@ -14,12 +14,12 @@ describe Cocoon do
   before(:each) do
     @tester = TestClass.new
     @post = Post.new
-    @form_obj = double(:object => @post, :object_name => @post.class.name)
   end
 
 
   context "link_to_add_association" do
     before(:each) do
+      @form_obj = double(:object => @post, :object_name => @post.class.name)
       allow(@tester).to receive(:render_association).and_return('form<tag>')
     end
 
@@ -198,9 +198,13 @@ describe Cocoon do
           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'}})
+          @render_options = {:wrapper => 'inline', :locals => {:alfred => 'Judoka'}}
+          @html = @tester.link_to_add_association('add something', @form_obj, :people, :render_options => @render_options)
         end
         it_behaves_like "a correctly rendered add link", {template: 'partiallll', association: 'person', associations: 'people' }
+        it "does not afffect render-options" do
+          expect(@render_options[:locals]).to eq({alfred: 'Judoka'})
+        end
       end
       context "if no locals are given it still works" do
         before do
@@ -272,6 +276,9 @@ describe Cocoon do
   end
 
   context "link_to_remove_association" do
+    before do
+      @form_obj = @tester.send(:instantiate_builder, @post.class.name, @post, {})
+    end
     context "without a block" do
       context "accepts a name" do
         before do
@@ -326,7 +333,7 @@ describe Cocoon do
       before do
         @post_marked_for_destruction = Post.new
         @post_marked_for_destruction.mark_for_destruction
-        @form_obj_destroyed = double(:object => @post_marked_for_destruction, :object_name => @post_marked_for_destruction.class.name)
+        @form_obj_destroyed = @tester.send(:instantiate_builder, @post_marked_for_destruction.class.name, @post_marked_for_destruction, {})
         @html = @tester.link_to_remove_association('remove something', @form_obj_destroyed)
       end
 
@@ -387,11 +394,11 @@ describe Cocoon do
       # I submitted a bug for this: https://github.com/rails/rails/issues/11376
       if Rails.rails4?
         @post = Post.create(title: 'Testing')
-        @form_obj = double(:object => @post, :object_name => @post.class.name)
       end
-      result = @tester.create_object(@form_obj, :admin_comments)
+      form_obj = double(:object => @post, :object_name => @post.class.name)
+      result = @tester.create_object(form_obj, :admin_comments)
       expect(result.author).to eq("Admin")
-      expect(@form_obj.object.admin_comments).to be_empty
+      expect(form_obj.object.admin_comments).to be_empty
     end
 
     it "creates correct association for belongs_to associations" do
@@ -420,7 +427,8 @@ describe Cocoon do
 
     it "can create using only conditions not the association" do
       expect(@tester).to receive(:create_object_with_conditions).and_return('flappie')
-      expect(@tester.create_object(@form_obj, :comments, true)).to eq('flappie')
+      form_obj = @tester.send(:instantiate_builder, @post.class.name, @post, {})
+      expect(@tester.create_object(form_obj, :comments, true)).to eq('flappie')
     end
   end
 

data/spec/dummy/db/migrate/20110306212208_create_posts.rb

@@ -4,7 +4,7 @@ class CreatePosts < ActiveRecord::Migration
       t.string :title
       t.text :body
 
-      t.timestamps
+      t.timestamps null: false
     end
   end
 

data/spec/dummy/db/migrate/20110306212250_create_comments.rb

@@ -5,7 +5,7 @@ class CreateComments < ActiveRecord::Migration
       t.string :author
       t.integer :post_id
 
-      t.timestamps
+      t.timestamps null: false
     end
   end
 

data/spec/dummy/db/migrate/20110420222224_create_people.rb

@@ -5,7 +5,7 @@ class CreatePeople < ActiveRecord::Migration
       t.string :description
       t.integer :post_id
 
-      t.timestamps
+      t.timestamps null: false
     end
   end
 

data/spec/dummy/db/schema.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -8,23 +9,31 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110306212250) do
+ActiveRecord::Schema.define(version: 20110420222224) do
 
-  create_table "comments", :force => true do |t|
+  create_table "comments", force: :cascade do |t|
     t.text     "body"
     t.string   "author"
     t.integer  "post_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
-  create_table "posts", :force => true do |t|
+  create_table "people", force: :cascade do |t|
+    t.string   "name"
+    t.string   "description"
+    t.integer  "post_id"
+    t.datetime "created_at",  null: false
+    t.datetime "updated_at",  null: false
+  end
+
+  create_table "posts", force: :cascade do |t|
     t.string   "title"
     t.text     "body"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoon
 version: !ruby/object:Gem::Version
-  version: 1.2.14
+  version: 1.2.15
 platform: ruby
 authors:
 - Nathan Van der Auwera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-26 00:00:00.000000000 Z
+date: 2020-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -56,16 +56,16 @@ dependencies:
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -240,12 +240,13 @@ email: nathan@dixis.com
 executables: []
 extensions: []
 extra_rdoc_files:
+- LICENSE
 - README.markdown
 files:
 - ".travis.yml"
 - Gemfile
 - History.md
-- MIT-LICENSE
+- LICENSE
 - README.markdown
 - Rakefile
 - VERSION
@@ -257,6 +258,8 @@ files:
 - lib/cocoon.rb
 - lib/cocoon/view_helpers.rb
 - lib/generators/cocoon/install/install_generator.rb
+- npm/README.md
+- npm/package.json.erb
 - spec/cocoon_spec.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/controllers/application_controller.rb
@@ -323,8 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: gem that enables easier nested forms with standard forms, formtastic and