draper 0.9.5 → 0.10.0

data/Gemfile

@@ -2,8 +2,8 @@ source :rubygems
 
 gem 'rake'
 gem 'rspec', '~> 2.0'
-gem 'activesupport', '~> 3.0.10'
-gem 'actionpack', "~> 3.0.10", :require => 'action_view'
+gem 'activesupport', '~> 3.1.3'
+gem 'actionpack', "~> 3.1.3", :require => 'action_view'
 gem 'ammeter', '~> 0.1.3', :require => 'ammeter/init'
 gem 'guard'
 gem 'guard-rspec'

data/Readme.markdown

@@ -1,23 +1,25 @@
 # Draper: View Models for Rails
 
-![TravisCI Build Status](https://secure.travis-ci.org/jcasimir/draper.png)
+[![TravisCI Build Status](https://secure.travis-ci.org/jcasimir/draper.png)](http://travis-ci.org/jcasimir/draper)
+[![Gemnasium Build Status](https://gemnasium.com/jcasimir/draper.png)](https://gemnasium.com/jcasimir/draper)
 
 ## Quick Start
 
 1. Add `gem 'draper'` to your `Gemfile` and `bundle`
-2. Run `rails g draper:decorator YourModel`
-3. Edit `app/decorators/[your_model]_decorator.rb` using:
+2. Run `rails g draper:install` to create the directory and `ApplicationDecorator`
+3. Run `rails g draper:decorator YourModel`
+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`
-4. Put common decorations in `app/decorators/application.rb`  
-5. Wrap models in your controller with the decorator using:
+5. Put common decorations in `app/decorators/application.rb`  
+6. 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, 
     ex: `ArticleDecorator.decorate(Article.all)`
   3. `.new` method with single object
     ex: `ArticleDecorator.new(Article.first)`
-6. Output the instance methods in your view templates
+7. Output the instance methods in your view templates
   ex: `@article_decorator.created_at`
 
 ## Watch the RailsCast
@@ -209,7 +211,7 @@ When writing your controller actions, you have three options:
 * Call `.new` and pass in the object to be wrapped
 
 ```ruby
-ArticleDecorator.new(Article.find(params[:id]))`
+ArticleDecorator.new(Article.find(params[:id]))
 ```
 
 * Call `.decorate` and pass in an object or collection of objects to be wrapped:
@@ -219,7 +221,7 @@ ArticleDecorator.decorate(Article.first) # Returns one instance of ArticleDecora
 ArticleDecorator.decorate(Article.all)   # Returns an enumeration proxy of ArticleDecorator instances
 ```
   
-* Call `.find` to do automatically do a lookup on the `decorates` class:
+* Call `.find` to automatically do a lookup on the `decorates` class:
 
 ```ruby
 ArticleDecorator.find(1)
@@ -247,6 +249,15 @@ class ActicleMailer < ActionMailer::Base
   end
 end
 ```
+### Integration with RSpec
+
+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 run `ApplicationController.new.set_current_view_context` which makes 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. 
+
+Note: If you're using Spork, you need to `require 'draper/rspec_integration'` in your Spork.prefork block.
 
 ## Possible Decoration Methods
 
@@ -318,7 +329,6 @@ class ArticleDecorator < ApplicationDecorator
   end
 end
 ```
-
 ## Issues / Pending
 
 * Documentation

data/lib/draper.rb

@@ -6,5 +6,6 @@ require 'draper/model_support'
 require 'draper/helper_support'
 require 'draper/view_context'
 require 'draper/decorated_enumerable_proxy'
+require 'draper/rspec_integration' if defined?(RSpec) and RSpec.respond_to?(:configure)
 
-Draper::System.setup
+Draper::System.setup

data/lib/draper/base.rb

@@ -15,15 +15,15 @@ module Draper
 
     # Initialize a new decorator instance by passing in
     # an instance of the source class. Pass in an optional
-    # context is stored for later use.
+    # context inside the options hash is stored for later use.
     #
     # @param [Object] instance to wrap
-    # @param [Object] context (optional)
-    def initialize(input, context = {})
+    # @param [Hash] options (optional)
+    def initialize(input, options = {})
       input.inspect # forces evaluation of a lazy query from AR
       self.class.model_class = input.class if model_class.nil?
       @model = input
-      self.context = context
+      self.context = options.fetch(:context, {})
     end
 
     # Proxies to the class specified by `decorates` to automatically
@@ -31,8 +31,8 @@ module Draper
     #
     # @param [Symbol or String] id to lookup
     # @return [Object] instance of this decorator class
-    def self.find(input, context = {})
-      self.new(model_class.find(input), context)
+    def self.find(input, options = {})
+      self.new(model_class.find(input), options)
     end
 
     # Typically called within a decorator definition, this method
@@ -43,16 +43,42 @@ module Draper
     # But they don't have to match in name, so a `EmployeeDecorator`
     # class could call `decorates :person` to wrap instances of `Person`
     #
-    # This is primarilly set so the `.find` method knows which class 
+    # This is primarilly set so the `.find` method knows which class
     # to query.
     #
     # @param [Symbol] class_name snakecase name of the decorated class, like `:product`
-    def self.decorates(input)
-      self.model_class = input.to_s.camelize.constantize
+    def self.decorates(input, options = {})
+      self.model_class = options[:class] || input.to_s.camelize.constantize
       model_class.send :include, Draper::ModelSupport
       define_method(input){ @model }
     end
 
+    # Typically called within a decorator definition, this method causes
+    # the assocation to be decorated when it is retrieved.
+    #
+    # @param [Symbol] name of association to decorate, like `:products`
+    # @option opts [Class] :with The decorator to decorate the association with
+    def self.decorates_association(association_symbol, options = {})
+      define_method(association_symbol) do
+        orig_association = model.send(association_symbol)
+        return orig_association  if orig_association.nil?
+        if options[:with]
+          options[:with].decorate(orig_association)
+        else
+          reflection = model.class.reflect_on_association(association_symbol)
+          "#{reflection.klass}Decorator".constantize.decorate(orig_association)
+        end
+      end
+    end
+
+    # A convenience method for decorating multiple associations. Calls
+    # decorates_association on each of the given symbols.
+    #
+    # @param [Symbols*] name of associations to decorate
+    def self.decorates_associations(*association_symbols)
+      association_symbols.each{ |sym| decorates_association(sym) }
+    end
+
     # Specifies a black list of methods which may *not* be proxied to
     # to the wrapped object.
     #
@@ -83,7 +109,7 @@ module Draper
 
     # Initialize a new decorator instance by passing in
     # an instance of the source class. Pass in an optional
-    # context is stored for later use.
+    # context into the options hash is stored for later use.
     #
     # When passing in a single object, using `.decorate` is
     # identical to calling `.new`. However, `.decorate` can
@@ -91,31 +117,37 @@ module Draper
     # individually decorated objects.
     #
     # @param [Object] instance(s) to wrap
-    # @param [Object] context (optional)
-    def self.decorate(input, context = {})
-      input.respond_to?(:each) ? Draper::DecoratedEnumerableProxy.new(input, self, context) : new(input, context)
+    # @param [Hash] options (optional)
+    def self.decorate(input, options = {})
+      if input.respond_to?(:each)
+        Draper::DecoratedEnumerableProxy.new(input, self, options)
+      elsif options[:infer]
+        input.decorator(options)
+      else
+        new(input, options)
+      end
     end
-    
+
     # Fetch all instances of the decorated class and decorate them.
     #
-    # @param [Object] context (optional)
+    # @param [Hash] options (optional)
     # @return [Draper::DecoratedEnumerableProxy]
-    def self.all(context = {})
-      Draper::DecoratedEnumerableProxy.new(model_class.all, self, context)
+    def self.all(options = {})
+      Draper::DecoratedEnumerableProxy.new(model_class.all, self, options)
     end
-    
-    def self.first(context = {})
-      decorate(model_class.first, context)
+
+    def self.first(options = {})
+      decorate(model_class.first, options)
     end
 
-    def self.last(context = {})
-      decorate(model_class.last, context)
+    def self.last(options = {})
+      decorate(model_class.last, options)
     end
 
     # Access the helpers proxy to call built-in and user-defined
     # Rails helpers. Aliased to `.h` for convinience.
     #
-    # @return [Object] proxy   
+    # @return [Object] proxy
     def helpers
       self.class.helpers
     end
@@ -124,13 +156,13 @@ module Draper
     # Access the helpers proxy to call built-in and user-defined
     # Rails helpers from a class context.
     #
-    # @return [Object] proxy   
+    # @return [Object] proxy
     class << self
       def helpers
         Draper::ViewContext.current
       end
       alias :h :helpers
-    end    
+    end
 
     # Fetch the original wrapped model.
     #
@@ -141,11 +173,16 @@ module Draper
 
     # Delegates == to the decorated models
     #
-    # @return [Boolean] true if other's model == self's model 
+    # @return [Boolean] true if other's model == self's model
     def ==(other)
       @model == (other.respond_to?(:model) ? other.model : other)
     end
 
+    def kind_of?(klass)
+      super || model.kind_of?(klass)
+    end
+    alias :is_a? :kind_of?
+
     def respond_to?(method, include_private = false)
       super || (allow?(method) && model.respond_to?(method))
     end
@@ -153,7 +190,10 @@ module Draper
     def method_missing(method, *args, &block)
       if allow?(method)
         begin
-          model.send(method, *args, &block)
+          self.class.send :define_method, method do |*args, &block|
+            model.send(method, *args, &block)
+          end
+          self.send(method, *args, &block)
         rescue NoMethodError
           super
         end
@@ -161,11 +201,11 @@ module Draper
         super
       end
     end
-    
+
     def self.method_missing(method, *args, &block)
       model_class.send(method, *args, &block)
     end
-    
+
     def self.respond_to?(method, include_private = false)
       super || model_class.respond_to?(method)
     end
@@ -173,6 +213,6 @@ module Draper
   private
     def allow?(method)
       (!allowed? || allowed.include?(method) || FORCED_PROXY.include?(method)) && !denied.include?(method)
-    end    
+    end
   end
 end

data/lib/draper/decorated_enumerable_proxy.rb

@@ -2,16 +2,16 @@ module Draper
   class DecoratedEnumerableProxy
     include Enumerable
 
-    def initialize(collection, klass, context)
-      @wrapped_collection, @klass, @context = collection, klass, context
+    def initialize(collection, klass, options = {})
+      @wrapped_collection, @klass, @options = collection, klass, options
     end
 
     def each(&block)
-      @wrapped_collection.each { |member| block.call(@klass.new(member, @context)) }
+      @wrapped_collection.each { |member| block.call(@klass.decorate(member, @options)) }
     end
 
     def to_ary
-      @wrapped_collection.map { |member| @klass.new(member, @context) }
+      @wrapped_collection.map { |member| @klass.decorate(member, @options) }
     end
 
     def method_missing (method, *args, &block)
@@ -21,11 +21,20 @@ module Draper
     def respond_to?(method)
       super || @wrapped_collection.respond_to?(method)
     end
+    
+    def kind_of?(klass)
+      super || @wrapped_collection.kind_of?(klass)
+    end
+    alias :is_a? :kind_of?
 
     def ==(other)
       @wrapped_collection == other
     end
 
+    def [](index)
+      @klass.new(@wrapped_collection[index], @options)
+    end
+
     def to_s
       "#<DecoratedEnumerableProxy of #{@klass} for #{@wrapped_collection.inspect}>"
     end

data/lib/draper/model_support.rb

@@ -1,14 +1,14 @@
 module Draper::ModelSupport
-  def decorator
-    @decorator ||= "#{self.class.name}Decorator".constantize.decorate(self)
+  def decorator(options = {})
+    @decorator ||= "#{self.class.name}Decorator".constantize.decorate(self, options.merge(:infer => false))
     block_given? ? yield(@decorator) : @decorator
   end
-  
+
   alias :decorate :decorator
 
   module ClassMethods
-    def decorate(context = {})
-      @decorator_proxy ||= "#{model_name}Decorator".constantize.decorate(self.scoped)
+    def decorate(options = {})
+      @decorator_proxy ||= "#{model_name}Decorator".constantize.decorate(self.scoped, options)
       block_given? ? yield(@decorator_proxy) : @decorator_proxy
     end
   end

data/lib/draper/rspec_integration.rb

@@ -0,0 +1,22 @@
+module Draper
+  module DecoratorExampleGroup
+    extend ActiveSupport::Concern
+    included { metadata[:type] = :decorator }
+  end
+
+  RSpec.configure do |config|
+    # Automatically tag specs in specs/decorators as type: :decorator
+    config.include Draper::DecoratorExampleGroup, :type => :decorator, :example_group => {
+      :file_path => /spec[\\\/]decorators/
+    }
+
+    # Specs tagged type: :decorator set the Draper view context
+    config.around do |example|
+      if :decorator == example.metadata[:type]
+        ApplicationController.new.set_current_view_context
+      end
+      example.call
+    end
+  end
+end
+

data/lib/draper/version.rb

@@ -1,3 +1,3 @@
 module Draper
-  VERSION = "0.9.5"
+  VERSION = "0.10.0"
 end

data/lib/generators/draper/decorator/decorator_generator.rb

@@ -1,16 +1,18 @@
 module Draper
   class DecoratorGenerator < Rails::Generators::NamedBase
+    desc <<-DESC
+    Description:
+        Generate a decorator for the given model.
+        Example: rails g draper:decorator Article
+                    generates: "app/decorators/article_decorator"
+                               "spec/decorators/article_decorator_spec"
+    DESC
+    
     source_root File.expand_path('../templates', __FILE__)
 
     DECORATORS_ROOT = 'app/decorators/'
-    APPLICATION_DECORATOR = 'application_decorator.rb'
-    APPLICATION_DECORATOR_PATH = DECORATORS_ROOT + APPLICATION_DECORATOR
 
-    def build_model_and_application_decorators
-      empty_directory "app/decorators"
-      unless File.exists?(APPLICATION_DECORATOR_PATH)
-        template APPLICATION_DECORATOR, APPLICATION_DECORATOR_PATH
-      end
+    def build_model_decorator
       template 'decorator.rb', "#{DECORATORS_ROOT}#{singular_name}_decorator.rb"
     end
 

data/lib/generators/draper/decorator/templates/decorator.rb

@@ -6,9 +6,9 @@ class <%= singular_name.camelize %>Decorator < ApplicationDecorator
   #
   #   Normal Usage: helpers.number_to_currency(2)
   #   Abbreviated : h.number_to_currency(2)
-  #   
-  #   Or, optionally enable "lazy helpers" by calling this method:
-  #     lazy_helpers
+  #
+  #   Or, optionally enable "lazy helpers" by including this module:
+  #     include Draper::LazyHelpers
   #   Then use the helpers with no proxy:
   #     number_to_currency(2)
 
@@ -24,9 +24,9 @@ class <%= singular_name.camelize %>Decorator < ApplicationDecorator
   # Presentation Methods
   #   Define your own instance methods, even overriding accessors
   #   generated by ActiveRecord:
-  #   
+  #
   #   def created_at
-  #     h.content_tag :span, time.strftime("%a %m/%d/%y"), 
+  #     h.content_tag :span, time.strftime("%a %m/%d/%y"),
   #                   :class => 'timestamp'
   #   end
 end

data/lib/generators/draper/install/install_generator.rb

@@ -0,0 +1,39 @@
+module Draper
+  class InstallGenerator < Rails::Generators::Base
+    
+    desc <<-DESC
+    Description:
+        Generate application and spec decorators in your application.
+    DESC
+    
+    class_option "test-framework", :type => :string, :default => "rspec", :aliases => "-t", :desc => "Test framework to be invoked"
+    
+    source_root File.expand_path('../templates', __FILE__)
+
+    def build_application_decorator
+      empty_directory 'app/decorators'
+      template 'application_decorator.rb', File.join('app/decorators', 'application_decorator.rb')
+    end
+    
+    def build_decorator_tests
+      case options["test-framework"]
+        when "rspec"
+          build_application_decorator_spec
+        when "test_unit"
+          build_application_decorator_test
+      end
+    end
+    
+    private
+    def build_application_decorator_spec
+      empty_directory 'spec/decorators'
+      template 'application_decorator_spec.rb', File.join('spec/decorators', 'application_decorator_spec.rb')
+    end
+    
+    def build_application_decorator_test
+      empty_directory 'test/decorators/'
+      template 'application_decorator_test.rb', File.join('test/decorators', 'application_decorator_test.rb')
+    end
+
+  end
+end

data/lib/generators/draper/{decorator → install}/templates/application_decorator.rb

@@ -4,24 +4,24 @@ class ApplicationDecorator < Draper::Base
   #        ex: number_to_currency(model.price)
   #   CON: Add a bazillion methods into your decorator's namespace
   #        and probably sacrifice performance/memory
-  #  
+  #
   #   Enable them by uncommenting this line:
   #   lazy_helpers
 
   # Shared Decorations
   #   Consider defining shared methods common to all your models.
-  #   
+  #
   #   Example: standardize the formatting of timestamps
   #
   #   def formatted_timestamp(time)
-  #     h.content_tag :span, time.strftime("%a %m/%d/%y"), 
-  #                   :class => 'timestamp' 
+  #     h.content_tag :span, time.strftime("%a %m/%d/%y"),
+  #                   :class => 'timestamp'
   #   end
-  # 
+  #
   #   def created_at
   #     formatted_timestamp(model.created_at)
   #   end
-  # 
+  #
   #   def updated_at
   #     formatted_timestamp(model.updated_at)
   #   end

data/lib/generators/draper/install/templates/application_decorator_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+
+describe ApplicationDecorator do
+end

data/lib/generators/rspec/decorator_generator.rb

@@ -3,14 +3,8 @@ module Rspec
     source_root File.expand_path('../templates', __FILE__)
 
     SPEC_ROOT = 'spec/decorators/'
-    APPLICATION_DECORATOR_SPEC = 'application_decorator_spec.rb'
-    APPLICATION_DECORATOR_SPEC_PATH = SPEC_ROOT + APPLICATION_DECORATOR_SPEC
 
     def build_model_and_application_decorator_specs
-      empty_directory SPEC_ROOT
-      unless File.exists?(APPLICATION_DECORATOR_SPEC_PATH)
-        template APPLICATION_DECORATOR_SPEC, APPLICATION_DECORATOR_SPEC_PATH
-      end
       template 'decorator_spec.rb', "#{SPEC_ROOT}#{singular_name}_decorator_spec.rb"
     end
   end

data/lib/generators/test_unit/decorator_generator.rb

@@ -3,14 +3,8 @@ module TestUnit
     source_root File.expand_path('../templates', __FILE__)
 
     TEST_ROOT = 'test/decorators/'
-    APPLICATION_DECORATOR_TEST = 'application_decorator_test.rb'
-    APPLICATION_DECORATOR_TEST_PATH = TEST_ROOT + APPLICATION_DECORATOR_TEST
 
-    def build_model_and_application_decorator_tests
-      empty_directory TEST_ROOT
-      unless File.exists?(APPLICATION_DECORATOR_TEST_PATH)
-        template APPLICATION_DECORATOR_TEST, APPLICATION_DECORATOR_TEST_PATH
-      end
+    def build_model_decorator_tests
       template 'decorator_test.rb', "#{TEST_ROOT}#{singular_name}_decorator_test.rb"
     end
   end

data/performance/active_record.rb

@@ -0,0 +1,4 @@
+module ActiveRecord
+  class Base
+  end
+end

data/performance/bechmark.rb

@@ -0,0 +1,55 @@
+require 'rubygems'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+Bundler.require(:default) if defined?(Bundler)
+
+require "benchmark"
+require "draper"
+require "./performance/models"
+require "./performance/decorators"
+
+Benchmark.bm do |bm|
+  puts "\n[ Exclusivelly using #method_missing for model delegation ]"
+  [ 1_000, 10_000, 100_000 ].each do |i|
+    puts "\n[ #{i} ]"
+    bm.report("#new                 ") do
+      i.times do |n|
+        ProductDecorator.decorate(Product.new)
+      end
+    end
+    
+    bm.report("#hello_world         ") do
+      i.times do |n|
+        ProductDecorator.decorate(Product.new).hello_world
+      end
+    end
+    
+    bm.report("#sample_class_method ") do
+      i.times do |n|
+        ProductDecorator.decorate(Product.new).class.sample_class_method
+      end
+    end
+  end
+  
+  puts "\n[ Defining methods on method_missing first hit ]"
+  [ 1_000, 10_000, 100_000 ].each do |i|
+    puts "\n[ #{i} ]"
+    bm.report("#new                 ") do
+      i.times do |n|
+        FastProductDecorator.decorate(FastProduct.new)
+      end
+    end
+    
+    bm.report("#hello_world         ") do
+      i.times do |n|
+        FastProductDecorator.decorate(FastProduct.new).hello_world
+      end
+    end
+    
+    bm.report("#sample_class_method ") do
+      i.times do |n|
+        FastProductDecorator.decorate(FastProduct.new).class.sample_class_method
+      end
+    end
+  end
+end

data/performance/decorators.rb

@@ -0,0 +1,47 @@
+require "./performance/models"
+class ProductDecorator < Draper::Base
+  decorates :product
+  
+  def awesome_title
+    "Awesome Title"
+  end
+  
+  # Original #method_missing
+  def method_missing(method, *args, &block)
+    if allow?(method)
+      begin
+        model.send(method, *args, &block)
+      rescue NoMethodError
+        super
+      end
+    else
+      super
+    end
+  end
+
+end
+
+class FastProductDecorator < Draper::Base
+  decorates :product
+  
+  def awesome_title
+    "Awesome Title"
+  end
+  
+  # Modified #method_missing
+  def method_missing(method, *args, &block)
+    if allow?(method)
+      begin
+        self.class.send :define_method, method do |*args, &block|
+          model.send(method, *args, &block)
+        end
+        self.send(method, *args, &block)
+      rescue NoMethodError
+        super
+      end
+    else
+      super
+    end
+  end
+
+end

data/performance/models.rb

@@ -0,0 +1,20 @@
+require "./performance/active_record"
+class Product < ActiveRecord::Base
+  def self.sample_class_method
+    "sample class method"
+  end
+  
+  def hello_world
+    "Hello, World"
+  end
+end
+
+class FastProduct < ActiveRecord::Base
+  def self.sample_class_method
+    "sample class method"
+  end
+  
+  def hello_world
+    "Hello, World"
+  end
+end

data/spec/draper/base_spec.rb

@@ -58,6 +58,58 @@ describe Draper::Base do
       pd = ProductDecorator.new(source)
       pd.send(:product).should == source
     end
+
+    context("namespaced model supporting") do
+      let(:source){ Namespace::Product.new }
+
+      it "sets the model class for the decorator" do
+        decorator = Namespace::ProductDecorator.new(source)
+        decorator.model_class.should == Namespace::Product
+      end
+
+      it "creates a named accessor for the wrapped model" do
+        pd = Namespace::ProductDecorator.new(source)
+        pd.send(:product).should == source
+      end
+    end
+  end
+
+  context(".decorates_association") do
+    context "for collection associations" do
+      before(:each){ subject.class_eval{ decorates_association :similar_products } }
+      it "causes the association's method to return a collection of wrapped objects" do
+        subject.similar_products.each{ |decorated| decorated.should be_instance_of(ProductDecorator) }
+      end
+    end
+
+    context "for a singular association" do
+      before(:each){ subject.class_eval{ decorates_association :previous_version } }
+      it "causes the association's method to return a single wrapped object if the association is singular" do
+        subject.previous_version.should be_instance_of(ProductDecorator)
+      end
+
+      it "causes the association's method to return nil if the association is nil" do
+        source.stub(:previous_version){ nil }
+        subject.previous_version.should be_nil
+      end
+    end
+
+    context "with a specific decorator specified" do
+      before(:each){ subject.class_eval{ decorates_association :previous_version, :with => SpecificProductDecorator } }
+      it "causes the association to be decorated with the specified association" do
+        subject.previous_version.should be_instance_of(SpecificProductDecorator)
+      end
+    end
+  end
+
+  context('.decorates_associations') do
+    subject { Decorator }
+    it "decorates each of the associations" do
+      subject.should_receive(:decorates_association).with(:similar_products)
+      subject.should_receive(:decorates_association).with(:previous_version)
+
+      subject.decorates_associations :similar_products, :previous_version
+    end
   end
 
   context(".model / .to_model") do
@@ -121,7 +173,7 @@ describe Draper::Base do
     end
 
     it "should accept and store a context" do
-      pd = ProductDecorator.find(1, :admin)
+      pd = ProductDecorator.find(1, :context => :admin)
       pd.context.should == :admin
     end
   end
@@ -150,7 +202,7 @@ describe Draper::Base do
     context "with a context" do
       let(:context) {{ :some => 'data' }}
 
-      subject { Draper::Base.decorate(source, context) }
+      subject { Draper::Base.decorate(source, :context => context) }
 
       context "when given a collection of source objects" do
         let(:source) { [Product.new, Product.new] }
@@ -167,6 +219,47 @@ describe Draper::Base do
       end
     end
 
+    context "does not infer collections by default" do
+      subject { Draper::Base.decorate(source).to_ary }
+
+      let(:source) { [Product.new, Widget.new] }
+
+      it "returns a collection of wrapped objects all with the same decorator" do
+        subject.first.class.name.should eql 'Draper::Base'
+        subject.last.class.name.should eql  'Draper::Base'
+      end
+    end
+
+    context "does not infer single items by default" do
+      subject { Draper::Base.decorate(source) }
+
+      let(:source) { Product.new }
+
+      it "returns a decorator of the type explicity used in the call" do
+        subject.class.should eql Draper::Base
+      end
+    end
+
+    context "returns a collection containing only the explicit decorator used in the call" do
+      subject { Draper::Base.decorate(source, :infer => true).to_ary }
+
+      let(:source) { [Product.new, Widget.new] }
+
+      it "returns a mixed collection of wrapped objects" do
+        subject.first.class.should eql ProductDecorator
+        subject.last.class.should eql WidgetDecorator
+      end
+    end
+
+    context "when given a single object" do
+      subject { Draper::Base.decorate(source, :infer => true) }
+
+      let(:source) { Product.new }
+
+      it "can also infer its decorator" do
+        subject.class.should eql ProductDecorator
+      end
+    end
   end
 
   context('.==') do
@@ -175,7 +268,7 @@ describe Draper::Base do
       subject.should == other
     end
   end
-  
+
   context 'position accessors' do
     [:first, :last].each do |method|
       context "##{method}" do
@@ -188,9 +281,9 @@ describe Draper::Base do
         end
 
         it "should accept an optional context" do
-          ProductDecorator.send(method, :admin).context.should == :admin
+          ProductDecorator.send(method, :context => :admin).context.should == :admin
         end
-      end      
+      end
     end
   end
 
@@ -255,13 +348,38 @@ describe Draper::Base do
       subject_one.should_not == subject_two
     end
 
+    it "should allow decorated access by index" do
+      subject = ProductDecorator.decorate(paged_array)
+      subject[0].should be_instance_of ProductDecorator
+    end
+    
+    context "pretends to be of kind of wrapped collection class" do
+      subject { ProductDecorator.decorate(paged_array) }
+      
+      it "#kind_of? DecoratedEnumerableProxy" do
+        subject.should be_kind_of Draper::DecoratedEnumerableProxy
+      end
+
+      it "#is_a? DecoratedEnumerableProxy" do
+        subject.is_a?(Draper::DecoratedEnumerableProxy).should be_true
+      end
+
+      it "#kind_of? Array" do
+        subject.should be_kind_of Array
+      end
+
+      it "#is_a? Array" do
+        subject.is_a?(Array).should be_true
+      end
+    end
+
     context '#all' do
       it "should return a decorated collection" do
         ProductDecorator.all.first.should be_instance_of ProductDecorator
       end
-      
+
       it "should accept a context" do
-        collection = ProductDecorator.all(:admin)
+        collection = ProductDecorator.all(:context => :admin)
         collection.first.context.should == :admin
       end
     end
@@ -362,4 +480,41 @@ describe Draper::Base do
       decorator.sample_truncate.should == "Once..."
     end
   end
+  
+  describe "#method_missing" do
+    context "when #hello_world is called for the first time" do
+      it "hits method missing" do
+        subject.should_receive(:method_missing)
+        subject.hello_world
+      end
+    end
+    
+    context "when #hello_world is called again" do
+      before { subject.hello_world }
+      it "proxies method directly after first hit" do
+        subject.should_not_receive(:method_missing)
+        subject.hello_world
+      end
+    end
+  end
+
+  describe "#kind_of?" do
+    context "pretends to be of kind of model class" do      
+      it "#kind_of? decorator class" do
+        subject.should be_kind_of subject.class
+      end
+
+      it "#is_a? decorator class" do
+        subject.is_a?(subject.class).should be_true
+      end
+
+      it "#kind_of? source class" do
+        subject.should be_kind_of source.class
+      end
+
+      it "#is_a? source class" do
+        subject.is_a?(source.class).should be_true
+      end
+    end
+  end
 end

data/spec/draper/model_support_spec.rb

@@ -26,4 +26,14 @@ describe Draper::ModelSupport do
       subject.decorate.to_ary[0].model.should be_a(Product)
     end
   end
+
+  describe '#decorate - decorate collections of namespaced AR objects' do
+    subject { Namespace::Product.limit }
+    its(:decorate) { should be_kind_of(Draper::DecoratedEnumerableProxy) }
+
+    it "should decorate the collection" do
+      subject.decorate.size.should == 1
+      subject.decorate.to_ary[0].model.should be_a(Namespace::Product)
+    end
+  end
 end

data/spec/generators/draper/decorator/decorator_generator_spec.rb

@@ -12,12 +12,6 @@ describe Draper::DecoratorGenerator do
   describe 'no arguments' do
     before { run_generator %w(products)  }
 
-    describe 'app/decorators/application_decorator.rb' do
-      subject { file('app/decorators/application_decorator.rb') }
-      it { should exist }
-      it { should contain "class ApplicationDecorator < Draper::Base" }
-    end
-
     describe 'app/decorators/products_decorator.rb' do
       subject { file('app/decorators/products_decorator.rb') }
       it { should exist }

data/spec/generators/draper/install/install_generator_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+# Generators are not automatically loaded by Rails
+require 'generators/draper/install/install_generator'
+
+describe Draper::InstallGenerator do
+  # Tell the generator where to put its output (what it thinks of as Rails.root)
+  destination File.expand_path("../../../../../tmp", __FILE__)
+
+  before { prepare_destination }
+
+  context 'using rspec' do
+    before { run_generator }
+
+    shared_examples_for "ApplicationDecoratorGenerator" do
+      describe 'app/decorators/application_decorator.rb' do
+        subject { file('app/decorators/application_decorator.rb') }
+        it { should exist }
+        it { should contain "class ApplicationDecorator < Draper::Base" }
+      end
+    end
+    
+    describe 'spec/decorators/application_decorator_spec.rb' do
+      subject { file('spec/decorators/application_decorator_spec.rb') }
+      it { should exist }
+      it { should contain "describe ApplicationDecorator do" }
+    end
+  end
+  
+  context "using test_unit" do
+    before { run_generator ["", "-t=test_unit"]  }
+    
+    it_should_behave_like "ApplicationDecoratorGenerator"
+    
+    describe 'spec/decorators/application_decorator_spec.rb' do
+      subject { file('spec/decorators/application_decorator_spec.rb') }
+      it { should_not exist }
+    end
+    
+    describe 'spec/decorators/application_decorator_test.rb' do
+      subject { file('test/decorators/application_decorator_test.rb') }
+      it { should exist }
+    end
+  end
+
+end

data/spec/generators/rspec/decorator_generator_spec.rb

@@ -12,12 +12,6 @@ describe Rspec::DecoratorGenerator do
   describe 'no arguments' do
     before { run_generator %w(products)  }
 
-    describe 'spec/decorators/application_decorator_spec.rb' do
-      subject { file('spec/decorators/application_decorator_spec.rb') }
-      it { should exist }
-      it { should contain "describe ApplicationDecorator do" }
-    end
-
     describe 'spec/decorators/products_decorator_spec.rb' do
       subject { file('spec/decorators/products_decorator_spec.rb') }
       it { should exist }

data/spec/generators/test_unit/decorator_generator_spec.rb

@@ -12,12 +12,6 @@ describe TestUnit::DecoratorGenerator do
   describe 'no arguments' do
     before { run_generator %w(products)  }
 
-    describe 'test/decorators/application_decorator_test.rb' do
-      subject { file('test/decorators/application_decorator_test.rb') }
-      it { should exist }
-      it { should contain "class ApplicationDecoratorTest < ActiveSupport::TestCase" }
-    end
-
     describe 'test/decorators/products_decorator_test.rb' do
       subject { file('test/decorators/products_decorator_test.rb') }
       it { should exist }

data/spec/spec_helper.rb

@@ -2,4 +2,17 @@ require 'rubygems'
 require 'bundler/setup'
 Bundler.require
 
-Dir['./spec/support/**/*.rb'].each {|file| require file }
+require './spec/support/samples/active_record.rb'
+require './spec/support/samples/application_controller.rb'
+require './spec/support/samples/application_helper.rb'
+require './spec/support/samples/decorator.rb'
+require './spec/support/samples/decorator_with_allows.rb'
+require './spec/support/samples/decorator_with_application_helper.rb'
+require './spec/support/samples/decorator_with_denies.rb'
+require './spec/support/samples/namespaced_product.rb'
+require './spec/support/samples/namespaced_product_decorator.rb'
+require './spec/support/samples/product.rb'
+require './spec/support/samples/product_decorator.rb'
+require './spec/support/samples/specific_product_decorator.rb'
+require './spec/support/samples/widget.rb'
+require './spec/support/samples/widget_decorator.rb'

data/spec/support/samples/namespaced_product.rb

@@ -0,0 +1,51 @@
+require './spec/support/samples/product'
+
+module Namespace
+  class Product < ActiveRecord::Base
+    include Draper::ModelSupport
+
+    def self.first
+      @@first ||= Namespace::Product.new
+    end
+
+    def self.last
+      @@last ||= Namespace::Product.new
+    end
+
+    def self.all
+      [Namespace::Product.new, Namespace::Product.new]
+    end
+
+    def self.scoped
+      [Namespace::Product.new]
+    end
+
+    def self.model_name
+      "Namespace::Product"
+    end
+
+    def self.find(id)
+      return Namespace::Product.new
+    end
+
+    def self.sample_class_method
+      "sample class method"
+    end
+
+    def hello_world
+      "Hello, World"
+    end
+
+    def goodnight_moon
+      "Goodnight, Moon"
+    end
+
+    def title
+      "Sample Title"
+    end
+
+    def block
+      yield
+    end
+  end
+end

data/spec/support/samples/namespaced_product_decorator.rb

@@ -0,0 +1,7 @@
+require './spec/support/samples/namespaced_product'
+
+module Namespace
+  class ProductDecorator < Draper::Base
+    decorates :product, :class => Namespace::Product
+  end
+end

data/spec/support/samples/product.rb

@@ -44,4 +44,16 @@ class Product < ActiveRecord::Base
   def block
     yield
   end
+
+  def self.reflect_on_association(association_symbol)
+    OpenStruct.new(:klass => self)
+  end
+
+  def similar_products
+    [Product.new, Product.new]
+  end
+
+  def previous_version
+    Product.new
+  end
 end

data/spec/support/samples/specific_product_decorator.rb

@@ -0,0 +1,4 @@
+require './spec/support/samples/product_decorator'
+
+class SpecificProductDecorator < ProductDecorator
+end

data/spec/support/samples/widget.rb

@@ -0,0 +1,2 @@
+class Widget < Product
+end

data/spec/support/samples/widget_decorator.rb

@@ -0,0 +1,2 @@
+class WidgetDecorator < ProductDecorator
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: draper
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-29 00:00:00.000000000Z
+date: 2012-01-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70218782393040 !ruby/object:Gem::Requirement
+  requirement: &70130732077940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 2.3.10
   type: :runtime
   prerelease: false
-  version_requirements: *70218782393040
+  version_requirements: *70130732077940
 description: Draper implements a decorator or presenter pattern for Rails applications.
 email:
 - jeff@casimircreative.com
@@ -65,25 +65,32 @@ files:
 - lib/draper/helper_support.rb
 - lib/draper/lazy_helpers.rb
 - lib/draper/model_support.rb
+- lib/draper/rspec_integration.rb
 - lib/draper/system.rb
 - lib/draper/version.rb
 - lib/draper/view_context.rb
 - lib/generators/draper/decorator/USAGE
 - lib/generators/draper/decorator/decorator_generator.rb
-- lib/generators/draper/decorator/templates/application_decorator.rb
 - lib/generators/draper/decorator/templates/decorator.rb
+- lib/generators/draper/install/install_generator.rb
+- lib/generators/draper/install/templates/application_decorator.rb
+- lib/generators/draper/install/templates/application_decorator_spec.rb
+- lib/generators/draper/install/templates/application_decorator_test.rb
 - lib/generators/rails/decorator_generator.rb
 - lib/generators/rspec/decorator_generator.rb
-- lib/generators/rspec/templates/application_decorator_spec.rb
 - lib/generators/rspec/templates/decorator_spec.rb
 - lib/generators/test_unit/decorator_generator.rb
-- lib/generators/test_unit/templates/application_decorator_test.rb
 - lib/generators/test_unit/templates/decorator_test.rb
+- performance/active_record.rb
+- performance/bechmark.rb
+- performance/decorators.rb
+- performance/models.rb
 - spec/draper/base_spec.rb
 - spec/draper/helper_support_spec.rb
 - spec/draper/model_support_spec.rb
 - spec/draper/view_context_spec.rb
 - spec/generators/draper/decorator/decorator_generator_spec.rb
+- spec/generators/draper/install/install_generator_spec.rb
 - spec/generators/rspec/decorator_generator_spec.rb
 - spec/generators/test_unit/decorator_generator_spec.rb
 - spec/spec_helper.rb
@@ -94,8 +101,13 @@ files:
 - spec/support/samples/decorator_with_allows.rb
 - spec/support/samples/decorator_with_application_helper.rb
 - spec/support/samples/decorator_with_denies.rb
+- spec/support/samples/namespaced_product.rb
+- spec/support/samples/namespaced_product_decorator.rb
 - spec/support/samples/product.rb
 - spec/support/samples/product_decorator.rb
+- spec/support/samples/specific_product_decorator.rb
+- spec/support/samples/widget.rb
+- spec/support/samples/widget_decorator.rb
 homepage: http://github.com/jcasimir/draper
 licenses: []
 post_install_message: 
@@ -126,6 +138,7 @@ test_files:
 - spec/draper/model_support_spec.rb
 - spec/draper/view_context_spec.rb
 - spec/generators/draper/decorator/decorator_generator_spec.rb
+- spec/generators/draper/install/install_generator_spec.rb
 - spec/generators/rspec/decorator_generator_spec.rb
 - spec/generators/test_unit/decorator_generator_spec.rb
 - spec/spec_helper.rb
@@ -136,5 +149,11 @@ test_files:
 - spec/support/samples/decorator_with_allows.rb
 - spec/support/samples/decorator_with_application_helper.rb
 - spec/support/samples/decorator_with_denies.rb
+- spec/support/samples/namespaced_product.rb
+- spec/support/samples/namespaced_product_decorator.rb
 - spec/support/samples/product.rb
 - spec/support/samples/product_decorator.rb
+- spec/support/samples/specific_product_decorator.rb
+- spec/support/samples/widget.rb
+- spec/support/samples/widget_decorator.rb
+has_rdoc: 

data/lib/generators/rspec/templates/application_decorator_spec.rb

@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-describe ApplicationDecorator do
-  before { ApplicationController.new.set_current_view_context }
-end