active_decorator 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c9a39129fbb4e1377d75be5b7267e7b0074c584
-  data.tar.gz: 7ef274bdeee7522ae1e4d2e72efcd3c1f8c1ad3a
+  metadata.gz: 7ec9e246de4d4a482aec613131463383e11c6b65
+  data.tar.gz: f3c66bc4714c7fe4f2332d82b3504b310dfdf8a6
 SHA512:
-  metadata.gz: f9b90b4730880cc22f36c7ff07225837d1d02a24cb1118f4306d27870905767a5ad93ec0ea1115b6eecb1410715a0a7a9435b5a7f7a67ee31e737e58cad867b1
-  data.tar.gz: f1ad27c204dcb408bbb87086da228aac33db149da114e99216c9dd3ba7ddccb245131c84b37ec050a0478f4ceed07e5f567060f1802680ef6d920d6daa72ac1a
+  metadata.gz: b1a8711efe0ae4efe92b48a362f7a3d39d79ff734d16fa587817a7d53056aeafae90281669572a872b25f97464c4835d781fd5ba70e1c473868b224218048ffc
+  data.tar.gz: 803072777c134ff503868e0f7909f866ddd87fad2e58151fcc65522d5a91e9372d543db71f496b7d2bf6117cd32279866013d47643ba3b9ac4a1decf67730bbc

data/lib/active_decorator/monkey/action_controller/base/rescue_from.rb

@@ -0,0 +1,11 @@
+module ActionController
+  class Base
+    def rescue_with_handler_with_decorator_view_context(exception)
+      ActiveDecorator::ViewContext.push(view_context)
+      rescue_with_handler_without_decorator_view_context(exception)
+    ensure
+      ActiveDecorator::ViewContext.pop
+    end
+    alias_method_chain :rescue_with_handler, :decorator_view_context
+  end
+end

data/lib/active_decorator/railtie.rb

@@ -9,6 +9,7 @@ module ActiveDecorator
       end
       ActiveSupport.on_load(:action_controller) do
         require 'active_decorator/monkey/abstract_controller/rendering'
+        require 'active_decorator/monkey/action_controller/base/rescue_from'
         ActionController::Base.send :include, ActiveDecorator::ViewContext::Filter
       end
       ActiveSupport.on_load(:action_mailer) do

data/lib/active_decorator/version.rb

@@ -1,3 +1,3 @@
 module ActiveDecorator
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

data/spec/fake_app/app/views/books/error.html.erb

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

data/spec/fake_app/fake_app.rb

@@ -26,6 +26,7 @@ ActiveDecoratorTestApp::Application.routes.draw do
   resources :authors, :only => [:index, :show] do
     resources :books, :only => [:index, :show] do
       member do
+        get :error
         post :purchase
       end
     end
@@ -72,6 +73,10 @@ module BookDecorator
   def cover_image
     image_tag 'cover.png'
   end
+
+  def error
+    "ERROR"
+  end
 end
 
 # decorator fake
@@ -105,6 +110,12 @@ class AuthorsController < ApplicationController
   end
 end
 class BooksController < ApplicationController
+  class CustomError < StandardError; end
+
+  rescue_from CustomError do
+    render "error"
+  end
+
   def index
     @author = Author.find params[:author_id]
     @books  = @author.books
@@ -114,6 +125,11 @@ class BooksController < ApplicationController
     @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 purchase
     @book = Author.find(params[:author_id]).books.find(params[:id])
 

data/spec/features/action_view_helpers_spec.rb

@@ -14,6 +14,11 @@ feature 'fallback to helpers' do
     page.should have_css('img')
   end
 
+  scenario 'invoking action_view helper methods in rescue_from view' do
+    visit "/authors/#{@rhg.author.id}/books/#{@rhg.id}/error"
+    page.should have_content('ERROR')
+  end
+
   scenario 'make sure that action_view + action_mailer works' do
     visit "/authors/#{@rhg.author.id}/books/#{@rhg.id}"
     click_link 'purchase'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_decorator
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-21 00:00:00.000000000 Z
+date: 2015-02-28 00:00:00.000000000 Z
 dependencies: []
 description: A simple and Rubyish view helper for Rails 3
 email:
@@ -36,6 +36,7 @@ files:
 - lib/active_decorator/decorator.rb
 - lib/active_decorator/helpers.rb
 - lib/active_decorator/monkey/abstract_controller/rendering.rb
+- lib/active_decorator/monkey/action_controller/base/rescue_from.rb
 - lib/active_decorator/monkey/action_view/partial_renderer.rb
 - lib/active_decorator/railtie.rb
 - lib/active_decorator/version.rb
@@ -55,6 +56,7 @@ files:
 - spec/fake_app/app/views/books/_book.html.erb
 - spec/fake_app/app/views/books/_book.json.jbuilder
 - spec/fake_app/app/views/books/_book_locals.html.erb
+- spec/fake_app/app/views/books/error.html.erb
 - spec/fake_app/app/views/books/index.html.erb
 - spec/fake_app/app/views/books/purchase.html.erb
 - spec/fake_app/app/views/books/show.html.erb
@@ -98,6 +100,7 @@ test_files:
 - spec/fake_app/app/views/books/_book.html.erb
 - spec/fake_app/app/views/books/_book.json.jbuilder
 - spec/fake_app/app/views/books/_book_locals.html.erb
+- spec/fake_app/app/views/books/error.html.erb
 - spec/fake_app/app/views/books/index.html.erb
 - spec/fake_app/app/views/books/purchase.html.erb
 - spec/fake_app/app/views/books/show.html.erb
@@ -108,4 +111,3 @@ test_files:
 - spec/features/jbuilder_spec.rb
 - spec/features/partial_spec.rb
 - spec/spec_helper.rb
-has_rdoc: