Simplify CollectionDecorator#find

lib/draper/collection_decorator.rb

@@ -1,4 +1,3 @@
-require 'active_support/core_ext/object/blank'
 module Draper
   class CollectionDecorator
     include Enumerable
@@ -28,13 +27,11 @@ module Draper
     end
     alias_method :to_ary, :decorated_collection
 
-    def find(ifnone_or_id = nil, &blk)
+    def find(*args, &block)
       if block_given?
-        decorated_collection.find(ifnone_or_id, &blk)
+        decorated_collection.find(*args, &block)
       else
-        obj = decorated_collection.first
+        decorator_class.find(*args)
-        return nil if obj.blank?
-        obj.class.find(ifnone_or_id)
       end
     end
 

spec/draper/collection_decorator_spec.rb

@@ -31,8 +31,8 @@ describe Draper::CollectionDecorator do
     context "without a block" do
       it "decorates Model.find" do
         source.should_not_receive(:find)
-        Product.should_receive(:find).with(1)
+        Product.should_receive(:find).with(1).and_return(:product)
-        subject.find(1)
+        subject.find(1).should == ProductDecorator.new(:product)
       end
     end
   end