draper 4.0.4 → 4.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78c5e444690de191d46a5be87ed46a3f9be6ec0ffd59fed6dcd1d63e5d527b85
-  data.tar.gz: f92be8ee42d8ce2e48c1743077f758eef779296593fcbcdef9a82fd5937a03ae
+  metadata.gz: c37ab7e42fe93c37a13899d6b51f1dbddfcb7a417eaad7531a3e11d59fb63442
+  data.tar.gz: 3ab092943fa340ef28abfe4974960201374f92e2defa6bd1c8fd90cd495b6056
 SHA512:
-  metadata.gz: 2b2d10594f175019d7cbee9b7af7f811c8978349abae3cdce746abd94f24501d81b519c9da9ae350658265dd5aa0b33cdd9b3f18e26df922363227df8f57c4a4
-  data.tar.gz: 81565fd7b8034294a41c49b557f48619e6cee814056d2d4bff4c0e6f17c024877b250b421d4a185310f6b6fa3dee14b51d954b6ee3cef39100d3cfb4c9582af7
+  metadata.gz: d700dbac01e145361e56c8b6fbf04c93b9156492e14659ba6724fa36be20ebdac6319c2bc2910beaf68b9cbe40271808ed17c23bed2c8a76361d438cc5b35033
+  data.tar.gz: bd8689b7de4f934d97dc48a564795ef91e2e859b586f7561c0ba3996e0f2b7434a29d8a9e497d5248b0e28074b854befdb86f6f20858f1816474755ec14fdca3

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # 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

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
@@ -672,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
 

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.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
@@ -13,6 +14,10 @@ module Draper
 
     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}

data/lib/draper/railtie.rb

@@ -56,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.4'
+  VERSION = '4.0.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: draper
 version: !ruby/object:Gem::Version
-  version: 4.0.4
+  version: 4.0.6
 platform: ruby
 authors:
 - Jeff Casimir
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-28 00:00:00.000000000 Z
+date: 2025-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -217,26 +217,20 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
-- ".github/PULL_REQUEST_TEMPLATE.md"
-- ".github/workflows/ci.yml"
-- ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".yardopts"
 - CHANGELOG.md
 - CONTRIBUTING.md
-- Gemfile
 - Guardfile
 - LICENSE
 - README.md
 - Rakefile
-- bin/bundle
-- bin/rake
-- draper.gemspec
 - lib/draper.rb
 - lib/draper/automatic_delegation.rb
 - lib/draper/collection_decorator.rb
 - lib/draper/compatibility/api_only.rb
+- lib/draper/compatibility/broadcastable.rb
 - lib/draper/compatibility/global_id.rb
 - lib/draper/configuration.rb
 - lib/draper/decoratable.rb
@@ -276,117 +270,6 @@ files:
 - lib/generators/rspec/templates/decorator_spec.rb
 - lib/generators/test_unit/decorator_generator.rb
 - lib/generators/test_unit/templates/decorator_test.rb
-- spec/draper/collection_decorator_spec.rb
-- spec/draper/configuration_spec.rb
-- spec/draper/decoratable/equality_spec.rb
-- spec/draper/decoratable_spec.rb
-- spec/draper/decorated_association_spec.rb
-- spec/draper/decorates_assigned_spec.rb
-- spec/draper/decorator_spec.rb
-- spec/draper/draper_spec.rb
-- spec/draper/factory_spec.rb
-- spec/draper/finders_spec.rb
-- spec/draper/helper_proxy_spec.rb
-- spec/draper/lazy_helpers_spec.rb
-- spec/draper/query_methods/load_strategy_spec.rb
-- spec/draper/query_methods_spec.rb
-- spec/draper/undecorate_chain_spec.rb
-- spec/draper/undecorate_spec.rb
-- spec/draper/view_context/build_strategy_spec.rb
-- spec/draper/view_context_spec.rb
-- spec/draper/view_helpers_spec.rb
-- spec/dummy/.rspec
-- spec/dummy/Rakefile
-- spec/dummy/app/assets/config/manifest.js
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/controllers/base_controller.rb
-- spec/dummy/app/controllers/localized_urls.rb
-- spec/dummy/app/controllers/posts_controller.rb
-- spec/dummy/app/decorators/comment_decorator.rb
-- spec/dummy/app/decorators/mongoid_post_decorator.rb
-- spec/dummy/app/decorators/post_decorator.rb
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/jobs/publish_post_job.rb
-- spec/dummy/app/mailers/application_mailer.rb
-- spec/dummy/app/mailers/post_mailer.rb
-- spec/dummy/app/models/admin.rb
-- spec/dummy/app/models/application_record.rb
-- spec/dummy/app/models/comment.rb
-- spec/dummy/app/models/mongoid_post.rb
-- spec/dummy/app/models/post.rb
-- spec/dummy/app/models/user.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/views/post_mailer/decorated_email.html.erb
-- spec/dummy/app/views/posts/_post.html.erb
-- spec/dummy/app/views/posts/show.html.erb
-- spec/dummy/bin/rails
-- spec/dummy/config.ru
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/draper.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/secret_token.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/mongoid.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/config/storage.yml
-- spec/dummy/db/migrate/20121019115657_create_posts.rb
-- spec/dummy/db/migrate/20240907041839_create_comments.rb
-- spec/dummy/db/schema.rb
-- spec/dummy/db/seeds.rb
-- spec/dummy/fast_spec/post_decorator_spec.rb
-- spec/dummy/lib/tasks/test.rake
-- spec/dummy/log/.gitkeep
-- spec/dummy/public/404.html
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/script/rails
-- spec/dummy/spec/decorators/active_model_serializers_spec.rb
-- spec/dummy/spec/decorators/devise_spec.rb
-- spec/dummy/spec/decorators/helpers_spec.rb
-- spec/dummy/spec/decorators/post_decorator_spec.rb
-- spec/dummy/spec/decorators/spec_type_spec.rb
-- spec/dummy/spec/decorators/view_context_spec.rb
-- spec/dummy/spec/jobs/publish_post_job_spec.rb
-- spec/dummy/spec/mailers/post_mailer_spec.rb
-- spec/dummy/spec/models/application_spec.rb
-- spec/dummy/spec/models/mongoid_post_spec.rb
-- spec/dummy/spec/models/post_spec.rb
-- spec/dummy/spec/rails_helper.rb
-- spec/dummy/spec/shared_examples/decoratable.rb
-- spec/dummy/spec/spec_helper.rb
-- spec/dummy/test/decorators/minitest/devise_test.rb
-- spec/dummy/test/decorators/minitest/helpers_test.rb
-- spec/dummy/test/decorators/minitest/spec_type_test.rb
-- spec/dummy/test/decorators/minitest/view_context_test.rb
-- spec/dummy/test/decorators/test_unit/devise_test.rb
-- spec/dummy/test/decorators/test_unit/helpers_test.rb
-- spec/dummy/test/decorators/test_unit/view_context_test.rb
-- spec/dummy/test/minitest_helper.rb
-- spec/dummy/test/test_helper.rb
-- spec/generators/controller/controller_generator_spec.rb
-- spec/generators/decorator/decorator_generator_spec.rb
-- spec/generators/install/install_generator_spec.rb
-- spec/integration/integration_spec.rb
-- spec/performance/active_record.rb
-- spec/performance/benchmark.rb
-- spec/performance/decorators.rb
-- spec/performance/models.rb
-- spec/spec_helper.rb
-- spec/support/dummy_app.rb
-- spec/support/matchers/have_text.rb
-- spec/support/shared_examples/decoratable_equality.rb
-- spec/support/shared_examples/view_helpers.rb
 homepage: https://github.com/drapergem/draper
 licenses:
 - MIT
@@ -410,115 +293,4 @@ rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: View Models for Rails
-test_files:
-- spec/draper/collection_decorator_spec.rb
-- spec/draper/configuration_spec.rb
-- spec/draper/decoratable/equality_spec.rb
-- spec/draper/decoratable_spec.rb
-- spec/draper/decorated_association_spec.rb
-- spec/draper/decorates_assigned_spec.rb
-- spec/draper/decorator_spec.rb
-- spec/draper/draper_spec.rb
-- spec/draper/factory_spec.rb
-- spec/draper/finders_spec.rb
-- spec/draper/helper_proxy_spec.rb
-- spec/draper/lazy_helpers_spec.rb
-- spec/draper/query_methods/load_strategy_spec.rb
-- spec/draper/query_methods_spec.rb
-- spec/draper/undecorate_chain_spec.rb
-- spec/draper/undecorate_spec.rb
-- spec/draper/view_context/build_strategy_spec.rb
-- spec/draper/view_context_spec.rb
-- spec/draper/view_helpers_spec.rb
-- spec/dummy/.rspec
-- spec/dummy/Rakefile
-- spec/dummy/app/assets/config/manifest.js
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/controllers/base_controller.rb
-- spec/dummy/app/controllers/localized_urls.rb
-- spec/dummy/app/controllers/posts_controller.rb
-- spec/dummy/app/decorators/comment_decorator.rb
-- spec/dummy/app/decorators/mongoid_post_decorator.rb
-- spec/dummy/app/decorators/post_decorator.rb
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/jobs/publish_post_job.rb
-- spec/dummy/app/mailers/application_mailer.rb
-- spec/dummy/app/mailers/post_mailer.rb
-- spec/dummy/app/models/admin.rb
-- spec/dummy/app/models/application_record.rb
-- spec/dummy/app/models/comment.rb
-- spec/dummy/app/models/mongoid_post.rb
-- spec/dummy/app/models/post.rb
-- spec/dummy/app/models/user.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/views/post_mailer/decorated_email.html.erb
-- spec/dummy/app/views/posts/_post.html.erb
-- spec/dummy/app/views/posts/show.html.erb
-- spec/dummy/bin/rails
-- spec/dummy/config.ru
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/draper.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/secret_token.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/mongoid.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/config/storage.yml
-- spec/dummy/db/migrate/20121019115657_create_posts.rb
-- spec/dummy/db/migrate/20240907041839_create_comments.rb
-- spec/dummy/db/schema.rb
-- spec/dummy/db/seeds.rb
-- spec/dummy/fast_spec/post_decorator_spec.rb
-- spec/dummy/lib/tasks/test.rake
-- spec/dummy/log/.gitkeep
-- spec/dummy/public/404.html
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/script/rails
-- spec/dummy/spec/decorators/active_model_serializers_spec.rb
-- spec/dummy/spec/decorators/devise_spec.rb
-- spec/dummy/spec/decorators/helpers_spec.rb
-- spec/dummy/spec/decorators/post_decorator_spec.rb
-- spec/dummy/spec/decorators/spec_type_spec.rb
-- spec/dummy/spec/decorators/view_context_spec.rb
-- spec/dummy/spec/jobs/publish_post_job_spec.rb
-- spec/dummy/spec/mailers/post_mailer_spec.rb
-- spec/dummy/spec/models/application_spec.rb
-- spec/dummy/spec/models/mongoid_post_spec.rb
-- spec/dummy/spec/models/post_spec.rb
-- spec/dummy/spec/rails_helper.rb
-- spec/dummy/spec/shared_examples/decoratable.rb
-- spec/dummy/spec/spec_helper.rb
-- spec/dummy/test/decorators/minitest/devise_test.rb
-- spec/dummy/test/decorators/minitest/helpers_test.rb
-- spec/dummy/test/decorators/minitest/spec_type_test.rb
-- spec/dummy/test/decorators/minitest/view_context_test.rb
-- spec/dummy/test/decorators/test_unit/devise_test.rb
-- spec/dummy/test/decorators/test_unit/helpers_test.rb
-- spec/dummy/test/decorators/test_unit/view_context_test.rb
-- spec/dummy/test/minitest_helper.rb
-- spec/dummy/test/test_helper.rb
-- spec/generators/controller/controller_generator_spec.rb
-- spec/generators/decorator/decorator_generator_spec.rb
-- spec/generators/install/install_generator_spec.rb
-- spec/integration/integration_spec.rb
-- spec/performance/active_record.rb
-- spec/performance/benchmark.rb
-- spec/performance/decorators.rb
-- spec/performance/models.rb
-- spec/spec_helper.rb
-- spec/support/dummy_app.rb
-- spec/support/matchers/have_text.rb
-- spec/support/shared_examples/decoratable_equality.rb
-- spec/support/shared_examples/view_helpers.rb
+test_files: []

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -1,24 +0,0 @@
-## Description
-Detail your changes here.  
-A few sentences describing the overall goals of the pull request's commits will suffice.
-Some questions you might answer:
-
-* Why was this change required?
-* Did you have any tough decisions to make? Which one(s) did you go with and why?
-* Are there any deployment impacts to this change?
-* Is there something you aren't happy with or that needs extra attention?
-
-## Testing
-Outline steps to test your changes.
-
-1. Go here.
-1. Click this.
-1. See that.
-
-## To-Dos
-- [ ] tests
-- [ ] documentation
-
-## References
-* [GitHub Issue ####](https://github.com/drapergem/draper/issues/####)
-* [GitHub Pull Request ####](https://github.com/drapergem/draper/pull/####)

data/.github/workflows/ci.yml

@@ -1,71 +0,0 @@
----
-name: CI
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-
-permissions:
-  contents: read
-
-jobs:
-  rspec:
-    name: >-
-      rspec (${{ matrix.ruby }})
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby:
-          - 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:
-        image: mongo
-        ports:
-          - 27017:27017
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          rubygems: latest
-          bundler-cache: true
-
-      - name: RSpec & publish code coverage
-        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/.gitignore

@@ -1,18 +0,0 @@
-*.gem
-.rvmrc
-.ruby-version
-.ruby-gemset
-.bundle
-Gemfile.lock
-pkg/*
-coverage.data
-coverage/*
-.yardoc
-doc/*
-tmp
-vendor/bundle
-*.swp
-*.swo
-*.DS_Store
-spec/dummy/log/*
-spec/dummy/db/*.sqlite3

data/Gemfile

@@ -1,46 +0,0 @@
-source "https://rubygems.org"
-
-gemspec
-
-gem 'puma'
-
-platforms :ruby do
-  if RUBY_VERSION >= "2.5.0"
-    gem 'sqlite3'
-  else
-    gem 'sqlite3', '~> 1.3.6'
-  end
-end
-
-platforms :jruby do
-  gem "minitest"
-  gem "activerecord-jdbcsqlite3-adapter"
-end
-
-case rails_version = ENV['RAILS_VERSION']
-when nil
-  gem 'rails'
-when 'edge'
-  gem 'rails', github: 'rails/rails'
-else
-  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