active_decorator 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23b742ea8c0e64545e2ad4249061b4f459f73f8012c9313d5900b5011399169d
-  data.tar.gz: 58b7e4519a166264d6565d04ae593309da02c026240164f01a9dbe3795b100a3
+  metadata.gz: 24bc5e2bff457e42cf67f9382718c8317b4b208ded7f64d008d4314bd3e58dd0
+  data.tar.gz: c06a655a2d778a46a5b57559b7dc9091960130846b9f4a28f526715a5b7c652f
 SHA512:
-  metadata.gz: 23f24b4acbb2c9cfdbfb6c4c6ce7f6aafba6924bab0fc924b7ebeb51f9dad4ffbb5bb8280f9b7f12a51fbcb1cd0be859e6d7621cf4092d344afce85536364a16
-  data.tar.gz: 4e4938a409750f666a0bffacd411c82d33e79b247acd221c9f62ac150e00dc12a361e9e3bc7dbd151aeaccacafe165348621b927c10ab5e2c15ddec4c895c79d
+  metadata.gz: 7535ee72c44901d579416091437f2ffe78ded2dc535a1e442412f7257004d6bb42f2eff340e31fb563a3fd3bdfa6002dc85d81c0ef4dfd32cefddd4d7b046e63
+  data.tar.gz: c6e02769eff8fcd3e53d0e1456554639038d39377d970aba27310cf1c971c0913785c2f2b1a0e4a9e0de3fe3e34d0d4540ff661b44ead9a242321e30e0195dde

data/.github/workflows/main.yml

@@ -11,11 +11,42 @@ jobs:
     name: Ruby ${{ matrix.ruby_version }} / Rails ${{ matrix.rails_version }}${{ matrix.api == '1' && ' / API' || '' }}
     strategy:
       matrix:
-        ruby_version: [ruby-head, '3.2', '3.1', '3.0', '2.7']
-        rails_version: [edge, '7.0', '6.1']
+        ruby_version: [ruby-head, '3.4', '3.3', '3.2', '3.1']
+        rails_version: [edge, '8.0', '7.2', '7.1', '7.0', '6.1']
         api: ['0', '1']
 
         include:
+          - ruby_version: '3.0'
+            rails_version: '7.1'
+          - ruby_version: '3.0'
+            rails_version: '7.1'
+            api: '1'
+          - ruby_version: '3.0'
+            rails_version: '7.0'
+          - ruby_version: '3.0'
+            rails_version: '7.0'
+            api: '1'
+          - ruby_version: '3.0'
+            rails_version: '6.1'
+          - ruby_version: '3.0'
+            rails_version: '6.1'
+            api: '1'
+
+          - ruby_version: '2.7'
+            rails_version: '7.1'
+          - ruby_version: '2.7'
+            rails_version: '7.1'
+            api: '1'
+          - ruby_version: '2.7'
+            rails_version: '7.0'
+          - ruby_version: '2.7'
+            rails_version: '7.0'
+            api: '1'
+          - ruby_version: '2.7'
+            rails_version: '6.1'
+          - ruby_version: '2.7'
+            rails_version: '6.1'
+            api: '1'
           - ruby_version: '2.7'
             rails_version: '6.0'
           - ruby_version: '2.7'
@@ -67,19 +98,31 @@ jobs:
             rails_version: '4.2'
             bundler_version: '1'
 
+        exclude:
+          - ruby_version: '3.1'
+            rails_version: edge
+          - ruby_version: '3.1'
+            rails_version: edge
+            api: '1'
+          - ruby_version: '3.1'
+            rails_version: '8.0'
+          - ruby_version: '3.1'
+            rails_version: '8.0'
+            api: '1'
+
     env:
       RAILS_VERSION: ${{ matrix.rails_version }}
       API: ${{ matrix.api }}
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
 
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby_version }}
-          rubygems: ${{ matrix.ruby_version < '2.6' && 'default' || 'latest' }}
+          rubygems: ${{ (matrix.ruby_version < '2.7' && 'default') || (matrix.ruby_version < '3' && '3.4.22') || 'latest' }}
           bundler: ${{ matrix.bundler_version }}
           bundler-cache: true
         continue-on-error: ${{ matrix.allow_failures == 'true' }}

data/CHANGELOG.md

@@ -1,6 +1,13 @@
+## 1.5.0
+
+* Don't drop keyword arguments when delegating helper methods via method_missing
+
+* Use ActiveSupport::CurrentAttributes (if available) for storing ViewContext instead of `Thread.current` for better thread safety
+
+
 ## 1.4.1
 
-* Support Ruby 3.2 by `File.exists?` => `File.exists?` in generator [@kyoshidajp]
+* Support Ruby 3.2 by `File.exists?` => `File.exist?` in generator [@kyoshidajp]
 
 * A little bit of internal code cleanup
 

data/Gemfile

@@ -9,7 +9,11 @@ if ENV['RAILS_VERSION'] == 'edge'
   gem 'rackup'
 elsif ENV['RAILS_VERSION']
   gem 'rails', "~> #{ENV['RAILS_VERSION']}.0"
-  gem 'sqlite3', '< 1.4' if ENV['RAILS_VERSION'] <= '5.0'
+  if ENV['RAILS_VERSION'] <= '5.0'
+    gem 'sqlite3', '< 1.4'
+  elsif (ENV['RAILS_VERSION'] <= '8') || (RUBY_VERSION < '3')
+    gem 'sqlite3', '< 2'
+  end
   gem 'rackup' if ENV['RAILS_VERSION'] > '7.1'
 else
   gem 'rails'
@@ -25,6 +29,11 @@ gem 'nokogiri', RUBY_VERSION < '2.1' ? '~> 1.6.0' : '>= 1.7'
 gem 'loofah', RUBY_VERSION < '2.5' ? '< 2.21.0' : '>= 0'
 gem 'concurrent-ruby', RUBY_VERSION < '2.3' ? '~> 1.1.0' : '>= 1.2'
 gem 'selenium-webdriver', RUBY_VERSION == '3.0' ? '4.9.0' : '>= 0'
-gem 'webdrivers' if ENV['RAILS_VERSION'] && ENV['RAILS_VERSION'] >= '6'
+gem 'webdrivers' if (ENV['RAILS_VERSION'] && ENV['RAILS_VERSION'] >= '6') && (RUBY_VERSION < '3')
 gem 'net-smtp' if RUBY_VERSION >= '3.1'
 gem 'jbuilder' unless ENV['API'] == '1'
+gem 'mutex_m' if RUBY_VERSION >= '3.4'
+gem 'base64' if RUBY_VERSION >= '3.4'
+gem 'bigdecimal' if RUBY_VERSION >= '3.4'
+gem 'logger' if RUBY_VERSION >= '3.5'
+gem 'benchmark' if RUBY_VERSION >= '3.5'

data/README.md

@@ -1,6 +1,6 @@
 # ActiveDecorator [![Build Status](https://github.com/amatsuda/active_decorator/actions/workflows/main.yml/badge.svg)](https://github.com/amatsuda/active_decorator/actions) [![Code Climate](https://codeclimate.com/github/amatsuda/active_decorator/badges/gpa.svg)](https://codeclimate.com/github/amatsuda/active_decorator)
 
-A simple and Rubyish view helper for Rails 4, Rails 5, Rails 6, and Rails 7. Keep your helpers and views Object-Oriented!
+A simple and Rubyish view helper for Rails 4, Rails 5, Rails 6, Rails 7, and Rails 8. Keep your helpers and views Object-Oriented!
 
 
 ## Features ##
@@ -15,9 +15,9 @@ A simple and Rubyish view helper for Rails 4, Rails 5, Rails 6, and Rails 7. Kee
 
 ## Supported versions ##
 
-* Ruby 2.1.x, 2.2.x, 2.3.x, 2.4.x, 2.5.x, 2.6.x, 2.7.x, 3.0.x, 3.1.x, 3.2.x, and 3.3 (trunk)
+* Ruby 2.1.x, 2.2.x, 2.3.x, 2.4.x, 2.5.x, 2.6.x, 2.7.x, 3.0.x, 3.1.x, 3.2.x, 3.3.x, 3.4.x, and 3.5 (trunk)
 
-* Rails 4.2.x, 5.0, 5.1, 5.2, 6.0, 6.1, 7.0, and 7.1 (edge)
+* Rails 4.2.x, 5.0, 5.1, 5.2, 6.0, 6.1, 7.0, 7.1, 7.2, 8.0, and 8.1 (edge)
 
 
 ## Supported ORMs ##

data/lib/active_decorator/helpers.rb

@@ -3,7 +3,7 @@
 # On the fly delegation from the decorator to the decorated object and the helpers.
 module ActiveDecorator
   module Helpers
-    def method_missing(method, *args, &block)
+    def method_missing(method, *args, **kwargs, &block)
       super
     rescue NoMethodError, NameError => e1
       # the error is not mine, so just releases it as is.
@@ -11,7 +11,11 @@ module ActiveDecorator
 
       if (view_context = ActiveDecorator::ViewContext.current)
         begin
-          view_context.send method, *args, &block
+          if kwargs.any?
+            view_context.send method, *args, **kwargs, &block
+          else
+            view_context.send method, *args, &block
+          end
         rescue NoMethodError => e2
           raise e2 if e2.name != method
 

data/lib/active_decorator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveDecorator
-  VERSION = '1.4.1'
+  VERSION = '1.5.0'
 end

data/lib/active_decorator/view_context.rb

@@ -2,7 +2,36 @@
 
 # A module that carries the controllers' view_context to decorators.
 module ActiveDecorator
-  module ViewContext
+  # Use Rails' CurrentAttributes if available (Rails 5.2+)
+  if defined? ActiveSupport::CurrentAttributes
+    class ViewContext < ActiveSupport::CurrentAttributes
+      # Rails 7.2+
+      if method(:attribute).parameters.include? [:key, :default]
+        attribute :view_context_stack, default: []
+      else
+        attribute :view_context_stack
+
+        def view_context_stack
+          attributes[:view_context_stack] ||= []
+        end
+      end
+
+      resets do
+        view_context_stack = nil
+      end
+    end
+  else
+    # Fallback implementation for Rails < 5.2
+    class ViewContext
+      class << self
+        def view_context_stack
+          Thread.current[:active_decorator_view_contexts] ||= []
+        end
+      end
+    end
+  end
+
+  class ViewContext
     class << self
       def current
         view_context_stack.last
@@ -16,10 +45,6 @@ module ActiveDecorator
         view_context_stack.pop
       end
 
-      def view_context_stack
-        Thread.current[:active_decorator_view_contexts] ||= []
-      end
-
       def run_with(view_context)
         push view_context
         yield

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: active_decorator
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Akira Matsuda
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-10 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -163,7 +162,6 @@ homepage: https://github.com/amatsuda/active_decorator
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -178,8 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.0.dev
-signing_key:
+rubygems_version: 3.8.0.dev
 specification_version: 4
 summary: A simple and Rubyish view helper for Rails
 test_files: []