draper 4.0.2 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b009279cf28737a6fcf4027fc26f3dc2a955741c7c5e5d2220c8dcb383490e3
-  data.tar.gz: 22455a3a7126650483af269d6a0e432a5a4465a59c762518ce78f40bcecb4286
+  metadata.gz: 78c5e444690de191d46a5be87ed46a3f9be6ec0ffd59fed6dcd1d63e5d527b85
+  data.tar.gz: f92be8ee42d8ce2e48c1743077f758eef779296593fcbcdef9a82fd5937a03ae
 SHA512:
-  metadata.gz: 2fd6c0b87227c23320e9ee211b4b2001c81cbf76d103a12e5076f427954febdb2d0366d5182f16b27f5155717ad878f08671098f8b1f9986c137ec053e1637bf
-  data.tar.gz: 260d4eccd57c623c966422cd256ab1485e1ce4bbaea05d2c6f615cdb644ab0147f00e8917b8165eba78651f279b66cde0a13da38b1c5cc9dc6a0e49822db2361
+  metadata.gz: 2b2d10594f175019d7cbee9b7af7f811c8978349abae3cdce746abd94f24501d81b519c9da9ae350658265dd5aa0b33cdd9b3f18e26df922363227df8f57c4a4
+  data.tar.gz: 81565fd7b8034294a41c49b557f48619e6cee814056d2d4bff4c0e6f17c024877b250b421d4a185310f6b6fa3dee14b51d954b6ee3cef39100d3cfb4c9582af7

data/.github/workflows/ci.yml

@@ -2,21 +2,42 @@
 name: CI
 
 on:
-  - push
-  - pull_request
+  push:
+    branches:
+      - master
+  pull_request:
+
+permissions:
+  contents: read
 
 jobs:
   rspec:
-    runs-on: ubuntu-20.04
+    name: >-
+      rspec (${{ matrix.ruby }})
+
+    runs-on: ubuntu-latest
+
     strategy:
       fail-fast: false
       matrix:
         ruby:
-          - '3.0'
-          - '2.7'
-          - '2.6'
-          - '2.5'
-          - '2.4'
+          - 3.3
+          - 3.2
+          - 3.1
+        rails:
+          - 7.2
+        include:
+          # Edge
+          - { ruby: 'head', rails: 'edge', allow-fail: true }
+          # Outdated
+          - { ruby: '3.0',  rails: '7.1' }
+          - { ruby: '2.7',  rails: '6'   } # RSpec AR Expectations support Rails 7.1 since Ruby 3.0
+          - { ruby: '2.6',  rails: '6'   }
+          - { ruby: '2.5',  rails: '6'   }
+          - { ruby: '2.4',  rails: '5'   }
+
+    env:
+      RAILS_VERSION: "${{ matrix.rails }}"
 
     services:
       mongodb:
@@ -25,31 +46,26 @@ jobs:
           - 27017:27017
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-
-      - name: Setup Ruby cache
-        uses: actions/cache@v2
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gems-${{ matrix.ruby }}-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-gems-${{ matrix.ruby }}-
-
-      - name: Bundle
-        run: |
-          gem install bundler
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
+          rubygems: latest
+          bundler-cache: true
 
       - name: RSpec & publish code coverage
-        uses: paambaati/codeclimate-action@v2.7.5
+        uses: paambaati/codeclimate-action@v8
         env:
           CC_TEST_REPORTER_ID: b7ba588af2a540fa96c267b3655a2afe31ea29976dc25905a668dd28d5e88915
         with:
           coverageCommand: bin/rake
+        continue-on-error: ${{ matrix.allow-fail }}
+        id: test
+
+      - name: >-
+          Test ${{ steps.test.outcome }}
+        run: |
+          echo Ruby  ${{ matrix.ruby  }}
+          echo Rails ${{ matrix.rails }}

data/.rspec

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

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Draper Changelog
 
+## 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/Gemfile

@@ -2,6 +2,8 @@ source "https://rubygems.org"
 
 gemspec
 
+gem 'puma'
+
 platforms :ruby do
   if RUBY_VERSION >= "2.5.0"
     gem 'sqlite3'
@@ -15,10 +17,30 @@ platforms :jruby do
   gem "activerecord-jdbcsqlite3-adapter"
 end
 
-if RUBY_VERSION >= "2.5.0"
-  gem "rails", "~> 6.0"
-  gem 'webrick'
+case rails_version = ENV['RAILS_VERSION']
+when nil
+  gem 'rails'
+when 'edge'
+  gem 'rails', github: 'rails/rails'
 else
-  gem "rails", "~> 5.0"
+  gem 'rails', "~> #{rails_version}.0"
+end
+
+gem 'mongoid' unless
+    rails_version == 'edge'
+gem 'active_model_serializers'
+
+case RUBY_VERSION
+when '2.6'...'3.0'
+  gem "turbo-rails", "<= 2.0.7"
+  gem "redis", "~> 4.0"
+when '3.0'...'4'
+  gem 'turbo-rails'
+  gem 'redis', '~> 4.0'
+end
+
+if RUBY_VERSION < "2.5.0"
+  gem 'rspec-activerecord-expectations', '~> 1.2.0'
+  gem 'simplecov', '0.17.1'
+  gem "loofah", "< 2.21.0" # Workaround for `uninitialized constant Nokogiri::HTML4`
 end
-gem "mongoid", github: "mongodb/mongoid"

data/README.md

@@ -131,6 +131,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 +166,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
@@ -664,7 +684,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 +694,4 @@ great community of open source
 * Vasiliy Ermolovich
 * Andrew Haines
 * Sean Linsley
+* Cliff Braton (cliff.braton@gmail.com)

data/draper.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.version     = Draper::VERSION
   s.authors     = ["Jeff Casimir", "Steve Klabnik"]
   s.email       = ["jeff@casimircreative.com", "steve@steveklabnik.com"]
-  s.homepage    = "http://github.com/drapergem/draper"
+  s.homepage    = "https://github.com/drapergem/draper"
   s.summary     = "View Models for Rails"
   s.description = "Draper adds an object-oriented layer of presentation logic to your Rails apps."
   s.license     = "MIT"
@@ -26,9 +26,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'ammeter'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec-rails'
+  s.add_development_dependency 'rspec-activerecord-expectations'
   s.add_development_dependency 'minitest-rails'
   s.add_development_dependency 'capybara'
-  s.add_development_dependency 'active_model_serializers', '>= 0.10'
   s.add_development_dependency 'rubocop'
-  s.add_development_dependency 'simplecov', '0.17.1'
+  s.add_development_dependency 'simplecov'
 end

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/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

@@ -11,6 +11,8 @@ module Draper
     extend ActiveSupport::Concern
     include Draper::Decoratable::Equality
 
+    autoload :CollectionProxy, 'draper/decoratable/collection_proxy'
+
     # Decorates the object using the inferred {#decorator_class}.
     # @param [Hash] options
     #   see {Decorator#initialize}
@@ -87,8 +89,6 @@ module Draper
       def ===(other)
         super || (other.is_a?(Draper::Decorator) && super(other.object))
       end
-
     end
-
   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
 

data/lib/draper/version.rb

@@ -1,3 +1,3 @@
 module Draper
-  VERSION = '4.0.2'
+  VERSION = '4.0.4'
 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}.")

data/spec/draper/decoratable_spec.rb

@@ -147,7 +147,7 @@ module Draper
         scoped = [Product.new]
         allow(Product).to receive(:all).and_return(scoped)
 
-        expect(Product.decorator_class).to 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
 

data/spec/draper/decorator_spec.rb

@@ -118,7 +118,7 @@ module Draper
         it "creates a CollectionDecorator using itself for each item" do
           object = [Model.new]
 
-          expect(CollectionDecorator).to receive(:new).with(object, with: Decorator)
+          expect(CollectionDecorator).to receive(:new).with(object, {with: Decorator})
           Decorator.decorate_collection(object)
         end
 
@@ -134,7 +134,7 @@ module Draper
         it "creates a custom collection decorator using itself for each item" do
           object = [Model.new]
 
-          expect(ProductsDecorator).to receive(:new).with(object, with: ProductDecorator)
+          expect(ProductsDecorator).to receive(:new).with(object, {with: ProductDecorator})
           ProductDecorator.decorate_collection(object)
         end
 

data/spec/draper/factory_spec.rb

@@ -73,17 +73,17 @@ module Draper
           worker = ->(*){}
           allow(Factory::Worker).to receive_messages new: worker
 
-          expect(worker).to receive(:call).with(baz: "qux", context: {foo: "bar"})
+          expect(worker).to receive(:call).with({baz: "qux", context: {foo: "bar"}})
           factory.decorate(double, {baz: "qux"})
         end
 
         it "is overridden by explicitly-specified context" do
-          factory = Factory.new(context: {foo: "bar"})
+          factory = Factory.new({context: {foo: "bar"}})
           worker = ->(*){}
           allow(Factory::Worker).to receive_messages new: worker
 
-          expect(worker).to receive(:call).with(context: {baz: "qux"})
-          factory.decorate(double, context: {baz: "qux"})
+          expect(worker).to receive(:call).with({context: {baz: "qux"}})
+          factory.decorate(double, {context: {baz: "qux"}})
         end
       end
     end
@@ -109,7 +109,7 @@ module Draper
           allow(worker).to receive_messages decorator: decorator
           context = {foo: "bar"}
 
-          expect(decorator).to receive(:call).with(anything(), context: context)
+          expect(decorator).to receive(:call).with(anything(), {context: context})
           worker.call(context: ->{ context })
         end
 
@@ -140,7 +140,7 @@ module Draper
           allow(worker).to receive_messages decorator: decorator
           context = {foo: "bar"}
 
-          expect(decorator).to receive(:call).with(anything(), context: context)
+          expect(decorator).to receive(:call).with(anything(), {context: context})
           worker.call(context: context)
         end
       end
@@ -150,7 +150,7 @@ module Draper
         decorator = ->(*){}
         allow(worker).to receive_messages decorator: decorator
 
-        expect(decorator).to receive(:call).with(anything(), foo: "bar")
+        expect(decorator).to receive(:call).with(anything(), {foo: "bar"})
         worker.call(foo: "bar", context_args: [])
       end
     end
@@ -228,7 +228,7 @@ module Draper
               allow(object).to receive(:decorate){ nil }
               worker = Factory::Worker.new(nil, object)
 
-              expect(decorator_class).to receive(:decorate_collection).with(object, foo: "bar", with: nil).and_return(:decorated)
+              expect(decorator_class).to receive(:decorate_collection).with(object, {foo: "bar", with: nil}).and_return(:decorated)
               expect(worker.decorator.call(object, foo: "bar")).to be :decorated
             end
           end

data/spec/draper/query_methods_spec.rb

@@ -53,14 +53,24 @@ module Draper
       context 'when strategy allows collection to call the method' do
         before do
           allow(fake_strategy).to receive(:allowed?).with(:some_query_method).and_return(true)
+          allow(collection).to receive(:respond_to?).with(:some_query_method).and_return(true)
         end
 
         it { is_expected.to eq(true) }
+
+        context 'and collection does not implement the method' do
+          before do
+            allow(collection).to receive(:respond_to?).with(:some_query_method).and_return(false)
+          end
+
+          it { is_expected.to eq(false) }
+        end
       end
 
       context 'when strategy does not allow collection to call the method' do
         before do
           allow(fake_strategy).to receive(:allowed?).with(:some_query_method).and_return(false)
+          allow(collection).to receive(:respond_to?).with(:some_query_method).and_return(true)
         end
 
         it { is_expected.to eq(false) }

data/spec/draper/view_context/build_strategy_spec.rb

@@ -37,7 +37,7 @@ module Draper
 
         expect(controller.request).to be_nil
         strategy.call
-        expect(controller.request).to be_an ActionController::TestRequest
+        expect(controller.request).to be_an ActionDispatch::TestRequest
         expect(controller.params).to be_empty
 
         # sanity checks
@@ -45,23 +45,6 @@ module Draper
         expect(controller.view_context.params).to be controller.params
       end
 
-      it "compatible with rails 5.1 change on ActionController::TestRequest.create method" do
-        ActionController::TestRequest.class_eval do
-          if ActionController::TestRequest.method(:create).parameters.first == []
-            def create controller_class
-              create
-            end
-          end
-        end
-        controller = Class.new(ActionController::Base).new
-        allow(ViewContext).to receive_messages controller: controller
-        strategy = ViewContext::BuildStrategy::Full.new
-
-        expect(controller.request).to be_nil
-        strategy.call
-        expect(controller.request).to be_an ActionController::TestRequest
-      end
-
       it "adds methods to the view context from the constructor block" do
         allow(ViewContext).to receive(:controller).and_return(fake_controller)
         strategy = ViewContext::BuildStrategy::Full.new do

data/spec/dummy/.rspec

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

data/spec/dummy/app/decorators/comment_decorator.rb

@@ -0,0 +1,13 @@
+class CommentDecorator < Draper::Decorator
+  delegate_all
+
+  # Define presentation-specific methods here. Helpers are accessed through
+  # `helpers` (aka `h`). You can override attributes, for example:
+  #
+  #   def created_at
+  #     helpers.content_tag :span, class: 'time' do
+  #       object.created_at.strftime("%a %m/%d/%y")
+  #     end
+  #   end
+
+end

data/spec/dummy/app/decorators/mongoid_post_decorator.rb

@@ -1,4 +1,2 @@
-if defined?(Mongoid)
-  class MongoidPostDecorator < Draper::Decorator
-  end
+class MongoidPostDecorator < Draper::Decorator
 end

data/spec/dummy/app/models/admin.rb

@@ -1,5 +1,3 @@
-if defined?(Devise)
-  class Admin
-    extend Devise::Models
-  end
+class Admin
+  extend Devise::Models if defined? Devise
 end

data/spec/dummy/app/models/comment.rb

@@ -0,0 +1,3 @@
+class Comment < ApplicationRecord
+  belongs_to :post
+end

data/spec/dummy/app/models/mongoid_post.rb

@@ -1,5 +1,3 @@
-if defined?(Mongoid)
-  class MongoidPost
-    include Mongoid::Document
-  end
+class MongoidPost
+  include Mongoid::Document if defined? Mongoid
 end

data/spec/dummy/app/models/post.rb

@@ -1,3 +1,7 @@
 class Post < ApplicationRecord
   # attr_accessible :title, :body
+
+  has_many :comments
+
+  broadcasts if defined? Turbo::Broadcastable
 end

data/spec/dummy/app/models/user.rb

@@ -1,5 +1,3 @@
-if defined?(Devise)
-  class User
-    extend Devise::Models
-  end
+class User
+  extend Devise::Models if defined? Devise
 end