active_decorator 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 298a6372406ac3480e7baaeee85eeea4b3dcb393ed37e6ccf4ab0fe120b5d7ed
-  data.tar.gz: 9576044dd3bf36591e9a56190b37f88062f58bc6f325c4e6a7b0446b5d8d05f5
+  metadata.gz: 95d46d933899535231f0e24953747370ac289afed99ac881dd91a1bafca06d00
+  data.tar.gz: '08989f206e82987244927a07c17f147f59f25c268bb61b59763dbed7cf11aa06'
 SHA512:
-  metadata.gz: ac2c57c9ace629b66a38fa039d622dd4c6f345334ec7bfee10e8e64dbe6efd43f78adc378fd2aff5e9ba52ecd73e963a21ec9817f776718035db250f13365567
-  data.tar.gz: acaf0a2612909a35e9d095ec6ad8e80b9cc5240df40accec3fc8e337e192714c8fda649d02f98b6ed92a41ac9c0a33702f2d8bc64b2e61071a7f71762d9e2988
+  metadata.gz: e89c4cc6d373b308858919ebf119c18bc3547e09d0f0dda9d1c52643a844eb50696aac9f5e0372f7c274acbe5d3f34db5b66ad02db62cd3a0808f7c3b566436b
+  data.tar.gz: d62771d0c66da65522e8a3b05ba03a5bce188da0c6bad782bac5d8b7d53827ca5471fbd756e7533b7b4701b4539f0a038098c0be37dac514b688c32821b1cd93

data/.travis.yml

@@ -78,5 +78,17 @@ matrix:
   include:
     - 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

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.1.1
+
+* Improved ActionController::API support for Rails 5.0.x [@frodsan]
+
+* Fixed "NameError: undefined local variable or method `view_context'" with ActionController::API or when rendering in controllers
+
+
 ## 1.1.0
 
 * ActionController::API support [@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 and Rails 5. Keep your helpers and views Object-Oriented!
+A simple and Rubyish view helper for Rails 3, 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 and Rails 5. Keep your hel
 
 ## Supported versions ##
 
-* Ruby 2.0.0, 2.1.x, 2.2.x, 2.3.x, 2.4.x, and 2.5 (trunk)
+* Ruby 2.0.0, 2.1.x, 2.2.x, 2.3.x, 2.4.x, and 2.5, and 2.6 (trunk)
 
-* Rails 3.2.x, 4.0.x, 4.1.x, 4.2.x, 5.0, 5.1, and 5.2 (edge)
+* Rails 3.2.x, 4.0.x, 4.1.x, 4.2.x, 5.0, 5.1, 5.2, and 6.0 (edge)
 
 
 ## Supported ORMs ##

data/Rakefile

@@ -8,7 +8,11 @@ require 'rake/testtask'
 
 Rake::TestTask.new do |t|
   t.libs << "test"
-  t.pattern = 'test/**/*_test.rb'
+  if ENV['API']
+    t.pattern = 'test/**/*_api_test.rb'
+  else
+    t.test_files = Dir['test/**/*_test.rb'] - Dir['test/**/*_api_test.rb']
+  end
   t.warning = true
   t.verbose = true
 end

data/lib/active_decorator/helpers.rb

@@ -5,20 +5,24 @@ module ActiveDecorator
   module Helpers
     def method_missing(method, *args, &block)
       super
-    rescue NoMethodError, NameError => e
+    rescue NoMethodError, NameError => e1
       # the error is not mine, so just releases it as is.
-      raise e if e.name != method
+      raise e1 if e1.name != method
 
-      begin
-        (view_context = ActiveDecorator::ViewContext.current).send method, *args, &block
-      rescue NoMethodError => e
-        raise e if e.name != method
+      if (view_context = ActiveDecorator::ViewContext.current)
+        begin
+          view_context.send method, *args, &block
+        rescue NoMethodError => e2
+          raise e2 if e2.name != method
 
-        raise NoMethodError.new("undefined method `#{method}' for either #{self} or #{view_context}", method)
-      rescue NameError => e
-        raise e if e.name != method
+          raise NoMethodError.new("undefined method `#{method}' for either #{self} or #{view_context}", method)
+        rescue NameError => e2
+          raise e2 if e2.name != method
 
-        raise NameError.new("undefined local variable `#{method}' for either #{self} or #{view_context}", method)
+          raise NameError.new("undefined local variable `#{method}' for either #{self} or #{view_context}", method)
+        end
+      else  # AC::API would have not view_context
+        raise e1
       end
     end
   end

data/lib/active_decorator/railtie.rb

@@ -22,14 +22,14 @@ module ActiveDecorator
       end
 
       if Rails::VERSION::MAJOR >= 5
-        ActiveSupport.on_load :action_controller_api do
-          require 'active_decorator/monkey/abstract_controller/rendering'
-          ::ActionController::API.send :prepend, ActiveDecorator::Monkey::AbstractController::Rendering
-
-          require 'active_decorator/monkey/action_controller/base/rescue_from'
-          ::ActionController::API.send :prepend, ActiveDecorator::Monkey::ActionController::Base
-
-          ::ActionController::API.send :include, ActiveDecorator::ViewContext::Filter
+        ActiveSupport.on_load :action_controller do
+          if self == ActionController::API
+            require 'active_decorator/monkey/abstract_controller/rendering'
+            ::ActionController::API.send :prepend, ActiveDecorator::Monkey::AbstractController::Rendering
+
+            require 'active_decorator/monkey/action_controller/base/rescue_from'
+            ::ActionController::API.send :prepend, ActiveDecorator::Monkey::ActionController::Base
+          end
         end
       end
 

data/lib/active_decorator/version.rb

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

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

@@ -1,2 +1 @@
-# frozen_string_literal: true
 json.name  @bookstore.name

data/test/fake_app/app/views/authors/show.json.jbuilder

@@ -1,3 +1,2 @@
-# frozen_string_literal: true
 json.name  @author.name
 json.books @author.books, partial: 'books/book', as: :book

data/test/fake_app/app/views/books/_book.json.jbuilder

@@ -1,3 +1,2 @@
-# frozen_string_literal: true
 json.title          book.title
 json.reverse_title  book.reverse_title

data/test/fake_app/fake_app.rb

@@ -167,79 +167,80 @@ end
 class MovieDecorator; end
 
 # controllers
-class ApplicationController < ActionController::Base
-  self.append_view_path File.dirname(__FILE__)
-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
-    else
-      # ActiveRecord 4.x
-      if params[:variable_type] == 'array'
-        @authors = Author.all.to_a
-      elsif params[:variable_type] == 'proxy'
-        @authors = RelationProxy.new(Author.all)
+unless ENV['API']
+  class ApplicationController < ActionController::Base
+    self.append_view_path File.dirname(__FILE__)
+  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
       else
-        @authors = Author.all
+        # 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
       end
     end
-  end
 
-  def show
-    @author = Author.find params[:id]
+    def show
+      @author = Author.find params[:id]
+    end
   end
-end
-class BooksController < ApplicationController
-  class CustomError < StandardError; end
+  class BooksController < ApplicationController
+    class CustomError < StandardError; end
 
-  rescue_from CustomError do
-    render :error
-  end
+    rescue_from CustomError do
+      render :error
+    end
 
-  def index
-    @author = Author.find params[:author_id]
-    @books  = @author.books
-  end
+    def index
+      @author = Author.find params[:author_id]
+      @books  = @author.books
+    end
 
-  def show
-    @book = Author.find(params[:author_id]).books.find(params[:id])
-  end
+    def show
+      @book = Author.find(params[:author_id]).books.find(params[:id])
+    end
 
-  def errata
-    @book = Author.find(params[:author_id]).books.find(params[:id])
-  end
+    def errata
+      @book = Author.find(params[:author_id]).books.find(params[:id])
+    end
 
-  def errata2
-    @book = Author.find(params[:author_id]).books.find(params[:id])
-  end
+    def errata2
+      @book = Author.find(params[:author_id]).books.find(params[:id])
+    end
 
-  def error
-    @book = Author.find(params[:author_id]).books.find(params[:id])
-    raise CustomError, "error"
-  end
+    def error
+      @book = Author.find(params[:author_id]).books.find(params[:id])
+      raise CustomError, "error"
+    end
 
-  def purchase
-    @book = Author.find(params[:author_id]).books.find(params[:id])
+    def purchase
+      @book = Author.find(params[:author_id]).books.find(params[:id])
 
-    @view_context_before_sending_mail = ActiveDecorator::ViewContext.current
-    BookMailer.thanks(@book).deliver
-    raise 'Wrong ViewContext!' if ActiveDecorator::ViewContext.current != @view_context_before_sending_mail
+      @view_context_before_sending_mail = ActiveDecorator::ViewContext.current
+      BookMailer.thanks(@book).deliver
+      raise 'Wrong ViewContext!' if ActiveDecorator::ViewContext.current != @view_context_before_sending_mail
+    end
   end
-end
-class MoviesController < ApplicationController
-  def show
-    @movie = Movie.find params[:id]
+  class MoviesController < ApplicationController
+    def show
+      @movie = Movie.find params[:id]
+    end
   end
-end
-if Rails::VERSION::MAJOR >= 5
+else
   module Api
     class BookstoresController < ActionController::API
       def show

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_decorator
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-07 00:00:00.000000000 Z
+date: 2018-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit-rails
@@ -169,6 +169,7 @@ files:
 - 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
@@ -221,6 +222,7 @@ test_files:
 - 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