active_decorator 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39935554e752b75933ebf759c5173fc67b451c077c6cb3d18c48af54f9b4192c
-  data.tar.gz: 6917e250174825e7ead1ffaa69ad4614ba6aa1070bd53d6e84aa2b2c15faef47
+  metadata.gz: f803e15d40a85700faf6ceb443bea2fabc225c2d3503e32c99dcb4e54e7f75e3
+  data.tar.gz: 1c15042cec49c02013f05ff50c91335d00d6acff63b6ae51ccee2ea77c27ec88
 SHA512:
-  metadata.gz: 1acb7ae8ea1a3a263d59611d3819036eb6aa303a3dfc3b55b0a6eb9eaef4b26412ed6c74aea6580ef1435aaab4a62360b7464e75130004f3da1d563f49a321c3
-  data.tar.gz: 69b9d07798170f1944cdd98a396b880232ed44278167ae0db3760aebdfc83a86f8f9fcf9846ec8008594bbb28e6285b9537fef3c19805ebbe3d17b47dd3e589d
+  metadata.gz: b48a0acdcdce16cd8f3fda7b56c95209af5e833502ea2ea5f9244e9e78bcf4255c376c21f50310631852a928279283d070bed45f618578867eb1edd45f6ddcaa
+  data.tar.gz: 8b959e33b9c70791a47ee759a6e9c3c877672cda9bb3ba5dc1de0ea4587be5d16bbccd0d0e980fc9ecfaae47adad0f616b35dda7f3c902b05cba064fda21fcc5

data/.travis.yml

@@ -11,9 +11,9 @@ before_install:
 cache: bundler
 
 # rvm:
-#   - 2.6.3
-#   - 2.5.5
-#   - 2.4.6
+#   - 2.6.7
+#   - 2.5.9
+#   - 2.4.10
 #   - 2.3.8
 #   - 2.2.10
 #   - 2.1.10
@@ -26,31 +26,53 @@ cache: bundler
 
 matrix:
   include:
-    - rvm: 2.6.3
+    - rvm: 3.0.1
+      gemfile: gemfiles/Gemfile-rails.6.1.x
+    - rvm: 3.0.1
+      gemfile: gemfiles/Gemfile-rails.6.1.x
+      env: API=1
+
+    - rvm: 2.7.3
+      gemfile: gemfiles/Gemfile-rails.6.1.x
+    - rvm: 2.7.3
+      gemfile: gemfiles/Gemfile-rails.6.1.x
+      env: API=1
+    - rvm: 2.7.3
       gemfile: gemfiles/Gemfile-rails.6.0.x
-    - rvm: 2.6.3
+    - rvm: 2.7.3
       gemfile: gemfiles/Gemfile-rails.6.0.x
       env: API=1
-    - rvm: 2.6.3
+
+    - rvm: 2.6.7
+      gemfile: gemfiles/Gemfile-rails.6.1.x
+    - rvm: 2.6.7
+      gemfile: gemfiles/Gemfile-rails.6.1.x
+      env: API=1
+    - rvm: 2.6.7
+      gemfile: gemfiles/Gemfile-rails.6.0.x
+    - rvm: 2.6.7
+      gemfile: gemfiles/Gemfile-rails.6.0.x
+      env: API=1
+    - rvm: 2.6.7
       gemfile: gemfiles/Gemfile-rails.5.2.x
-    - rvm: 2.6.3
+    - rvm: 2.6.7
       gemfile: gemfiles/Gemfile-rails.5.2.x
       env: API=1
-    - rvm: 2.6.3
+    - rvm: 2.6.7
       gemfile: gemfiles/Gemfile-rails.5.1.x
-    - rvm: 2.6.3
+    - rvm: 2.6.7
       gemfile: gemfiles/Gemfile-rails.5.1.x
       env: API=1
-    - rvm: 2.6.3
+    - rvm: 2.6.7
       gemfile: gemfiles/Gemfile-rails.5.0.x
-    - rvm: 2.6.3
+    - rvm: 2.6.7
       gemfile: gemfiles/Gemfile-rails.5.0.x
       env: API=1
 
-    - rvm: 2.5.5
+    - rvm: 2.5.9
       gemfile: gemfiles/Gemfile-rails.5.2.x
 
-    - rvm: 2.4.6
+    - rvm: 2.4.10
       gemfile: gemfiles/Gemfile-rails.5.2.x
 
     - rvm: 2.3.8
@@ -69,7 +91,6 @@ matrix:
 
     - rvm: ruby-head
       gemfile: gemfiles/Gemfile-rails.edge
-
     - rvm: ruby-head
       gemfile: gemfiles/Gemfile-rails.edge
       env: API=1

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 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/README.md

@@ -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.0.0, 2.1.x, 2.2.x, 2.3.x, 2.4.x, 2.5.x, 2.6.x, 2.7.x, 3.0.x, and 3.1 (trunk)
 
-* Rails 4.2.x, 5.0, 5.1, 5.2, and 6.0 (edge)
+* Rails 4.2.x, 5.0, 5.1, 5.2, 6.0, 6.1, and 7.0 (edge)
 
 
 ## Supported ORMs ##

data/active_decorator.gemspec

@@ -13,17 +13,18 @@ Gem::Specification.new do |s|
   s.summary     = %q{A simple and Rubyish view helper for Rails}
   s.description = %q{A simple and Rubyish view helper for Rails}
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
   s.require_paths = ["lib"]
 
+  s.add_dependency 'activesupport'
+
   s.add_development_dependency 'test-unit-rails'
   s.add_development_dependency 'selenium-webdriver'
   s.add_development_dependency 'puma'
   s.add_development_dependency 'capybara'
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'jbuilder'
   s.add_development_dependency 'byebug'
 end

data/gemfiles/Gemfile-rails.4.2.x

@@ -5,3 +5,4 @@ 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

@@ -4,3 +4,4 @@ gemspec path: '..'
 
 gem 'rails', '~> 5.0.0'
 gem 'sqlite3', '< 1.4'
+gem 'jbuilder' unless ENV['API']

data/gemfiles/Gemfile-rails.5.1.x

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

data/gemfiles/Gemfile-rails.5.2.x

@@ -2,4 +2,6 @@ source 'https://rubygems.org'
 
 gemspec path: '..'
 
-gem 'rails', '~> 5.2.0'
+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

@@ -2,4 +2,6 @@ source 'https://rubygems.org'
 
 gemspec path: '..'
 
-gem 'rails', '~> 6.0.0.rc1'
+gem 'rails', '~> 6.0.0'
+gem 'webdrivers'
+gem 'jbuilder' unless ENV['API']

data/gemfiles/Gemfile-rails.6.1.x

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

data/gemfiles/Gemfile-rails.edge

@@ -10,3 +10,9 @@ end
 github 'rails/rails' do
   gem 'rails'
 end
+
+unless ENV['API']
+  github 'rails/jbuilder' do
+    gem 'jbuilder'
+  end
+end

data/lib/active_decorator/decorator.rb

@@ -23,34 +23,38 @@ 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)
+      case obj
+      when Array
         obj.each do |r|
           decorate r
         end
-      elsif obj.is_a?(Hash)
+      when 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
+      when nil, true, false
+        obj
       else
-        if defined?(ActiveRecord) && obj.is_a?(ActiveRecord::Base) && !obj.is_a?(ActiveDecorator::Decorated)
-          obj.extend ActiveDecorator::Decorated
-        end
+        if 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
+        else
+          if defined?(ActiveRecord) && obj.is_a?(ActiveRecord::Base) && !obj.is_a?(ActiveDecorator::Decorated)
+            obj.extend ActiveDecorator::Decorated
+          end
 
-        d = decorator_for obj.class
-        return obj unless d
-        obj.extend d unless obj.is_a? d
+          d = decorator_for obj.class
+          return obj unless d
+          obj.extend d unless obj.is_a? d
+        end
       end
 
       obj
@@ -69,7 +73,7 @@ module ActiveDecorator
       return @@decorators[model_class] if @@decorators.key? model_class
 
       decorator_name = "#{model_class.name}#{ActiveDecorator.config.decorator_suffix}"
-      d = Object.const_get decorator_name, false
+      d = decorator_name.constantize
       unless Class === d
         d.send :include, ActiveDecorator::Helpers
         @@decorators[model_class] = d

data/lib/active_decorator/helpers.rb

@@ -25,5 +25,6 @@ module ActiveDecorator
         raise e1
       end
     end
+    ruby2_keywords :method_missing if respond_to?(:ruby2_keywords, true)
   end
 end

data/lib/active_decorator/monkey/action_controller/base/rescue_from.rb

@@ -7,10 +7,10 @@ module ActiveDecorator
     module ActionController
       module Base
         def rescue_with_handler(*)
-          ActiveDecorator::ViewContext.push(view_context)
+          ActiveDecorator::ViewContext.push(view_context) if defined?(view_context)
           super
         ensure
-          ActiveDecorator::ViewContext.pop
+          ActiveDecorator::ViewContext.pop if defined?(view_context)
         end
       end
     end

data/lib/active_decorator/monkey/action_view/collection_renderer.rb

@@ -0,0 +1,12 @@
+module ActiveDecorator
+  module Monkey
+    module ActionView
+      module CollectionRenderer
+        def render_collection_with_partial(collection, *)
+          ActiveDecorator::Decorator.instance.decorate collection
+          super
+        end
+      end
+    end
+  end
+end

data/lib/active_decorator/monkey/action_view/object_renderer.rb

@@ -0,0 +1,12 @@
+module ActiveDecorator
+  module Monkey
+    module ActionView
+      module ObjectRenderer
+        def render_object_with_partial(object, *)
+          ActiveDecorator::Decorator.instance.decorate object
+          super
+        end
+      end
+    end
+  end
+end

data/lib/active_decorator/monkey/action_view/partial_renderer.rb

@@ -5,18 +5,30 @@ module ActiveDecorator
   module Monkey
     module ActionView
       module PartialRenderer
+        if Rails.version.to_f >= 6.1
+          def initialize(*)
+            super
+
+            @locals.each_value do |v|
+              ActiveDecorator::Decorator.instance.decorate v
+            end
+          end
+        end
+
         private
 
-        def setup(*)
-          super
+        if Rails.version.to_f < 6.1
+          def setup(*)
+            super
 
-          @locals.each_value do |v|
-            ActiveDecorator::Decorator.instance.decorate v
-          end if @locals
-          ActiveDecorator::Decorator.instance.decorate @object if @object
-          ActiveDecorator::Decorator.instance.decorate @collection unless @collection.blank?
+            @locals.each_value do |v|
+              ActiveDecorator::Decorator.instance.decorate v
+            end if @locals
+            ActiveDecorator::Decorator.instance.decorate @object if @object
+            ActiveDecorator::Decorator.instance.decorate @collection unless @collection.blank?
 
-          self
+            self
+          end
         end
       end
     end

data/lib/active_decorator/railtie.rb

@@ -6,6 +6,14 @@ module ActiveDecorator
       ActiveSupport.on_load :action_view do
         require 'active_decorator/monkey/action_view/partial_renderer'
         ActionView::PartialRenderer.send :prepend, ActiveDecorator::Monkey::ActionView::PartialRenderer
+
+        if Rails.version.to_f >= 6.1
+          require 'active_decorator/monkey/action_view/collection_renderer'
+          ActionView::CollectionRenderer.send :prepend, ActiveDecorator::Monkey::ActionView::CollectionRenderer
+
+          require 'active_decorator/monkey/action_view/object_renderer'
+          ActionView::ObjectRenderer.send :prepend, ActiveDecorator::Monkey::ActionView::ObjectRenderer
+        end
       end
 
       ActiveSupport.on_load :action_controller do

data/lib/active_decorator/version.rb

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

data/lib/generators/rails/templates/decorator.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module <%= class_name %>Decorator
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require '<%= File.exists?('spec/rails_helper.rb') ? 'rails_helper' : 'spec_helper' %>'
 
 RSpec.describe <%= class_name %>Decorator do

data/lib/generators/test_unit/templates/decorator_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class <%= class_name %>DecoratorTest < ActiveSupport::TestCase

metadata

@@ -1,23 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: active_decorator
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Akira Matsuda
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-28 00:00:00.000000000 Z
+date: 2021-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: test-unit-rails
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: selenium-webdriver
+  name: test-unit-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: puma
+  name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jbuilder
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -142,6 +142,7 @@ files:
 - 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
@@ -150,6 +151,8 @@ files:
 - lib/active_decorator/helpers.rb
 - lib/active_decorator/monkey/abstract_controller/rendering.rb
 - lib/active_decorator/monkey/action_controller/base/rescue_from.rb
+- lib/active_decorator/monkey/action_view/collection_renderer.rb
+- lib/active_decorator/monkey/action_view/object_renderer.rb
 - lib/active_decorator/monkey/action_view/partial_renderer.rb
 - lib/active_decorator/monkey/active_record/associations.rb
 - lib/active_decorator/railtie.rb
@@ -162,40 +165,11 @@ files:
 - lib/generators/rspec/templates/decorator_spec.rb
 - lib/generators/test_unit/decorator_generator.rb
 - lib/generators/test_unit/templates/decorator_test.rb
-- test/configuration_test.rb
-- test/controllers/fake_detection_test.rb
-- test/decorator_test.rb
-- test/fake_app/app/views/api/bookstores/show.json.jbuilder
-- test/fake_app/app/views/authors/index.html.erb
-- test/fake_app/app/views/authors/show.html.erb
-- test/fake_app/app/views/authors/show.json.jbuilder
-- test/fake_app/app/views/book_mailer/thanks.text.erb
-- test/fake_app/app/views/books/_book.html.erb
-- test/fake_app/app/views/books/_book.json.jbuilder
-- test/fake_app/app/views/books/_book_locals.html.erb
-- test/fake_app/app/views/books/errata.html.erb
-- test/fake_app/app/views/books/errata2.html.erb
-- test/fake_app/app/views/books/error.html.erb
-- test/fake_app/app/views/books/index.html.erb
-- test/fake_app/app/views/books/purchase.html.erb
-- test/fake_app/app/views/books/show.html.erb
-- test/fake_app/app/views/movies/show.html.erb
-- test/fake_app/fake_app.rb
-- test/fake_app/public/images/cover.png
-- test/features/action_controller_api_test.rb
-- test/features/action_view_helpers_test.rb
-- test/features/association_test.rb
-- test/features/controller_ivar_test.rb
-- test/features/jbuilder_test.rb
-- test/features/name_error_handling_test.rb
-- test/features/partial_test.rb
-- test/models/association_test.rb
-- test/test_helper.rb
 homepage: https://github.com/amatsuda/active_decorator
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -210,37 +184,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.0.dev
+signing_key:
 specification_version: 4
 summary: A simple and Rubyish view helper for Rails
-test_files:
-- test/configuration_test.rb
-- test/controllers/fake_detection_test.rb
-- test/decorator_test.rb
-- test/fake_app/app/views/api/bookstores/show.json.jbuilder
-- test/fake_app/app/views/authors/index.html.erb
-- test/fake_app/app/views/authors/show.html.erb
-- test/fake_app/app/views/authors/show.json.jbuilder
-- test/fake_app/app/views/book_mailer/thanks.text.erb
-- test/fake_app/app/views/books/_book.html.erb
-- test/fake_app/app/views/books/_book.json.jbuilder
-- test/fake_app/app/views/books/_book_locals.html.erb
-- test/fake_app/app/views/books/errata.html.erb
-- test/fake_app/app/views/books/errata2.html.erb
-- test/fake_app/app/views/books/error.html.erb
-- test/fake_app/app/views/books/index.html.erb
-- test/fake_app/app/views/books/purchase.html.erb
-- test/fake_app/app/views/books/show.html.erb
-- test/fake_app/app/views/movies/show.html.erb
-- test/fake_app/fake_app.rb
-- test/fake_app/public/images/cover.png
-- test/features/action_controller_api_test.rb
-- test/features/action_view_helpers_test.rb
-- test/features/association_test.rb
-- test/features/controller_ivar_test.rb
-- test/features/jbuilder_test.rb
-- test/features/name_error_handling_test.rb
-- test/features/partial_test.rb
-- test/models/association_test.rb
-- test/test_helper.rb
+test_files: []