active_decorator 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9312dab89b8f57877eac8447beff11151b7399640c9a457aa51d9251a0779792
-  data.tar.gz: d09cceaf7f064a6536d983fdb577bdbca11aba51046faaee021887ca112b1bed
+  metadata.gz: 3d00316b3198613b67dc2acc5cce77d11a47cf9910efd0a5e3d1eae040a466ed
+  data.tar.gz: 56034e7c1ad34d076d8829fb69d6b41db1e8ecf0be5c1d2de59d445d9f2200ad
 SHA512:
-  metadata.gz: f1d98fea1b67c618239dc865b913a8f1ccf32097ca19b7e2adc2679bb3668ce57a981ddcc5940aa3b5388d85ac7fe01eb4cd51bd8005944253016112d53e5c1c
-  data.tar.gz: 9314835959902259af91f0909abd3b299dc7b7a30730323b235e51a231d8d9ce644145c457cfeae526b18a600dbf3561dcbf9072219ad17a9d980a1ec3c0595a
+  metadata.gz: 0c1e4341ac408a03d24a5ff0479d5127f175b4ffd42e3439441a3ce207e07ce8f54429b468c7b120bd2487562f8d76f70e0bab1928eadf311c082858c61e8c29
+  data.tar.gz: 2c480cf0308dd867d108a152629bcd29b03cd28c43b632a664847149e527e459c3fd13830151064acce473ce2e4ebe2dcb96897c8bd0672ca470416b4fdabcb8

data/.travis.yml

@@ -26,6 +26,12 @@ cache: bundler
 
 matrix:
   include:
+    - rvm: 2.7.0
+      gemfile: gemfiles/Gemfile-rails.6.0.x
+    - rvm: 2.7.0
+      gemfile: gemfiles/Gemfile-rails.6.0.x
+      env: API=1
+
     - rvm: 2.6.3
       gemfile: gemfiles/Gemfile-rails.6.0.x
     - rvm: 2.6.3

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 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]

data/README.md

@@ -17,7 +17,7 @@ A simple and Rubyish view helper for Rails 4, Rails 5, and Rails 6. Keep your he
 
 * 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 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 ##

data/active_decorator.gemspec

@@ -26,6 +26,5 @@ Gem::Specification.new do |s|
   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.rc2'
+gem 'rails', '~> 6.0.0'
+gem 'webdrivers'
+gem 'jbuilder' unless ENV['API']

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/version.rb

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

data/test/fake_app/fake_app.rb

@@ -7,7 +7,7 @@ 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:')
@@ -48,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
@@ -164,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
@@ -234,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

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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_decorator
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-16 00:00:00.000000000 Z
+date: 2020-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -108,20 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: jbuilder
-  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'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +166,6 @@ files:
 - test/controllers/fake_detection_test.rb
 - test/decorator_test.rb
 - test/fake_app/app/decorators/comic_decorator.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
@@ -234,7 +219,6 @@ test_files:
 - test/controllers/fake_detection_test.rb
 - test/decorator_test.rb
 - test/fake_app/app/decorators/comic_decorator.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

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

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