draper 0.8.1 → 0.9.0

data/Guardfile

@@ -1,5 +1,5 @@
 guard 'rspec', :version => 2, :notification => false do
   watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
 end

data/Readme.markdown

@@ -198,7 +198,7 @@ Hate seeing that `h.` proxy all over? Willing to mix a bazillion methods into yo
 ```ruby
 class ArticleDecorator < ApplicationDecorator
   decorates :article
-  lazy_helpers
+  include Draper::LazyHelpers
   
   def published_at
     date = content_tag(:span, model.published_at.strftime("%A, %B %e").squeeze(" "), :class => 'date')

data/lib/draper/base.rb

@@ -5,7 +5,7 @@ module Draper
     attr_accessor :context, :model
 
     DEFAULT_DENIED = Object.new.methods << :method_missing
-    FORCED_PROXY = [:to_param]
+    FORCED_PROXY = [:to_param, :id]
     FORCED_PROXY.each do |method|
       define_method method do |*args, &block|
         model.send method, *args, &block
@@ -93,7 +93,7 @@ module Draper
     # @param [Object] instance(s) to wrap
     # @param [Object] context (optional)
     def self.decorate(input, context = {})
-      input.respond_to?(:each) ? input.map{|i| new(i, context)} : new(input, context)
+      input.respond_to?(:each) ? DecoratedEnumerableProxy.new(input, self, context) : new(input, context)
     end
 
     # Access the helpers proxy to call built-in and user-defined
@@ -105,16 +105,6 @@ module Draper
     end
     alias :h :helpers
 
-    # Calling `lazy_helpers` will make the built-in and
-    # user-defined Rails helpers accessible as class methods
-    # in the decorator without using the `h.` or `helpers.` proxy.
-    #
-    # The drawback is that you dump many methods into your decorator's
-    # namespace and collisions could create unexpected results.
-    def self.lazy_helpers
-      self.send(:include, Draper::LazyHelpers)
-    end
-
     # Fetch the original wrapped model.
     #
     # @return [Object] original_model
@@ -130,16 +120,16 @@ module Draper
     end
 
     def respond_to?(method, include_private = false)
-      if select_methods.include?(method)
-        model.respond_to?(method)
-      else
-        super
-      end
+      super || (allow?(method) && model.respond_to?(method))
     end
 
     def method_missing(method, *args, &block)
-      if select_methods.include?(method)
-        model.send(method, *args, &block)
+      if allow?(method)
+        begin
+          model.send(method, *args, &block)
+        rescue NoMethodError
+          super
+        end
       else
         super
       end
@@ -154,9 +144,35 @@ module Draper
     end
 
   private
-    def select_methods
-      specified = self.allowed || (model.public_methods.map{|s| s.to_sym} - denied.map{|s| s.to_sym})
-      (specified - self.public_methods.map{|s| s.to_sym}) + FORCED_PROXY
+    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

data/lib/draper/version.rb

@@ -1,3 +1,3 @@
 module Draper
-  VERSION = "0.8.1"
+  VERSION = "0.9.0"
 end

data/lib/draper/view_context.rb

@@ -1,7 +1,7 @@
 module Draper
   module ViewContext
     def set_current_view_context
-      Thread.current[:current_view_context] ||= self.view_context
+      Thread.current[:current_view_context] = self.view_context
     end
     
     def self.included(source)

data/lib/generators/draper/decorator/decorator_generator.rb

@@ -13,5 +13,7 @@ module Draper
       end
       template 'decorator.rb', "#{DECORATORS_ROOT}#{singular_name}_decorator.rb"
     end
+
+    hook_for :test_framework
   end
-end
+end

data/lib/generators/rspec/decorator_generator.rb

@@ -0,0 +1,17 @@
+module Rspec
+  class DecoratorGenerator < ::Rails::Generators::NamedBase
+    source_root File.expand_path('../templates', __FILE__)
+
+    SPEC_ROOT = 'spec/decorators/'
+    APPLICATION_DECORATOR_SPEC = 'application_decorator_spec.rb'
+    APPLICATION_DECORATOR_SPEC_PATH = SPEC_ROOT + APPLICATION_DECORATOR_SPEC
+
+    def build_model_and_application_decorator_specs
+      empty_directory SPEC_ROOT
+      unless File.exists?(APPLICATION_DECORATOR_SPEC_PATH)
+        template APPLICATION_DECORATOR_SPEC, APPLICATION_DECORATOR_SPEC_PATH
+      end
+      template 'decorator_spec.rb', "#{SPEC_ROOT}#{singular_name}_decorator_spec.rb"
+    end
+  end
+end

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

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe ApplicationDecorator do
+  before { ApplicationController.new.set_current_view_context }
+end

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

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe <%= singular_name.camelize %>Decorator do
+  before { ApplicationController.new.set_current_view_context }
+end

data/spec/base_spec.rb

@@ -26,13 +26,6 @@ describe Draper::Base do
     end    
   end
 
-  context(".lazy_helpers") do
-    it "makes Rails helpers available without using the h. proxy" do
-      Draper::Base.lazy_helpers
-      subject.send(:pluralize, 5, "cat").should == "5 cats"
-    end
-  end
-
   context(".decorates") do
     it "sets the model class for the decorator" do
       ProductDecorator.new(source).model_class.should == Product
@@ -74,6 +67,11 @@ describe Draper::Base do
       Draper::Base.new(source).to_param.should == 1
     end
 
+    it "should always proxy id" do
+      source.send :class_eval, "def id; 123456789; end"
+      Draper::Base.new(source).id.should == 123456789
+    end
+
     it "should not copy the .class, .inspect, or other existing methods" do
       source.class.should_not == subject.class
       source.inspect.should_not == subject.inspect
@@ -150,6 +148,7 @@ describe Draper::Base do
         its(:context) { should eq(context) }
       end
     end
+
   end
 
   context('.==') do
@@ -159,6 +158,32 @@ describe Draper::Base do
     end
   end
 
+  describe "collection decoration" do
+    
+    # Implementation of #decorate that returns an array
+    # of decorated objects is insufficient to deal with 
+    # situations where the original collection has been 
+    # expanded with the use of modules (as often the case
+    # with paginator gems) or is just more complex then 
+    # an array. 
+    module Paginator; def page_number; "magic_value"; end; end
+    Array.send(:include, Paginator)
+    let(:paged_array) { [Product.new, Product.new] }
+    subject { ProductDecorator.decorate(paged_array) }
+
+    it "should proxy all calls to decorated collection" do
+      paged_array.page_number.should == "magic_value"
+      subject.page_number.should == "magic_value"
+    end
+
+    it "should support Rails partial lookup for a collection" do
+      # to support Rails render @collection the returned collection 
+      # (or its proxy) should implement #to_ary. 
+      subject.respond_to?(:to_ary).should be true
+      subject.to_a.first.should == ProductDecorator.decorate(paged_array.first)
+    end
+  end
+
   describe "a sample usage with denies" do
     let(:subject_with_denies){ DecoratorWithDenies.new(source) }
 

data/spec/generators/rspec/decorator_generator_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+# Generators are not automatically loaded by Rails
+require 'generators/rspec/decorator_generator'
+
+describe Rspec::DecoratorGenerator do
+  # Tell the generator where to put its output (what it thinks of as Rails.root)
+  destination File.expand_path("../../../../tmp", __FILE__)
+
+  before { prepare_destination }
+
+  describe 'no arguments' do
+    before { run_generator %w(products)  }
+
+    describe 'spec/decorators/application_decorator_spec.rb' do
+      subject { file('spec/decorators/application_decorator_spec.rb') }
+      it { should exist }
+      it { should contain "describe ApplicationDecorator do" }
+    end
+
+    describe 'spec/decorators/products_decorator_spec.rb' do
+      subject { file('spec/decorators/products_decorator_spec.rb') }
+      it { should exist }
+      it { should contain "describe ProductsDecorator" }
+    end
+
+  end
+end

data/spec/view_context_spec.rb

@@ -22,4 +22,14 @@ describe Draper::ViewContext do
     Thread.current[:current_view_context] = nil
     expect {app_controller.current_view_context}.should raise_exception(Exception)
   end
+  
+  it "sets view_context every time" do
+    app_controller_instance.stub(:view_context) { 'first' }
+    app_controller_instance.set_current_view_context
+    Thread.current[:current_view_context].should == 'first'
+    
+    app_controller_instance.stub(:view_context) { 'second' }
+    app_controller_instance.set_current_view_context
+    Thread.current[:current_view_context].should == 'second'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: draper
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-09 00:00:00.000000000Z
+date: 2011-10-20 00:00:00.000000000Z
 dependencies: []
 description: Draper reimagines the role of helpers in the view layer of a Rails application,
   allowing an object-oriented approach rather than procedural.
@@ -60,9 +60,13 @@ files:
 - lib/generators/draper/decorator/templates/application_decorator.rb
 - lib/generators/draper/decorator/templates/decorator.rb
 - lib/generators/rails/decorator_generator.rb
+- lib/generators/rspec/decorator_generator.rb
+- lib/generators/rspec/templates/application_decorator_spec.rb
+- lib/generators/rspec/templates/decorator_spec.rb
 - spec/base_spec.rb
 - spec/draper/model_support_spec.rb
 - spec/generators/draper/decorator/decorator_generator_spec.rb
+- spec/generators/rspec/decorator_generator_spec.rb
 - spec/samples/active_record.rb
 - spec/samples/application_controller.rb
 - spec/samples/application_helper.rb
@@ -102,6 +106,7 @@ test_files:
 - spec/base_spec.rb
 - spec/draper/model_support_spec.rb
 - spec/generators/draper/decorator/decorator_generator_spec.rb
+- spec/generators/rspec/decorator_generator_spec.rb
 - spec/samples/active_record.rb
 - spec/samples/application_controller.rb
 - spec/samples/application_helper.rb