active_decorator 0.2.1 → 0.3.0

data/lib/active_decorator.rb

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

data/lib/active_decorator/helpers.rb

@@ -1,5 +1,3 @@
-require 'action_view'
-
 module ActiveDecorator
   module Helpers
     def method_missing(method, *args, &block)
@@ -7,15 +5,10 @@ module ActiveDecorator
     #TODO need to make sure who raised the error?
     rescue NoMethodError => no_method_error
       begin
-        @@_decorator_view_proxy ||= DecoratorViewProxy.new
-        @@_decorator_view_proxy.send method, *args, &block
+        ActiveDecorator::ViewContext.current.send method, *args, &block
       rescue NoMethodError
         raise no_method_error
       end
     end
-
-    class DecoratorViewProxy
-      include ::ActionView::Helpers
-    end
   end
 end

data/lib/active_decorator/railtie.rb

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

data/lib/active_decorator/version.rb

@@ -1,3 +1,3 @@
 module ActiveDecorator
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/lib/active_decorator/view_context.rb

@@ -0,0 +1,23 @@
+module ActiveDecorator
+  module ViewContext
+    class << self
+      def current
+        Thread.current[:view_context]
+      end
+
+      def current=(view_context)
+        Thread.current[:view_context] = view_context
+      end
+    end
+
+    module Filter
+      extend ActiveSupport::Concern
+
+      included do
+        before_filter do |controller|
+          ActiveDecorator::ViewContext.current = controller.view_context
+        end
+      end
+    end
+  end
+end

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

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

data/spec/fake_app/fake_app.rb

@@ -54,6 +54,10 @@ module BookDecorator
   def link
     link_to title, 'http://example.com'
   end
+
+  def cover_image
+    image_tag 'cover.png'
+  end
 end
 
 # controllers

data/spec/requests/action_view_helpers_spec.rb

@@ -11,5 +11,6 @@ feature 'fallback to helpers' do
     within 'a' do
       page.should have_content 'RHG'
     end
+    page.should have_css('img')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_decorator
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-21 00:00:00.000000000 Z
+date: 2012-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2153458080 !ruby/object:Gem::Requirement
+  requirement: &70226630611740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153458080
+  version_requirements: *70226630611740
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2153457640 !ruby/object:Gem::Requirement
+  requirement: &70226630609000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153457640
+  version_requirements: *70226630609000
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2153457200 !ruby/object:Gem::Requirement
+  requirement: &70226630606920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153457200
+  version_requirements: *70226630606920
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2153456780 !ruby/object:Gem::Requirement
+  requirement: &70226630605800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153456780
+  version_requirements: *70226630605800
 description: A simple and Rubyish view helper for Rails 3
 email:
 - ronnie@dio.jp
@@ -77,6 +77,7 @@ files:
 - lib/active_decorator/monkey/action_view/partial_renderer.rb
 - lib/active_decorator/railtie.rb
 - lib/active_decorator/version.rb
+- lib/active_decorator/view_context.rb
 - lib/generators/rails/decorator_generator.rb
 - lib/generators/rails/templates/decorator.rb
 - lib/generators/rspec/decorator_generator.rb
@@ -105,21 +106,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1770381626412442444
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1770381626412442444
 requirements: []
 rubyforge_project: active_decorator
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: A simple and Rubyish view helper for Rails 3