cocoon 1.0.22 → 1.1.0

data/History.md

@@ -1,6 +1,27 @@
 # Change History / Release Notes
 
 
+## Version 1.1.0
+
+* BREAKING: the triggered javascript events `removal-callback`, `after-removal-callback`, and `insertion-callback` are renamed to the more correct and symmetric
+  `cocoon:after-insert, cocoon:before-insert, cocoon:after-remove, cocoon:before-remove`. Also the events are namespaced to prevent collisions with other libraries.
+* allow created objects to be decorated with a callable. This is especially useful if you are using Draper or some decorator instead of the plain model in your views.
+* it is now possible to specify a relative node, and use standard jquery traversal methods on insertion
+* trigger insertion event on correct `insertionNode`
+* thanks to #90 cocoon now supports non-AR associations and array-fields, you just have to supply your own `build_<association>` methods
+
+I would really really like to thank all contributors, check them out https://github.com/nathanvda/cocoon/graphs/contributors
+They made cocoon way more awesome than I could have done in my lonesome.
+
+## Version 1.0.22
+
+* Fix that it still works for mongoid
+
+## Version 1.0.21
+
+* Use association build methods instead of assoc.klass.new. This avoids mass-assignment errors and other misbehaviors around attribute accessibility.
+
+
 ## Version 1.0.20
 
 * improved handing of the `:partial`: remove the extra options-hash, and just make it use the single hash, so now we can just write

data/README.markdown

@@ -9,6 +9,8 @@ For example a project with its tasks, an invoice with its ordered items.
 
 It is formbuilder-agnostic, so it works with standard Rails, or Formtastic or simple_form.
 
+This project is not related to [Apache Cocoon](http://cocoon.apache.org/)
+
 ## Prerequisites
 
 This gem uses jQuery, it is most useful to use this gem in a rails3
@@ -26,7 +28,7 @@ Inside your `Gemfile` add the following:
 gem "cocoon"
 ````
 
-### Rails 3.1
+### Rails 3.1+
 
 Add the following to `application.js` so it compiles to the
 asset_pipeline
@@ -35,7 +37,7 @@ asset_pipeline
 //= require cocoon
 ````
 
-### Rails 3.x
+### Rails 3.0.x
 
 If you are using Rails 3.0.x, you need to run the installation task (since rails 3.1 this is no longer needed):
 
@@ -96,7 +98,7 @@ We will show the sample usage with the different possible form-builders.
 Inside our `projects/_form` partial we then write:
 
 ````haml
-- f.inputs do
+= f.inputs do
   = f.input :name
   = f.input :description
   %h3 Tasks
@@ -105,7 +107,7 @@ Inside our `projects/_form` partial we then write:
       = render 'task_fields', :f => task
     .links
       = link_to_add_association 'add task', f, :tasks
-  -f.actions do
+  = f.actions do
     = f.action :submit
 ````
 
@@ -125,14 +127,70 @@ There is an example project on github implementing it called [cocoon_formtastic_
 
 ### Using simple_form
 
-This is almost identical to formtastic, instead of writing `semantic_fields_for` you write `simple_fields_for`.
+Inside our `projects/_form` partial we then write:
 
-There is an example project on github implementing it called [cocoon_simple_form_demo](https://github.com/nathanvda/cocoon_simple_form_demo).
+````haml
+= simple_form_for @project do |f|
+  = f.input :name
+  = f.input :description
+  %h3 Tasks
+  #tasks
+    = f.simple_fields_for :tasks do |task|
+      = render 'task_fields', :f => task
+    .links
+      = link_to_add_association 'add task', f, :tasks
+  = f.submit
+````
+
+and inside the `_task_fields` partial we write:
 
+````haml
+.nested-fields
+  = f.input :description
+  = f.input :done, :as => :boolean
+  = link_to_remove_association "remove task", f
+````
+
+There is an example project on github implementing it called [cocoon_simple_form_demo](https://github.com/nathanvda/cocoon_simple_form_demo).
 
 ### Using standard rails forms
 
-I will provide a full example (and a sample project) later.
+Inside our `projects/_form` partial we then write:
+
+````haml
+- form_for @project do |f|
+  .field
+    = f.label :name
+    %br
+    = f.text_field :name
+  .field
+    = f.label :description
+    %br
+    = f.text_field :description
+  %h3 Tasks
+  #tasks
+    = f.fields_for :tasks do |task|
+      = render 'task_fields', :f => task
+    .links
+      = link_to_add_association 'add task', f, :tasks
+  = f.submit
+````
+
+and inside the `_task_fields` partial we write:
+
+````haml
+.nested-fields
+  .field
+    = f.label :description
+    %br
+    = f.text_field :description
+  .field
+    = f.check_box :done
+    = f.label :done
+  = link_to_remove_association "remove task", f
+````
+
+I will provide a sample project later.
 
 ## How it works
 
@@ -150,6 +208,7 @@ It takes four parameters:
 - 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`)
   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-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.
@@ -165,6 +224,8 @@ Inside the `html_options` you can add an option `:render_options`, and the conta
 form. E.g. especially when using `twitter-bootstrap` and `simple_form` together, the `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')
+
 ````haml
 = link_to_add_association 'add something', f, :something, :render_options => {:wrapper => 'inline' }
 ````
@@ -201,7 +262,14 @@ Optionally you could also leave out the name and supply a block that is captured
 
 ### Callbacks (upon insert and remove of items)
 
-There is an option to add a callback on insertion or removal. If in your view you have the following snippet to select an `owner`
+On insertion or removal the following events are triggered:
+
+* `cocoon:before-insert`: called before inserting a new nested child
+* `cocoon:after-insert`: called after inserting
+* `cocoon:before-remove`: called before removing the nested child
+* `cocoon:after-remove`: called after removal
+
+If in your view you have the following snippet to select an `owner`
 (we use slim for demonstration purposes)
 
 ````haml
@@ -218,17 +286,21 @@ The callbacks can be added as follows:
 
 ````javascript
 $(document).ready(function() {
-    $('#owner').bind('insertion-callback',
+    $('#owner').bind('cocoon:before-insert',
          function() {
            $("#owner_from_list").hide();
            $("#owner a.add_fields").hide();
          });
-    $('#owner').bind("removal-callback",
+    $('#owner').bind('cocoon:after-insert',
+         function() {
+           /* ... do something ... */
+         });
+    $('#owner').bind("cocoon:before-remove",
          function() {
            $("#owner_from_list").show();
            $("#owner a.add_fields").show();
          });
-    $('#owner').bind("after-removal-callback",
+    $('#owner').bind("cocoon:after-remove",
          function() {
            /* e.g. recalculate order of child items */
          });
@@ -236,7 +308,7 @@ $(document).ready(function() {
 ````
 
 Do note that for the callbacks to work there has to be a surrounding container (div), where you can bind the callbacks to.
-Note that the default `removal-callback` is called _before_ removing the nested item.
+
 
 ### Control the Insertion behaviour
 
@@ -256,6 +328,18 @@ The `association-insertion-node` will determine where to add it. You can choose
 
 The `association-insertion-method` will determine where to add it in relation with the node. Any jQuery DOM Manipulation method can be set but we recommend sticking to any of the following: `before`, `after`, `append`, `prepend`. It is unknown at this time what others would do.
 
+The `association-insertion-traversal` will allow node selection to be relative to the link.
+
+For example:
+
+````javascript
+$(document).ready(function() {
+    $("#owner a.add_fields").
+      data("association-insertion-method", 'append').
+      data("association-insertion-traversal", 'closest').
+      data("association-insertion-node", '#parent_table');
+});
+````
 
 ### Partial
 
@@ -280,6 +364,12 @@ There is no limit to the amount of nesting, though.
 * Send me a pull request. Bonus points for topic branches.
 
 
+## Contributors
+
+The list of contributors just keeps on growing. [Check it out](https://github.com/nathanvda/cocoon/graphs/contributors) !!
+I would really really like to thank all of them,
+they make cocoon more awesome every day. Thanks.
+
 ## Todo
 
 * add more sample relations: `has_many :through`, `belongs_to`, ...
@@ -288,3 +378,9 @@ There is no limit to the amount of nesting, though.
 ## Copyright
 
 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. 
+
+[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.0.22
+1.1.0

data/app/assets/javascripts/cocoon.js

@@ -5,12 +5,12 @@
     content.replace(reg_exp, with_str);
   }
 
-  function trigger_removal_callback(node) {
-    node.trigger('removal-callback');
+  function trigger_before_removal_callback(node) {
+    node.trigger('cocoon:before-remove');
   }
 
   function trigger_after_removal_callback(node) {
-    node.trigger('after-removal-callback');
+    node.trigger('cocoon:after-remove');
   }
 
   $('.add_fields').live('click', function(e) {
@@ -18,9 +18,10 @@
     var $this                 = $(this),
         assoc                 = $this.data('association'),
         assocs                = $this.data('associations'),
-        content               = $this.data('template'),
+        content               = $this.data('association-insertion-template'),
         insertionMethod       = $this.data('association-insertion-method') || $this.data('association-insertion-position') || 'before';
         insertionNode         = $this.data('association-insertion-node'),
+        insertionTraversal    = $this.data('association-insertion-traversal'),
         regexp_braced         = new RegExp('\\[new_' + assoc + '\\]', 'g'),
         regexp_underscord     = new RegExp('_new_' + assoc + '_', 'g'),
         new_id                = new Date().getTime(),
@@ -37,25 +38,31 @@
     new_content = new_content.replace(regexp_underscord, newcontent_underscord);
 
     if (insertionNode){
-      insertionNode = insertionNode == "this" ? $this : $(insertionNode);
+      if (insertionTraversal){
+        insertionNode = $this[insertionTraversal](insertionNode)
+      } else {
+        insertionNode = insertionNode == "this" ? $this : $(insertionNode);
+      }
     } else {
       insertionNode = $this.parent();
     }
 
     var contentNode = $(new_content);
 
+    insertionNode.trigger('cocoon:before-insert');
+
     // allow any of the jquery dom manipulation methods (after, before, append, prepend, etc)
     // to be called on the node.  allows the insertion node to be the parent of the inserted
     // code and doesn't force it to be a sibling like after/before does. default: 'before'
     insertionNode[insertionMethod](contentNode);
 
-    $this.parent().trigger('insertion-callback');
+    insertionNode.trigger('cocoon:after-insert');
   });
 
   $('.remove_fields.dynamic').live('click', function(e) {
     var $this = $(this);
     var trigger_node = $this.closest(".nested-fields").parent();
-    trigger_removal_callback(trigger_node);
+    trigger_before_removal_callback(trigger_node);
     e.preventDefault();
     $this.closest(".nested-fields").remove();
     trigger_after_removal_callback(trigger_node);
@@ -64,11 +71,11 @@
   $('.remove_fields.existing').live('click', function(e) {
     var $this = $(this);
     var trigger_node = $this.closest(".nested-fields").parent().parent();
-    trigger_removal_callback(trigger_node);
+    trigger_before_removal_callback(trigger_node);
     e.preventDefault();
     $this.prev("input[type=hidden]").val("1");
     $this.closest(".nested-fields").hide();
     trigger_after_removal_callback(trigger_node);
   });
 
-})(jQuery);
+})(jQuery);

data/cocoon.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cocoon"
-  s.version = "1.0.22"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Van der Auwera"]
-  s.date = "2012-05-20"
+  s.date = "2012-10-08"
   s.description = "Unobtrusive nested forms handling, using jQuery. Use this and discover cocoon-heaven."
   s.email = "nathan@dixis.com"
   s.extra_rdoc_files = [
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
     "spec/cocoon_spec.rb",
     "spec/dummy/Rakefile",
     "spec/dummy/app/controllers/application_controller.rb",
+    "spec/dummy/app/decorators/comment_decorator.rb",
     "spec/dummy/app/helpers/application_helper.rb",
     "spec/dummy/app/models/comment.rb",
     "spec/dummy/app/models/person.rb",
@@ -73,7 +74,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/nathanvda/cocoon"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.15"
+  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

data/lib/cocoon/view_helpers.rb

@@ -67,13 +67,19 @@ module Cocoon
         render_options   = html_options.delete(:render_options)
         render_options ||= {}
         override_partial = html_options.delete(:partial)
+        wrap_object = html_options.delete(:wrap_object)
 
         html_options[:class] = [html_options[:class], "add_fields"].compact.join(' ')
         html_options[:'data-association'] = association.to_s.singularize
         html_options[:'data-associations'] = association.to_s.pluralize
 
-        new_object = create_object(f, association)
-        html_options[:'data-template'] = CGI.escapeHTML(render_association(association, f, new_object, render_options, override_partial)).html_safe
+        if wrap_object.respond_to?(:call)
+          new_object = wrap_object.call(create_object(f, association))
+        else
+          new_object = create_object(f, association)
+        end
+
+        html_options[:'data-association-insertion-template'] = CGI.escapeHTML(render_association(association, f, new_object, render_options, override_partial)).html_safe
 
         link_to(name, '#', html_options )
       end
@@ -86,12 +92,28 @@ module Cocoon
     def create_object(f, association)
       assoc = f.object.class.reflect_on_association(association)
 
-      if assoc.class.name == "Mongoid::Relations::Metadata"
-        conditions = assoc.respond_to?(:conditions) ? assoc.conditions.flatten : []
-        assoc.klass.new(*conditions)
+      assoc ? create_object_on_association(f, association, assoc) : create_object_on_non_association(f, association)
+    end
+
+    def get_partial_path(partial, association)
+      partial ? partial : association.to_s.singularize + "_fields"
+    end
+
+    private
+
+    def create_object_on_non_association(f, association)
+      builder_method = %W{build_#{association} build_#{association.to_s.singularize}}.select { |m| f.object.respond_to?(m) }.first
+      return f.object.send(builder_method) if builder_method
+      raise "Association #{association} doesn't exist on #{f.object.class}"
+    end
+
+    def create_object_on_association(f, association, instance)
+      if instance.class.name == "Mongoid::Relations::Metadata"
+        conditions = instance.respond_to?(:conditions) ? instance.conditions.flatten : []
+        instance.klass.new(*conditions)
       else
         # assume ActiveRecord or compatible
-        if assoc.collection?
+        if  instance.collection?
           f.object.send(association).build
         else
           f.object.send("build_#{association}")
@@ -99,9 +121,5 @@ module Cocoon
       end
     end
 
-    def get_partial_path(partial, association)
-      partial ? partial : association.to_s.singularize + "_fields"
-    end
-
   end
 end

data/spec/cocoon_spec.rb

@@ -21,19 +21,25 @@ describe Cocoon do
     context "without a block" do
       it "accepts a name" do
         result = @tester.link_to_add_association('add something', @form_obj, :comments)
-        result.to_s.should == '<a href="#" class="add_fields" data-association="comment" data-associations="comments" data-template="form&lt;tag&gt;">add something</a>'
+        result.to_s.should == '<a href="#" class="add_fields" data-association-insertion-template="form&lt;tag&gt;" data-association="comment" data-associations="comments">add something</a>'
       end
 
       it "accepts html options and pass them to link_to" do
         result = @tester.link_to_add_association('add something', @form_obj, :comments, {:class => 'something silly'})
-        result.to_s.should == '<a href="#" class="something silly add_fields" data-association="comment" data-associations="comments" data-template="form&lt;tag&gt;">add something</a>'
+        result.to_s.should == '<a href="#" class="something silly add_fields" data-association-insertion-template="form&lt;tag&gt;" data-association="comment" data-associations="comments">add something</a>'
       end
 
       it "allows to explicitly hand the wanted partial" do
         @tester.unstub(:render_association)
         @tester.should_receive(:render_association).with(anything(), anything(), anything(), anything(), "shared/partial").and_return('partiallll')
         result = @tester.link_to_add_association('add something', @form_obj, :comments, :partial => "shared/partial")
-        result.to_s.should == '<a href="#" class="add_fields" data-association="comment" data-associations="comments" data-template="partiallll">add something</a>'
+        result.to_s.should == '<a href="#" class="add_fields" data-association-insertion-template="partiallll" data-association="comment" data-associations="comments">add something</a>'
+      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), anything(), anything()).and_return('partiallll')
+        @tester.link_to_add_association('add something', @form_obj, :comments, :wrap_object => Proc.new {|comment| CommentDecorator.new(comment) })
       end
     end
 
@@ -42,14 +48,14 @@ describe Cocoon do
         result = @tester.link_to_add_association(@form_obj, :comments) do
           "some long name"
         end
-        result.to_s.should == '<a href="#" class="add_fields" data-association="comment" data-associations="comments" data-template="form&lt;tag&gt;">some long name</a>'
+        result.to_s.should == '<a href="#" class="add_fields" data-association-insertion-template="form&lt;tag&gt;" data-association="comment" data-associations="comments">some long name</a>'
       end
 
       it "accepts html options and pass them to link_to" do
         result = @tester.link_to_add_association(@form_obj, :comments, {:class => 'floppy disk'}) do
           "some long name"
         end
-        result.to_s.should == '<a href="#" class="floppy disk add_fields" data-association="comment" data-associations="comments" data-template="form&lt;tag&gt;">some long name</a>'
+        result.to_s.should == '<a href="#" class="floppy disk add_fields" data-association-insertion-template="form&lt;tag&gt;" data-association="comment" data-associations="comments">some long name</a>'
       end
 
       it "allows to explicitly hand the wanted partial" do
@@ -58,21 +64,21 @@ describe Cocoon do
         result = @tester.link_to_add_association( @form_obj, :comments, :class => 'floppy disk', :partial => "shared/partial") do
           "some long name"
         end
-        result.to_s.should == '<a href="#" class="floppy disk add_fields" data-association="comment" data-associations="comments" data-template="partiallll">some long name</a>'
+        result.to_s.should == '<a href="#" class="floppy disk add_fields" data-association-insertion-template="partiallll" data-association="comment" data-associations="comments">some long name</a>'
       end
     end
 
     context "with an irregular plural" do
       it "uses the correct plural" do
         result = @tester.link_to_add_association('add something', @form_obj, :people)
-        result.to_s.should == '<a href="#" class="add_fields" data-association="person" data-associations="people" data-template="form&lt;tag&gt;">add something</a>'
+        result.to_s.should == '<a href="#" class="add_fields" data-association-insertion-template="form&lt;tag&gt;" data-association="person" data-associations="people">add something</a>'
       end
     end
 
     context "when using aliased association and class-name" do
       it "uses the correct name" do
         result = @tester.link_to_add_association('add something', @form_obj, :admin_comments)
-        result.to_s.should == '<a href="#" class="add_fields" data-association="admin_comment" data-associations="admin_comments" data-template="form&lt;tag&gt;">add something</a>'
+        result.to_s.should == '<a href="#" class="add_fields" data-association-insertion-template="form&lt;tag&gt;" data-association="admin_comment" data-associations="admin_comments">add something</a>'
       end
     end
 
@@ -84,7 +90,7 @@ describe Cocoon do
       it "uses the correct plural" do
         @tester.should_receive(:render_association).with(:people, @form_obj, anything, {:wrapper => 'inline'}, nil)
         result = @tester.link_to_add_association('add something', @form_obj, :people, :render_options => {:wrapper => 'inline'})
-        result.to_s.should == '<a href="#" class="add_fields" data-association="person" data-associations="people" data-template="form&lt;tag&gt;">add something</a>'
+        result.to_s.should == '<a href="#" class="add_fields" data-association-insertion-template="form&lt;tag&gt;" data-association="person" data-associations="people">add something</a>'
       end
     end
 
@@ -94,14 +100,14 @@ describe Cocoon do
         @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")
         result = @tester.link_to_add_association('add something', @form_obj, :people, :render_options => {:wrapper => 'inline', :locals => {:alfred => 'Judoka'}})
-        result.to_s.should == '<a href="#" class="add_fields" data-association="person" data-associations="people" data-template="partiallll">add something</a>'
+        result.to_s.should == '<a href="#" class="add_fields" data-association-insertion-template="partiallll" data-association="person" data-associations="people">add something</a>'
       end
       it "if no locals are given it still works" 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")
         result = @tester.link_to_add_association('add something', @form_obj, :people, :render_options => {:wrapper => 'inline'})
-        result.to_s.should == '<a href="#" class="add_fields" data-association="person" data-associations="people" data-template="partiallll">add something</a>'
+        result.to_s.should == '<a href="#" class="add_fields" data-association-insertion-template="partiallll" data-association="person" data-associations="people">add something</a>'
       end
     end
 
@@ -116,7 +122,7 @@ describe Cocoon do
         @form_obj.should_receive(:semantic_fields_for)
         @form_obj.should_receive(:fields_for).never
         result = @tester.link_to_add_association('add something', @form_obj, :people)
-        result.to_s.should == '<a href="#" class="add_fields" data-association="person" data-associations="people" data-template="form&lt;tagzzz&gt;">add something</a>'
+        result.to_s.should == '<a href="#" class="add_fields" data-association-insertion-template="form&lt;tagzzz&gt;" data-association="person" data-associations="people">add something</a>'
 
       end
     end
@@ -132,7 +138,7 @@ describe Cocoon do
         @form_obj.should_receive(:simple_fields_for)
         @form_obj.should_receive(:fields_for).never
         result = @tester.link_to_add_association('add something', @form_obj, :people)
-        result.to_s.should == '<a href="#" class="add_fields" data-association="person" data-associations="people" data-template="form&lt;tagxxx&gt;">add something</a>'
+        result.to_s.should == '<a href="#" class="add_fields" data-association-insertion-template="form&lt;tagxxx&gt;" data-association="person" data-associations="people">add something</a>'
 
       end
     end
@@ -185,6 +191,22 @@ describe Cocoon do
         result = @tester.create_object(stub(:object => Comment.new), :post)
         result.should be_a Post
       end
+
+      it "should raise error if cannot reflect on association" do
+        expect { @tester.create_object(stub(:object => Comment.new), :not_existing) }.to raise_error /association/i
+      end
+
+      it "should create 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(stub(:object => object), :custom_item).should == 'custom'
+      end
+
+      it "should create 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(stub(:object => object), :custom_items).should == 'custom'
+      end
     end
 
     context "get_partial_path" do

data/spec/dummy/app/decorators/comment_decorator.rb

@@ -0,0 +1,17 @@
+class CommentDecorator
+  def initialize(comment)
+    @comment = comment
+  end
+
+  def formatted_created_at
+    @comment.created_at.to_formatted_s(:short)
+  end
+
+  def method_missing(method_sym, *args)
+    if @comment.respond_to?(method_sym)
+      @comment.send(method_sym, *args)
+    else
+      super
+    end
+  end
+end

metadata

@@ -1,181 +1,184 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cocoon
-version: !ruby/object:Gem::Version 
-  hash: 59
+version: !ruby/object:Gem::Version
+  version: 1.1.0
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 22
-  version: 1.0.22
 platform: ruby
-authors: 
+authors:
 - Nathan Van der Auwera
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-20 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-10-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
-  version_requirements: *id001
-  name: rails
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id002
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id003
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: json_pure
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id004
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: jeweler
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
-        version: 2.6.0
-  version_requirements: *id005
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec-rails
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.6.0
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.6.0
-  version_requirements: *id006
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.6.0
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
-  version_requirements: *id007
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+- !ruby/object:Gem::Dependency
   name: actionpack
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id008
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
   name: simplecov
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id009
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: generator_spec
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
-        version: 2.0.0
-  version_requirements: *id010
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :development
-description: Unobtrusive nested forms handling, using jQuery. Use this and discover cocoon-heaven.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    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
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.markdown
-files: 
+files:
 - .travis.yml
 - Gemfile
 - History.md
@@ -191,6 +194,7 @@ files:
 - spec/cocoon_spec.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/decorators/comment_decorator.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/models/comment.rb
 - spec/dummy/app/models/person.rb
@@ -232,36 +236,30 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/nathanvda/cocoon
 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 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -4012454906623253900
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: gem that enables easier nested forms with standard forms, formtastic and simple-form
+summary: gem that enables easier nested forms with standard forms, formtastic and
+  simple-form
 test_files: []
-