draper 0.18.0 → 1.0.0

data/lib/draper/railtie.rb

@@ -3,8 +3,10 @@ require 'rails/railtie'
 module ActiveModel
   class Railtie < Rails::Railtie
     generators do |app|
-      Rails::Generators.configure!(app.config.generators)
-      require "generators/resource_override"
+      app ||= Rails.application # Rails 3.0.x does not yield `app`
+
+      Rails::Generators.configure! app.config.generators
+      require 'generators/resource_override'
     end
   end
 end
@@ -12,40 +14,44 @@ end
 module Draper
   class Railtie < Rails::Railtie
 
-    ##
-    # The `app/decorators` path is eager loaded
-    #
-    # This is the standard "Rails Way" to add paths from which constants
-    # can be loaded.
-    #
     config.after_initialize do |app|
-      app.config.paths.add 'app/decorators', :eager_load => true
+      app.config.paths.add 'app/decorators', eager_load: true
+
+      unless Rails.env.production?
+        require 'draper/test_case'
+        require 'draper/test/rspec_integration' if defined?(RSpec) and RSpec.respond_to?(:configure)
+        require 'draper/test/minitest_integration' if defined?(MiniTest::Rails)
+      end
     end
 
-    initializer "draper.extend_action_controller_base" do |app|
-      ActiveSupport.on_load(:action_controller) do
-        Draper::System.setup_action_controller(self)
+    initializer "draper.setup_action_controller" do |app|
+      ActiveSupport.on_load :action_controller do
+        Draper.setup_action_controller self
       end
     end
 
-    initializer "draper.extend_action_mailer_base" do |app|
-      ActiveSupport.on_load(:action_mailer) do
-        Draper::System.setup_action_mailer(self)
+    initializer "draper.setup_action_mailer" do |app|
+      ActiveSupport.on_load :action_mailer do
+        Draper.setup_action_mailer self
       end
     end
 
-    initializer "draper.extend_active_record_base" do |app|
-      ActiveSupport.on_load(:active_record) do
-        self.send(:include, Draper::ModelSupport)
+    initializer "draper.setup_orm" do |app|
+      [:active_record, :mongoid].each do |orm|
+        ActiveSupport.on_load orm do
+          Draper.setup_orm self
+        end
       end
     end
 
     console do
       require 'action_controller/test_case'
       ApplicationController.new.view_context
-      Draper::ViewContext.current.controller.request ||= ActionController::TestRequest.new
-      Draper::ViewContext.current.request            ||= Draper::ViewContext.current.controller.request
-      Draper::ViewContext.current.params             ||= {}
+      Draper::ViewContext.build_view_context
+    end
+
+    rake_tasks do
+      Dir[File.join(File.dirname(__FILE__),'tasks/*.rake')].each { |f| load f }
     end
   end
 end

data/lib/draper/tasks/test.rake

@@ -0,0 +1,22 @@
+require 'rake/testtask'
+
+test_task = if Rails.version.to_f < 3.2
+  require 'rails/test_unit/railtie'
+  Rake::TestTask
+else
+  require 'rails/test_unit/sub_test_task'
+  Rails::SubTestTask
+end
+
+namespace :test do
+  test_task.new(:decorators => "test:prepare") do |t|
+    t.libs << "test"
+    t.pattern = "test/decorators/**/*_test.rb"
+  end
+end
+
+if Rake::Task.task_defined?('test:run')
+  Rake::Task['test:run'].enhance do
+    Rake::Task['test:decorators'].invoke
+  end
+end

data/lib/draper/test/devise_helper.rb

@@ -0,0 +1,34 @@
+module Draper
+  module DeviseHelper
+    def sign_in(user)
+      warden.stub :authenticate! => user
+      controller.stub :current_user => user
+      user
+    end
+
+    private
+
+    def request
+      @request ||= ::ActionDispatch::TestRequest.new
+    end
+
+    def controller
+      return @controller if @controller
+      @controller = ApplicationController.new
+      @controller.request = request
+      ::Draper::ViewContext.current = @controller.view_context
+      @controller
+    end
+
+    # taken from Devise's helper but uses the request method instead of @request
+    #   and we don't really need the rest of their helper
+    def warden
+      @warden ||= begin
+        manager = Warden::Manager.new(nil) do |config|
+          config.merge! Devise.warden_config
+        end
+        request.env['warden'] = Warden::Proxy.new(request.env, manager)
+      end
+    end
+  end
+end

data/lib/draper/test/minitest_integration.rb

@@ -1,7 +1,6 @@
-class MiniTest::Rails::ActiveSupport::TestCase
-  # Use AS::TestCase for the base class when describing a decorator
+class Draper::TestCase
   register_spec_type(self) do |desc|
-    desc < Draper::Base if desc.is_a?(Class)
+    desc < Draper::Decorator || desc < Draper::CollectionDecorator if desc.is_a?(Class)
   end
   register_spec_type(/Decorator( ?Test)?\z/i, self)
 end

data/lib/draper/test/rspec_integration.rb

@@ -1,22 +1,12 @@
 module Draper
   module DecoratorExampleGroup
+    include Draper::TestCase::Behavior
     extend ActiveSupport::Concern
+
     included { metadata[:type] = :decorator }
   end
-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/
-  }
-
-end
-
-if defined?(Capybara)
-  require 'capybara/rspec/matchers'
 
   RSpec.configure do |config|
-    config.include Capybara::RSpecMatchers, :type => :decorator
+    config.include DecoratorExampleGroup, example_group: {file_path: %r{spec/decorators}}, type: :decorator
   end
 end

data/lib/draper/test_case.rb

@@ -0,0 +1,33 @@
+module Draper
+  begin
+    require 'minitest/rails'
+  rescue LoadError
+  end
+
+  active_support_test_case = begin
+    require 'minitest/rails/active_support' # minitest-rails < 0.5
+    ::MiniTest::Rails::ActiveSupport::TestCase
+  rescue LoadError
+    require 'active_support/test_case'
+    ::ActiveSupport::TestCase
+  end
+
+  class TestCase < active_support_test_case
+    module Behavior
+      if defined?(::Devise)
+        require 'draper/test/devise_helper'
+        include Draper::DeviseHelper
+      end
+
+      if defined?(::Capybara) && (defined?(::RSpec) || defined?(::MiniTest::Matchers))
+        require 'capybara/rspec/matchers'
+        include ::Capybara::RSpecMatchers
+      end
+
+      include Draper::ViewHelpers::ClassMethods
+      alias_method :helper, :helpers
+    end
+
+    include Behavior
+  end
+end

data/lib/draper/version.rb

@@ -1,3 +1,3 @@
 module Draper
-  VERSION = "0.18.0"
+  VERSION = "1.0.0"
 end

data/lib/draper/view_context.rb

@@ -1,36 +1,31 @@
+require 'request_store'
+
 module Draper
   module ViewContext
+    def view_context
+      super.tap do |context|
+        Draper::ViewContext.current = context
+      end
+    end
+
     def self.current_controller
-      Thread.current[:current_controller] || ApplicationController.new
+      RequestStore.store[:current_controller] || ApplicationController.new
     end
 
     def self.current_controller=(controller)
-      Thread.current[:current_controller] = controller
+      RequestStore.store[:current_controller] = controller
     end
 
     def self.current
-      Thread.current[:current_view_context] ||= build_view_context
+      RequestStore.store[:current_view_context] ||= build_view_context
     end
 
     def self.current=(context)
-      Thread.current[:current_view_context] = context
+      RequestStore.store[:current_view_context] = context
     end
 
-    def view_context
-      super.tap do |context|
-        Draper::ViewContext.current = context
-      end
-    end
-
-    private
-
     def self.build_view_context
       current_controller.view_context.tap do |context|
-        context.instance_eval do
-          def url_options
-            ActionMailer::Base.default_url_options
-          end
-        end unless context.request
         if defined?(ActionController::TestRequest)
           context.controller.request ||= ActionController::TestRequest.new
           context.request            ||= context.controller.request

data/lib/draper/view_helpers.rb

@@ -0,0 +1,37 @@
+module Draper
+  # Provides the {#helpers} method used in {Decorator} and {CollectionDecorator}
+  # to call the Rails helpers.
+  module ViewHelpers
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+
+      # Access the helpers proxy to call built-in and user-defined
+      # Rails helpers from a class context.
+      #
+      # @return [HelperProxy] the helpers proxy
+      def helpers
+        @helpers ||= Draper::HelperProxy.new
+      end
+      alias_method :h, :helpers
+
+    end
+
+    # Access the helpers proxy to call built-in and user-defined
+    # Rails helpers. Aliased to `h` for convenience.
+    #
+    # @return [HelperProxy] the helpers proxy
+    def helpers
+      self.class.helpers
+    end
+    alias_method :h, :helpers
+
+    # Alias for `helpers.localize`, since localize is something that's used
+    # quite often. Further aliased to `l` for convenience.
+    def localize(*args)
+      helpers.localize(*args)
+    end
+    alias_method :l, :localize
+
+  end
+end

data/lib/draper.rb

@@ -1,16 +1,55 @@
 require 'action_view'
 
 require 'draper/version'
-require 'draper/system'
-require 'draper/active_model_support'
-require 'draper/base'
+require 'draper/view_helpers'
+require 'draper/delegation'
+require 'draper/automatic_delegation'
+require 'draper/finders'
+require 'draper/decorator'
+require 'draper/helper_proxy'
 require 'draper/lazy_helpers'
-require 'draper/model_support'
+require 'draper/decoratable'
+require 'draper/decorated_association'
 require 'draper/helper_support'
 require 'draper/view_context'
-require 'draper/decorated_enumerable_proxy'
+require 'draper/collection_decorator'
 require 'draper/railtie' if defined?(Rails)
 
-# Test Support
-require 'draper/test/rspec_integration'    if defined?(RSpec) and RSpec.respond_to?(:configure)
-require 'draper/test/minitest_integration' if defined?(MiniTest::Rails)
+require 'active_support/core_ext/hash/keys'
+
+module Draper
+  def self.setup_action_controller(base)
+    base.class_eval do
+      include Draper::ViewContext
+      extend  Draper::HelperSupport
+      before_filter ->(controller) {
+        Draper::ViewContext.current = nil
+        Draper::ViewContext.current_controller = controller
+      }
+    end
+  end
+
+  def self.setup_action_mailer(base)
+    base.class_eval do
+      include Draper::ViewContext
+    end
+  end
+
+  def self.setup_orm(base)
+    base.class_eval do
+      include Draper::Decoratable
+    end
+  end
+
+  class UninferrableDecoratorError < NameError
+    def initialize(klass)
+      super("Could not infer a decorator for #{klass}.")
+    end
+  end
+
+  class UninferrableSourceError < NameError
+    def initialize(klass)
+      super("Could not infer a source for #{klass}.")
+    end
+  end
+end

data/lib/generators/decorator/decorator_generator.rb

@@ -20,9 +20,17 @@ module Rails
         elsif defined?(ApplicationDecorator)
           "ApplicationDecorator"
         else
-          "Draper::Base"
+          "Draper::Decorator"
         end
       end
-   end
+
+      	
+      # Rails 3.0.X compatibility, stolen from https://github.com/jnunemaker/mongomapper/pull/385/files#L1R32
+      unless methods.include?(:module_namespacing)
+        def module_namespacing(&block)
+          yield if block
+        end
+      end
+    end
   end
 end

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

@@ -1,34 +1,19 @@
-<% module_namespacing do -%>
+<%- module_namespacing do -%>
+  <%- if parent_class_name.present? -%>
 class <%= class_name %>Decorator < <%= parent_class_name %>
-  decorates :<%= singular_name %>
+  <%- else -%>
+class <%= class_name %>
+  <%- end -%>
+  delegate_all
 
-  # Accessing Helpers
-  #   You can access any helper via a proxy
-  #
-  #   Normal Usage: helpers.number_to_currency(2)
-  #   Abbreviated : h.number_to_currency(2)
-  #
-  #   Or, optionally enable "lazy helpers" by including this module:
-  #     include Draper::LazyHelpers
-  #   Then use the helpers with no proxy:
-  #     number_to_currency(2)
-
-  # Defining an Interface
-  #   Control access to the wrapped subject's methods using one of the following:
-  #
-  #   To allow only the listed methods (whitelist):
-  #     allows :method1, :method2
-  #
-  #   To allow everything except the listed methods (blacklist):
-  #     denies :method1, :method2
-
-  # Presentation Methods
-  #   Define your own instance methods, even overriding accessors
-  #   generated by ActiveRecord:
+  # Define presentation-specific methods here. Helpers are accessed through
+  # `helpers` (aka `h`). You can override attributes, for example:
   #
   #   def created_at
-  #     h.content_tag :span, attributes["created_at"].strftime("%a %m/%d/%y"),
-  #                   :class => 'timestamp'
+  #     helpers.content_tag :span, class: 'time' do
+  #       source.created_at.strftime("%a %m/%d/%y")
+  #     end
   #   end
+
 end
 <% end -%>

data/lib/generators/mini_test/decorator_generator.rb

@@ -0,0 +1,20 @@
+require 'generators/mini_test'
+
+module MiniTest
+  module Generators
+    class DecoratorGenerator < Base
+      def self.source_root
+        File.expand_path('../templates', __FILE__)
+      end
+
+      class_option :spec, :type => :boolean, :default => false, :desc => "Use MiniTest::Spec DSL"
+
+      check_class_collision suffix: "DecoratorTest"
+
+      def create_test_file
+        template_type = options[:spec] ? "spec" : "test"
+        template "decorator_#{template_type}.rb", File.join("test/decorators", class_path, "#{singular_name}_decorator_test.rb")
+      end
+    end
+  end
+end

data/lib/generators/mini_test/templates/decorator_spec.rb

@@ -0,0 +1,4 @@
+require 'minitest_helper'
+
+describe <%= class_name %>Decorator do
+end

data/lib/generators/mini_test/templates/decorator_test.rb

@@ -0,0 +1,4 @@
+require 'minitest_helper'
+
+class <%= class_name %>DecoratorTest < Draper::TestCase
+end

data/lib/generators/test_unit/templates/decorator_test.rb

@@ -1,4 +1,4 @@
 require 'test_helper'
 
-class <%= class_name %>DecoratorTest < ActiveSupport::TestCase
+class <%= class_name %>DecoratorTest < Draper::TestCase
 end