Merge pull request #814 from akre54/reuse-model

allow a Model or Collection to be composed with reuse

src/chaplin/composer.coffee

@@ -80,7 +80,11 @@ module.exports = class Composer
         else
           return @_compose name, options: third, compose: ->
             # The compose method here just constructs the class.
-            @item = new second @options
+            # Model and Collection both take `options` as the second argument.
+            if second.prototype instanceof Backbone.Model or second.prototype instanceof Backbone.Collection
+              @item = new second null, @options
+            else
+              @item = new second @options
 
             # Render this item if it has a render method and it either
             # doesn't have an autoRender property or that autoRender

test/spec/composer_spec.coffee

@@ -179,6 +179,13 @@ define [
 
       mediator.publish 'dispatcher:dispatch'
 
+    it 'should allow a model to be composed with options', ->
+      mediator.execute 'composer:compose', 'spy', Model, { collection: 2 }
+
+      expect(composer.compositions['spy'].item.collection).to.be 2
+
+      mediator.publish 'dispatcher:dispatch'
+
     it 'should allow a composition to be composed', ->
       spy = sinon.spy()