active_decorator 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aaf638a40c289f98d04544cf74fb6fc4ed4e6d900e9624612ad4369a61b2032d
-  data.tar.gz: 014c96599fa99736ff84c75571a95e6ad49bb24d99220e382b78e8516f746759
+  metadata.gz: 39935554e752b75933ebf759c5173fc67b451c077c6cb3d18c48af54f9b4192c
+  data.tar.gz: 6917e250174825e7ead1ffaa69ad4614ba6aa1070bd53d6e84aa2b2c15faef47
 SHA512:
-  metadata.gz: f2270ef449d855e51524d81ba1feeda5582732969dd622a0e2e4cc4b700e8e0d1529e0f891ca39572f2c03c41cd6143a2809c8dad27fcfdca1c3408434445ee0
-  data.tar.gz: 515a67fa6e3964ec7b8ece6a6ec4d410fd4479aac285d2bd2d6c59eeea023a35123b54b3bb0c0e4481931328d89200c682f7756db534934d59b90ff6b52984c9
+  metadata.gz: 1acb7ae8ea1a3a263d59611d3819036eb6aa303a3dfc3b55b0a6eb9eaef4b26412ed6c74aea6580ef1435aaab4a62360b7464e75130004f3da1d563f49a321c3
+  data.tar.gz: 69b9d07798170f1944cdd98a396b880232ed44278167ae0db3760aebdfc83a86f8f9fcf9846ec8008594bbb28e6285b9537fef3c19805ebbe3d17b47dd3e589d

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.6.3
 #   - 2.5.5
-#   - 2.4.5
+#   - 2.4.6
 #   - 2.3.8
 #   - 2.2.10
 #   - 2.1.10
@@ -26,42 +23,40 @@ 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.6.3
+      gemfile: gemfiles/Gemfile-rails.6.0.x
+    - rvm: 2.6.3
+      gemfile: gemfiles/Gemfile-rails.6.0.x
+      env: API=1
+    - rvm: 2.6.3
       gemfile: gemfiles/Gemfile-rails.5.2.x
-    - rvm: 2.6.2
+    - rvm: 2.6.3
       gemfile: gemfiles/Gemfile-rails.5.2.x
       env: API=1
-    - rvm: 2.6.2
+    - rvm: 2.6.3
       gemfile: gemfiles/Gemfile-rails.5.1.x
-    - rvm: 2.6.2
+    - rvm: 2.6.3
       gemfile: gemfiles/Gemfile-rails.5.1.x
       env: API=1
-    - rvm: 2.6.2
+    - rvm: 2.6.3
       gemfile: gemfiles/Gemfile-rails.5.0.x
-    - rvm: 2.6.2
+    - rvm: 2.6.3
       gemfile: gemfiles/Gemfile-rails.5.0.x
       env: API=1
 
     - rvm: 2.5.5
       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 +67,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,19 @@
+## 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, and 6.0 (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

@@ -22,7 +22,8 @@ Gem::Specification.new do |s|
   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,5 @@ source 'https://rubygems.org'
 gemspec path: '..'
 
 gem 'rails', '~> 4.2.0'
+gem 'sqlite3', '< 1.4'
 gem 'nokogiri', '~> 1.6.0'

data/gemfiles/Gemfile-rails.5.0.x

@@ -3,3 +3,4 @@ source 'https://rubygems.org'
 gemspec path: '..'
 
 gem 'rails', '~> 5.0.0'
+gem 'sqlite3', '< 1.4'

data/gemfiles/{Gemfile-rails.4.0.x → Gemfile-rails.6.0.x}

@@ -2,5 +2,4 @@ source 'https://rubygems.org'
 
 gemspec path: '..'
 
-gem 'rails', '~> 4.0.0'
-gem 'nokogiri', '~> 1.6.0'
+gem 'rails', '~> 6.0.0.rc1'

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)
@@ -69,7 +69,7 @@ module ActiveDecorator
       return @@decorators[model_class] if @@decorators.key? model_class
 
       decorator_name = "#{model_class.name}#{ActiveDecorator.config.decorator_suffix}"
-      d = decorator_name.constantize
+      d = Object.const_get decorator_name, false
       unless Class === d
         d.send :include, ActiveDecorator::Helpers
         @@decorators[model_class] = d
@@ -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/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.2.0'
+  VERSION = '1.3.0'
 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/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,5 +1,7 @@
 # frozen_string_literal: true
 
+ENV['RAILS_ENV'] ||= 'test'
+
 require 'active_record'
 require 'action_controller/railtie'
 require 'action_mailer/railtie'
@@ -173,24 +175,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
 

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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_decorator
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-01 00:00:00.000000000 Z
+date: 2019-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit-rails
@@ -70,16 +70,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A simple and Rubyish view helper for Rails
 email:
 - ronnie@dio.jp
@@ -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
@@ -177,6 +189,7 @@ 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:
@@ -229,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.1.x

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