draper 0.9.2 → 0.9.3

data/Readme.markdown

@@ -22,8 +22,9 @@
 
 ## What's New
 
-### Version 0.9.2
+### Version 0.9.3
 
+* Helpers are available from the decorator class level, so you could call `ArticleDecorator.new_article_link`
 * Automatically generate a named accessor for the wrapped object, so now inside of `ArticleDecorator` you can use `article` instead of just `model`
 * Removed the `lazy_helpers` method to favor using `include Draper::LazyHelpers`
 * Refactored how methods are selected for delegation to the wrapped model

data/lib/draper.rb

@@ -4,5 +4,6 @@ require 'draper/base'
 require 'draper/lazy_helpers'
 require 'draper/model_support'
 require 'draper/view_context'
+require 'draper/decorated_enumerable_proxy'
 
 Draper::System.setup

data/lib/draper/base.rb

@@ -21,7 +21,6 @@ module Draper
     # @param [Object] context (optional)
     def initialize(input, context = {})
       input.inspect # forces evaluation of a lazy query from AR
-      input.inspect
       self.class.model_class = input.class if model_class.nil?
       @model = input
       self.context = context
@@ -94,7 +93,7 @@ module Draper
     # @param [Object] instance(s) to wrap
     # @param [Object] context (optional)
     def self.decorate(input, context = {})
-      input.respond_to?(:each) ? DecoratedEnumerableProxy.new(input, self, context) : new(input, context)
+      input.respond_to?(:each) ? Draper::DecoratedEnumerableProxy.new(input, self, context) : new(input, context)
     end
 
     # Access the helpers proxy to call built-in and user-defined
@@ -102,10 +101,21 @@ module Draper
     #
     # @return [Object] proxy   
     def helpers
-      Thread.current[:current_view_context]
+      self.class.helpers
     end
     alias :h :helpers
 
+    # Access the helpers proxy to call built-in and user-defined
+    # Rails helpers from a class context.
+    #
+    # @return [Object] proxy   
+    class << self
+      def helpers
+        Thread.current[:current_view_context]
+      end
+      alias :h :helpers
+    end    
+
     # Fetch the original wrapped model.
     #
     # @return [Object] original_model
@@ -147,33 +157,6 @@ module Draper
   private
     def allow?(method)
       (!allowed? || allowed.include?(method) || FORCED_PROXY.include?(method)) && !denied.include?(method)
-    end
-
-    class DecoratedEnumerableProxy
-      include Enumerable
-
-      def initialize(collection, klass, context)
-        @wrapped_collection, @klass, @context = collection, klass, context
-      end
-
-      # Implementation of Enumerable#each that proxyes to the wrapped collection
-      def each(&block)
-        @wrapped_collection.each { |member| block.call(@klass.new(member, @context)) }
-      end
-
-      # Implement to_arry so that render @decorated_collection is happy
-      def to_ary
-        @wrapped_collection.to_ary
-      end
-
-      def method_missing (meth, *args, &block)
-        @wrapped_collection.send(meth, *args, &block)
-      end
-
-      def to_s
-        "#<DecoratedEnumerableProxy of #{@klass} for #{@wrapped_collection.inspect}>"
-      end
-    end
-    
+    end    
   end
 end

data/lib/draper/decorated_enumerable_proxy.rb

@@ -0,0 +1,27 @@
+module Draper
+  class DecoratedEnumerableProxy
+    include Enumerable
+
+    def initialize(collection, klass, context)
+      @wrapped_collection, @klass, @context = collection, klass, context
+    end
+
+    # Implementation of Enumerable#each that proxyes to the wrapped collection
+    def each(&block)
+      @wrapped_collection.each { |member| block.call(@klass.new(member, @context)) }
+    end
+
+    # Implement to_arry so that render @decorated_collection is happy
+    def to_ary
+      @wrapped_collection.to_ary
+    end
+
+    def method_missing (meth, *args, &block)
+      @wrapped_collection.send(meth, *args, &block)
+    end
+
+    def to_s
+      "#<DecoratedEnumerableProxy of #{@klass} for #{@wrapped_collection.inspect}>"
+    end
+  end
+end

data/lib/draper/version.rb

@@ -1,3 +1,3 @@
 module Draper
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

data/spec/base_spec.rb

@@ -23,8 +23,22 @@ describe Draper::Base do
   context(".helpers") do
     it "should have a valid view_context" do
       subject.helpers.should be
+    end
+    
+    it "should be aliased to .h" do
+      subject.h.should == subject.helpers
     end    
   end
+  
+  context("#helpers") do
+    it "should have a valid view_context" do
+      Decorator.helpers.should be
+    end
+    
+    it "should be aliased to #h" do
+      Decorator.h.should == Decorator.helpers
+    end
+  end
 
   context(".decorates") do
     it "sets the model class for the decorator" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: draper
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
   prerelease: 
 platform: ruby
 authors:
@@ -50,6 +50,7 @@ files:
 - draper.gemspec
 - lib/draper.rb
 - lib/draper/base.rb
+- lib/draper/decorated_enumerable_proxy.rb
 - lib/draper/lazy_helpers.rb
 - lib/draper/model_support.rb
 - lib/draper/system.rb