active_decorator 0.9.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a64ac56dc2cc2bf285935260b3dd24f83df0b82
-  data.tar.gz: ec20d7d2ea5a11c8dff62b1b4bf648e73294da95
+  metadata.gz: 8ec56959877091a50db872942aaeb8352cdb9269
+  data.tar.gz: 5a64a878439cc739235815ad6b9345d243cd191b
 SHA512:
-  metadata.gz: 113084bbe2c85cfe885ba8c99bac86b7a09650647630fe4c5c71c93ef2c316039552055a5200d49fc1d2f87a0573686d8c6865f22e38761c46751fbdd23ea58b
-  data.tar.gz: a8dd5c74158c52d2dbda7116a3289ac30287b639606271f14f4ddcd924f6a2ee3dac79294fec6c9d3e41f6d55aea20f027530358589bf17f42e1a51a4fd7bb0a
+  metadata.gz: 7935a3abad55b5a751acfe09fab8cf4dcd7f1b4e5c66b09d2a00fbc0cccbf9562ea84ee76767cc77313160174f427fbcb38ec17f767a2f503c01329e8d377472
+  data.tar.gz: f84157d3533f18cfd9aafed0e5b23f48f210e3dd8a351e8c0bb2df95afec646c634ca650f833e388fb11c1134527ea58c7b7c5f7f4fe7933b98a8221a6672a25

data/.travis.yml

@@ -7,7 +7,7 @@ rvm:
   - 2.0.0
   - 2.1.10
   - 2.2.7
-  - 2.3.3
+  - 2.3.4
   - 2.4.1
   - ruby-head
 gemfile:

data/README.md

@@ -17,7 +17,7 @@ A simple and Rubyish view helper for Rails 3, Rails 4 and Rails 5. Keep your hel
 
 * Ruby 2.0.0, 2.1.x, 2.2.x, 2.3.x, 2.4.x, and 2.5 (trunk)
 
-* Rails 3.2.x, 4.0.x, 4.1.x, 4.2.x, 5.0, and 5.1 (edge)
+* Rails 3.2.x, 4.0.x, 4.1.x, 4.2.x, 5.0, 5.1, and 5.2 (edge)
 
 
 ## Supported ORMs ##
@@ -47,8 +47,8 @@ end
 * Controller
 ```ruby
 class AuthorsController < ApplicationController
-  def show(id)
-    @user = Author.find id
+  def show(id)  # powered by action_args
+    @author = Author.find id
   end
 end
 ```
@@ -87,7 +87,7 @@ end
 ```ruby
 class AuthorsController < ApplicationController
   def show(id)
-    @user = Author.find id
+    @author = Author.find id
   end
 end
 ```
@@ -112,6 +112,20 @@ end
 </ul>
 ```
 
+### Using ActiveDecorator outside of Action View ###
+
+Sometimes your may want to use decorators outside of Action View, for example,
+for background tasks for ActiveJob.
+For such use case, ActiveDecorator module provides `with_view_context` method
+that takes some kind of Action View and a block.
+
+```ruby
+ActiveDecorator::ViewContext.run_with ApplicationController.new.view_context do
+  ## perform some heavy jobs here
+end
+```
+
+
 ## Testing
 
 You can test a decorator using your favorite test framework by decorating the model instance with
@@ -120,7 +134,7 @@ You can test a decorator using your favorite test framework by decorating the mo
 ActiveDecorator::Decorator.instance.decorate(model_instance)
 ```
 
-Considering an `Organization` model and it's simple decorator:
+Considering an `Organization` model and its simple decorator:
 
 ```ruby
 module OrganizationDecorator

data/gemfiles/Gemfile-rails.4.0.x

@@ -6,4 +6,5 @@ gem 'rails', '~> 4.0.0'
 gem 'test-unit-rails'
 gem 'capybara'
 gem 'sqlite3'
+gem 'nokogiri', '~> 1.6.0'
 gem 'jbuilder'

data/gemfiles/Gemfile-rails.4.1.x

@@ -6,4 +6,5 @@ gem 'rails', '~> 4.1.0'
 gem 'test-unit-rails'
 gem 'capybara'
 gem 'sqlite3'
+gem 'nokogiri', '~> 1.6.0'
 gem 'jbuilder'

data/gemfiles/Gemfile-rails.4.2.x

@@ -6,4 +6,5 @@ gem 'rails', '~> 4.2.0'
 gem 'test-unit-rails'
 gem 'capybara'
 gem 'sqlite3'
+gem 'nokogiri', '~> 1.6.0'
 gem 'jbuilder'

data/gemfiles/Gemfile-rails.5.1.x

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'active_decorator', path: '..'
 
-gem 'rails', '5.1.0.rc1'
+gem 'rails', '5.1.0'
 gem 'test-unit-rails'
 gem 'capybara'
 gem 'sqlite3'

data/lib/active_decorator/helpers.rb

@@ -4,13 +4,20 @@ module ActiveDecorator
   module Helpers
     def method_missing(method, *args, &block)
       super
-    rescue NoMethodError, NameError
+    rescue NoMethodError, NameError => e
+      # the error is not mine, so just releases it as is.
+      raise e if e.name != method
+
       begin
         (view_context = ActiveDecorator::ViewContext.current).send method, *args, &block
-      rescue NoMethodError
-        raise NoMethodError, "undefined method `#{method}` for either #{self} or #{view_context}"
-      rescue NameError
-        raise NameError, "undefined local variable `#{method}` for either #{self} or #{view_context}"
+      rescue NoMethodError => e
+        raise e if e.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 NameError.new("undefined local variable `#{method}' for either #{self} or #{view_context}", method)
       end
     end
   end

data/lib/active_decorator/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ActiveDecorator
-  VERSION = '0.9.0'
+  VERSION = '1.0.0'
 end

data/lib/active_decorator/view_context.rb

@@ -4,16 +4,26 @@ module ActiveDecorator
   module ViewContext
     class << self
       def current
-        Thread.current[:active_decorator_view_contexts].last
+        view_context_stack.last
       end
 
       def push(view_context)
-        Thread.current[:active_decorator_view_contexts] ||= []
-        Thread.current[:active_decorator_view_contexts] << view_context
+        view_context_stack.push view_context
       end
 
       def pop
-        Thread.current[:active_decorator_view_contexts].pop if Thread.current[:active_decorator_view_contexts]
+        view_context_stack.pop
+      end
+
+      def view_context_stack
+        Thread.current[:active_decorator_view_contexts] ||= []
+      end
+
+      def run_with(view_context)
+        push view_context
+        yield
+      ensure
+        pop
       end
     end
 
@@ -23,20 +33,14 @@ module ActiveDecorator
       included do
         if Rails::VERSION::MAJOR >= 4
           around_action do |controller, blk|
-            begin
-              ActiveDecorator::ViewContext.push controller.view_context
+            ActiveDecorator::ViewContext.run_with(controller.view_context) do
               blk.call
-            ensure
-              ActiveDecorator::ViewContext.pop
             end
           end
         else
           around_filter do |controller, blk|
-            begin
-              ActiveDecorator::ViewContext.push controller.view_context
+            ActiveDecorator::ViewContext.run_with(controller.view_context) do
               blk.call
-            ensure
-              ActiveDecorator::ViewContext.pop
             end
           end
         end

data/lib/generators/rspec/templates/decorator_spec.rb

@@ -1,7 +1,7 @@
 require '<%= File.exists?('spec/rails_helper.rb') ? 'rails_helper' : 'spec_helper' %>'
 
-describe <%= singular_name.camelize %>Decorator do
-  let(:<%= singular_name %>) { <%= class_name %>.new.extend <%= singular_name.camelize %>Decorator }
+describe <%= class_name %>Decorator do
+  let(:<%= singular_name %>) { <%= class_name %>.new.extend <%= class_name %>Decorator }
   subject { <%= singular_name %> }
   it { should be_a <%= class_name %> }
 end

data/lib/generators/test_unit/templates/decorator_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class <%= singular_name.camelize %>DecoratorTest < ActiveSupport::TestCase
   def setup
-    @<%= singular_name %> = <%= class_name %>.new.extend <%= singular_name.camelize %>Decorator
+    @<%= singular_name %> = <%= class_name %>.new.extend <%= class_name %>Decorator
   end
 
   # test "the truth" do

data/test/decorator_test.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+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)
+  end
+
+  test 'it returns the object when it already is decorated on decorate' do
+    book = Book.new title: 'Boek'
+    assert_equal book, ActiveDecorator::Decorator.instance.decorate(ActiveDecorator::Decorator.instance.decorate(book))
+  end
+end

data/test/fake_app/app/views/books/errata2.html.erb

@@ -0,0 +1 @@
+<%= @book.errata2 %>

data/test/fake_app/fake_app.rb

@@ -29,6 +29,7 @@ ActiveDecoratorTestApp::Application.routes.draw do
     resources :books, only: [:index, :show] do
       member do
         get :errata
+        get :errata2
         get :error
         post :purchase
       end
@@ -115,6 +116,10 @@ module BookDecorator
     poof!
   end
 
+  def errata2
+    title.boom!
+  end
+
   def error
     "ERROR"
   end
@@ -203,6 +208,10 @@ class BooksController < ApplicationController
     @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"

data/test/features/name_error_handling_test.rb

@@ -12,6 +12,17 @@ class NameErrorHandlingTest < ActionDispatch::IntegrationTest
       visit "/authors/#{@rhg.author.id}/books/#{@rhg.id}/errata"
     end
 
-    assert_match(/undefined method `poof!` for/, err.message)
+    assert_match(/undefined method `poof!' for/, err.message)
+    assert_match 'poof!', err.cause.name if err.respond_to?(:cause)
+  end
+
+  test "Don't touch NameError that was not raised from a decorator module but from other classes" do
+    err = assert_raises ActionView::Template::Error do
+      visit "/authors/#{@rhg.author.id}/books/#{@rhg.id}/errata2"
+    end
+
+    assert_match(/undefined method `boom!' for/, err.message)
+    assert_match 'boom!', err.cause.name if err.respond_to?(:cause)
+    assert_not_match(/active_decorator\/lib\/active_decorator\/.* in method_missing'$/, err.backtrace[0])
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_decorator
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-05 00:00:00.000000000 Z
+date: 2017-06-29 00:00:00.000000000 Z
 dependencies: []
 description: A simple and Rubyish view helper for Rails
 email:
@@ -17,8 +17,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -48,9 +48,9 @@ files:
 - lib/generators/rspec/templates/decorator_spec.rb
 - lib/generators/test_unit/decorator_generator.rb
 - lib/generators/test_unit/templates/decorator_test.rb
-- spec/lib/decorator_spec.rb
 - test/configuration_test.rb
 - test/controllers/fake_detection_test.rb
+- test/decorator_test.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
@@ -59,6 +59,7 @@ files:
 - test/fake_app/app/views/books/_book.json.jbuilder
 - test/fake_app/app/views/books/_book_locals.html.erb
 - test/fake_app/app/views/books/errata.html.erb
+- test/fake_app/app/views/books/errata2.html.erb
 - test/fake_app/app/views/books/error.html.erb
 - test/fake_app/app/views/books/index.html.erb
 - test/fake_app/app/views/books/purchase.html.erb
@@ -81,24 +82,24 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: A simple and Rubyish view helper for Rails
 test_files:
-- spec/lib/decorator_spec.rb
 - test/configuration_test.rb
 - test/controllers/fake_detection_test.rb
+- test/decorator_test.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
@@ -107,6 +108,7 @@ test_files:
 - test/fake_app/app/views/books/_book.json.jbuilder
 - test/fake_app/app/views/books/_book_locals.html.erb
 - test/fake_app/app/views/books/errata.html.erb
+- test/fake_app/app/views/books/errata2.html.erb
 - test/fake_app/app/views/books/error.html.erb
 - test/fake_app/app/views/books/index.html.erb
 - test/fake_app/app/views/books/purchase.html.erb

data/spec/lib/decorator_spec.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-require 'spec_helper'
-
-describe ActiveDecorator::Decorator do
-  subject { ActiveDecorator::Decorator.instance }
-  let(:book) { Book.new(title: 'Boek') }
-
-  it 'returns the object on decoration' do
-    subject.decorate(book).should == book
-  end
-
-  it "returns the object when it already is decorated on decorate" do
-    subject.decorate(subject.decorate(book)).should == book
-  end
-end