draper 0.10.0 → 0.11.0

data/lib/draper.rb

@@ -7,5 +7,5 @@ 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)
+require 'draper/railtie'
 
-Draper::System.setup

data/lib/draper/base.rb

@@ -2,9 +2,10 @@ module Draper
   class Base
     require 'active_support/core_ext/class/attribute'
     class_attribute :denied, :allowed, :model_class
-    attr_accessor :context, :model
+    attr_accessor :model, :options
 
     DEFAULT_DENIED = Object.new.methods << :method_missing
+    DEFAULT_ALLOWED = []
     FORCED_PROXY = [:to_param, :id]
     FORCED_PROXY.each do |method|
       define_method method do |*args, &block|
@@ -12,6 +13,7 @@ module Draper
       end
     end
     self.denied = DEFAULT_DENIED
+    self.allowed = DEFAULT_ALLOWED
 
     # Initialize a new decorator instance by passing in
     # an instance of the source class. Pass in an optional
@@ -23,7 +25,7 @@ module Draper
       input.inspect # forces evaluation of a lazy query from AR
       self.class.model_class = input.class if model_class.nil?
       @model = input
-      self.context = options.fetch(:context, {})
+      self.options = options
     end
 
     # Proxies to the class specified by `decorates` to automatically
@@ -48,7 +50,8 @@ module Draper
     #
     # @param [Symbol] class_name snakecase name of the decorated class, like `:product`
     def self.decorates(input, options = {})
-      self.model_class = options[:class] || input.to_s.camelize.constantize
+      self.model_class = options[:class] || options[:class_name] || input.to_s.camelize
+      self.model_class = model_class.constantize if model_class.respond_to?(:constantize)
       model_class.send :include, Draper::ModelSupport
       define_method(input){ @model }
     end
@@ -61,13 +64,21 @@ module Draper
     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)
+
+        return orig_association if orig_association.nil?
+
+        return options[:with].decorate(orig_association) if options[:with]
+
+        if options[:polymorphic]
+          klass = orig_association.class
+        elsif model.class.respond_to?(:reflect_on_association) && model.class.reflect_on_association(association_symbol)
+          klass = model.class.reflect_on_association(association_symbol).klass
+        elsif orig_association.respond_to?(:first)
+          klass = orig_association.first.class
         else
-          reflection = model.class.reflect_on_association(association_symbol)
-          "#{reflection.klass}Decorator".constantize.decorate(orig_association)
+          klass = orig_association.class
         end
+        "#{klass}Decorator".constantize.decorate(orig_association, options)
       end
     end
 
@@ -88,7 +99,7 @@ module Draper
     # @param [Symbols*] methods to deny like `:find, :find_by_name`
     def self.denies(*input_denied)
       raise ArgumentError, "Specify at least one method (as a symbol) to exclude when using denies" if input_denied.empty?
-      raise ArgumentError, "Use either 'allows' or 'denies', but not both." if self.allowed?
+      raise ArgumentError, "Use either 'allows' or 'denies', but not both." unless (self.allowed == DEFAULT_ALLOWED)
       self.denied += input_denied
     end
 
@@ -104,7 +115,7 @@ module Draper
     def self.allows(*input_allows)
       raise ArgumentError, "Specify at least one method (as a symbol) to allow when using allows" if input_allows.empty?
       raise ArgumentError, "Use either 'allows' or 'denies', but not both." unless (self.denied == DEFAULT_DENIED)
-      self.allowed = input_allows
+      self.allowed += input_allows
     end
 
     # Initialize a new decorator instance by passing in
@@ -119,7 +130,10 @@ module Draper
     # @param [Object] instance(s) to wrap
     # @param [Hash] options (optional)
     def self.decorate(input, options = {})
-      if input.respond_to?(:each)
+      if input.instance_of?(self)
+        input.options = options unless options.empty?
+        return input
+      elsif input.respond_to?(:each)
         Draper::DecoratedEnumerableProxy.new(input, self, options)
       elsif options[:infer]
         input.decorator(options)
@@ -145,7 +159,7 @@ module Draper
     end
 
     # Access the helpers proxy to call built-in and user-defined
-    # Rails helpers. Aliased to `.h` for convinience.
+    # Rails helpers. Aliased to `.h` for convenience.
     #
     # @return [Object] proxy
     def helpers
@@ -153,6 +167,14 @@ module Draper
     end
     alias :h :helpers
 
+    # Localize is something that's used quite often. Even though
+    # it's available through helpers, that's annoying. Aliased
+    # to `.l` for convenience.
+    def localize(str)
+      self.class.helpers.localize(str)
+    end
+    alias :l :localize
+
     # Access the helpers proxy to call built-in and user-defined
     # Rails helpers from a class context.
     #
@@ -188,31 +210,52 @@ module Draper
     end
 
     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
+      super unless allow?(method)
+
+      if model.respond_to?(method)
+        self.class.send :define_method, method do |*args, &block|
+          model.send method, *args, &block
         end
+
+        send method, *args, &block
       else
         super
       end
+
+    rescue NoMethodError => no_method_error
+      super if no_method_error.name == method
+      raise no_method_error
     end
 
     def self.method_missing(method, *args, &block)
-      model_class.send(method, *args, &block)
+      if method.to_s.match(/^find_by.*/)
+        self.decorate(model_class.send(method, *args, &block))
+      else
+        model_class.send(method, *args, &block)
+      end
     end
 
     def self.respond_to?(method, include_private = false)
       super || model_class.respond_to?(method)
     end
 
+    def context
+      options.fetch(:context, {})
+    end
+
+    def context=(input)
+      options[:context] = input
+    end
+
+    def source
+      model
+    end
+    alias_method :to_source, :model
+
   private
+
     def allow?(method)
-      (!allowed? || allowed.include?(method) || FORCED_PROXY.include?(method)) && !denied.include?(method)
+      (allowed.empty? || allowed.include?(method) || FORCED_PROXY.include?(method)) && !denied.include?(method)
     end
   end
 end

data/lib/draper/decorated_enumerable_proxy.rb

@@ -21,7 +21,7 @@ module Draper
     def respond_to?(method)
       super || @wrapped_collection.respond_to?(method)
     end
-    
+
     def kind_of?(klass)
       super || @wrapped_collection.kind_of?(klass)
     end
@@ -38,5 +38,10 @@ module Draper
     def to_s
       "#<DecoratedEnumerableProxy of #{@klass} for #{@wrapped_collection.inspect}>"
     end
+
+    def source
+      @wrapped_collection
+    end
+    alias_method :to_source, :source
   end
 end

data/lib/draper/model_support.rb

@@ -8,8 +8,8 @@ module Draper::ModelSupport
 
   module ClassMethods
     def decorate(options = {})
-      @decorator_proxy ||= "#{model_name}Decorator".constantize.decorate(self.scoped, options)
-      block_given? ? yield(@decorator_proxy) : @decorator_proxy
+      decorator_proxy = "#{model_name}Decorator".constantize.decorate(self.scoped, options)
+      block_given? ? yield(decorator_proxy) : decorator_proxy
     end
   end
 

data/lib/draper/railtie.rb

@@ -0,0 +1,19 @@
+require 'rails/railtie'
+
+module Draper
+  class Railtie < Rails::Railtie
+
+    initializer "draper.extend_action_controller_base" do |app|
+      ActiveSupport.on_load(:action_controller) do
+        Draper::System.setup(:action_controller)
+      end
+    end
+
+    initializer "draper.extend_action_mailer_base" do |app|
+      ActiveSupport.on_load(:action_mailer) do
+        Draper::System.setup(:action_mailer)
+      end
+    end
+
+  end
+end

data/lib/draper/system.rb

@@ -1,9 +1,12 @@
 module Draper
   class System
-    def self.setup
-      ActionController::Base.send(:include, Draper::ViewContextFilter) if defined?(ActionController::Base)
-      ActionMailer::Base.send(:include, Draper::ViewContextFilter) if defined?(ActionMailer::Base)
-      ActionController::Base.send(:helper, Draper::HelperSupport) if defined?(ActionController::Base)
+    def self.setup(component)
+      if component == :action_controller
+        ActionController::Base.send(:include, Draper::ViewContextFilter)
+        ActionController::Base.extend(Draper::HelperSupport)
+      elsif component == :action_mailer
+        ActionMailer::Base.send(:include, Draper::ViewContextFilter)
+      end
     end
   end
 end

data/lib/draper/version.rb

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

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

@@ -1,5 +1,5 @@
 module Draper
-  class DecoratorGenerator < Rails::Generators::NamedBase
+  class DecoratorGenerator < Rails::Generators::Base
     desc <<-DESC
     Description:
         Generate a decorator for the given model.
@@ -7,15 +7,37 @@ module Draper
                     generates: "app/decorators/article_decorator"
                                "spec/decorators/article_decorator_spec"
     DESC
-    
+
+    argument :resource_name, :type => :string
+    class_option "test-framework", :type => :string, :default => "rspec", :aliases => "-t", :desc => "Test framework to be invoked"
+
     source_root File.expand_path('../templates', __FILE__)
 
     DECORATORS_ROOT = 'app/decorators/'
 
     def build_model_decorator
-      template 'decorator.rb', "#{DECORATORS_ROOT}#{singular_name}_decorator.rb"
+      template 'decorator.rb', "#{DECORATORS_ROOT}#{resource_name.singularize}_decorator.rb"
+    end
+
+    def build_decorator_tests
+      case options["test-framework"]
+        when "rspec"
+          build_decorator_spec
+        when "test_unit"
+          build_decorator_test
+      end
+    end
+
+    private
+    def build_decorator_spec
+      empty_directory 'spec/decorators'
+      template 'decorator_spec.rb', File.join('spec/decorators', "#{resource_name.singularize}_decorator_spec.rb")
+    end
+
+    def build_decorator_test
+      empty_directory 'test/decorators/'
+      template 'decorator_test.rb', File.join('test/decorators', "#{resource_name.singularize}_decorator_test.rb")
     end
 
-    hook_for :test_framework
   end
 end

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

@@ -1,5 +1,5 @@
-class <%= singular_name.camelize %>Decorator < ApplicationDecorator
-  decorates :<%= singular_name.to_sym %>
+class <%= resource_name.singularize.camelize %>Decorator < ApplicationDecorator
+  decorates :<%= resource_name.singularize.to_sym %>
 
   # Accessing Helpers
   #   You can access any helper via a proxy

data/lib/generators/{rspec → draper/decorator}/templates/decorator_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
 
-describe <%= singular_name.camelize %>Decorator do
+describe <%= resource_name.singularize.camelize %>Decorator do
   before { ApplicationController.new.set_current_view_context }
 end

data/lib/generators/{test_unit → draper/decorator}/templates/decorator_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class <%= singular_name.camelize %>DecoratorTest < ActiveSupport::TestCase
+class <%= resource_name.singularize.camelize %>DecoratorTest < ActiveSupport::TestCase
   def setup
     ApplicationController.new.set_current_view_context
   end

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

@@ -1,20 +1,20 @@
 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"
@@ -23,13 +23,13 @@ module Draper
           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')

data/lib/generators/rails/decorator_generator.rb

@@ -1,14 +1,14 @@
 require File.expand_path('../../draper/decorator/decorator_generator.rb', __FILE__)
 class Rails::DecoratorGenerator < Draper::DecoratorGenerator
-  
+
   source_root File.expand_path('../../draper/decorator/templates', __FILE__)
-  
+
   class_option :invoke_after_finished, :type => :string, :description => "Generator to invoke when finished"
 
   def build_model_and_application_decorators
     super
     if self.options[:invoke_after_finished]
-      Rails::Generators.invoke(self.options[:invoke_after_finished], [@name, @_initializer.first[1..-1]]) 
+      Rails::Generators.invoke(self.options[:invoke_after_finished], [@name, @_initializer.first[1..-1]])
     end
   end
 

data/performance/bechmark.rb

@@ -17,20 +17,20 @@ Benchmark.bm do |bm|
         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} ]"
@@ -39,13 +39,13 @@ Benchmark.bm do |bm|
         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

data/performance/decorators.rb

@@ -1,11 +1,11 @@
 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)
@@ -23,11 +23,11 @@ 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)