Merge pull request drapergem#530 from haines/decorating_unsaved_associations

Fix decoration of unsaved collection associations

Author: steveklabnik

lib/draper/factory.rb

@@ -59,7 +59,11 @@ def decorator
       attr_reader :decorator_class, :source
 
       def source_decorator
-        ->(source, options) { source.decorate(options) }
+        if collection?
+          ->(source, options) { source.decorator_class.decorate_collection(source, options.reverse_merge(with: nil))}
+        else
+          ->(source, options) { source.decorate(options) }
+        end
       end
 
       def decorator_method(klass)

spec/draper/factory_spec.rb

@@ -213,13 +213,15 @@ module Draper
 
         context "when decorator_class is unspecified" do
           context "and the source is decoratable" do
-            it "returns the source's #decorate method" do
+            it "returns the .decorate_collection method from the source's decorator" do
               source = []
-              options = {foo: "bar"}
+              decorator_class = Class.new(Decorator)
+              source.stub decorator_class: decorator_class
+              source.stub decorate: nil
               worker = Factory::Worker.new(nil, source)
 
-              source.should_receive(:decorate).with(options).and_return(:decorated)
-              expect(worker.decorator.call(source, options)).to be :decorated
+              decorator_class.should_receive(:decorate_collection).with(source, foo: "bar", with: nil).and_return(:decorated)
+              expect(worker.decorator.call(source, foo: "bar")).to be :decorated
             end
           end