draper 4.0.1 → 4.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a90d57e1df50336b735a6f16cc119a558ee8472b70bd9748c59f25b70afc319a
-  data.tar.gz: a4510f40a8afac7976e7afea4659d8e1c3eb981c005bc4046660b4d110874df7
+  metadata.gz: c37ab7e42fe93c37a13899d6b51f1dbddfcb7a417eaad7531a3e11d59fb63442
+  data.tar.gz: 3ab092943fa340ef28abfe4974960201374f92e2defa6bd1c8fd90cd495b6056
 SHA512:
-  metadata.gz: bee71715525fdc2de5336c399b1dfe4a774d9fd68071bb01468c8f31712504cf6af8beecf1f4facf4ea25ef5bcad7a14b2e2f12bec12f7b6f1e55c04318c4f7a
-  data.tar.gz: 8f013f4b36efa767ada401a979e5bf10e28f068997d24fd8035e4025254300709eb7c2e80c5f0498cc49c176b7561fbff48e2cc03f39b418f368c3266bf30359
+  metadata.gz: d700dbac01e145361e56c8b6fbf04c93b9156492e14659ba6724fa36be20ebdac6319c2bc2910beaf68b9cbe40271808ed17c23bed2c8a76361d438cc5b35033
+  data.tar.gz: bd8689b7de4f934d97dc48a564795ef91e2e859b586f7561c0ba3996e0f2b7434a29d8a9e497d5248b0e28074b854befdb86f6f20858f1816474755ec14fdca3

data/.rspec

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

data/CHANGELOG.md

@@ -1,5 +1,45 @@
 # Draper Changelog
 
+## 4.0.6 - 2025-11-15
+
+### Fixes
+* Revert breaking change from v4.0.5
+
+## 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
+* Fix kwargs usage for Ruby 3 compatibility [#885](https://github.com/drapergem/draper/pull/885)
+* Fix ruby warnings for "ambiguous first argument" [#881](https://github.com/drapergem/draper/pull/881)
+* Fix rake warnings in CI [#897](https://github.com/drapergem/draper/pull/897)
+* Fix decoration spec [#895](https://github.com/drapergem/draper/pull/895)
+
+### Other Changes
+* Migration from Travis CI to GitHub Actions [#893](https://github.com/drapergem/draper/pull/893), [#896](https://github.com/drapergem/draper/pull/896), [#903](https://github.com/drapergem/draper/pull/903)
+
 ## 4.0.1 - 2020-03-25
 
 ### Fixes

data/README.md

@@ -1,8 +1,6 @@
 # Draper: View Models for Rails
 
-[![TravisCI Build Status](https://travis-ci.org/drapergem/draper.svg?branch=master)](http://travis-ci.org/drapergem/draper)
-[![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

@@ -6,7 +6,7 @@ module Draper
     # method calls to `object` as well. Calling `super` will first try to call the method on
     # the parent decorator class. If no method exists on the parent class, it will then try
     # to call the method on the `object`.
-    def method_missing(method, *args, &block)
+    ruby2_keywords def method_missing(method, *args, &block)
       return super unless delegatable?(method)
 
       object.send(method, *args, &block)
@@ -18,16 +18,26 @@ 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
       # Proxies missing class methods to the source class.
-      def method_missing(method, *args, &block)
+      ruby2_keywords def method_missing(method, *args, &block)
         return super unless delegatable?(method)
 
         object_class.send(method, *args, &block)

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/helper_proxy.rb

@@ -8,7 +8,7 @@ module Draper
     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
@@ -31,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

@@ -4,7 +4,7 @@ module Draper
   # 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

data/lib/draper/query_methods.rb

@@ -3,14 +3,14 @@ require_relative 'query_methods/load_strategy'
 module Draper
   module QueryMethods
     # Proxies missing query methods to the source class if the strategy allows.
-    def method_missing(method, *args, &block)
+    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
+      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.1'
+  VERSION = '4.0.6'
 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/view_helpers.rb

@@ -28,7 +28,7 @@ module Draper
 
     # 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
 

data/lib/draper.rb

@@ -8,6 +8,8 @@ require 'active_support/core_ext/hash/keys'
 require 'active_support/core_ext/hash/reverse_merge'
 require 'active_support/core_ext/name_error'
 
+require 'ruby2_keywords'
+
 require 'draper/version'
 require 'draper/configuration'
 require 'draper/view_helpers'
@@ -49,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}.")