draper 4.0.2 → 4.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b009279cf28737a6fcf4027fc26f3dc2a955741c7c5e5d2220c8dcb383490e3
-  data.tar.gz: 22455a3a7126650483af269d6a0e432a5a4465a59c762518ce78f40bcecb4286
+  metadata.gz: 01d36de260431b65888e966e0ae86d336da78fb154c016e3e1871c07db8b1502
+  data.tar.gz: 773cef0abfa87de807d460dca408a86d1aa9f34e2e652486c6b242c9819ad178
 SHA512:
-  metadata.gz: 2fd6c0b87227c23320e9ee211b4b2001c81cbf76d103a12e5076f427954febdb2d0366d5182f16b27f5155717ad878f08671098f8b1f9986c137ec053e1637bf
-  data.tar.gz: 260d4eccd57c623c966422cd256ab1485e1ce4bbaea05d2c6f615cdb644ab0147f00e8917b8165eba78651f279b66cde0a13da38b1c5cc9dc6a0e49822db2361
+  metadata.gz: bc3e685a475539225c88e1d7cc44575ec5ce59872ddd1babede55eb9a07c323a2fa267e3d35d55d2c009a12948e83273150c132829597c8bc641c99c15445f7b
+  data.tar.gz: 37670673d87b1fea1b93bf435756d1ddaee6da897c1f3905c9aaec7c1b7dab6e02cb3ea9c52ab106a98b54c0e254c1f0e2d8fddaab0ba539a8a308b9cbdd58ea

data/.rspec

@@ -1,2 +1 @@
---color
---order rand
+--format progress

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Draper Changelog
 
+## 4.0.5 - 2025-11-12
+
+### Fixes
+* Remove unused files from package [#945](https://github.com/drapergem/draper/pull/945)
+* Support Rails 8.1 [#949](https://github.com/drapergem/draper/pull/949)
+
+## 4.0.4 - 2025-01-28
+
+### Fixes
+* Fix a `LoadError` caused by a cherry-pick issue in version 4.0.3
+
+## 4.0.3 - 2025-01-27
+
+Added support for latest Ruby (upto 3.4) and Rails (upto 8) versions.
+
+### Fixes
+* Fix `CollectionDecorator#respond_to?` for non-ORM collections [#920](https://github.com/drapergem/draper/pull/920)
+* Fix issues with using Draper outside of controller scope [#927](https://github.com/drapergem/draper/pull/927)
+* Fix decoration of AR associations [#932](https://github.com/drapergem/draper/pull/932)
+
+### Other Changes
+* Improve performance of delegation via `delegate_all` [#911](https://github.com/drapergem/draper/pull/911)
+* Improve README [#878](https://github.com/drapergem/draper/pull/878), [#922](https://github.com/drapergem/draper/pull/922), [#934](https://github.com/drapergem/draper/pull/934)
+
 ## 4.0.2 - 2021-05-27
 
 ### Fixes

data/README.md

@@ -1,8 +1,6 @@
 # Draper: View Models for Rails
 
-[![Actions Status](https://github.com/drapergem/draper/workflows/CI/badge.svg?branch=master)](https://github.com/drapergem/draper/actions?query=workflow%3Aci+branch%3Amaster)
-[![Code Climate](https://codeclimate.com/github/drapergem/draper.svg)](https://codeclimate.com/github/drapergem/draper)
-[![Test Coverage](https://api.codeclimate.com/v1/badges/0d40c43951d516bf6985/test_coverage)](https://codeclimate.com/github/drapergem/draper/test_coverage)
+[![Actions Status](https://github.com/drapergem/draper/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/drapergem/draper/actions?query=workflow%3Aci+branch%3Amaster)
 [![Inline docs](http://inch-ci.org/github/drapergem/draper.svg?branch=master)](http://inch-ci.org/github/drapergem/draper)
 
 Draper adds an object-oriented layer of presentation logic to your Rails
@@ -131,6 +129,17 @@ class ArticleDecorator < Draper::Decorator
 end
 ```
 
+
+To decorate a model in a namespace e.g. `Admin::Catalogue` place the decorator under the
+directory `app/decorators/admin` in the same way you would with views and models.
+
+```ruby
+# app/decorators/admin/catalogue_decorator.rb
+class Admin::CatalogueDecorator < Draper::Decorator
+# ...
+end
+```
+
 ### Generators
 
 To create an `ApplicationDecorator` that all generated decorators inherit from, run...
@@ -155,6 +164,15 @@ rails generate decorator Article
 
 ...to create the `ArticleDecorator`.
 
+If you don't want Rails to generate decorator files when generating a new controller,
+you can add the following configuration to your `config/application.rb` file:
+
+```ruby
+config.generators do |g|
+  g.decorator false
+end
+```
+
 ### Accessing Helpers
 
 Normal Rails helpers are still useful for lots of tasks. Both Rails' provided
@@ -652,9 +670,8 @@ you can include this module manually.
 [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).
-Decorated objects implement Global ID by delegating to the object they are decorating. This means
-you can pass decorated objects to background jobs, however, the object won't be decorated when it is
-deserialized.
+Decorators implement Global ID.
+This means you can pass decorated objects to background jobs, and get them just as decorated when deserialized.
 
 ## Contributors
 
@@ -664,7 +681,8 @@ great community of open source
 
 ### Current maintainers
 
-* Cliff Braton (cliff.braton@gmail.com)
+* Alexander Senko (Alexander.Senko@gmail.com)
+* Yuji Yaginuma (yuuji.yaginuma@gmail.com)
 
 ### Historical maintainers
 
@@ -673,3 +691,4 @@ great community of open source
 * Vasiliy Ermolovich
 * Andrew Haines
 * Sean Linsley
+* Cliff Braton (cliff.braton@gmail.com)

data/lib/draper/automatic_delegation.rb

@@ -18,11 +18,21 @@ module Draper
       super || delegatable?(method)
     end
 
-    # @private
-    def delegatable?(method)
-      return if private_methods(false).include?(method)
+    # The inherit argument for `private_method_defined?` is supported since Ruby 2.6.
+    if RUBY_VERSION >= "2.6"
+      # @private
+      def delegatable?(method)
+        return if self.class.private_method_defined?(method, false)
 
-      object.respond_to?(method)
+        object.respond_to?(method)
+      end
+    else
+      # @private
+      def delegatable?(method)
+        return if private_methods(false).include?(method)
+
+        object.respond_to?(method)
+      end
     end
 
     module ClassMethods

data/lib/draper/collection_decorator.rb

@@ -61,12 +61,6 @@ module Draper
 
     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)
       decorated_collection.replace(other)
       self

data/lib/draper/compatibility/broadcastable.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Draper
+  module Compatibility
+    # It would look consistent to use decorated objects inside templates broadcasted with
+    # Turbo::Broadcastable.
+    #
+    # This compatibility patch fixes the issue by overriding the original defaults to decorate the
+    # object, that's passed to the partial in a local variable.
+    module Broadcastable
+      private
+
+      def broadcast_rendering_with_defaults(options)
+        return super unless decorator_class?
+
+        # Add the decorated current instance into the locals (see original method for details).
+        options[:locals] =
+          (options[:locals] || {}).reverse_merge!(model_name.element.to_sym => decorate)
+
+        super
+      end
+    end
+  end
+end

data/lib/draper/compatibility/global_id.rb

@@ -5,17 +5,21 @@ module Draper
     # 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.
+    # This compatibility patch implements Global ID for decorated objects by defining `.find(id)`
+    # class method that uses the original one and decorates the result.
+    # This means you can pass decorated objects to background jobs and they will be decorated when
+    # deserialized.
     module GlobalID
       extend ActiveSupport::Concern
 
       included do
         include ::GlobalID::Identification
+      end
 
-        delegate :to_global_id, :to_signed_global_id, to: :object
+      class_methods do
+        def find(*args)
+          object_class.find(*args).decorate
+        end
       end
     end
   end

data/lib/draper/decoratable/collection_proxy.rb

@@ -0,0 +1,15 @@
+module Draper
+  module Decoratable
+    module CollectionProxy
+      # Decorates a collection of objects. Used at the end of a scope chain.
+      #
+      # @example
+      #   company.products.popular.decorate
+      # @param [Hash] options
+      #   see {Decorator.decorate_collection}.
+      def decorate(options = {})
+        decorator_class.decorate_collection(load_target, options.reverse_merge(with: nil))
+      end
+    end
+  end
+end

data/lib/draper/decoratable.rb

@@ -1,4 +1,5 @@
 require 'draper/decoratable/equality'
+require 'draper/compatibility/broadcastable'
 
 module Draper
   # Provides shortcuts to decorate objects directly, so you can do
@@ -11,6 +12,12 @@ module Draper
     extend ActiveSupport::Concern
     include Draper::Decoratable::Equality
 
+    autoload :CollectionProxy, 'draper/decoratable/collection_proxy'
+
+    included do
+      prepend Draper::Compatibility::Broadcastable if defined? Turbo::Broadcastable
+    end
+
     # Decorates the object using the inferred {#decorator_class}.
     # @param [Hash] options
     #   see {Decorator#initialize}
@@ -87,8 +94,6 @@ module Draper
       def ===(other)
         super || (other.is_a?(Draper::Decorator) && super(other.object))
       end
-
     end
-
   end
 end

data/lib/draper/decorator.rb

@@ -33,7 +33,7 @@ module Draper
       options.assert_valid_keys(:context)
       @object = object
       @context = options.fetch(:context, {})
-      handle_multiple_decoration(options) if object.instance_of?(self.class)
+      handle_multiple_decoration(options) if object.is_a?(Draper::Decorator)
     end
 
     class << self
@@ -185,22 +185,6 @@ module Draper
       self.class.hash ^ object.hash
     end
 
-    # Checks if `self.kind_of?(klass)` or `object.kind_of?(klass)`
-    #
-    # @param [Class] klass
-    def kind_of?(klass)
-      super || object.kind_of?(klass)
-    end
-
-    alias :is_a? :kind_of?
-
-    # Checks if `self.instance_of?(klass)` or `object.instance_of?(klass)`
-    #
-    # @param [Class] klass
-    def instance_of?(klass)
-      super || object.instance_of?(klass)
-    end
-
     delegate :to_s
 
     # In case object is nil
@@ -267,7 +251,7 @@ module Draper
       if object.applied_decorators.last == self.class
         @context = object.context unless options.has_key?(:context)
         @object = object.object
-      else
+      elsif object.applied_decorators.include?(self.class)
         warn "Reapplying #{self.class} decorator to target that is already decorated with it. Call stack:\n#{caller(1).join("\n")}"
       end
     end

data/lib/draper/query_methods.rb

@@ -10,7 +10,7 @@ module Draper
     end
 
     def respond_to_missing?(method, include_private = false)
-      strategy.allowed?(method) || super
+      object.respond_to?(method) && strategy.allowed?(method) || super
     end
 
     private

data/lib/draper/railtie.rb

@@ -33,10 +33,14 @@ module Draper
     end
 
     initializer 'draper.setup_orm' do
-      [:active_record, :mongoid].each do |orm|
-        ActiveSupport.on_load orm do
-          Draper.setup_orm self
-        end
+      ActiveSupport.on_load :active_record do
+        include Draper::Decoratable
+
+        ActiveRecord::Associations::CollectionProxy.include Draper::Decoratable::CollectionProxy
+      end
+
+      ActiveSupport.on_load :mongoid do
+        include Draper::Decoratable
       end
     end
 
@@ -52,7 +56,12 @@ module Draper
       Draper::ViewContext.build
     end
 
-    console { initialize_view_context }
+    console do
+      initialize_view_context
+      if ActiveSupport.gem_version >= Gem::Version.new('8.1.0')
+        ActiveSupport::ExecutionContext.nestable = false
+      end
+    end
 
     runner { initialize_view_context }
 

data/lib/draper/version.rb

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

data/lib/draper/view_context/build_strategy.rb

@@ -38,17 +38,9 @@ module Draper
         def controller
           Draper::ViewContext.controller ||= Draper.default_controller.new
           Draper::ViewContext.controller.tap do |controller|
-            controller.request ||= new_test_request controller if defined?(ActionController::TestRequest)
+            controller.request ||= ActionDispatch::TestRequest.create
           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
   end

data/lib/draper.rb

@@ -51,12 +51,6 @@ module Draper
     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}.")