draper 3.0.0 → 4.0.2

data/lib/draper/collection_decorator.rb

@@ -2,6 +2,7 @@ module Draper
   class CollectionDecorator
     include Enumerable
     include Draper::ViewHelpers
+    include Draper::QueryMethods
     extend Draper::Delegation
 
     # @return the collection being decorated.
@@ -34,7 +35,7 @@ module Draper
     end
 
     class << self
-      alias_method :decorate, :new
+      alias :decorate :new
     end
 
     # @return [Array] the decorated items.
@@ -58,11 +59,12 @@ module Draper
       true
     end
 
-    alias_method :decorated_with?, :instance_of?
+    alias :decorated_with? :instance_of?
 
     def kind_of?(klass)
       decorated_collection.kind_of?(klass) || super
     end
+
     alias_method :is_a?, :kind_of?
 
     def replace(other)

data/lib/draper/compatibility/global_id.rb

@@ -0,0 +1,22 @@
+module Draper
+  module Compatibility
+    # [Active Job](http://edgeguides.rubyonrails.org/active_job_basics.html) allows you to pass
+    # ActiveRecord objects to background tasks directly and performs the necessary serialization
+    # and deserialization. In order to do this, arguments to a background job must implement
+    # [Global ID](https://github.com/rails/globalid).
+    #
+    # This compatibility patch implements Global ID for decorated objects by delegating to the object
+    # that is decorated. This means you can pass decorated objects to background jobs, but 
+    # the object won't be decorated when it is deserialized. This patch is meant as an intermediate
+    # fix until we can find a way to deserialize the decorated object correctly.
+    module GlobalID
+      extend ActiveSupport::Concern
+
+      included do
+        include ::GlobalID::Identification
+
+        delegate :to_global_id, :to_signed_global_id, to: :object
+      end
+    end
+  end
+end

data/lib/draper/configuration.rb

@@ -11,5 +11,13 @@ module Draper
     def default_controller=(controller)
       @@default_controller = controller
     end
+
+    def default_query_methods_strategy
+      @@default_query_methods_strategy ||= :active_record
+    end
+
+    def default_query_methods_strategy=(strategy)
+      @@default_query_methods_strategy = strategy
+    end
   end
 end

data/lib/draper/decoratable.rb

@@ -48,7 +48,6 @@ module Draper
     end
 
     module ClassMethods
-
       # Decorates a collection of objects. Used at the end of a scope chain.
       #
       # @example
@@ -69,16 +68,16 @@ module Draper
       # `Product` maps to `ProductDecorator`).
       #
       # @return [Class] the inferred decorator class.
-      def decorator_class
+      def decorator_class(called_on = self)
         prefix = respond_to?(:model_name) ? model_name : name
         decorator_name = "#{prefix}Decorator"
-        decorator_name.constantize
-      rescue NameError => error
-        raise unless error.missing_name?(decorator_name)
+        decorator_name_constant = decorator_name.safe_constantize
+        return decorator_name_constant unless decorator_name_constant.nil?
+
         if superclass.respond_to?(:decorator_class)
-          superclass.decorator_class
+          superclass.decorator_class(called_on)
         else
-          raise Draper::UninferrableDecoratorError.new(self)
+          raise Draper::UninferrableDecoratorError.new(called_on)
         end
       end
 

data/lib/draper/decorated_association.rb

@@ -1,7 +1,6 @@
 module Draper
   # @private
   class DecoratedAssociation
-
     def initialize(owner, association, options)
       options.assert_valid_keys(:with, :scope, :context)
 
@@ -30,6 +29,5 @@ module Draper
 
       @decorated = factory.decorate(associated, context_args: owner.context)
     end
-
   end
 end

data/lib/draper/decorator.rb

@@ -1,6 +1,9 @@
+require 'draper/compatibility/global_id'
+
 module Draper
   class Decorator
     include Draper::ViewHelpers
+    include Draper::Compatibility::GlobalID if defined?(GlobalID)
     extend Draper::Delegation
 
     include ActiveModel::Serialization
@@ -9,7 +12,8 @@ module Draper
 
     # @return the object being decorated.
     attr_reader :object
-    alias_method :model, :object
+
+    alias :model :object
 
     # @return [Hash] extra data to be used in user-defined methods.
     attr_accessor :context
@@ -33,7 +37,7 @@ module Draper
     end
 
     class << self
-      alias_method :decorate, :new
+      alias :decorate :new
     end
 
     # Automatically delegates instance methods to the source object. Class
@@ -187,7 +191,8 @@ module Draper
     def kind_of?(klass)
       super || object.kind_of?(klass)
     end
-    alias_method :is_a?, :kind_of?
+
+    alias :is_a? :kind_of?
 
     # Checks if `self.instance_of?(klass)` or `object.instance_of?(klass)`
     #
@@ -222,9 +227,9 @@ module Draper
     # @return [Class] the class created by {decorate_collection}.
     def self.collection_decorator_class
       name = collection_decorator_name
-      name.constantize
-    rescue NameError
-      Draper::CollectionDecorator
+      name_constant = name&.safe_constantize
+
+      name_constant || Draper::CollectionDecorator
     end
 
     private
@@ -239,22 +244,23 @@ module Draper
     end
 
     def self.object_class_name
-      raise NameError if name.nil? || name.demodulize !~ /.+Decorator$/
+      return nil if name.nil? || name.demodulize !~ /.+Decorator$/
       name.chomp("Decorator")
     end
 
     def self.inferred_object_class
       name = object_class_name
-      name.constantize
-    rescue NameError => error
-      raise if name && !error.missing_name?(name)
+      name_constant = name&.safe_constantize
+      return name_constant unless name_constant.nil?
+
       raise Draper::UninferrableObjectError.new(self)
     end
 
     def self.collection_decorator_name
-      plural = object_class_name.pluralize
-      raise NameError if plural == object_class_name
-      "#{plural}Decorator"
+      singular = object_class_name
+      plural = singular&.pluralize
+
+      "#{plural}Decorator" unless plural == singular
     end
 
     def handle_multiple_decoration(options)

data/lib/draper/delegation.rb

@@ -7,7 +7,7 @@ module Draper
     #   @return [void]
     def delegate(*methods)
       options = methods.extract_options!
-      super *methods, options.reverse_merge(to: :object)
+      super(*methods, **options.reverse_merge(to: :object))
     end
   end
 end

data/lib/draper/finders.rb

@@ -3,7 +3,6 @@ module Draper
   # do not have to extend this module directly; it is extended by
   # {Decorator.decorates_finders}.
   module Finders
-
     def find(id, options = {})
       decorate(object_class.find(id), options)
     end

data/lib/draper/helper_proxy.rb

@@ -2,14 +2,13 @@ module Draper
   # Provides access to helper methods - both Rails built-in helpers, and those
   # defined in your application.
   class HelperProxy
-
     # @overload initialize(view_context)
     def initialize(view_context)
       @view_context = view_context
     end
 
     # Sends helper methods to the view context.
-    def method_missing(method, *args, &block)
+    ruby2_keywords def method_missing(method, *args, &block)
       self.class.define_proxy method
       send(method, *args, &block)
     end
@@ -32,6 +31,7 @@ module Draper
       define_method name do |*args, &block|
         view_context.send(name, *args, &block)
       end
+      ruby2_keywords name
     end
   end
 end

data/lib/draper/lazy_helpers.rb

@@ -3,13 +3,11 @@ module Draper
   # so that you can stop typing `h.` everywhere, at the cost of mixing in a
   # bazillion methods.
   module LazyHelpers
-
     # Sends missing methods to the {HelperProxy}.
-    def method_missing(method, *args, &block)
+    ruby2_keywords def method_missing(method, *args, &block)
       helpers.send(method, *args, &block)
     rescue NoMethodError
       super
     end
-
   end
 end

data/lib/draper/query_methods.rb

@@ -0,0 +1,23 @@
+require_relative 'query_methods/load_strategy'
+
+module Draper
+  module QueryMethods
+    # Proxies missing query methods to the source class if the strategy allows.
+    ruby2_keywords def method_missing(method, *args, &block)
+      return super unless strategy.allowed? method
+
+      object.send(method, *args, &block).decorate(with: decorator_class, context: context)
+    end
+
+    def respond_to_missing?(method, include_private = false)
+      strategy.allowed?(method) || super
+    end
+
+    private
+
+    # Configures the strategy used to proxy the query methods, which defaults to `:active_record`.
+    def strategy
+      @strategy ||= LoadStrategy.new(Draper.default_query_methods_strategy)
+    end
+  end
+end

data/lib/draper/query_methods/load_strategy.rb

@@ -0,0 +1,21 @@
+module Draper
+  module QueryMethods
+    module LoadStrategy
+      def self.new(name)
+        const_get(name.to_s.camelize).new
+      end
+
+      class ActiveRecord
+        def allowed?(method)
+          ::ActiveRecord::Relation::VALUE_METHODS.include? method
+        end
+      end
+
+      class Mongoid
+        def allowed?(method)
+          raise NotImplementedError
+        end
+      end
+    end
+  end
+end

data/lib/draper/test_case.rb

@@ -3,9 +3,9 @@ module Draper
 
   class TestCase < ::ActiveSupport::TestCase
     module ViewContextTeardown
-      def teardown
-        super
+      def before_setup
         Draper::ViewContext.clear!
+        super
       end
     end
 
@@ -21,7 +21,7 @@ module Draper
       end
 
       include Draper::ViewHelpers::ClassMethods
-      alias_method :helper, :helpers
+      alias :helper :helpers
     end
 
     include Behavior

data/lib/draper/undecorate.rb

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

data/lib/draper/version.rb

@@ -1,3 +1,3 @@
 module Draper
-  VERSION = '3.0.0'
+  VERSION = '4.0.2'
 end

data/lib/draper/view_context/build_strategy.rb

@@ -2,7 +2,6 @@ module Draper
   module ViewContext
     # @private
     module BuildStrategy
-
       def self.new(name, &block)
         const_get(name.to_s.camelize).new(&block)
       end
@@ -13,7 +12,7 @@ module Draper
         end
 
         def call
-          view_context_class.new
+          view_context_class.respond_to?(:empty) ? view_context_class.empty : view_context_class.new
         end
 
         private
@@ -51,7 +50,6 @@ module Draper
           ActionController::TestRequest.method(:create).parameters.first == [:req, :controller_class]
         end
       end
-
     end
   end
 end

data/lib/draper/view_helpers.rb

@@ -5,7 +5,6 @@ module Draper
     extend ActiveSupport::Concern
 
     module ClassMethods
-
       # Access the helpers proxy to call built-in and user-defined
       # Rails helpers from a class context.
       #
@@ -13,8 +12,8 @@ module Draper
       def helpers
         Draper::ViewContext.current
       end
-      alias_method :h, :helpers
 
+      alias :h :helpers
     end
 
     # Access the helpers proxy to call built-in and user-defined
@@ -24,14 +23,15 @@ module Draper
     def helpers
       Draper::ViewContext.current
     end
-    alias_method :h, :helpers
+
+    alias :h :helpers
 
     # Alias for `helpers.localize`, since localize is something that's used
     # quite often. Further aliased to `l` for convenience.
-    def localize(*args)
+    ruby2_keywords def localize(*args)
       helpers.localize(*args)
     end
-    alias_method :l, :localize
 
+    alias :l :localize
   end
 end

data/lib/generators/draper/install_generator.rb

@@ -1,7 +1,7 @@
 module Draper
   module Generators
     class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path('../templates', __FILE__)
+      source_root File.expand_path("templates", __dir__)
 
       desc 'Creates an ApplicationDecorator, if none exists.'
 

data/lib/generators/mini_test/decorator_generator.rb

@@ -4,7 +4,7 @@ module MiniTest
   module Generators
     class DecoratorGenerator < Base
       def self.source_root
-        File.expand_path('../templates', __FILE__)
+        File.expand_path("templates", __dir__)
       end
 
       class_option :spec, type: :boolean, default: false, desc: "Use MiniTest::Spec DSL"

data/lib/generators/rails/decorator_generator.rb

@@ -1,7 +1,7 @@
 module Rails
   module Generators
     class DecoratorGenerator < NamedBase
-      source_root File.expand_path("../templates", __FILE__)
+      source_root File.expand_path("templates", __dir__)
       check_class_collision suffix: "Decorator"
 
       class_option :parent, type: :string, desc: "The parent class for the generated decorator"

data/lib/generators/rspec/decorator_generator.rb

@@ -1,9 +1,11 @@
 module Rspec
-  class DecoratorGenerator < ::Rails::Generators::NamedBase
-    source_root File.expand_path('../templates', __FILE__)
+  module Generators
+    class DecoratorGenerator < ::Rails::Generators::NamedBase
+      source_root File.expand_path("templates", __dir__)
 
-    def create_spec_file
-      template 'decorator_spec.rb', File.join('spec/decorators', class_path, "#{singular_name}_decorator_spec.rb")
+      def create_spec_file
+        template 'decorator_spec.rb', File.join('spec/decorators', class_path, "#{singular_name}_decorator_spec.rb")
+      end
     end
   end
 end