active_decorator 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4ff2ae758a8f2c1a18ff85c02a06cfe4227815d
-  data.tar.gz: 5e8fe96b2279ba2ef44a62d342056e4b6aa6b9fd
+  metadata.gz: 8c9a39129fbb4e1377d75be5b7267e7b0074c584
+  data.tar.gz: 7ef274bdeee7522ae1e4d2e72efcd3c1f8c1ad3a
 SHA512:
-  metadata.gz: b1d64f92890474e35d2e3efcc231f1dd1299c5fd1cee9c6f4e526d8cc1d8c1900d1ce35715f8061129248e8baace4d6034bd50b805ca25b2cd6019117b0acdf1
-  data.tar.gz: 7f885ea5e6e225b08edef2c2962affac26d450d0ea7e41af18150f1affdd624f8dabc4018504dfd4c66ad141751421f40cd7d0b828ba561da4f7e93e9e787eda
+  metadata.gz: f9b90b4730880cc22f36c7ff07225837d1d02a24cb1118f4306d27870905767a5ad93ec0ea1115b6eecb1410715a0a7a9435b5a7f7a67ee31e737e58cad867b1
+  data.tar.gz: f1ad27c204dcb408bbb87086da228aac33db149da114e99216c9dd3ba7ddccb245131c84b37ec050a0478f4ceed07e5f567060f1802680ef6d920d6daa72ac1a

data/README.md

@@ -14,7 +14,7 @@ A simple and Rubyish view helper for Rails 3 and Rails 4. Keep your helpers and
 
 ## Supported versions ##
 
-Rails 3.0.x, 3.1.x, 3.2.x, 4.0.x, and 4.1 (edge)
+Rails 3.0.x, 3.1.x, 3.2.x, 4.0.x, 4.1.x, 4.2.x, and 5.0 (edge)
 
 
 ## Supported ORMs ##
@@ -63,6 +63,18 @@ end
 <% end %>
 ```
 
+## Configuring the decorator suffix
+
+By default, ActiveDecorator searches a decorator module named `target_class.name + "Decorator"`
+
+If you would like a different rule, you can configure in your initializer.
+
+```ruby
+ActiveDecorator.configure do |config|
+  config.decorator_suffix = 'Presenter'
+end
+```
+
 ## Contributing to ActiveDecorator ##
 
 * Fork, fix, then send me a pull request.

data/lib/active_decorator.rb

@@ -1,3 +1,4 @@
 require 'active_decorator/version'
 require 'active_decorator/decorator'
 require 'active_decorator/railtie'
+require 'active_decorator/config'

data/lib/active_decorator/config.rb

@@ -0,0 +1,20 @@
+module ActiveDecorator
+  def self.configure(&block)
+    yield @config ||= ActiveDecorator::Configuration.new
+  end
+
+  def self.config
+    @config
+  end
+
+  # need a Class for 3.0
+  class Configuration #:nodoc:
+    include ActiveSupport::Configurable
+
+    config_accessor :decorator_suffix
+  end
+
+  configure do |config|
+    config.decorator_suffix = 'Decorator'
+  end
+end

data/lib/active_decorator/decorator.rb

@@ -37,7 +37,7 @@ module ActiveDecorator
     def decorator_for(model_class)
       return @@decorators[model_class] if @@decorators.has_key? model_class
 
-      decorator_name = "#{model_class.name}Decorator"
+      decorator_name = "#{model_class.name}#{ActiveDecorator.config.decorator_suffix}"
       d = decorator_name.constantize
       unless Class === d
         d.send :include, ActiveDecorator::Helpers

data/lib/active_decorator/railtie.rb

@@ -12,8 +12,10 @@ module ActiveDecorator
         ActionController::Base.send :include, ActiveDecorator::ViewContext::Filter
       end
       ActiveSupport.on_load(:action_mailer) do
-        require 'active_decorator/monkey/abstract_controller/rendering'
-        ActionMailer::Base.send :include, ActiveDecorator::ViewContext::Filter
+        if ActionMailer::Base.respond_to? :before_action
+          require 'active_decorator/monkey/abstract_controller/rendering'
+          ActionMailer::Base.send :include, ActiveDecorator::ViewContext::Filter
+        end
       end
     end
   end

data/lib/active_decorator/version.rb

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

data/lib/active_decorator/view_context.rb

@@ -2,11 +2,16 @@ module ActiveDecorator
   module ViewContext
     class << self
       def current
-        Thread.current[:view_context]
+        Thread.current[:active_decorator_view_contexts].last
       end
 
-      def current=(view_context)
-        Thread.current[:view_context] = view_context
+      def push(view_context)
+        Thread.current[:active_decorator_view_contexts] ||= []
+        Thread.current[:active_decorator_view_contexts] << view_context
+      end
+
+      def pop
+        Thread.current[:active_decorator_view_contexts].pop if Thread.current[:active_decorator_view_contexts]
       end
     end
 
@@ -14,8 +19,24 @@ module ActiveDecorator
       extend ActiveSupport::Concern
 
       included do
-        before_filter do |controller|
-          ActiveDecorator::ViewContext.current = controller.view_context
+        if Rails::VERSION::MAJOR >= 4
+          around_action do |controller, blk|
+            begin
+              ActiveDecorator::ViewContext.push controller.view_context
+              blk.call
+            ensure
+              ActiveDecorator::ViewContext.pop
+            end
+          end
+        else
+          around_filter do |controller, blk|
+            begin
+              ActiveDecorator::ViewContext.push controller.view_context
+              blk.call
+            ensure
+              ActiveDecorator::ViewContext.pop
+            end
+          end
         end
       end
     end

data/spec/configuration_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+Comic = Struct.new(:title, :price)
+
+module ComicPresenter
+  def price
+    "$#{super}"
+  end
+end
+
+describe ActiveDecorator::Configuration do
+  let(:comic) { ActiveDecorator::Decorator.instance.decorate(Comic.new("amatsuda's (Poignant) Guide to ActiveDecorator", 3)) }
+
+  context 'with a custom decorator_suffix' do
+    before do
+      ActiveDecorator.configure do |config|
+        config.decorator_suffix = 'Presenter'
+      end
+    end
+
+    after do
+      ActiveDecorator.configure do |config|
+        config.decorator_suffix = 'Decorator'
+      end
+    end
+
+    specify { comic.price.should == '$3' }
+  end
+end

data/spec/fake_app/app/views/book_mailer/thanks.text.erb

@@ -0,0 +1 @@
+Thank you for purchasing <%= @book.upcased_title %>.

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

@@ -0,0 +1 @@
+done

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

@@ -0,0 +1,4 @@
+<%= @book.link %>
+<%= @book.cover_image %>
+
+<%= link_to 'purchase', [:purchase, @book.author, @book], :method => :post %>

data/spec/fake_app/fake_app.rb

@@ -1,5 +1,6 @@
 require 'active_record'
 require 'action_controller/railtie'
+require 'action_mailer/railtie'
 require 'action_view/railtie'
 require 'jbuilder'
 
@@ -13,6 +14,9 @@ module ActiveDecoratorTestApp
     config.active_support.deprecation = :log
     config.eager_load = false
     config.action_dispatch.show_exceptions = false
+    config.root = File.dirname(__FILE__)
+
+    config.action_mailer.delivery_method = :test
   end
 end
 ActiveDecoratorTestApp::Application.initialize!
@@ -20,7 +24,11 @@ ActiveDecoratorTestApp::Application.initialize!
 # routes
 ActiveDecoratorTestApp::Application.routes.draw do
   resources :authors, :only => [:index, :show] do
-    resources :books, :only => [:index, :show]
+    resources :books, :only => [:index, :show] do
+      member do
+        post :purchase
+      end
+    end
   end
   resources :movies, :only => :show
 end
@@ -58,7 +66,7 @@ module BookDecorator
   end
 
   def link
-    link_to title, "#{request.protocol}#{request.host_with_port}/assets/sample.png"
+    link_to title, "#{request.protocol}#{request.host_with_port}/assets/sample.png", :class => 'title'
   end
 
   def cover_image
@@ -105,6 +113,14 @@ class BooksController < ApplicationController
   def show
     @book = Author.find(params[:author_id]).books.find(params[:id])
   end
+
+  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
+  end
 end
 class MoviesController < ApplicationController
   def show
@@ -112,6 +128,14 @@ class MoviesController < ApplicationController
   end
 end
 
+# mailers
+class BookMailer < ActionMailer::Base
+  def thanks(book)
+    @book = book
+    mail :from => 'nobody@example.com', :to => 'test@example.com', :subject => 'Thanks'
+  end
+end
+
 # migrations
 class CreateAllTables < ActiveRecord::Migration
   def self.up

data/spec/features/action_view_helpers_spec.rb

@@ -8,9 +8,15 @@ feature 'fallback to helpers' do
 
   scenario 'invoking action_view helper methods' do
     visit "/authors/#{@rhg.author.id}/books/#{@rhg.id}"
-    within 'a' do
+    within 'a.title' do
       page.should have_content 'RHG'
     end
     page.should have_css('img')
   end
+
+  scenario 'make sure that action_view + action_mailer works' do
+    visit "/authors/#{@rhg.author.id}/books/#{@rhg.id}"
+    click_link 'purchase'
+    page.should have_content 'done'
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_decorator
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
+date: 2015-02-21 00:00:00.000000000 Z
 dependencies: []
 description: A simple and Rubyish view helper for Rails 3
 email:
@@ -32,6 +32,7 @@ files:
 - gemfiles/Gemfile-rails.4.1.x
 - gemfiles/Gemfile-rails.4.2.x
 - lib/active_decorator.rb
+- lib/active_decorator/config.rb
 - lib/active_decorator/decorator.rb
 - lib/active_decorator/helpers.rb
 - lib/active_decorator/monkey/abstract_controller/rendering.rb
@@ -45,17 +46,20 @@ files:
 - lib/generators/rspec/templates/decorator_spec.rb
 - lib/generators/test_unit/decorator_generator.rb
 - lib/generators/test_unit/templates/decorator_test.rb
+- spec/configuration_spec.rb
 - spec/controllers/fake_detection_spec.rb
-- spec/fake_app/authors/index.html.erb
-- spec/fake_app/authors/show.html.erb
-- spec/fake_app/authors/show.json.jbuilder
-- spec/fake_app/books/_book.html.erb
-- spec/fake_app/books/_book.json.jbuilder
-- spec/fake_app/books/_book_locals.html.erb
-- spec/fake_app/books/index.html.erb
-- spec/fake_app/books/show.html.erb
+- spec/fake_app/app/views/authors/index.html.erb
+- spec/fake_app/app/views/authors/show.html.erb
+- spec/fake_app/app/views/authors/show.json.jbuilder
+- spec/fake_app/app/views/book_mailer/thanks.text.erb
+- 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/index.html.erb
+- spec/fake_app/app/views/books/purchase.html.erb
+- spec/fake_app/app/views/books/show.html.erb
+- spec/fake_app/app/views/movies/show.html.erb
 - spec/fake_app/fake_app.rb
-- spec/fake_app/movies/show.html.erb
 - spec/features/action_view_helpers_spec.rb
 - spec/features/controller_ivar_spec.rb
 - spec/features/jbuilder_spec.rb
@@ -85,19 +89,23 @@ signing_key:
 specification_version: 4
 summary: A simple and Rubyish view helper for Rails 3
 test_files:
+- spec/configuration_spec.rb
 - spec/controllers/fake_detection_spec.rb
-- spec/fake_app/authors/index.html.erb
-- spec/fake_app/authors/show.html.erb
-- spec/fake_app/authors/show.json.jbuilder
-- spec/fake_app/books/_book.html.erb
-- spec/fake_app/books/_book.json.jbuilder
-- spec/fake_app/books/_book_locals.html.erb
-- spec/fake_app/books/index.html.erb
-- spec/fake_app/books/show.html.erb
+- spec/fake_app/app/views/authors/index.html.erb
+- spec/fake_app/app/views/authors/show.html.erb
+- spec/fake_app/app/views/authors/show.json.jbuilder
+- spec/fake_app/app/views/book_mailer/thanks.text.erb
+- 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/index.html.erb
+- spec/fake_app/app/views/books/purchase.html.erb
+- spec/fake_app/app/views/books/show.html.erb
+- spec/fake_app/app/views/movies/show.html.erb
 - spec/fake_app/fake_app.rb
-- spec/fake_app/movies/show.html.erb
 - spec/features/action_view_helpers_spec.rb
 - spec/features/controller_ivar_spec.rb
 - spec/features/jbuilder_spec.rb
 - spec/features/partial_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

data/spec/fake_app/books/show.html.erb

@@ -1,2 +0,0 @@
-<%= @book.link %>
-<%= @book.cover_image %>