active_decorator 1.1.1 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95d46d933899535231f0e24953747370ac289afed99ac881dd91a1bafca06d00
-  data.tar.gz: '08989f206e82987244927a07c17f147f59f25c268bb61b59763dbed7cf11aa06'
+  metadata.gz: '029394fb4c79f67fd71559154ad159840fd13e9635754f0748bf0e489cfdb411'
+  data.tar.gz: a668184bfb8b7e77e2b205af385b8d319f161f0a5eb6b98e395b18e91e2e89db
 SHA512:
-  metadata.gz: e89c4cc6d373b308858919ebf119c18bc3547e09d0f0dda9d1c52643a844eb50696aac9f5e0372f7c274acbe5d3f34db5b66ad02db62cd3a0808f7c3b566436b
-  data.tar.gz: d62771d0c66da65522e8a3b05ba03a5bce188da0c6bad782bac5d8b7d53827ca5471fbd756e7533b7b4701b4539f0a038098c0be37dac514b688c32821b1cd93
+  metadata.gz: 6207c58d396a6d465776ec79b74e20e59f3b04368c045cecaf5d075c13ba64717d3fd636e7ed0eb0106fc816068c3630abeb63561d431454e54913ddc55612ac
+  data.tar.gz: 3881e7bc7470797115cdbc7286afb3eff68b6c77ea36b16f1cb11bdc86232c8861cbf3c7df7cf45efa0f2293285a4a73fd8c01f1823b98c87815f9a676ae531c

data/.gitignore

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

data/.travis.yml

@@ -1,94 +1,85 @@
 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 update bundler --no-document
+  - gem i bundler -v '<2'
+
+cache: bundler
 
-rvm:
-  - 2.5.3
-  - 2.4.5
-  - 2.3.7
-  - 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
-  - gemfiles/Gemfile-rails.4.1.x
-  - gemfiles/Gemfile-rails.4.0.x
-  - gemfiles/Gemfile-rails.3.2.x
+# 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:
-  exclude:
-    - rvm: 2.1.10
+  include:
+    - 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.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.0.0
+    - rvm: 2.6.6
       gemfile: gemfiles/Gemfile-rails.5.2.x
-    - rvm: 2.4.5
-      gemfile: gemfiles/Gemfile-rails.5.1.x
-    - rvm: 2.3.7
-      gemfile: gemfiles/Gemfile-rails.5.1.x
-    - rvm: 2.1.10
+      env: API=1
+    - rvm: 2.6.6
       gemfile: gemfiles/Gemfile-rails.5.1.x
-    - rvm: 2.0.0
+    - rvm: 2.6.6
       gemfile: gemfiles/Gemfile-rails.5.1.x
-    - rvm: 2.4.5
-      gemfile: gemfiles/Gemfile-rails.5.0.x
-    - rvm: 2.3.7
+      env: API=1
+    - rvm: 2.6.6
       gemfile: gemfiles/Gemfile-rails.5.0.x
-    - rvm: 2.1.10
+    - rvm: 2.6.6
       gemfile: gemfiles/Gemfile-rails.5.0.x
-    - rvm: 2.0.0
-      gemfile: gemfiles/Gemfile-rails.5.0.x
-    - rvm: 2.5.3
-      gemfile: gemfiles/Gemfile-rails.4.2.x
-    - rvm: 2.4.5
+      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.5.3
-      gemfile: gemfiles/Gemfile-rails.4.1.x
-    - rvm: 2.4.5
-      gemfile: gemfiles/Gemfile-rails.4.1.x
-    - rvm: 2.2.10
-      gemfile: gemfiles/Gemfile-rails.4.1.x
-    - rvm: 2.1.10
-      gemfile: gemfiles/Gemfile-rails.4.1.x
-    - rvm: 2.5.3
-      gemfile: gemfiles/Gemfile-rails.4.0.x
-    - rvm: 2.4.5
-      gemfile: gemfiles/Gemfile-rails.4.0.x
+
     - rvm: 2.2.10
-      gemfile: gemfiles/Gemfile-rails.4.0.x
+      gemfile: gemfiles/Gemfile-rails.5.2.x
+
     - rvm: 2.1.10
-      gemfile: gemfiles/Gemfile-rails.4.0.x
-    - rvm: 2.5.3
-      gemfile: gemfiles/Gemfile-rails.3.2.x
-    - rvm: 2.4.5
-      gemfile: gemfiles/Gemfile-rails.3.2.x
-  include:
+      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: 2.5.3
-      gemfile: gemfiles/Gemfile-rails.5.2.x
-      env: API=1
-    - rvm: 2.5.3
-      gemfile: gemfiles/Gemfile-rails.5.1.x
-      env: API=1
-    - rvm: 2.5.3
-      gemfile: gemfiles/Gemfile-rails.5.0.x
-      env: API=1
+
     - rvm: ruby-head
       gemfile: gemfiles/Gemfile-rails.edge
       env: API=1
+
   allow_failures:
     - rvm: ruby-head
+    - gemfile: gemfiles/Gemfile-rails.edge

data/CHANGELOG.md

@@ -1,3 +1,31 @@
+## 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 ##
@@ -15,9 +15,9 @@ A simple and Rubyish view helper for Rails 3, Rails 4, Rails 5, and Rails 6. Kee
 
 ## Supported versions ##
 
-* Ruby 2.0.0, 2.1.x, 2.2.x, 2.3.x, 2.4.x, and 2.5, and 2.6 (trunk)
+* 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

@@ -18,11 +18,13 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   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

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

@@ -15,6 +15,7 @@ module ActiveDecorator
     # Decorates the given object.
     # Plus, performs special decoration for the classes below:
     #   Array: decorates its each element
+    #   Hash: decorates its each value
     #   AR::Relation: decorates its each record lazily
     #   AR model: decorates its associations on the fly
     #
@@ -29,6 +30,10 @@ module ActiveDecorator
         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)
@@ -85,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/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

data/lib/active_decorator/railtie.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'active_decorator/view_context'
-require 'rails'
-
 module ActiveDecorator
   class Railtie < ::Rails::Railtie
     initializer 'active_decorator' do
@@ -18,6 +15,7 @@ module ActiveDecorator
         require 'active_decorator/monkey/action_controller/base/rescue_from'
         ActionController::Base.send :prepend, ActiveDecorator::Monkey::ActionController::Base
 
+        require 'active_decorator/view_context'
         ActionController::Base.send :include, ActiveDecorator::ViewContext::Filter
       end
 
@@ -38,6 +36,7 @@ module ActiveDecorator
         ActionMailer::Base.send :prepend, ActiveDecorator::Monkey::AbstractController::Rendering
 
         if ActionMailer::Base.respond_to? :before_action
+          require 'active_decorator/view_context'
           ActionMailer::Base.send :include, ActiveDecorator::ViewContext::Filter
         end
       end
@@ -45,12 +44,15 @@ module ActiveDecorator
       ActiveSupport.on_load :active_record do
         require 'active_decorator/monkey/active_record/associations'
         ActiveRecord::Associations::Association.send :prepend, ActiveDecorator::Monkey::ActiveRecord::Associations::Association
+
         if Rails.version.to_f < 5.1
           ActiveRecord::Associations::CollectionAssociation.send :prepend, ActiveDecorator::Monkey::ActiveRecord::Associations::CollectionAssociation
         end
-        if Rails.version.to_f >= 4.0
-          ActiveRecord::Associations::CollectionProxy.send :prepend, ActiveDecorator::Monkey::ActiveRecord::Associations::CollectionProxy
-        end
+
+        ActiveRecord::AssociationRelation.send :prepend, ActiveDecorator::Monkey::ActiveRecord::AssociationRelation
+
+        ActiveRecord::Associations::CollectionProxy.send :prepend, ActiveDecorator::Monkey::ActiveRecord::Associations::CollectionProxy
+        ActiveRecord::Associations::CollectionAssociation.send :prepend, ActiveDecorator::Monkey::ActiveRecord::Associations::CollectionAssociation
       end
     end
   end

data/lib/active_decorator/version.rb

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

data/lib/active_decorator/view_context.rb

@@ -32,17 +32,9 @@ module ActiveDecorator
       extend ActiveSupport::Concern
 
       included do
-        if Rails::VERSION::MAJOR >= 4
-          around_action do |controller, blk|
-            ActiveDecorator::ViewContext.run_with(controller.view_context) do
-              blk.call
-            end
-          end
-        else
-          around_filter do |controller, blk|
-            ActiveDecorator::ViewContext.run_with(controller.view_context) do
-              blk.call
-            end
+        around_action do |controller, blk|
+          ActiveDecorator::ViewContext.run_with(controller.view_context) do
+            blk.call
           end
         end
       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

data/test/decorator_test.rb

@@ -3,7 +3,6 @@
 require 'test_helper'
 
 class DecoratorTest < Test::Unit::TestCase
-
   test 'it returns the object on decoration' do
     book = Book.new title: 'Boek'
     assert_equal book, ActiveDecorator::Decorator.instance.decorate(book)
@@ -31,4 +30,29 @@ class DecoratorTest < Test::Unit::TestCase
     books = Book.all
     assert_equal books, ActiveDecorator::Decorator.instance.decorate(ActiveDecorator::Decorator.instance.decorate(books))
   end
+
+  test 'decorating Array decorates its each element' do
+    array = [Book.new(title: 'Boek')]
+    assert_equal array, ActiveDecorator::Decorator.instance.decorate(array)
+
+    array.each do |value|
+      assert value.is_a?(BookDecorator)
+    end
+  end
+
+  test 'decorating Hash decorates its each value' do
+    hash = {some_record: Book.new(title: 'Boek')}
+    assert_equal hash, ActiveDecorator::Decorator.instance.decorate(hash)
+
+    hash.values.each do |value|
+      assert value.is_a?(BookDecorator)
+    end
+  end
+
+  test "Don't use the wrong decorator for nested classes" do
+    comic = Foo::Comic.new
+
+    assert_equal comic, ActiveDecorator::Decorator.instance.decorate(comic)
+    assert !comic.is_a?(ComicDecorator)
+  end
 end

data/test/fake_app/app/decorators/comic_decorator.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+# decorator to test auto-loading behavior
+# this module is intended not to be loaded.
+module ComicDecorator; end

data/test/fake_app/app/views/authors/show.html.erb

@@ -2,7 +2,7 @@
 <%= @author.capitalized_name %>
 <%= @author.books.first.upcased_title %>
 <%= @author.books.last.upcased_title %>
-<% if Rails.version.to_f >= 4.0 && p = @author.publishers.take %><%= p.upcased_name %><% end %>
+<% if p = @author.publishers.take %><%= p.upcased_name %><% end %>
 <% if Rails.version.to_f >= 5.1 && p = @author.publishers.second_to_last %><%= p.reversed_name %><% end %>
 <% if p = @author.profile %><%= p.address %><% end %>
 <% if h = @author.profile_history %><%= h.update_date %><% end %>

data/test/fake_app/fake_app.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
+ENV['RAILS_ENV'] ||= 'test'
+
 require 'active_record'
 require 'action_controller/railtie'
 require 'action_mailer/railtie'
 require 'action_view/railtie'
 require 'ostruct'
-require 'jbuilder'
+require 'jbuilder' unless ENV['API']
 
 # config
 ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
@@ -46,7 +48,11 @@ ActiveDecoratorTestApp::Application.routes.draw do
 
   if Rails::VERSION::MAJOR >= 5
     namespace :api do
-      resources :bookstores, only: :show
+      resources :bookstores, only: :show do
+        collection do
+          get :error
+        end
+      end
     end
   end
 end
@@ -162,6 +168,15 @@ module CompanyDecorator
     name.reverse
   end
 end
+module BookstoreDecorator
+  def initial
+    name.first
+  end
+
+  def to_json
+    {name: name, initial: initial}
+  end
+end
 
 # decorator fake
 class MovieDecorator; end
@@ -173,24 +188,13 @@ unless ENV['API']
   end
   class AuthorsController < ApplicationController
     def index
-      if Author.respond_to?(:scoped)
-        # ActiveRecord 3.x
-        if params[:variable_type] == 'array'
-          @authors = Author.all
-        elsif params[:variable_type] == 'proxy'
-          @authors = RelationProxy.new(Author.scoped)
-        else
-          @authors = Author.scoped
-        end
+      # ActiveRecord 4.x
+      if params[:variable_type] == 'array'
+        @authors = Author.all.to_a
+      elsif params[:variable_type] == 'proxy'
+        @authors = RelationProxy.new(Author.all)
       else
-        # ActiveRecord 4.x
-        if params[:variable_type] == 'array'
-          @authors = Author.all.to_a
-        elsif params[:variable_type] == 'proxy'
-          @authors = RelationProxy.new(Author.all)
-        else
-          @authors = Author.all
-        end
+        @authors = Author.all
       end
     end
 
@@ -243,8 +247,23 @@ unless ENV['API']
 else
   module Api
     class BookstoresController < ActionController::API
+      class CustomError < StandardError; end
+
+      rescue_from CustomError do
+        head :internal_server_error
+      end
+
       def show
         @bookstore = Bookstore.find params[:id]
+        render json: serialize('bookstore')
+      end
+
+      private def serialize(name)
+        view_assigns[name].to_json
+      end
+
+      def error
+        raise CustomError, 'boom!'
       end
     end
   end
@@ -286,3 +305,7 @@ class RelationProxy < BasicObject
     @ar_relation.public_send(method, *args, &block)
   end
 end
+
+module Foo
+  class Comic; end
+end

data/test/features/action_controller_api_test.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 require 'test_helper'
 
 if Rails::VERSION::MAJOR >= 5
@@ -12,7 +11,13 @@ class ActionControllerAPITest < ActionDispatch::IntegrationTest
   test 'decorating objects in api only controllers' do
     get "/api/bookstores/#{Bookstore.last.id}.json"
 
-    assert_equal({"name" => "junkudo"}, response.parsed_body)
+    assert_equal({"initial" => "j", "name" => "junkudo"}, response.parsed_body)
+  end
+
+  test 'error handling in api only controllers' do
+    get "/api/bookstores/error.json"
+
+    assert_response :error
   end
 end
 

data/test/features/association_test.rb

@@ -2,7 +2,7 @@
 
 require 'test_helper'
 
-class AssociationTest < ActionDispatch::IntegrationTest
+class AssociationIntegrationTest < ActionDispatch::IntegrationTest
   setup do
     company = Company.create! name: 'NaCl'
     @matz = company.authors.create! name: 'matz'
@@ -23,9 +23,7 @@ class AssociationTest < ActionDispatch::IntegrationTest
     visit "/authors/#{@matz.id}"
     assert page.has_content? 'the world of code'.upcase
     assert page.has_content? 'the ruby programming language'.upcase
-    if Rails.version.to_f >= 4.0
-      assert page.has_content? 'nikkei linux'.upcase
-    end
+    assert page.has_content? 'nikkei linux'.upcase
     if Rails.version.to_f >= 5.1
       assert page.has_content? 'nikkei linux'.reverse
     end

data/test/models/association_test.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class AssociationTest < Test::Unit::TestCase
+  setup do
+    a = Author.create! name: 'pragdave'
+    ActiveDecorator::Decorator.instance.decorate a
+
+    @books = a.books
+
+    b = @books.create! title: 'pragprog'
+    @id = b.id
+  end
+
+  test 'build' do
+    b = @books.build title: 'pickaxe'
+    assert b.is_a? ActiveDecorator::Decorated
+  end
+
+  test 'create!' do
+    b = @books.create! title: 'pickaxe'
+    assert b.is_a? ActiveDecorator::Decorated
+  end
+
+  test 'each' do
+    @books.each do |b|
+      assert b.is_a? ActiveDecorator::Decorated
+    end
+  end
+
+  test 'first' do
+    assert @books.first.is_a? ActiveDecorator::Decorated
+  end
+
+  test 'last' do
+    assert @books.last.is_a? ActiveDecorator::Decorated
+  end
+
+  test 'find' do
+    assert @books.find(@id).is_a? ActiveDecorator::Decorated
+  end
+
+  test 'take' do
+    assert @books.take.is_a? ActiveDecorator::Decorated
+  end
+
+  sub_test_case 'when method chained' do
+    setup do
+      @books = @books.order(:id)
+    end
+
+    test 'each' do
+      @books.each do |b|
+        assert b.is_a? ActiveDecorator::Decorated
+      end
+    end
+
+    test 'first' do
+      assert @books.first.is_a? ActiveDecorator::Decorated
+    end
+
+    test 'last' do
+      assert @books.last.is_a? ActiveDecorator::Decorated
+    end
+
+    test 'find' do
+      assert @books.find(@id).is_a? ActiveDecorator::Decorated
+    end
+
+    test 'take' do
+      assert @books.take.is_a? ActiveDecorator::Decorated
+    end
+  end
+end

data/test/test_helper.rb

@@ -11,6 +11,7 @@ require 'active_decorator'
 Bundler.require
 require 'capybara'
 require 'selenium/webdriver'
+require 'byebug'
 
 # needs to load the app next
 require 'fake_app/fake_app'
@@ -30,7 +31,11 @@ rescue LoadError
     include Capybara::DSL
   end
 else
-  ActionDispatch::SystemTestCase.driven_by(:selenium, using: :headless_chrome)
+  if ActionPack::VERSION::STRING > '5.2'
+    ActionDispatch::SystemTestCase.driven_by :selenium, using: :headless_chrome
+  else
+    ActionDispatch::SystemTestCase.driven_by :selenium_chrome_headless
+  end
 end
 
 module DatabaseDeleter

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: active_decorator
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.3.3
 platform: ruby
 authors:
 - Akira Matsuda
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-14 00:00:00.000000000 Z
+date: 2020-09-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit-rails
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jbuilder
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,13 +137,11 @@ files:
 - README.md
 - Rakefile
 - active_decorator.gemspec
-- gemfiles/Gemfile-rails.3.2.x
-- gemfiles/Gemfile-rails.4.0.x
-- gemfiles/Gemfile-rails.4.1.x
 - 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.edge
 - lib/active_decorator.rb
 - lib/active_decorator/config.rb
@@ -153,7 +165,7 @@ 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/decorators/comic_decorator.rb
 - 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
@@ -177,12 +189,13 @@ files:
 - 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
@@ -197,16 +210,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.2.0.rc.1
+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/decorators/comic_decorator.rb
 - 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
@@ -230,4 +242,5 @@ test_files:
 - 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

data/gemfiles/Gemfile-rails.3.2.x

@@ -1,8 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'rails', '~> 3.2.0'
-gem 'test-unit-rails', '1.0.2'
-gem 'capybara', '~> 2.0.0'
-gem 'nokogiri', '~> 1.5.0'

data/gemfiles/Gemfile-rails.4.0.x

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'rails', '~> 4.0.0'
-gem 'nokogiri', '~> 1.6.0'

data/gemfiles/Gemfile-rails.4.1.x

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'rails', '~> 4.1.0'
-gem 'nokogiri', '~> 1.6.0'

data/test/fake_app/app/views/api/bookstores/show.json.jbuilder

@@ -1 +0,0 @@
-json.name  @bookstore.name