active_decorator 1.2.0 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aaf638a40c289f98d04544cf74fb6fc4ed4e6d900e9624612ad4369a61b2032d
-  data.tar.gz: 014c96599fa99736ff84c75571a95e6ad49bb24d99220e382b78e8516f746759
+  metadata.gz: abd22d415613228c6c98fe9a0bf7255496dabaada709c34ba2cbe032a2fcc9b6
+  data.tar.gz: af38045be9a3de1832be692fa8f349010e7f79c7144d8d1f9f248aa3c311abb3
 SHA512:
-  metadata.gz: f2270ef449d855e51524d81ba1feeda5582732969dd622a0e2e4cc4b700e8e0d1529e0f891ca39572f2c03c41cd6143a2809c8dad27fcfdca1c3408434445ee0
-  data.tar.gz: 515a67fa6e3964ec7b8ece6a6ec4d410fd4479aac285d2bd2d6c59eeea023a35123b54b3bb0c0e4481931328d89200c682f7756db534934d59b90ff6b52984c9
+  metadata.gz: 39f6198f7583dbc4df7bb3071161f234ce858cda7d17a27c07caab910bc3a1c652468cd42dfd7bf094cb53ceedc9da8c9a35d031a0e258398dc41f15b44d2925
+  data.tar.gz: 3b342f062765a460b03b3adbe2562cf01579a4b54427713dd3abe88694e371acee44ded648a218e9a2fd2872285635a08016cf11a0b68ecae0631243c6909c2f

data/.gitignore

@@ -5,3 +5,4 @@ gemfiles/*.lock
 pkg/*
 log
 tmp
+.byebug_history

data/.travis.yml

@@ -1,22 +1,19 @@
 language: ruby
 
-sudo: false
-
-script: bundle exec rake test
-
 addons:
   chrome: stable
 
 before_install:
   - sudo apt update -qq
   - sudo apt install -y chromium-chromedriver
-  - sudo ln -s /usr/lib/chromium-browser/chromedriver /usr/bin/
   - gem i bundler -v '<2'
 
+cache: bundler
+
 # rvm:
-#   - 2.6.2
-#   - 2.5.5
-#   - 2.4.5
+#   - 2.6.6
+#   - 2.5.8
+#   - 2.4.6
 #   - 2.3.8
 #   - 2.2.10
 #   - 2.1.10
@@ -26,42 +23,56 @@ before_install:
 #   - gemfiles/Gemfile-rails.5.1.x
 #   - gemfiles/Gemfile-rails.5.0.x
 #   - gemfiles/Gemfile-rails.4.2.x
-#   - gemfiles/Gemfile-rails.4.1.x
-#   - gemfiles/Gemfile-rails.4.0.x
-#   - gemfiles/Gemfile-rails.3.2.x
 
 matrix:
   include:
-    - rvm: 2.6.2
+    - 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.2
+    - rvm: 2.6.6
       gemfile: gemfiles/Gemfile-rails.5.2.x
       env: API=1
-    - rvm: 2.6.2
+    - rvm: 2.6.6
       gemfile: gemfiles/Gemfile-rails.5.1.x
-    - rvm: 2.6.2
+    - rvm: 2.6.6
       gemfile: gemfiles/Gemfile-rails.5.1.x
       env: API=1
-    - rvm: 2.6.2
+    - rvm: 2.6.6
       gemfile: gemfiles/Gemfile-rails.5.0.x
-    - rvm: 2.6.2
+    - rvm: 2.6.6
       gemfile: gemfiles/Gemfile-rails.5.0.x
       env: API=1
 
-    - rvm: 2.5.5
+    - rvm: 2.5.8
       gemfile: gemfiles/Gemfile-rails.5.2.x
 
-    - rvm: 2.4.5
+    - 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.3.8
-      gemfile: gemfiles/Gemfile-rails.4.1.x
-    - rvm: 2.3.8
-      gemfile: gemfiles/Gemfile-rails.4.0.x
 
     - rvm: 2.2.10
       gemfile: gemfiles/Gemfile-rails.5.2.x
@@ -72,10 +83,6 @@ matrix:
     - rvm: 2.0.0
       gemfile: gemfiles/Gemfile-rails.4.2.x
 
-    - rvm: 2.0.0
-      gemfile: gemfiles/Gemfile-rails.3.2.x
-
-
     - rvm: ruby-head
       gemfile: gemfiles/Gemfile-rails.edge
 

data/CHANGELOG.md

@@ -1,3 +1,35 @@
+## 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
+
+* Switched `config` from ActiveSupport::Configurable to a simple Struct
+
+* Association decoration now propagates from AssociationRelation to spawned Relations (e.g. `@post.comments.order(:id).each`)
+
+* Dropped support for Rails 3.2, 4.0, and 4.1
+
+
+## 1.2.0
+
+* Decorate values in Hash recursively [@FumiyaShibusawa]
+
+
 ## 1.1.1
 
 * Improved ActionController::API support for Rails 5.0.x [@frodsan]

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)
 
-A simple and Rubyish view helper for Rails 3, 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, and Rails 6. Keep your helpers and views Object-Oriented!
 
 
 ## Features ##
@@ -17,7 +17,7 @@ A simple and Rubyish view helper for Rails 3, Rails 4, Rails 5, and Rails 6. Kee
 
 * 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)
 
-* Rails 3.2.x, 4.0.x, 4.1.x, 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, and 6.1 (edge)
 
 
 ## Supported ORMs ##
@@ -105,7 +105,7 @@ end
 ```erb
 <p><%= @author.name %></p>
 <ul>
-<% @author.books.each do |book| %>
+<% @author.books.order(:id).each do |book| %>
   <%# `book` here is auto-decorated because @author is a decorated instance %>
   <li><%= book.link %></li>
 <% end %>

data/active_decorator.gemspec

@@ -13,16 +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', '< 1.4'
+  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

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

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

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

@@ -0,0 +1,7 @@
+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

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'rails', '~> 6.1.0'
+gem 'webdrivers'
+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.rb

@@ -2,5 +2,9 @@
 
 require 'active_decorator/version'
 require 'active_decorator/decorator'
-require 'active_decorator/railtie'
+begin
+  require 'rails'
+  require 'active_decorator/railtie'
+rescue LoadError
+end
 require 'active_decorator/config'

data/lib/active_decorator/config.rb

@@ -1,7 +1,13 @@
 # frozen_string_literal: true
 
 module ActiveDecorator
-  include ActiveSupport::Configurable
+  def self.config
+    @_config ||= Struct.new(:decorator_suffix).new
+  end
+
+  def self.configure
+    yield config
+  end
 
   config.decorator_suffix = 'Decorator'
 end

data/lib/active_decorator/decorator.rb

@@ -31,7 +31,7 @@ module ActiveDecorator
           decorate r
         end
       elsif obj.is_a?(Hash)
-        obj.values.each do |v|
+        obj.each_value do |v|
           decorate v
         end
       elsif defined?(ActiveRecord) && obj.is_a?(ActiveRecord::Relation)
@@ -90,18 +90,14 @@ module ActiveDecorator
   # For AR 3 and 4
   module RelationDecoratorLegacy
     def to_a
-      super.tap do |arr|
-        ActiveDecorator::Decorator.instance.decorate arr
-      end
+      ActiveDecorator::Decorator.instance.decorate super
     end
   end
 
   # For AR 5+
   module RelationDecorator
     def records
-      super.tap do |arr|
-        ActiveDecorator::Decorator.instance.decorate arr
-      end
+      ActiveDecorator::Decorator.instance.decorate super
     end
   end
 end

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/monkey/active_record/associations.rb

@@ -11,15 +11,7 @@ module ActiveDecorator
           end
         end
 
-        # @see https://github.com/rails/rails/commit/03855e790de2224519f55382e3c32118be31eeff
-        if Rails.version.to_f < 4.1
-          module CollectionAssociation
-            private
-            def first_or_last(*)
-              ActiveDecorator::Decorator.instance.decorate_association(owner, super)
-            end
-          end
-        elsif Rails.version.to_f < 5.1
+        if Rails.version.to_f < 5.1
           module CollectionAssociation
             private
             def first_nth_or_last(*)
@@ -28,29 +20,41 @@ module ActiveDecorator
           end
         end
 
-        if Rails.version.to_f >= 4.0
-          module CollectionProxy
-            def take(limit = nil)
+        module CollectionProxy
+          def take(*)
+            ActiveDecorator::Decorator.instance.decorate_association(@association.owner, super)
+          end
+
+          if Rails.version.to_f >= 5.1
+            def last(*)
               ActiveDecorator::Decorator.instance.decorate_association(@association.owner, super)
             end
 
-            if Rails.version.to_f >= 5.1
-              def last(limit = nil)
-                ActiveDecorator::Decorator.instance.decorate_association(@association.owner, super)
-              end
-
-              private
+            private
 
-              def find_nth_with_limit(index, limit)
-                ActiveDecorator::Decorator.instance.decorate_association(@association.owner, super)
-              end
+            def find_nth_with_limit(*)
+              ActiveDecorator::Decorator.instance.decorate_association(@association.owner, super)
+            end
 
-              def find_nth_from_last(index)
-                ActiveDecorator::Decorator.instance.decorate_association(@association.owner, super)
-              end
+            def find_nth_from_last(*)
+              ActiveDecorator::Decorator.instance.decorate_association(@association.owner, super)
             end
           end
         end
+
+        module CollectionAssociation
+          private
+
+          def build_record(*)
+            ActiveDecorator::Decorator.instance.decorate_association(@owner, super)
+          end
+        end
+      end
+
+      module AssociationRelation
+        def spawn(*)
+          ActiveDecorator::Decorator.instance.decorate_association(@association.owner, super)
+        end
       end
     end
   end