draper 3.0.0.pre1 → 3.0.0

data/lib/draper/tasks/test.rake

@@ -2,7 +2,7 @@ require 'rake/testtask'
 require 'rails/test_unit/railtie'
 
 namespace :test do
-  Rake::TestTask.new(:decorators => "test:prepare") do |t|
+  Rake::TestTask.new(decorators: "test:prepare") do |t|
     t.libs << "test"
     t.pattern = "test/decorators/**/*_test.rb"
   end

data/lib/draper/test/devise_helper.rb

@@ -1,14 +1,7 @@
 module Draper
   module DeviseHelper
     def sign_in(resource_or_scope, resource = nil)
-      scope = begin
-        Devise::Mapping.find_scope!(resource_or_scope)
-      rescue RuntimeError => e
-        # Draper 1.0 didn't require the mapping to exist
-        ActiveSupport::Deprecation.warn("#{e.message}.\nUse `sign_in :user, mock_user` instead.", caller)
-        :user
-      end
-
+      scope = Devise::Mapping.find_scope!(resource_or_scope)
       _stub_current_scope scope, resource || resource_or_scope
     end
 

data/lib/draper/undecorate.rb

@@ -6,4 +6,12 @@ module Draper
       object
     end
   end
+  
+  def self.undecorate_chain(object)
+    if object.respond_to?(:decorated?) && object.decorated?
+      undecorate_chain(object.object)
+    else
+      object
+    end
+  end
 end

data/lib/draper/version.rb

@@ -1,3 +1,3 @@
 module Draper
-  VERSION = "3.0.0.pre1"
+  VERSION = '3.0.0'
 end

data/lib/draper/view_context.rb

@@ -20,8 +20,10 @@ module Draper
       RequestStore.store[:current_controller]
     end
 
-    # Sets the current controller.
+    # Sets the current controller. Clears view context when we are setting
+    # different controller.
     def self.controller=(controller)
+      clear! if RequestStore.store[:current_controller] != controller
       RequestStore.store[:current_controller] = controller
     end
 
@@ -82,23 +84,5 @@ module Draper
     def self.build_strategy
       @build_strategy ||= Draper::ViewContext::BuildStrategy.new(:full)
     end
-
-    # @deprecated Use {controller} instead.
-    def self.current_controller
-      ActiveSupport::Deprecation.warn("Draper::ViewContext.current_controller is deprecated (use controller instead)", caller)
-      self.controller || ApplicationController.new
-    end
-
-    # @deprecated Use {controller=} instead.
-    def self.current_controller=(controller)
-      ActiveSupport::Deprecation.warn("Draper::ViewContext.current_controller= is deprecated (use controller instead)", caller)
-      self.controller = controller
-    end
-
-    # @deprecated Use {build} instead.
-    def self.build_view_context
-      ActiveSupport::Deprecation.warn("Draper::ViewContext.build_view_context is deprecated (use build instead)", caller)
-      build
-    end
   end
 end

data/lib/draper/view_context/build_strategy.rb

@@ -37,10 +37,19 @@ module Draper
         attr_reader :block
 
         def controller
-          (Draper::ViewContext.controller || ApplicationController.new).tap do |controller|
-            controller.request ||= ActionController::TestRequest.create
+          Draper::ViewContext.controller ||= Draper.default_controller.new
+          Draper::ViewContext.controller.tap do |controller|
+            controller.request ||= new_test_request controller if defined?(ActionController::TestRequest)
           end
         end
+
+        def new_test_request(controller)
+          is_above_rails_5_1 ? ActionController::TestRequest.create(controller) : ActionController::TestRequest.create
+        end
+
+        def is_above_rails_5_1
+          ActionController::TestRequest.method(:create).parameters.first == [:req, :controller_class]
+        end
       end
 
     end

data/lib/generators/controller_override.rb

@@ -5,13 +5,13 @@ require "rails/generators/rails/scaffold_controller/scaffold_controller_generato
 module Rails
   module Generators
     class ControllerGenerator
-      hook_for :decorator, default: true do |generator|
+      hook_for :decorator, type: :boolean, default: true do |generator|
         invoke generator, [name.singularize]
       end
     end
 
     class ScaffoldControllerGenerator
-      hook_for :decorator, default: true
+      hook_for :decorator, type: :boolean, default: true
     end
   end
 end

data/lib/generators/draper/install_generator.rb

@@ -0,0 +1,14 @@
+module Draper
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      source_root File.expand_path('../templates', __FILE__)
+
+      desc 'Creates an ApplicationDecorator, if none exists.'
+
+      def create_application_decorator
+        file = 'application_decorator.rb'
+        copy_file file, "app/decorators/#{file}"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+class ApplicationDecorator < Draper::Decorator
+  # Define methods for all decorated objects.
+  # Helpers are accessed through `helpers` (aka `h`). For example:
+  #
+  #   def percent_amount
+  #     h.number_to_percentage object.amount, precision: 2
+  #   end
+end

data/lib/generators/mini_test/decorator_generator.rb

@@ -7,7 +7,7 @@ module MiniTest
         File.expand_path('../templates', __FILE__)
       end
 
-      class_option :spec, :type => :boolean, :default => false, :desc => "Use MiniTest::Spec DSL"
+      class_option :spec, type: :boolean, default: false, desc: "Use MiniTest::Spec DSL"
 
       check_class_collision suffix: "DecoratorTest"
 

data/lib/generators/rails/decorator_generator.rb

@@ -1,6 +1,6 @@
 module Rails
   module Generators
-   class DecoratorGenerator < NamedBase
+    class DecoratorGenerator < NamedBase
       source_root File.expand_path("../templates", __FILE__)
       check_class_collision suffix: "Decorator"
 
@@ -24,13 +24,6 @@ module Rails
           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
-          yield if block_given?
-        end
-      end
     end
   end
 end

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

@@ -1,4 +1,4 @@
 require 'rails_helper'
 
-describe <%= class_name %>Decorator do
+RSpec.describe <%= class_name %>Decorator do
 end

data/spec/draper/collection_decorator_spec.rb

@@ -63,7 +63,7 @@ module Draper
         it "does not trigger decoration" do
           decorator = CollectionDecorator.new([])
 
-          decorator.should_not_receive(:decorated_collection)
+          expect(decorator).not_to receive(:decorated_collection)
           decorator.context = {other: "context"}
         end
 
@@ -110,37 +110,22 @@ module Draper
       protect_class ProductsDecorator
 
       it "defaults the :to option to :object" do
-        Object.should_receive(:delegate).with(:foo, :bar, to: :object)
+        expect(Object).to receive(:delegate).with(:foo, :bar, to: :object)
         ProductsDecorator.delegate :foo, :bar
       end
 
       it "does not overwrite the :to option if supplied" do
-        Object.should_receive(:delegate).with(:foo, :bar, to: :baz)
+        expect(Object).to receive(:delegate).with(:foo, :bar, to: :baz)
         ProductsDecorator.delegate :foo, :bar, to: :baz
       end
     end
 
     describe "#find" do
-      context "with a block" do
-        it "decorates Enumerable#find" do
-          decorator = CollectionDecorator.new([])
-
-          decorator.decorated_collection.should_receive(:find).and_return(:delegated)
-          expect(decorator.find{|p| p.title == "title"}).to be :delegated
-        end
-      end
-
-      context "without a block" do
-        it "decorates object.find" do
-          object = []
-          found = double(decorate: :decorated)
-          decorator = CollectionDecorator.new(object)
+      it "decorates Enumerable#find" do
+        decorator = CollectionDecorator.new([])
 
-          object.should_receive(:find).and_return(found)
-          ActiveSupport::Deprecation.silence do
-            expect(decorator.find(1)).to be :decorated
-          end
-        end
+        expect(decorator.decorated_collection).to receive(:find).and_return(:delegated)
+        expect(decorator.find{|p| p.title == "title"}).to be :delegated
       end
     end
 
@@ -149,7 +134,7 @@ module Draper
       it "delegates to the decorated collection" do
         decorator = CollectionDecorator.new([])
 
-        decorator.decorated_collection.should_receive(:to_ary).and_return(:delegated)
+        expect(decorator.decorated_collection).to receive(:to_ary).and_return(:delegated)
         expect(decorator.to_ary).to be :delegated
       end
     end
@@ -157,7 +142,7 @@ module Draper
     it "delegates array methods to the decorated collection" do
       decorator = CollectionDecorator.new([])
 
-      decorator.decorated_collection.should_receive(:[]).with(42).and_return(:delegated)
+      allow(decorator).to receive_message_chain(:decorated_collection, :[]).with(42).and_return(:delegated)
       expect(decorator[42]).to be :delegated
     end
 
@@ -267,14 +252,14 @@ module Draper
     describe '#kind_of?' do
       it 'asks the kind of its decorated collection' do
         decorator = ProductsDecorator.new([])
-        decorator.decorated_collection.should_receive(:kind_of?).with(Array).and_return("true")
+        expect(decorator.decorated_collection).to receive(:kind_of?).with(Array).and_return("true")
         expect(decorator.kind_of?(Array)).to eq "true"
       end
 
       context 'when asking the underlying collection returns false' do
         it 'asks the CollectionDecorator instance itself' do
           decorator = ProductsDecorator.new([])
-          decorator.decorated_collection.stub(:kind_of?).with(::Draper::CollectionDecorator).and_return(false)
+          allow(decorator.decorated_collection).to receive(:kind_of?).with(::Draper::CollectionDecorator).and_return(false)
           expect(decorator.kind_of?(::Draper::CollectionDecorator)).to be true
         end
       end

data/spec/draper/configuration_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+module Draper
+  RSpec.describe Configuration do
+    it 'yields Draper on configure' do
+      Draper.configure { |config| expect(config).to be Draper }
+    end
+
+    it 'defaults default_controller to ApplicationController' do
+      expect(Draper.default_controller).to be ApplicationController
+    end
+
+    it 'allows customizing default_controller through configure' do
+      default = Draper.default_controller
+
+      Draper.configure do |config|
+        config.default_controller = CustomController
+      end
+
+      expect(Draper.default_controller).to be CustomController
+
+      Draper.default_controller = default
+    end
+  end
+end

data/spec/draper/decoratable_spec.rb

@@ -22,7 +22,7 @@ module Draper
 
       it "uses the #decorator_class" do
         product = Product.new
-        product.stub decorator_class: OtherDecorator
+        allow(product).to receive_messages decorator_class: OtherDecorator
 
         expect(product.decorate).to be_an_instance_of OtherDecorator
       end
@@ -70,7 +70,7 @@ module Draper
       it "delegates to .decorator_class" do
         product = Product.new
 
-        Product.should_receive(:decorator_class).and_return(:some_decorator)
+        expect(Product).to receive(:decorator_class).and_return(:some_decorator)
         expect(product.decorator_class).to be :some_decorator
       end
     end
@@ -83,14 +83,14 @@ module Draper
       it "is true when #== is true" do
         product = Product.new
 
-        product.should_receive(:==).and_return(true)
+        expect(product).to receive(:==).and_return(true)
         expect(product === :anything).to be_truthy
       end
 
       it "is false when #== is false" do
         product = Product.new
 
-        product.should_receive(:==).and_return(false)
+        expect(product).to receive(:==).and_return(false)
         expect(product === :anything).to be_falsey
       end
     end
@@ -109,19 +109,25 @@ module Draper
       end
 
       it "is true for a decorated instance" do
-        decorator = double(object: Product.new)
+        decorator = Product.new.decorate
 
         expect(Product === decorator).to be_truthy
       end
 
       it "is true for a decorated derived instance" do
-        decorator = double(object: Class.new(Product).new)
+        decorator = Class.new(Product).new.decorate
 
         expect(Product === decorator).to be_truthy
       end
 
       it "is false for a decorated unrelated instance" do
-        decorator = double(object: Model.new)
+        decorator = Other.new.decorate
+
+        expect(Product === decorator).to be_falsey
+      end
+
+      it "is false for a non-decorator which happens to respond to object" do
+        decorator = double(object: Product.new)
 
         expect(Product === decorator).to be_falsey
       end
@@ -130,17 +136,17 @@ module Draper
     describe ".decorate" do
       it "calls #decorate_collection on .decorator_class" do
         scoped = [Product.new]
-        Product.stub all: scoped
+        allow(Product).to receive(:all).and_return(scoped)
 
-        Product.decorator_class.should_receive(:decorate_collection).with(scoped, with: nil).and_return(:decorated_collection)
+        expect(Product.decorator_class).to receive(:decorate_collection).with(scoped, with: nil).and_return(:decorated_collection)
         expect(Product.decorate).to be :decorated_collection
       end
 
       it "accepts options" do
         options = {with: ProductDecorator, context: {some: "context"}}
-        Product.stub all: []
+        allow(Product).to receive(:all).and_return([])
 
-        Product.decorator_class.should_receive(:decorate_collection).with([], options)
+        expect(Product.decorator_class).to receive(:decorate_collection).with([], options)
         Product.decorate(options)
       end
     end
@@ -175,13 +181,22 @@ module Draper
 
         context "for ActiveModel classes" do
           it "infers the decorator from the model name" do
-            Namespaced::Product.stub(:model_name).and_return("Namespaced::Other")
+            allow(Namespaced::Product).to receive(:model_name).and_return("Namespaced::Other")
 
             expect(Namespaced::Product.decorator_class).to be Namespaced::OtherDecorator
           end
         end
       end
 
+      context "when the decorator contains name error" do
+        it "throws an NameError" do
+          # We imitate ActiveSupport::Autoload behavior here in order to cause lazy NameError exception raising
+          allow_any_instance_of(Module).to receive(:const_missing) { Class.new { any_nonexisting_method_name } }
+
+          expect{Model.decorator_class}.to raise_error { |error| expect(error).to be_an_instance_of(NameError) }
+        end
+      end
+
       context "when the decorator can't be inferred" do
         it "throws an UninferrableDecoratorError" do
           expect{Model.decorator_class}.to raise_error UninferrableDecoratorError
@@ -190,7 +205,7 @@ module Draper
 
       context "when an unrelated NameError is thrown" do
         it "re-raises that error" do
-          String.any_instance.stub(:constantize) { Draper::Base }
+          allow_any_instance_of(String).to receive(:constantize) { Draper::Base }
           expect{Product.decorator_class}.to raise_error NameError, /Draper::Base/
         end
       end

data/spec/draper/decorated_association_spec.rb

@@ -16,20 +16,20 @@ module Draper
       it "creates a factory" do
         options = {with: Decorator, context: {foo: "bar"}}
 
-        Factory.should_receive(:new).with(options)
+        expect(Factory).to receive(:new).with(options)
         DecoratedAssociation.new(double, :association, options)
       end
 
       describe ":with option" do
         it "defaults to nil" do
-          Factory.should_receive(:new).with(with: nil, context: anything())
+          expect(Factory).to receive(:new).with(with: nil, context: anything())
           DecoratedAssociation.new(double, :association, {})
         end
       end
 
       describe ":context option" do
         it "defaults to the identity function" do
-          Factory.should_receive(:new) do |options|
+          expect(Factory).to receive(:new) do |options|
             options[:context].call(:anything) == :anything
           end
           DecoratedAssociation.new(double, :association, {})
@@ -40,7 +40,7 @@ module Draper
     describe "#call" do
       it "calls the factory" do
         factory = double
-        Factory.stub new: factory
+        allow(Factory).to receive_messages(new: factory)
         associated = double
         owner_context = {foo: "bar"}
         object = double(association: associated)
@@ -48,18 +48,18 @@ module Draper
         decorated_association = DecoratedAssociation.new(owner, :association, {})
         decorated = double
 
-        factory.should_receive(:decorate).with(associated, context_args: owner_context).and_return(decorated)
+        expect(factory).to receive(:decorate).with(associated, context_args: owner_context).and_return(decorated)
         expect(decorated_association.call).to be decorated
       end
 
       it "memoizes" do
         factory = double
-        Factory.stub new: factory
+        allow(Factory).to receive_messages(new: factory)
         owner = double(object: double(association: double), context: {})
         decorated_association = DecoratedAssociation.new(owner, :association, {})
         decorated = double
 
-        factory.should_receive(:decorate).once.and_return(decorated)
+        expect(factory).to receive(:decorate).once.and_return(decorated)
         expect(decorated_association.call).to be decorated
         expect(decorated_association.call).to be decorated
       end
@@ -67,14 +67,14 @@ module Draper
       context "when the :scope option was given" do
         it "applies the scope before decoration" do
           factory = double
-          Factory.stub new: factory
+          allow(Factory).to receive_messages(new: factory)
           scoped = double
           object = double(association: double(applied_scope: scoped))
           owner = double(object: object, context: {})
           decorated_association = DecoratedAssociation.new(owner, :association, scope: :applied_scope)
           decorated = double
 
-          factory.should_receive(:decorate).with(scoped, anything()).and_return(decorated)
+          expect(factory).to receive(:decorate).with(scoped, anything()).and_return(decorated)
           expect(decorated_association.call).to be decorated
         end
       end