active_decorator 1.3.4 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abd22d415613228c6c98fe9a0bf7255496dabaada709c34ba2cbe032a2fcc9b6
-  data.tar.gz: af38045be9a3de1832be692fa8f349010e7f79c7144d8d1f9f248aa3c311abb3
+  metadata.gz: 23b742ea8c0e64545e2ad4249061b4f459f73f8012c9313d5900b5011399169d
+  data.tar.gz: 58b7e4519a166264d6565d04ae593309da02c026240164f01a9dbe3795b100a3
 SHA512:
-  metadata.gz: 39f6198f7583dbc4df7bb3071161f234ce858cda7d17a27c07caab910bc3a1c652468cd42dfd7bf094cb53ceedc9da8c9a35d031a0e258398dc41f15b44d2925
-  data.tar.gz: 3b342f062765a460b03b3adbe2562cf01579a4b54427713dd3abe88694e371acee44ded648a218e9a2fd2872285635a08016cf11a0b68ecae0631243c6909c2f
+  metadata.gz: 23f24b4acbb2c9cfdbfb6c4c6ce7f6aafba6924bab0fc924b7ebeb51f9dad4ffbb5bb8280f9b7f12a51fbcb1cd0be859e6d7621cf4092d344afce85536364a16
+  data.tar.gz: 4e4938a409750f666a0bffacd411c82d33e79b247acd221c9f62ac150e00dc12a361e9e3bc7dbd151aeaccacafe165348621b927c10ab5e2c15ddec4c895c79d

data/.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+
+updates:
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: daily

data/.github/workflows/main.yml

@@ -0,0 +1,88 @@
+name: build
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: '45 23 * * *'
+
+jobs:
+  build:
+    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']
+        api: ['0', '1']
+
+        include:
+          - ruby_version: '2.7'
+            rails_version: '6.0'
+          - ruby_version: '2.7'
+            rails_version: '6.0'
+            api: '1'
+
+          - ruby_version: '2.6'
+            rails_version: '6.1'
+          - ruby_version: '2.6'
+            rails_version: '6.1'
+            api: '1'
+          - ruby_version: '2.6'
+            rails_version: '6.0'
+          - ruby_version: '2.6'
+            rails_version: '6.0'
+            api: '1'
+          - ruby_version: '2.6'
+            rails_version: '5.2'
+          - ruby_version: '2.6'
+            rails_version: '5.2'
+            api: '1'
+          - ruby_version: '2.6'
+            rails_version: '5.1'
+          - ruby_version: '2.6'
+            rails_version: '5.1'
+            api: '1'
+          - ruby_version: '2.6'
+            rails_version: '5.0'
+          - ruby_version: '2.6'
+            rails_version: '5.0'
+            api: '1'
+
+          - ruby_version: '2.5'
+            rails_version: '5.2'
+
+          - ruby_version: '2.4'
+            rails_version: '5.2'
+
+          - ruby_version: '2.3'
+            rails_version: '5.2'
+          - ruby_version: '2.3'
+            rails_version: '4.2'
+            bundler_version: '1'
+
+          - ruby_version: '2.2'
+            rails_version: '5.2'
+
+          - ruby_version: '2.1'
+            rails_version: '4.2'
+            bundler_version: '1'
+
+    env:
+      RAILS_VERSION: ${{ matrix.rails_version }}
+      API: ${{ matrix.api }}
+
+    runs-on: ubuntu-20.04
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby_version }}
+          rubygems: ${{ matrix.ruby_version < '2.6' && 'default' || 'latest' }}
+          bundler: ${{ matrix.bundler_version }}
+          bundler-cache: true
+        continue-on-error: ${{ matrix.allow_failures == 'true' }}
+
+      - run: bundle exec rake
+        continue-on-error: ${{ matrix.allow_failures == 'true' }}

data/CHANGELOG.md

@@ -1,19 +1,35 @@
+## 1.4.1
+
+* Support Ruby 3.2 by `File.exists?` => `File.exists?` in generator [@kyoshidajp]
+
+* A little bit of internal code cleanup
+
+
+## 1.4.0
+
+* Decorate non-nil objects where `nil?` returns true, namely, ActionText::RichText body [@jamesbrooks]
+
+
 ## 1.3.4
 
 * Support Rails 6.1 [@y-yagi]
 
+
 ## 1.3.3
 
 * Fixed Ruby 2.7 keyword arguments warning [@pocke]
 
+
 ## 1.3.2
 
 * Fixed NameError on ActionController::API controllers without jbuilder enhancement [@kamillle]
 
+
 ## 1.3.1
 
 * Switched back from Ruby's `const_get` to Active Support `constantize` for fetching decorator modules, due to inability to properly detect namespaced decorator [@sinsoku]
 
+
 ## 1.3.0
 
 * Switched from Active Support `constantize` to Ruby's `const_get` when fetching decorator modules

data/Gemfile

@@ -3,3 +3,28 @@
 source 'https://rubygems.org'
 
 gemspec
+
+if ENV['RAILS_VERSION'] == 'edge'
+  gem 'rails', git: 'https://github.com/rails/rails.git'
+  gem 'rackup'
+elsif ENV['RAILS_VERSION']
+  gem 'rails', "~> #{ENV['RAILS_VERSION']}.0"
+  gem 'sqlite3', '< 1.4' if ENV['RAILS_VERSION'] <= '5.0'
+  gem 'rackup' if ENV['RAILS_VERSION'] > '7.1'
+else
+  gem 'rails'
+end
+
+if RUBY_VERSION < '2.7'
+  gem 'puma', '< 6'
+else
+  gem 'puma'
+end
+
+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 'net-smtp' if RUBY_VERSION >= '3.1'
+gem 'jbuilder' unless ENV['API'] == '1'

data/README.md

@@ -1,6 +1,6 @@
-# ActiveDecorator [![Build Status](https://travis-ci.org/amatsuda/active_decorator.svg?branch=master)](https://travis-ci.org/amatsuda/active_decorator) [![Code Climate](https://codeclimate.com/github/amatsuda/active_decorator/badges/gpa.svg)](https://codeclimate.com/github/amatsuda/active_decorator)
+# 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, and Rails 6. Keep your helpers and views Object-Oriented!
+A simple and Rubyish view helper for Rails 4, Rails 5, Rails 6, and Rails 7. Keep your helpers and views Object-Oriented!
 
 
 ## Features ##
@@ -15,9 +15,9 @@ A simple and Rubyish view helper for Rails 4, Rails 5, and Rails 6. Keep your he
 
 ## Supported versions ##
 
-* Ruby 2.0.0, 2.1.x, 2.2.x, 2.3.x, 2.4.x, 2.5.x, 2.6.x, and 2.7 (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, and 3.3 (trunk)
 
-* Rails 4.2.x, 5.0, 5.1, 5.2, 6.0, and 6.1 (edge)
+* Rails 4.2.x, 5.0, 5.1, 5.2, 6.0, 6.1, 7.0, and 7.1 (edge)
 
 
 ## Supported ORMs ##

data/Rakefile

@@ -8,7 +8,7 @@ require 'rake/testtask'
 
 Rake::TestTask.new do |t|
   t.libs << "test"
-  if ENV['API']
+  if ENV['API'] == '1'
     t.pattern = 'test/**/*_api_test.rb'
   else
     t.test_files = Dir['test/**/*_test.rb'] - Dir['test/**/*_api_test.rb']

data/lib/active_decorator/decorator.rb

@@ -9,7 +9,7 @@ module ActiveDecorator
     include Singleton
 
     def initialize
-      @@decorators = {}
+      @decorators = {}
     end
 
     # Decorates the given object.
@@ -23,34 +23,26 @@ module ActiveDecorator
     #
     # This method can be publicly called from anywhere by `ActiveDecorator::Decorator.instance.decorate(obj)`.
     def decorate(obj)
-      return if defined?(Jbuilder) && (Jbuilder === obj)
-      return if obj.nil?
+      return obj if defined?(Jbuilder) && (Jbuilder === obj)
 
-      if obj.is_a?(Array)
-        obj.each do |r|
-          decorate r
-        end
-      elsif obj.is_a?(Hash)
-        obj.each_value do |v|
-          decorate v
-        end
-      elsif defined?(ActiveRecord) && obj.is_a?(ActiveRecord::Relation)
-        # don't call each nor to_a immediately
-        if obj.respond_to?(:records)
-          # Rails 5.0
-          obj.extend ActiveDecorator::RelationDecorator unless obj.is_a? ActiveDecorator::RelationDecorator
-        else
-          # Rails 3.x and 4.x
-          obj.extend ActiveDecorator::RelationDecoratorLegacy unless obj.is_a? ActiveDecorator::RelationDecoratorLegacy
-        end
+      case obj
+      when Array
+        obj.each {|e| decorate e }
+      when Hash
+        obj.each_value {|v| decorate v }
+      when nil, true, false
+        # Do nothing
       else
-        if defined?(ActiveRecord) && obj.is_a?(ActiveRecord::Base) && !obj.is_a?(ActiveDecorator::Decorated)
-          obj.extend ActiveDecorator::Decorated
+        if defined? ActiveRecord
+          if obj.is_a? ActiveRecord::Relation
+            return decorate_relation obj
+          elsif ActiveRecord::Base === obj
+            obj.extend ActiveDecorator::Decorated unless ActiveDecorator::Decorated === obj
+          end
         end
 
         d = decorator_for obj.class
-        return obj unless d
-        obj.extend d unless obj.is_a? d
+        obj.extend d if d && !(d === obj)
       end
 
       obj
@@ -59,45 +51,57 @@ module ActiveDecorator
     # Decorates AR model object's association only when the object was decorated.
     # Returns the association instance.
     def decorate_association(owner, target)
-      owner.is_a?(ActiveDecorator::Decorated) ? decorate(target) : target
+      (ActiveDecorator::Decorated === owner) ? decorate(target) : target
     end
 
     private
     # Returns a decorator module for the given class.
     # Returns `nil` if no decorator module was found.
     def decorator_for(model_class)
-      return @@decorators[model_class] if @@decorators.key? model_class
+      return @decorators[model_class] if @decorators.key? model_class
 
       decorator_name = "#{model_class.name}#{ActiveDecorator.config.decorator_suffix}"
       d = decorator_name.constantize
       unless Class === d
         d.send :include, ActiveDecorator::Helpers
-        @@decorators[model_class] = d
+        @decorators[model_class] = d
       else
         # Cache nil results
-        @@decorators[model_class] = nil
+        @decorators[model_class] = nil
       end
     rescue NameError
       if model_class.respond_to?(:base_class) && (model_class.base_class != model_class)
-        @@decorators[model_class] = decorator_for model_class.base_class
+        @decorators[model_class] = decorator_for model_class.base_class
       else
         # Cache nil results
-        @@decorators[model_class] = nil
+        @decorators[model_class] = nil
       end
     end
-  end
 
-  # For AR 3 and 4
-  module RelationDecoratorLegacy
-    def to_a
-      ActiveDecorator::Decorator.instance.decorate super
+    # Decorate with proper monkey patch based on AR version
+    def decorate_relation(obj)
+      if obj.respond_to?(:records)
+        # Rails 5.0
+        obj.extend ActiveDecorator::RelationDecorator unless ActiveDecorator::RelationDecorator === obj
+      else
+        # Rails 3.x and 4.x
+        obj.extend ActiveDecorator::RelationDecoratorLegacy unless ActiveDecorator::RelationDecoratorLegacy === obj
+      end
+      obj
     end
   end
 
-  # For AR 5+
+  # Override AR::Relation#records to decorate each element after being loaded (for AR 5+)
   module RelationDecorator
     def records
       ActiveDecorator::Decorator.instance.decorate super
     end
   end
+
+  # Override AR::Relation#to_a to decorate each element after being loaded (for AR 3 and 4)
+  module RelationDecoratorLegacy
+    def to_a
+      ActiveDecorator::Decorator.instance.decorate super
+    end
+  end
 end

data/lib/active_decorator/version.rb

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

data/lib/generators/rspec/templates/decorator_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require '<%= File.exists?('spec/rails_helper.rb') ? 'rails_helper' : 'spec_helper' %>'
+require '<%= File.exist?('spec/rails_helper.rb') ? 'rails_helper' : 'spec_helper' %>'
 
 RSpec.describe <%= class_name %>Decorator do
   let(:<%= singular_name %>) { <%= class_name %>.new.extend <%= class_name %>Decorator }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_decorator
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.4.1
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-21 00:00:00.000000000 Z
+date: 2023-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -129,21 +129,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/main.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
 - README.md
 - Rakefile
 - active_decorator.gemspec
-- gemfiles/Gemfile-rails.4.2.x
-- gemfiles/Gemfile-rails.5.0.x
-- gemfiles/Gemfile-rails.5.1.x
-- gemfiles/Gemfile-rails.5.2.x
-- gemfiles/Gemfile-rails.6.0.x
-- gemfiles/Gemfile-rails.6.1.x
-- gemfiles/Gemfile-rails.edge
 - lib/active_decorator.rb
 - lib/active_decorator/config.rb
 - lib/active_decorator/decorated.rb
@@ -184,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0
+rubygems_version: 3.5.0.dev
 signing_key:
 specification_version: 4
 summary: A simple and Rubyish view helper for Rails

data/.travis.yml

@@ -1,95 +0,0 @@
-language: ruby
-
-addons:
-  chrome: stable
-
-before_install:
-  - sudo apt update -qq
-  - sudo apt install -y chromium-chromedriver
-  - gem i bundler -v '<2'
-
-cache: bundler
-
-# rvm:
-#   - 2.6.6
-#   - 2.5.8
-#   - 2.4.6
-#   - 2.3.8
-#   - 2.2.10
-#   - 2.1.10
-#   - 2.0.0
-# gemfile:
-#   - gemfiles/Gemfile-rails.5.2.x
-#   - gemfiles/Gemfile-rails.5.1.x
-#   - gemfiles/Gemfile-rails.5.0.x
-#   - gemfiles/Gemfile-rails.4.2.x
-
-matrix:
-  include:
-    - rvm: 2.7.1
-      gemfile: gemfiles/Gemfile-rails.6.1.x
-    - rvm: 2.7.1
-      gemfile: gemfiles/Gemfile-rails.6.1.x
-      env: API=1
-    - rvm: 2.7.1
-      gemfile: gemfiles/Gemfile-rails.6.0.x
-    - rvm: 2.7.1
-      gemfile: gemfiles/Gemfile-rails.6.0.x
-      env: API=1
-
-    - rvm: 2.6.6
-      gemfile: gemfiles/Gemfile-rails.6.1.x
-    - rvm: 2.6.6
-      gemfile: gemfiles/Gemfile-rails.6.1.x
-      env: API=1
-    - rvm: 2.6.6
-      gemfile: gemfiles/Gemfile-rails.6.0.x
-    - rvm: 2.6.6
-      gemfile: gemfiles/Gemfile-rails.6.0.x
-      env: API=1
-    - rvm: 2.6.6
-      gemfile: gemfiles/Gemfile-rails.5.2.x
-    - rvm: 2.6.6
-      gemfile: gemfiles/Gemfile-rails.5.2.x
-      env: API=1
-    - rvm: 2.6.6
-      gemfile: gemfiles/Gemfile-rails.5.1.x
-    - rvm: 2.6.6
-      gemfile: gemfiles/Gemfile-rails.5.1.x
-      env: API=1
-    - rvm: 2.6.6
-      gemfile: gemfiles/Gemfile-rails.5.0.x
-    - rvm: 2.6.6
-      gemfile: gemfiles/Gemfile-rails.5.0.x
-      env: API=1
-
-    - rvm: 2.5.8
-      gemfile: gemfiles/Gemfile-rails.5.2.x
-
-    - rvm: 2.4.6
-      gemfile: gemfiles/Gemfile-rails.5.2.x
-
-    - rvm: 2.3.8
-      gemfile: gemfiles/Gemfile-rails.5.2.x
-    - rvm: 2.3.8
-      gemfile: gemfiles/Gemfile-rails.4.2.x
-
-    - rvm: 2.2.10
-      gemfile: gemfiles/Gemfile-rails.5.2.x
-
-    - rvm: 2.1.10
-      gemfile: gemfiles/Gemfile-rails.4.2.x
-
-    - rvm: 2.0.0
-      gemfile: gemfiles/Gemfile-rails.4.2.x
-
-    - rvm: ruby-head
-      gemfile: gemfiles/Gemfile-rails.edge
-
-    - rvm: ruby-head
-      gemfile: gemfiles/Gemfile-rails.edge
-      env: API=1
-
-  allow_failures:
-    - rvm: ruby-head
-    - gemfile: gemfiles/Gemfile-rails.edge

data/gemfiles/Gemfile-rails.4.2.x

@@ -1,8 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'rails', '~> 4.2.0'
-gem 'sqlite3', '< 1.4'
-gem 'nokogiri', '~> 1.6.0'
-gem 'jbuilder' unless ENV['API']

data/gemfiles/Gemfile-rails.5.0.x

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'rails', '~> 5.0.0'
-gem 'sqlite3', '< 1.4'
-gem 'jbuilder' unless ENV['API']

data/gemfiles/Gemfile-rails.5.1.x

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'rails', '~> 5.1.0'
-gem 'jbuilder' unless ENV['API']

data/gemfiles/Gemfile-rails.5.2.x

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'rails', git: 'https://github.com/rails/rails', branch: '5-2-stable'
-gem 'webdrivers', '< 4'
-gem 'jbuilder' unless ENV['API']

data/gemfiles/Gemfile-rails.6.0.x

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'rails', '~> 6.0.0'
-gem 'webdrivers'
-gem 'jbuilder' unless ENV['API']

data/gemfiles/Gemfile-rails.6.1.x

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'rails', '~> 6.1.0'
-gem 'webdrivers'
-gem 'jbuilder' unless ENV['API']

data/gemfiles/Gemfile-rails.edge

@@ -1,18 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-git_source(:github) do |repo_name|
-  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
-  "https://github.com/#{repo_name}.git"
-end
-
-github 'rails/rails' do
-  gem 'rails'
-end
-
-unless ENV['API']
-  github 'rails/jbuilder' do
-    gem 'jbuilder'
-  end
-end