draper 0.17.0 → 1.0.0.beta2

data/.gitignore

@@ -6,8 +6,11 @@ pkg/*
 coverage.data
 coverage/*
 .yardoc
+doc/*
 tmp
 vendor/bundle
 *.swp
 *.swo
 *.DS_Store
+spec/dummy/log/*
+spec/dummy/db/*.sqlite3

data/.travis.yml

@@ -1,4 +1,9 @@
+language: ruby
 rvm:
   - 1.9.3
   - rbx-19mode
   - jruby-19mode
+  - ruby-head
+matrix:
+  allow_failures:
+    - rvm: ruby-head

data/CHANGELOG.markdown

@@ -1,5 +1,54 @@
 # Draper Changelog
 
+## 1.0.0.beta2
+
+* `has_finders` is now `decorates_finders`. [https://github.com/haines/draper/commit/33f18aa062e0d3848443dbd81047f20d5665579f](https://github.com/haines/draper/commit/33f18aa062e0d3848443dbd81047f20d5665579f)
+
+* If a finder method is used, and the source class is not set and cannot be inferred, an `UninferrableSourceError` is raised. [https://github.com/haines/draper/commit/8ef5bf2f02f7033e3cd4f1f5de7397b02c984fe3](https://github.com/haines/draper/commit/8ef5bf2f02f7033e3cd4f1f5de7397b02c984fe3)
+
+* Class methods are now properly delegated again. [https://github.com/haines/draper/commit/731995a5feac4cd06cf9328d2892c0eca9992db6](https://github.com/haines/draper/commit/731995a5feac4cd06cf9328d2892c0eca9992db6)
+
+* We no longer `respond_to?` private methods on the source. [https://github.com/haines/draper/commit/18ebac81533a6413aa20a3c26f23e91d0b12b031](https://github.com/haines/draper/commit/18ebac81533a6413aa20a3c26f23e91d0b12b031)
+
+* Rails versioning relaxed to support Rails 4 [https://github.com/drapergem/draper/commit/8bfd393b5baa7aa1488076a5e2cb88648efaa815](https://github.com/drapergem/draper/commit/8bfd393b5baa7aa1488076a5e2cb88648efaa815)
+
+## 1.0.0.beta1
+
+* Renaming `Draper::Base` to `Draper::Decorator`. This is the most significant
+  change you'll need to upgrade your application. [https://github.com/drapergem/draper/commit/025742cb3b295d259cf0ecf3669c24817d6f2df1](https://github.com/drapergem/draper/commit/025742cb3b295d259cf0ecf3669c24817d6f2df1)
+* Added an internal Rails application for integration tests. This won't affect
+  your application, but we're now running a set of Cucumber tests inside of a
+  Rails app in both development and production mode to help ensure that we
+  don't make changes that break Draper. [https://github.com/drapergem/draper/commit/90a4859085cab158658d23d77cd3108b6037e36f](https://github.com/drapergem/draper/commit/90a4859085cab158658d23d77cd3108b6037e36f)
+* Add `#decorated?` method. This gives us a free RSpec matcher,
+  `is_decorated?`. [https://github.com/drapergem/draper/commit/834a6fd1f24b5646c333a04a99fe9846a58965d6](https://github.com/drapergem/draper/commit/834a6fd1f24b5646c333a04a99fe9846a58965d6)
+* `#decorates` is no longer needed inside your models, and should be removed.
+  Decorators automatically infer the class they decorate. [https://github.com/drapergem/draper/commit/e1214d97b62f2cab45227cc650029734160dcdfe](https://github.com/drapergem/draper/commit/e1214d97b62f2cab45227cc650029734160dcdfe)
+* Decorators do not automatically come with 'finders' by default. If you'd like
+  to use `SomeDecorator.find(1)`, for example, simply add `#has_finders` to
+  the decorator to include them. [https://github.com/drapergem/draper/commit/42b6f78fda4f51845dab4d35da68880f1989d178](https://github.com/drapergem/draper/commit/42b6f78fda4f51845dab4d35da68880f1989d178)
+* To refer to the object being decorated, `#source` is now the preferred
+  method. [https://github.com/drapergem/draper/commit/1e84fcb4a0eab0d12f5feda6886ce1caa239cb16](https://github.com/drapergem/draper/commit/1e84fcb4a0eab0d12f5feda6886ce1caa239cb16)
+* `ActiveModel::Serialization` is included in Decorators if you've requred
+  `ActiveModel::Serializers`, so that decorators can be serialized. [https://github.com/drapergem/draper/commit/c4b352799067506849abcbf14963ea36abda301c](https://github.com/drapergem/draper/commit/c4b352799067506849abcbf14963ea36abda301c)
+* Properly support Test::Unit [https://github.com/drapergem/draper/commit/087e134ed0885ec11325ffabe8ab2bebef77a33a](https://github.com/drapergem/draper/commit/087e134ed0885ec11325ffabe8ab2bebef77a33a)
+
+And many small bug fixes and refactorings.
+
+## 0.18.0
+
+* [Adds the ability to decorate an enumerable proxy](https://github.com/drapergem/draper/commit/67c7125192740a7586a3a635acd735ae01b97837)
+
+* Many bug fixes.
+
+* Last version of Draper in the 0.x series.
+
+## 0.17.0
+
+* [Fix earlier fix of `view_context` priming](https://github.com/jcasimir/draper/commit/5da44336)
+* [Add `denies_all`](https://github.com/jcasimir/draper/commit/148e732)
+* [Properly proxy associations with regard to `find`](https://github.com/jcasimir/draper/commit/d46d19205e)
+
 ## 0.16.0
 
 * [Automatically prime `view_context`](https://github.com/jcasimir/draper/commit/057ab4e8)

data/Gemfile

@@ -1,3 +1,7 @@
 source :rubygems
 
 gemspec
+
+gem "sqlite3", :platforms => :ruby
+
+gem "activerecord-jdbcsqlite3-adapter",   :platforms => :jruby

data/Rakefile

@@ -1,47 +1,66 @@
-require 'bundler/gem_tasks'
 require 'rake'
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
-RCOV = RUBY_VERSION.to_f == 1.8
+def run_in_dummy_app(command)
+  success = system("cd spec/dummy && #{command}")
+  raise "#{command} failed" unless success
+end
+
+task "default" => "ci"
+
+desc "Run all tests for CI"
+task "ci" => "spec"
 
-namespace :spec do
+desc "Run all specs"
+task "spec" => "spec:all"
 
-  RSpec::Core::RakeTask.new(:coverage) do |t|
-    t.pattern = 'spec/**/*_spec.rb'
+namespace "spec" do
+  task "all" => ["draper", "generators", "minitest-rails", "integration"]
 
-    if RCOV
-      t.rcov = true
-      t.rcov_opts = '--exclude osx\/objc,spec,gems\/'
+  def spec_task(name)
+    desc "Run #{name} specs"
+    RSpec::Core::RakeTask.new(name) do |t|
+      t.pattern = "spec/#{name}/**/*_spec.rb"
     end
   end
 
-  RSpec::Core::RakeTask.new(:normal) do |t|
-    t.pattern ='spec/**/*_spec.rb'
-    t.rcov = false
-  end
+  spec_task "draper"
+  spec_task "generators"
+  spec_task "minitest-rails"
 
-  namespace :coverage do
-    desc "Cleanup coverage data"
-    task :cleanup do
-      rm_rf 'coverage.data'
-      rm_rf 'coverage'
-    end
+  desc "Run integration specs"
+  task "integration" => ["db:setup", "integration:all"]
 
-    desc "Browse the code coverage report."
-    task :report => ["spec:coverage:cleanup", "spec:coverage"] do
-      if RCOV
-        require "launchy"
-        Launchy.open("coverage/index.html")
-      else
-        require 'cover_me'
-        CoverMe.complete!
+  namespace "integration" do
+    task "all" => ["development", "production", "test"]
+
+    ["development", "production"].each do |environment|
+      task environment do
+        Rake::Task["spec:integration:run"].execute environment
       end
     end
-  end
 
-end
+    task "run" do |t, environment|
+      puts "Running integration specs in #{environment}"
+
+      ENV["RAILS_ENV"] = environment
+      success = system("rspec spec/integration")
 
-desc "RSpec tests"
-task "spec" => "spec:normal"
+      raise "Integration specs failed in #{environment}" unless success
+    end
 
-task "default" => "spec"
+    task "test" do
+      run_in_dummy_app "rake"
+    end
+  end
+end
+
+namespace "db" do
+  desc "Set up databases for integration testing"
+  task "setup" do
+    run_in_dummy_app "rm -f db/*.sqlite3"
+    run_in_dummy_app "RAILS_ENV=development rake db:schema:load db:seed db:test:prepare"
+    run_in_dummy_app "RAILS_ENV=production rake db:schema:load db:seed"
+  end
+end

data/Readme.markdown

@@ -1,55 +1,34 @@
 # Draper: View Models for Rails
 
-[![TravisCI Build Status](https://secure.travis-ci.org/jcasimir/draper.png)](http://travis-ci.org/jcasimir/draper)
+[![TravisCI Build Status](https://secure.travis-ci.org/drapergem/draper.png?branch=master)](http://travis-ci.org/drapergem/draper)
+[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/drapergem/draper)
 
 ## Quick Start
 
 1. Add `gem 'draper'` to your `Gemfile` and `bundle`
 2. When you generate a resource with `rails g resource YourModel`, you get a decorator automatically!
-3. If YourModel exists, run `rails g decorator YourModel`
+3. If `YourModel` already exists, run `rails g decorator YourModel` to create `YourModelDecorator`
 4. Edit `app/decorators/[your_model]_decorator.rb` using:
   1. `h` to proxy to Rails/application helpers like `h.current_user`
-  2. `[your_model]` to access the wrapped object like `article.created_at`
+  2. the name of your decorated model to access the wrapped object like `article.created_at`
 5. Wrap models in your controller with the decorator using:
-  1. `.find` automatic lookup & wrap
-    ex: `ArticleDecorator.find(1)`
-  2. `.decorate` method with single object or collection, 
+  1. `.decorate` method with a single object or collection,
     ex: `ArticleDecorator.decorate(Article.all)`
-  3. `.new` method with single object
+  2. `.new` method with single object
     ex: `ArticleDecorator.new(Article.first)`
-6. Output the instance methods in your view templates
-  ex: `@article_decorator.created_at`
+6. Call decorator methods from your view templates
+  ex: `<%= @article_decorator.created_at %>`
 
 If you need common methods in your decorators, create an `app/decorators/application_decorator.rb`:
 
 ``` ruby
-class ApplicationDecorator < Draper::Base
+class ApplicationDecorator < Draper::Decorator
   # your methods go here
 end
 ```
 
 and make your decorators inherit from it. Newly generated decorators will respect this choice and inherit from `ApplicationDecorator`.
 
-## Watch the RailsCast
-
-Ryan Bates has put together an excellent RailsCast on Draper based on the 0.8.0 release:
-
-[![RailsCast #286](https://img.skitch.com/20111021-dgxmqntq22d37fthky6pttk59n.jpg "RailsCast #286 - Draper")](http://railscasts.com/episodes/286-draper)
-
-## What's New
-
-Check out the full commit history at http://github.com/jcasimir/draper/commits
-
-In summary, you can now:
-
-* [Namespace the `decorates` call](https://github.com/jcasimir/draper/commit/1c3d5667b8406b80b490d876257379087b129f92)
-* [Use your decorators with CanCan](https://github.com/jcasimir/draper/commit/ac1f3083989107d877e2b1c918c3a3e792db99e8)
-* [Use a more generalized `options` hash in decorator initialization](https://github.com/jcasimir/draper/commit/03910877d0461356da0968a87346592908f292a7)
-* [Get better performance by generating methods](https://github.com/jcasimir/draper/commit/ebe30511b79eac82276413ca7ae54a4a4d86d4dc)
-* [Automatically decorate associated objects](https://github.com/jcasimir/draper/commit/1580baa287997ed4e356aae0ffeeb8fe9c326ced) See Example near bottom of Readme
-
-Thanks to [steveklabnik](http://github.com/steveklabnik), [i0rek](http://github.com/i0rek), [laserlemon](http://github.com/laserlemon), [michaelfairley](http://github.com/michaelfairley), [dnagir](http://github.com/dnagir), [ubermajestix](http://github.com/ubermajestix), [tmaier](http://github.com/tmaier), [angelim](http://github.com/angelim), [duncanbeevers](http://github.com/duncanbeevers), Albert Peng & JR Boyens, [leocassarani](http://github.com/leocassarani), [Jeff Felchner](http://github.com/Felchner), [shingara](http://github.com/shingara), [momolog](http://github.com/momolog), and [ayamomiji](http://github.com/ayamomiji) for their contributions to this version!
-
 ## Goals
 
 This gem makes it easy to apply the decorator pattern to domain models in a Rails application. This pattern gives you three wins:
@@ -65,9 +44,7 @@ Why hate normal helpers? In Ruby/Rails we approach everything from an Object-Ori
 A decorator wraps an object with presentation-related accessor methods. For instance, if you had an `Article` object, then the decorator could override `.published_at` to use formatted output like this:
 
 ```ruby
-class ArticleDecorator < Draper::Base
-  decorates :article
-
+class ArticleDecorator < Draper::Decorator
   def published_at
     date = h.content_tag(:span, article.published_at.strftime("%A, %B %e").squeeze(" "), :class => 'date')
     time = h.content_tag(:span, article.published_at.strftime("%l:%M%p"), :class => 'time').delete(" ")
@@ -88,8 +65,6 @@ When you use a decorator you have the power of a Ruby object but it's a part of
 
 ```ruby
 class ArticleDecorator < ApplicationDecorator
-  decorates :article
-  
   ADMIN_VISIBLE_ATTRIBUTES = [:title, :body, :author, :status]
   PUBLIC_VISIBLE_ATTRIBUTES = [:title, :body]
 
@@ -110,7 +85,6 @@ The `denies` method takes a blacklist approach. For instance:
 
 ```ruby
 class ArticleDecorator < ApplicationDecorator
-  decorates :article
   denies :title
 end
 ```
@@ -118,11 +92,19 @@ end
 Then, to test it:
 
 ```irb
- > ad = ArticleDecorator.find(1)
- => #<ArticleDecorator:0x000001020d7728 @model=#<Article id: 1, title: "Hello, World">> 
+ > ad = ArticleDecorator.new(Article.find(1))
+ => #<ArticleDecorator:0x000001020d7728 @model=#<Article id: 1, title: "Hello, World">>
  > ad.title
 NoMethodError: undefined method `title' for #<ArticleDecorator:0x000001020d7728>
-``` 
+```
+
+You may also blacklist all methods by using `denies_all`:
+
+```ruby
+class ArticleDecorate < ApplicationDecorator
+  denies_all
+end
+```
 
 #### Using `allows`
 
@@ -130,14 +112,13 @@ A better approach is to define a whitelist using `allows`:
 
 ```ruby
 class ArticleDecorator < ApplicationDecorator
-  decorates :article
   allows :title, :description
 end
 ```
 
 ```irb
-> ad = ArticleDecorator.find(1)
-=> #<ArticleDecorator:0x000001020d7728 @model=#<Article id: 1, title: "Hello, World">> 
+> ad = ArticleDecorator.new(Article.find(1))
+=> #<ArticleDecorator:0x000001020d7728 @model=#<Article id: 1, title: "Hello, World">>
 > ad.title
 => "Hello, World"
 > ad.created_at
@@ -166,14 +147,12 @@ rails generate decorator article
 
 ### Writing Methods
 
-Open the decorator model (ex: `app/decorators/article_decorator.rb`) and add normal instance methods. To access the wrapped source object, use a method named after the `decorates` argument:
+Open the decorator model (ex: `app/decorators/article_decorator.rb`) and add normal instance methods. To access the wrapped source object, use the `model` method:
 
 ```ruby
-class ArticleDecorator < Draper::Base
-  decorates :article
-  
+class ArticleDecorator < Draper::Decorator
   def author_name
-    article.author.first_name + " " + article.author.last_name
+    model.author.first_name + " " + model.author.last_name
   end
 end
 ```
@@ -183,9 +162,7 @@ end
 You probably want to make use of Rails helpers and those defined in your application. Use the `helpers` or `h` method proxy:
 
 ```ruby
-class ArticleDecorator < Draper::Base
-  decorates :article
-  
+class ArticleDecorator < Draper::Decorator
   def published_at
     date = h.content_tag(:span, article.published_at.strftime("%A, %B %e").squeeze(" "), :class => 'date')
     time = h.content_tag(:span, article.published_at.strftime("%l:%M%p"), :class => 'time').delete(" ")
@@ -199,10 +176,9 @@ end
 Hate seeing that `h.` proxy all over? Willing to mix a bazillion methods into your decorator? Then try lazy helpers:
 
 ```ruby
-class ArticleDecorator < Draper::Base
-  decorates :article
+class ArticleDecorator < Draper::Decorator
   include Draper::LazyHelpers
-  
+
   def published_at
     date = content_tag(:span, article.published_at.strftime("%A, %B %e").squeeze(" "), :class => 'date')
     time = content_tag(:span, article.published_at.strftime("%l:%M%p"), :class => 'time').delete(" ")
@@ -227,12 +203,6 @@ ArticleDecorator.new(Article.find(params[:id]))
 ArticleDecorator.decorate(Article.first) # Returns one instance of ArticleDecorator
 ArticleDecorator.decorate(Article.all)   # Returns an enumeration proxy of ArticleDecorator instances
 ```
-  
-* Call `.find` to automatically do a lookup on the `decorates` class:
-
-```ruby
-ArticleDecorator.find(1)
-```
 
 ### In Your Views
 
@@ -244,11 +214,11 @@ Use the new methods in your views like any other model method (ex: `@article.pub
 
 ### Integration with RSpec
 
-Using the provided generator, Draper will place specs for your new decorator in `spec/decorators/`. 
+Using the provided generator, Draper will place specs for your new decorator in `spec/decorators/`.
 
 By default, specs in `spec/decorators` will be tagged as `type => :decorator`. Any spec tagged as `decorator` will make helpers available to the decorator.
 
-If your decorator specs live somewhere else, which they shouldn't, make sure to tag them with `type => :decorator`. If you don't tag them, Draper's helpers won't be available to your decorator while testing. 
+If your decorator specs live somewhere else, which they shouldn't, make sure to tag them with `type => :decorator`. If you don't tag them, Draper's helpers won't be available to your decorator while testing.
 
 Note: If you're using Spork, you need to `require 'draper/test/rspec_integration'` in your Spork.prefork block.
 
@@ -260,7 +230,13 @@ Here are some ideas of what you might do in decorator methods:
 * Format dates and times using `strftime`
 * Implement a commonly used representation of the data object like a `.name` method that combines `first_name` and `last_name` attributes
 
-## Example Using a Decorator
+## Learning Resources
+
+### RailsCast
+
+Ryan Bates has put together an excellent RailsCast on Draper based on the 0.8.0 release: http://railscasts.com/episodes/286-draper
+
+### Example Using a Decorator
 
 For a brief tutorial with sample project, check this out: http://tutorials.jumpstartlab.com/topics/decorators.html
 
@@ -296,9 +272,9 @@ end
 Then you need to perform the wrapping in your controller. Here's the simplest method:
 
 ```ruby
-class ArticlesController < Draper::Decorator
+class ArticlesController < ApplicationController
   def show
-    @article = ArticleDecorator.find params[:id]
+    @article = ArticleDecorator.new(Article.find(params[:id]))
   end
 end
 ```
@@ -312,9 +288,7 @@ Then within your views you can utilize both the normal data methods and your new
 Ta-da! Object-oriented data formatting for your view layer. Below is the complete decorator with extra comments removed:
 
 ```ruby
-class ArticleDecorator < Draper::Base
-  decorates :article
-  
+class ArticleDecorator < Draper::Decorator
   def published_at
     date = h.content_tag(:span, article.published_at.strftime("%A, %B %e").squeeze(" "), :class => 'date')
     time = h.content_tag(:span, article.published_at.strftime("%l:%M%p"), :class => 'time').delete(" ")
@@ -328,14 +302,11 @@ end
 Add a `decorates_association :association_name` to gain access to a decorated version of your target association.
 
 ```ruby
-class ArticleDecorator < Draper::Base
-  decorates :article
-  decorates_association :author # belongs_to :author association  
+class ArticleDecorator < Draper::Decorator
+  decorates_association :author # belongs_to :author association
 end
 
-class AuthorDecorator < Draper::Base
-  decorates :author
-  
+class AuthorDecorator < Draper::Decorator
   def fancy_name
     "#{model.title}. #{model.first_name} #{model.middle_name[0]}. #{model.last_name}"
   end
@@ -360,7 +331,6 @@ end
 
 # app/decorators/user_decorator.rb
 class UserDecorator < ApplicationDecorator
-  decorates :user
 end
 ```
 
@@ -380,29 +350,30 @@ For automatic decoration, check out [decorates_before_rendering](https://github.
 4. Push to the branch (`git push origin my_awesome_branch`)
 5. Send pull request
 
-## Issues / Pending
-
-* Documentation
-  * Add more information about using "context"
-  * Add information about the `.decorator` method
-  * Make clear the pattern of overriding accessor methods of the wrapped model  
-  * Build sample Rails application(s)
-* Generators
-  * Implement hook so generating a controller/scaffold generates a decorator  
-  * Add generators for...
-    * `draper:model`: Model + Decorator
-    * `draper:controller`: Controller setup with decoration calls
-    * `draper:scaffold`: Controller, Model, Decorator, Views, Tests
-* Other
-  * Implement a HATEOAS helper, maybe as a separate gem
-  * Build a fly website like http://fabricationgem.com
+## Running tests
+
+If it's the first time you want to run the tests, start by creating the dummy database:
+
+```
+$ rake db:migrate
+```
+
+You can then run tests by executing `rake`.
+
+## Contributors
+
+Draper was conceived by Jeff Casimir and heavily refined by Steve Klabnik and a great community of open source contributors.
+
+### Core Team
+
+* Jeff Casimir (jeff@jumpstartlab.com)
+* Steve Klabnik (steve@jumpstartlab.com)
+* Vasiliy Ermolovich
 
 ## License
 
 (The MIT License)
 
-Copyright © 2011 Jeff Casimir
-
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ‘Software’), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

data/draper.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = Draper::VERSION
   s.authors     = ["Jeff Casimir", "Steve Klabnik"]
   s.email       = ["jeff@casimircreative.com", "steve@steveklabnik.com"]
-  s.homepage    = "http://github.com/jcasimir/draper"
+  s.homepage    = "http://github.com/drapergem/draper"
   s.summary     = "Decorator pattern implementation for Rails."
   s.description = "Draper implements a decorator or presenter pattern for Rails applications."
   s.rubyforge_project = "draper"
@@ -16,12 +16,14 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'activesupport', '~> 3.2'
-  s.add_dependency 'actionpack', '~> 3.2'
+  s.add_dependency 'activesupport', '>= 3.2'
+  s.add_dependency 'actionpack', '>= 3.2'
 
-  s.add_development_dependency 'ammeter', '0.2.2'
+  s.add_development_dependency 'ammeter'
   s.add_development_dependency 'rake', '~> 0.9.2'
   s.add_development_dependency 'rspec', '~> 2.10'
   s.add_development_dependency 'yard'
+  s.add_development_dependency 'minitest-rails', '~> 0.2'
   s.add_development_dependency 'minitest', '~> 3.0' if RUBY_PLATFORM == "java"
+  s.add_development_dependency 'capybara'
 end

data/lib/draper/collection_decorator.rb

@@ -0,0 +1,88 @@
+module Draper
+  class CollectionDecorator
+    include Enumerable
+    include ViewHelpers
+
+    attr_accessor :source, :options, :decorator_class
+    alias_method :to_source, :source
+
+    delegate :as_json, *(Array.instance_methods - Object.instance_methods), to: :decorated_collection
+
+    # @param source collection to decorate
+    # @param options [Hash] passed to each item's decorator (except
+    #   for the keys listed below)
+    # @option options [Class,Symbol] :with the class used to decorate
+    #   items, or `:infer` to call each item's `decorate` method instead
+    def initialize(source, options = {})
+      @source = source
+      @decorator_class = options.delete(:with) || self.class.inferred_decorator_class
+      @options = options
+    end
+
+    class << self
+      alias_method :decorate, :new
+    end
+
+    def decorated_collection
+      @decorated_collection ||= source.collect {|item| decorate_item(item) }
+    end
+
+    def find(*args, &block)
+      if block_given?
+        decorated_collection.find(*args, &block)
+      else
+        decorator_class.find(*args)
+      end
+    end
+
+    def method_missing(method, *args, &block)
+      source.send(method, *args, &block)
+    end
+
+    def respond_to?(method, include_private = false)
+      super || source.respond_to?(method, include_private)
+    end
+
+    def kind_of?(klass)
+      super || source.kind_of?(klass)
+    end
+    alias_method :is_a?, :kind_of?
+
+    def ==(other)
+      source == (other.respond_to?(:source) ? other.source : other)
+    end
+
+    def to_s
+      "#<CollectionDecorator of #{decorator_class} for #{source.inspect}>"
+    end
+
+    def options=(options)
+      each {|item| item.options = options }
+      @options = options
+    end
+
+    protected
+
+    def decorate_item(item)
+      if decorator_class == :infer
+        item.decorate(options)
+      else
+        decorator_class.decorate(item, options)
+      end
+    end
+
+    def self.inferred_decorator_class
+      decorator_name = "#{name.chomp("Decorator").singularize}Decorator"
+      decorator_uninferrable if decorator_name == name
+
+      decorator_name.constantize
+
+    rescue NameError
+      decorator_uninferrable
+    end
+
+    def self.decorator_uninferrable
+      raise Draper::UninferrableDecoratorError.new(self)
+    end
+  end
+end

data/lib/draper/decoratable.rb

@@ -0,0 +1,44 @@
+module Draper::Decoratable
+  extend ActiveSupport::Concern
+
+  def decorate(options = {})
+    decorator_class.decorate(self, options)
+  end
+
+  def decorator_class
+    self.class.decorator_class
+  end
+
+  def applied_decorators
+    []
+  end
+
+  def decorated_with?(decorator_class)
+    false
+  end
+
+  def decorated?
+    false
+  end
+
+  def ===(other)
+    super || (other.respond_to?(:source) && super(other.source))
+  end
+
+  module ClassMethods
+    def decorate(options = {})
+      decorator_class.decorate_collection(self.scoped, options)
+    end
+
+    def decorator_class
+      prefix = respond_to?(:model_name) ? model_name : name
+      "#{prefix}Decorator".constantize
+    rescue NameError
+      raise Draper::UninferrableDecoratorError.new(self)
+    end
+
+    def ===(other)
+      super || (other.respond_to?(:source) && super(other.source))
+    end
+  end
+end