cocoon 1.2.5 → 1.2.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWZmZDlkNWRhMjUyZWUyN2Q1YzM4NDk5YzM3NGE4OWQ5NzYxYjYyNQ==
+    M2MwYmFkNzAwZjhhYjA2NmEwMjMxMzMwY2Q0ZjNiNzU5YzFkZWE4YQ==
   data.tar.gz: !binary |-
-    ODkwOWM3OGYyZWIwZGM2Y2ZkMjBlZDhkOTE2NTE1ZjdkODQ1NDExOA==
+    NmE1YTIwY2YzOTVkOTI1NzkzNGE4ZjIyZmUyZGI4ZTA0OTRkMmVhNg==
 SHA512:
   metadata.gz: !binary |-
-    MmJkMWQzYjVjYjA0ZThiMTgwN2FiZTliMmU0MmY3YmYyMTdkZDVlNzhjNmFj
-    MTc1MTFlYTYwODRhYjI1MzczOTZlMTI2MmQ4MTY2M2JjOGYxMGFkYzE1ZjY3
-    NzE1YjliY2MyMmZjZjYyYzhhYjU3NzVhMzFlYmQ1YWRiNWYwZDE=
+    ZGZhNGU1N2FlNGZlOTFjYjVlZmNjZTFkMDIzYzE2OGNjMDJmZDljMTMxYTFh
+    MTIzYzkyNzExOWNlODljYzk0ZTQ2NmM3NzY2MDUyMmJiZjhmMGUzOWQ5Mzdh
+    YWRlNmM4NDZiMjdmZDdmNGEyYjVjOWYxYTc4ZjJkM2JhMWI0Yzg=
   data.tar.gz: !binary |-
-    M2Q5NmQzNjc1OGRkOTgxZTQ1MGNkN2ZhZjk2OGI1ODcwMWM0YTQ5OTRjNTM0
-    ZjMxYTk4YjhiOWU2ZjkyNTJkMzc4YTU2MWMwMDEzMjA0NTY4M2VhMWM4MWE1
-    NzRiNDczYWM3NjBiMTI5OGIyMTJmZjQxZTEyMzA1YjU3M2RjMTA=
+    YzUxMTgzY2VlOWRiNzgyMDlhMWRmYTU5ZmJjNjI4YjBlYzAwYmRmZTRkMzM4
+    MDNlOGFiNDAyMTM5ZWJlZjkxMDc3ZWEwZGRiNmNkZTI3Njk1NWRkNjQzMjhj
+    MzkxODI0NDkyMmU1NjU0NDkwYTQwNzQzNzE5NzQwODMyM2JlNjY=

data/History.md

@@ -1,5 +1,13 @@
 # Change History / Release Notes
 
+## Version 1.2.6
+
+* added some explicit documentation we use haml. Fixed the formtastic example.
+* "unfreeze" frozen objects. Fixes #193.
+* IE8 jquery fix (thanks @niuage).
+* merged #191 which fixes an issue with a monkeypatched CGI. For more info, see
+  ticket #191. Thanks gsmendoza.
+
 ## Version 1.2.5
 
 * fix gem dependencies: we added gems to allow building for rubinius, but those are only

data/README.markdown

@@ -101,22 +101,25 @@ E.g. in your `ProjectsController`:
 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).
+
 ### Formtastic
 
 In our `projects/_form` partial we'd write:
 
 ```haml
-= f.inputs do
-  = f.input :name
-  = f.input :description
-  %h3 Tasks
-  #tasks
-    = f.semantic_fields_for :tasks do |task|
-      = render 'task_fields', :f => task
-    .links
-      = link_to_add_association 'add task', f, :tasks
-  = f.actions do
-    = f.action :submit
+= semantic_form_for @project do |f|
+  = f.inputs do
+    = f.input :name
+    = f.input :description
+    %h3 Tasks
+    #tasks
+      = f.semantic_fields_for :tasks do |task|
+        = render 'task_fields', :f => task
+      .links
+        = link_to_add_association 'add task', f, :tasks
+    = f.actions do
+      = f.action :submit
 ```
 
 And in our `_task_fields` partial we'd write:

data/Rakefile

@@ -33,7 +33,6 @@ begin
     gem.email = "nathan@dixis.com"
     gem.homepage = "http://github.com/nathanvda/cocoon"
     gem.authors = ["Nathan Van der Auwera"]
-    gem.add_development_dependency "rspec", ">= 2.0.0"
     gem.licenses = ["MIT"]
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-1.2.5
+1.2.6

data/app/assets/javascripts/cocoon.js

@@ -5,11 +5,11 @@
   var create_new_id = function() {
     return (new Date().getTime() + cocoon_element_counter++);
   }
-  
+
   var newcontent_braced = function(id) {
     return '[' + id + ']$1';
   }
-  
+
   var newcontent_underscord = function(id) {
     return '_' + id + '_$1';
   }
@@ -30,7 +30,7 @@
         new_content           = content.replace(regexp_braced, newcontent_braced(new_id)),
         new_contents          = [];
 
-    
+
     if (new_content == content) {
       regexp_braced     = new RegExp('\\[new_' + assocs + '\\](.*?\\s)', 'g');
       regexp_underscord = new RegExp('_new_' + assocs + '_(\\w*)', 'g');
@@ -42,16 +42,16 @@
 
     count = (isNaN(count) ? 1 : Math.max(count, 1));
     count -= 1;
-    
+
     while (count) {
       new_id      = create_new_id();
       new_content = content.replace(regexp_braced, newcontent_braced(new_id));
       new_content = new_content.replace(regexp_underscord, newcontent_underscord(new_id));
       new_contents.push(new_content);
-      
+
       count -= 1;
     }
-    
+
     if (insertionNode){
       if (insertionTraversal){
         insertionNode = $this[insertionTraversal](insertionNode);
@@ -62,8 +62,8 @@
       insertionNode = $this.parent();
     }
 
-    for (var i in new_contents) {
-      var contentNode = $(new_contents[i]);
+    $.each(new_contents, function(i, node) {
+      var contentNode = $(node);
 
       insertionNode.trigger('cocoon:before-insert', [contentNode]);
 
@@ -73,7 +73,7 @@
       var addedContent = insertionNode[insertionMethod](contentNode);
 
       insertionNode.trigger('cocoon:after-insert', [contentNode]);
-    }
+    });
   });
 
   $(document).on('click', '.remove_fields.dynamic, .remove_fields.existing', function(e) {

data/cocoon.gemspec

@@ -2,15 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: cocoon 1.2.5 ruby lib
+# stub: cocoon 1.2.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "cocoon"
-  s.version = "1.2.5"
+  s.version = "1.2.6"
 
   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 = "2013-12-05"
+  s.date = "2014-03-18"
   s.description = "Unobtrusive nested forms handling, using jQuery. Use this and discover cocoon-heaven."
   s.email = "nathan@dixis.com"
   s.extra_rdoc_files = [
@@ -79,8 +80,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/nathanvda/cocoon"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.1.11"
+  s.rubygems_version = "2.2.1"
   s.summary = "gem that enables easier nested forms with standard forms, formtastic and simple-form"
 
   if s.respond_to? :specification_version then
@@ -102,7 +102,6 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<psych>, [">= 0"])
       s.add_development_dependency(%q<racc>, [">= 0"])
       s.add_development_dependency(%q<rubinius-developer_tools>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 2.0.0"])
     else
       s.add_dependency(%q<rails>, [">= 4.0.0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
@@ -119,7 +118,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<psych>, [">= 0"])
       s.add_dependency(%q<racc>, [">= 0"])
       s.add_dependency(%q<rubinius-developer_tools>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 2.0.0"])
     end
   else
     s.add_dependency(%q<rails>, [">= 4.0.0"])
@@ -137,7 +135,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<psych>, [">= 0"])
     s.add_dependency(%q<racc>, [">= 0"])
     s.add_dependency(%q<rubinius-developer_tools>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 2.0.0"])
   end
 end
 

data/lib/cocoon/view_helpers.rb

@@ -12,7 +12,7 @@ module Cocoon
     # - *f* : the form this link should be placed in
     # - *html_options*:  html options to be passed to link_to (see <tt>link_to</tt>)
     # - *&block*:        the output of the block will be show in the link, see <tt>link_to</tt>
-    
+
     def link_to_remove_association(*args, &block)
       if block_given?
         f            = args.first
@@ -60,7 +60,7 @@ module Cocoon
     #              - *:locals*     : the locals hash in the :render_options is handed to the partial
     #          - *:partial*        : explicitly override the default partial name
     #          - *:wrap_object*    : a proc that will allow to wrap your object, especially suited when using
-    #                                decorators, or if you want special initialisation   
+    #                                decorators, or if you want special initialisation
     #          - *:form_name*      : the parameter for the form in the nested form partial. Default `f`.
     #          - *:count*          : Count of how many objects will be added on a single click. Default `1`.
     # - *&block*:        see <tt>link_to</tt>
@@ -92,8 +92,8 @@ module Cocoon
         new_object = create_object(f, association, force_non_association_create)
         new_object = wrap_object.call(new_object) if wrap_object.respond_to?(:call)
 
-        html_options[:'data-association-insertion-template'] = CGI.escapeHTML(render_association(association, f, new_object, form_parameter_name, render_options, override_partial)).html_safe
-        
+        html_options[:'data-association-insertion-template'] = CGI.escapeHTML(render_association(association, f, new_object, form_parameter_name, render_options, override_partial).to_str).html_safe
+
         html_options[:'data-count'] = count if count > 0
 
         link_to(name, '#', html_options)
@@ -137,6 +137,8 @@ module Cocoon
           f.object.send(association).delete
         end
 
+        assoc_obj = assoc_obj.dup if assoc_obj.frozen?
+
         assoc_obj
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoon
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Nathan Van der Auwera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -72,28 +72,32 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: !binary |-
+          Mi44LjA=
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: !binary |-
+          Mi44LjA=
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: !binary |-
+          Mi44LjA=
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: !binary |-
+          Mi44LjA=
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -220,20 +224,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.0
 description: Unobtrusive nested forms handling, using jQuery. Use this and discover
   cocoon-heaven.
 email: nathan@dixis.com
@@ -321,7 +311,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: gem that enables easier nested forms with standard forms, formtastic and