draper 0.12.1 → 0.17.0

data/lib/generators/decorator/templates/decorator.rb

@@ -27,7 +27,7 @@ class <%= class_name %>Decorator < <%= parent_class_name %>
   #   generated by ActiveRecord:
   #
   #   def created_at
-  #     h.content_tag :span, time.strftime("%a %m/%d/%y"),
+  #     h.content_tag :span, attributes["created_at"].strftime("%a %m/%d/%y"),
   #                   :class => 'timestamp'
   #   end
 end

data/lib/generators/test_unit/templates/decorator_test.rb

@@ -2,6 +2,6 @@ require 'test_helper'
 
 class <%= class_name %>DecoratorTest < ActiveSupport::TestCase
   def setup
-    ApplicationController.new.set_current_view_context
+    ApplicationController.new.view_context
   end
 end

data/spec/draper/base_spec.rb

@@ -1,41 +1,41 @@
 require 'spec_helper'
 
 describe Draper::Base do
-  before(:each){ ApplicationController.new.set_current_view_context }
+  before(:each){ ApplicationController.new.view_context }
   subject{ Decorator.new(source) }
   let(:source){ Product.new }
   let(:non_active_model_source){ NonActiveModelProduct.new }
 
   context("proxying class methods") do
-    it "should pass missing class method calls on to the wrapped class" do
+    it "pass missing class method calls on to the wrapped class" do
       subject.class.sample_class_method.should == "sample class method"
     end
 
-    it "should respond_to a wrapped class method" do
+    it "respond_to a wrapped class method" do
       subject.class.should respond_to(:sample_class_method)
     end
 
-    it "should still respond_to its own class methods" do
+    it "still respond_to its own class methods" do
       subject.class.should respond_to(:own_class_method)
     end
   end
 
   context(".helpers") do
-    it "should have a valid view_context" do
+    it "have a valid view_context" do
       subject.helpers.should be
     end
 
-    it "should be aliased to .h" do
+    it "is aliased to .h" do
       subject.h.should == subject.helpers
     end
   end
 
   context("#helpers") do
-    it "should have a valid view_context" do
+    it "have a valid view_context" do
       Decorator.helpers.should be
     end
 
-    it "should be aliased to #h" do
+    it "is aliased to #h" do
       Decorator.h.should == Decorator.helpers
     end
   end
@@ -50,14 +50,14 @@ describe Draper::Base do
       ProductDecorator.new(product_decorator).model.should be_instance_of Product
     end
 
-    it "should handle plural-like words properly'" do
+    it "handle plural-like words properly'" do
       class Business; end
       expect do
         class BusinessDecorator < Draper::Base
           decorates:business
         end
         BusinessDecorator.model_class.should == Business
-      end.should_not raise_error
+      end.to_not raise_error
     end
 
     context("accepts ActiveRecord like :class_name option too") do
@@ -67,7 +67,7 @@ describe Draper::Base do
           decorates :product, :class => Product
         end
         CustomDecorator.model_class.should == Product
-        end.should_not raise_error
+        end.to_not raise_error
       end
 
       it "accepts constants for :class_name" do
@@ -76,7 +76,7 @@ describe Draper::Base do
           decorates :product, :class_name => Product
         end
         CustomDecorator.model_class.should == Product
-        end.should_not raise_error
+        end.to_not raise_error
       end
 
       it "accepts strings for :class" do
@@ -85,7 +85,7 @@ describe Draper::Base do
           decorates :product, :class => 'Product'
         end
         CustomDecorator.model_class.should == Product
-        end.should_not raise_error
+        end.to_not raise_error
       end
 
       it "accepts strings for :class_name" do
@@ -94,7 +94,7 @@ describe Draper::Base do
           decorates :product, :class_name => 'Product'
         end
         CustomDecorator.model_class.should == Product
-        end.should_not raise_error
+        end.to_not raise_error
       end
     end
 
@@ -154,6 +154,14 @@ describe Draper::Base do
       end
     end
 
+    context "with a scope specified" do
+      before(:each){ subject.class_eval{ decorates_association :thing, :scope => :foo } }
+      it "applies the scope before decoration" do
+        SomeThing.any_instance.should_receive(:foo).and_return(:bar)
+        subject.thing.model.should == :bar
+      end
+    end
+
     context "for a polymorphic association" do
       before(:each){ subject.class_eval{ decorates_association :thing, :polymorphic => true } }
       it "causes the association to be decorated with the right decorator" do
@@ -170,27 +178,50 @@ describe Draper::Base do
         subject.previous_version.should be_nil
       end
     end
+
+    context "#find" do
+      before(:each){ subject.class_eval{ decorates_association :similar_products } }
+      context "with a block" do
+        it "delegates to #each" do
+          subject.similar_products.source.should_receive :find
+          subject.similar_products.find {|p| p.title == "title" }
+        end
+      end
+
+      context "without a block" do
+        it "calls a finder method" do
+          subject.similar_products.source.should_not_receive :find
+          subject.similar_products.find 1
+        end
+      end
+    end
   end
 
   context('.decorates_associations') do
     subject { Decorator }
     it "decorates each of the associations" do
-      subject.should_receive(:decorates_association).with(:similar_products)
-      subject.should_receive(:decorates_association).with(:previous_version)
+      subject.should_receive(:decorates_association).with(:similar_products, {})
+      subject.should_receive(:decorates_association).with(:previous_version, {})
 
       subject.decorates_associations :similar_products, :previous_version
     end
+
+    it "dispatches options" do
+      subject.should_receive(:decorates_association).with(:similar_products, :with => ProductDecorator)
+      subject.should_receive(:decorates_association).with(:previous_version, :with => ProductDecorator)
+
+      subject.decorates_associations :similar_products, :previous_version, :with => ProductDecorator
+    end
   end
 
-  context(".model / .to_model") do
-    it "should return the wrapped object" do
-      subject.to_model.should == source
-      subject.model.should == source
+  context(".wrapped_object") do
+    it "return the wrapped object" do
+      subject.wrapped_object.should == source
     end
   end
 
   context(".source / .to_source") do
-    it "should return the wrapped object" do
+    it "return the wrapped object" do
       subject.to_source == source
       subject.source == source
     end
@@ -205,40 +236,43 @@ describe Draper::Base do
       end
     end
 
-    it "should not override a defined method with a source method" do
+    it "not override a defined method with a source method" do
       DecoratorWithApplicationHelper.new(source).length.should == "overridden"
     end
 
-    it "should not copy the .class, .inspect, or other existing methods" do
+    it "not copy the .class, .inspect, or other existing methods" do
       source.class.should_not == subject.class
       source.inspect.should_not == subject.inspect
       source.to_s.should_not == subject.to_s
     end
 
     context "when an ActiveModel descendant" do
-      it "should always proxy to_param" do
+      it "always proxy to_param if it is not defined on the decorator itself" do
         source.stub(:to_param).and_return(1)
         Draper::Base.new(source).to_param.should == 1
       end
 
-      it "should always proxy id" do
+      it "always proxy id if it is not defined on the decorator itself" do
         source.stub(:id).and_return(123456789)
         Draper::Base.new(source).id.should == 123456789
       end
 
-      it "should always proxy errors" do
+      it "always proxy errors if it is not defined on the decorator itself" do
         Draper::Base.new(source).errors.should be_an_instance_of ActiveModel::Errors
       end
-    end
 
-    context "when not an ActiveModel descendant" do
-      it "does not proxy to_param" do
-        non_active_model_source.stub(:to_param).and_return(1)
-        Draper::Base.new(non_active_model_source).to_param.should_not == 1
+      it "never proxy to_param if it is defined on the decorator itself" do
+        source.stub(:to_param).and_return(1)
+        DecoratorWithSpecialMethods.new(source).to_param.should == "foo"
       end
 
-      it "does not proxy errors" do
-        Draper::Base.new(non_active_model_source).should_not respond_to :errors
+      it "never proxy id if it is defined on the decorator itself" do
+        source.stub(:id).and_return(123456789)
+        DecoratorWithSpecialMethods.new(source).id.should == 1337
+      end
+
+      it "never proxy errors if it is defined on the decorator itself" do
+        DecoratorWithSpecialMethods.new(source).errors.should be_an_instance_of Array
       end
     end
   end
@@ -253,24 +287,24 @@ describe Draper::Base do
     end
   end
 
-  it "should wrap source methods so they still accept blocks" do
+  it "wrap source methods so they still accept blocks" do
     subject.block{"marker"}.should == "marker"
   end
 
   context ".find" do
-    it "should lookup the associated model when passed an integer" do
+    it "lookup the associated model when passed an integer" do
       pd = ProductDecorator.find(1)
       pd.should be_instance_of(ProductDecorator)
       pd.model.should be_instance_of(Product)
     end
 
-    it "should lookup the associated model when passed a string" do
+    it "lookup the associated model when passed a string" do
       pd = ProductDecorator.find("1")
       pd.should be_instance_of(ProductDecorator)
       pd.model.should be_instance_of(Product)
     end
 
-    it "should accept and store a context" do
+    it "accept and store a context" do
       pd = ProductDecorator.find(1, :context => :admin)
       pd.context.should == :admin
     end
@@ -342,6 +376,15 @@ describe Draper::Base do
         end
       end
 
+      context "when given a collection of sequel models" do
+        # Sequel models implement #each
+        let(:source) { [SequelProduct.new, SequelProduct.new] }
+
+        it "returns a collection of wrapped objects" do
+          subject.each{ |decorated| decorated.should be_instance_of(Draper::Base) }
+        end
+      end
+
       context "when given a single source object" do
         let(:source) { Product.new }
 
@@ -440,32 +483,35 @@ describe Draper::Base do
   end
 
   context('.==') do
-    it "should compare the decorated models" do
+    it "compare the decorated models" do
       other = Draper::Base.new(source)
       subject.should == other
     end
   end
 
   context ".respond_to?" do
-    it "should delegate respond_to? to the decorated model" do
+    # respond_to? is called by some proxies (id, to_param, errors).
+    # This is, why I stub it this way.
+    it "delegate respond_to? to the decorated model" do
       other = Draper::Base.new(source)
-      source.should_receive(:respond_to?).with(:whatever, true)
-      subject.respond_to?(:whatever, true)
+      source.stub(:respond_to?).and_return(false)
+      source.stub(:respond_to?).with(:whatever, true).once.and_return("mocked")
+      subject.respond_to?(:whatever, true).should == "mocked"
     end
   end
 
   context 'position accessors' do
     [:first, :last].each do |method|
       context "##{method}" do
-        it "should return a decorated instance" do
+        it "return a decorated instance" do
           ProductDecorator.send(method).should be_instance_of ProductDecorator
         end
 
-        it "should return the #{method} instance of the wrapped class" do
+        it "return the #{method} instance of the wrapped class" do
           ProductDecorator.send(method).model.should == Product.send(method)
         end
 
-        it "should accept an optional context" do
+        it "accept an optional context" do
           ProductDecorator.send(method, :context => :admin).context.should == :admin
         end
       end
@@ -486,32 +532,32 @@ describe Draper::Base do
     let(:empty_collection) { [] }
     subject { ProductDecorator.decorate(paged_array) }
 
-    it "should proxy all calls to decorated collection" do
+    it "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
+    it "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_ary.first.should == ProductDecorator.decorate(paged_array.first)
     end
 
-    it "should delegate respond_to? to the wrapped collection" do
+    it "delegate respond_to? to the wrapped collection" do
       decorator = ProductDecorator.decorate(paged_array)
       paged_array.should_receive(:respond_to?).with(:whatever, true)
       decorator.respond_to?(:whatever, true)
     end
 
-    it "should return blank for a decorated empty collection" do
+    it "return blank for a decorated empty collection" do
       # This tests that respond_to? is defined for the DecoratedEnumerableProxy
       # since activesupport calls respond_to?(:empty) in #blank
       decorator = ProductDecorator.decorate(empty_collection)
       decorator.should be_blank
     end
 
-    it "should return whether the member is in the array for a decorated wrapped collection" do
+    it "return whether the member is in the array for a decorated wrapped collection" do
       # This tests that include? is defined for the DecoratedEnumerableProxy
       member = paged_array.first
       subject.respond_to?(:include?)
@@ -520,20 +566,20 @@ describe Draper::Base do
       subject.include?(Product.new).should == false
     end
 
-    it "should equal each other when decorating the same collection" do
+    it "equal each other when decorating the same collection" do
       subject_one = ProductDecorator.decorate(paged_array)
       subject_two = ProductDecorator.decorate(paged_array)
       subject_one.should == subject_two
     end
 
-    it "should not equal each other when decorating different collections" do
+    it "not equal each other when decorating different collections" do
       subject_one = ProductDecorator.decorate(paged_array)
       new_paged_array = paged_array + [Product.new]
       subject_two = ProductDecorator.decorate(new_paged_array)
       subject_one.should_not == subject_two
     end
 
-    it "should allow decorated access by index" do
+    it "allow decorated access by index" do
       subject = ProductDecorator.decorate(paged_array)
       subject[0].should be_instance_of ProductDecorator
     end
@@ -559,18 +605,18 @@ describe Draper::Base do
     end
 
     context '#all' do
-      it "should return a decorated collection" do
+      it "return a decorated collection" do
         ProductDecorator.all.first.should be_instance_of ProductDecorator
       end
 
-      it "should accept a context" do
+      it "accept a context" do
         collection = ProductDecorator.all(:context => :admin)
         collection.first.context.should == :admin
       end
     end
 
     context(".source / .to_source") do
-      it "should return the wrapped object" do
+      it "return the wrapped object" do
         subject.to_source == source
         subject.source == source
       end
@@ -580,19 +626,19 @@ describe Draper::Base do
   describe "a sample usage with denies" do
     let(:subject_with_denies){ DecoratorWithDenies.new(source) }
 
-    it "should proxy methods not listed in denies" do
+    it "proxy methods not listed in denies" do
       subject_with_denies.should respond_to(:hello_world)
     end
 
-    it "should not echo methods specified with denies" do
+    it "not echo methods specified with denies" do
       subject_with_denies.should_not respond_to(:goodnight_moon)
     end
 
-    it "should not clobber other decorators' methods" do
+    it "not clobber other decorators' methods" do
       subject.should respond_to(:hello_world)
     end
 
-    it "should not allow method_missing to circumvent a deny" do
+    it "not allow method_missing to circumvent a deny" do
       expect{subject_with_denies.title}.to raise_error(NoMethodError)
     end
   end
@@ -602,20 +648,20 @@ describe Draper::Base do
 
     let(:subject_with_multiple_allows){ DecoratorWithMultipleAllows.new(source) }
 
-    it "should echo the allowed method" do
+    it "echo the allowed method" do
       subject_with_allows.should respond_to(:goodnight_moon)
     end
 
-    it "should echo _only_ the allowed method" do
+    it "echo _only_ the allowed method" do
       subject_with_allows.should_not respond_to(:hello_world)
     end
 
-    it "should echo the combined allowed methods" do
+    it "echo the combined allowed methods" do
       subject_with_multiple_allows.should respond_to(:goodnight_moon)
       subject_with_multiple_allows.should respond_to(:hello_world)
     end
 
-    it "should echo _only_ the combined allowed methods" do
+    it "echo _only_ the combined allowed methods" do
       subject_with_multiple_allows.should_not respond_to(:title)
     end
   end
@@ -647,62 +693,134 @@ describe Draper::Base do
       end
     }
 
-    it "should raise an exception for a blank allows" do
-      expect {blank_allows}.should raise_error(ArgumentError)
+    it "raise an exception for a blank allows" do
+      expect {blank_allows}.to raise_error(ArgumentError)
+    end
+
+    it "raise an exception for a blank denies" do
+      expect {blank_denies}.to raise_error(ArgumentError)
+    end
+
+    it "raise an exception for calling allows then denies" do
+      expect {using_allows_then_denies}.to raise_error(ArgumentError)
+    end
+
+    it "raise an exception for calling denies then allows" do
+      expect {using_denies_then_allows}.to raise_error(ArgumentError)
+    end
+  end
+
+  describe "a sample usage with denies_all" do
+    let(:subject_with_denies_all){ DecoratorWithDeniesAll.new(source) }
+
+    [:goodnight_moon, :hello_world, :title].each do |method|
+      it "does echo #{method} method" do
+        subject_with_denies_all.should_not respond_to(method)
+      end
+    end
+
+    let(:using_denies_all_then_denies_all) {
+      class DecoratorWithDeniesAllAndDeniesAll < Draper::Base
+        denies_all
+        denies_all
+      end
+    }
+
+    it "allows multple calls to .denies_all" do
+      expect { using_denies_all_then_denies_all }.to_not raise_error(ArgumentError)
     end
+  end
 
-    it "should raise an exception for a blank denies" do
-      expect {blank_denies}.should raise_error(ArgumentError)
+  describe "invalid usages of denies_all" do
+    let(:using_allows_then_denies_all) {
+      class DecoratorWithAllowsAndDeniesAll < Draper::Base
+        allows :hello_world
+        denies_all
+      end
+    }
+    let(:using_denies_then_denies_all) {
+      class DecoratorWithDeniesAndDeniesAll < Draper::Base
+        denies :goodnight_moon
+        denies_all
+      end
+    }
+    let(:using_denies_all_then_allows) {
+      class DecoratorWithDeniesAllAndAllows < Draper::Base
+        denies_all
+        allows :hello_world
+      end
+    }
+    let(:using_denies_all_then_denies) {
+      class DecoratorWithDeniesAllAndDenies < Draper::Base
+        denies_all
+        denies :goodnight_moon
+      end
+    }
+    it "raises an exception when calling allows then denies_all" do
+      expect {using_allows_then_denies_all}.to raise_error(ArgumentError)
     end
 
-    it "should raise an exception for calling allows then denies" do
-      expect {using_allows_then_denies}.should raise_error(ArgumentError)
+    it "raises an exception when calling denies then denies_all" do
+      expect {using_denies_then_denies_all}.to raise_error(ArgumentError)
     end
 
-    it "should raise an exception for calling denies then allows" do
-      expect {using_denies_then_allows}.should raise_error(ArgumentError)
+    it "raises an exception when calling denies_all then allows" do
+      expect {using_denies_all_then_allows}.to raise_error(ArgumentError)
+    end
+
+    it "raises an exception when calling denies_all then denies" do
+      expect {using_denies_all_then_denies}.to raise_error(ArgumentError)
     end
   end
 
   context "in a Rails application" do
     let(:decorator){ DecoratorWithApplicationHelper.decorate(Object.new) }
 
-    it "should have access to ApplicationHelper helpers" do
+    it "have access to ApplicationHelper helpers" do
       decorator.uses_hello_world == "Hello, World!"
     end
 
-    it "should be able to use the content_tag helper" do
+    it "is able to use the content_tag helper" do
       decorator.sample_content.to_s.should == "<span>Hello, World!</span>"
     end
 
-    it "should be able to use the link_to helper" do
+    it "is able to use the link_to helper" do
       decorator.sample_link.should == "<a href=\"/World\">Hello</a>"
     end
 
-    it "should be able to use the pluralize helper" do
+    it "is able to use the pluralize helper" do
       decorator.sample_truncate.should == "Once..."
     end
 
-    it "should be able to use l rather than helpers.l" do
+    it "is able to use l rather than helpers.l" do
       now = Time.now
-      decorator.helpers.should_receive(:localize).with(now)
+      decorator.helpers.instance_variable_get(:@helpers).should_receive(:localize).with(now)
       decorator.l now
     end
+
+    it "is able to access html_escape, a private method" do
+      decorator.sample_html_escaped_text.should == '&lt;script&gt;danger&lt;/script&gt;'
+    end
   end
 
-  describe "#method_missing" do
-    context "when #hello_world is called for the first time" do
-      it "hits method missing" do
-        subject.should_receive(:method_missing)
-        subject.hello_world
+  context "#method_missing" do
+    context "with an isolated decorator class" do
+      let(:decorator_class) { Class.new(Decorator) }
+      subject{ decorator_class.new(source) }
+
+      context "when #hello_world is called again" do
+        it "proxies method directly after first hit" do
+          subject.methods.should_not include(:hello_world)
+          subject.hello_world
+          subject.methods.should include(:hello_world)
+        end
       end
-    end
 
-    context "when #hello_world is called again" do
-      before { subject.hello_world }
-      it "proxies method directly after first hit" do
-        subject.should_not_receive(:method_missing)
-        subject.hello_world
+      context "when #hello_world is called for the first time" do
+        it "hits method missing" do
+          subject.should_receive(:method_missing)
+          subject.hello_world
+        end
       end
     end
 

data/spec/draper/model_support_spec.rb

@@ -1,18 +1,18 @@
 require 'spec_helper'
 
-describe Draper::ActiveModelSupport do
+describe Draper::ModelSupport do
   subject { Product.new }
 
   describe '#decorator' do
     its(:decorator) { should be_kind_of(ProductDecorator) }
     its(:decorator) { should be(subject.decorator) }
 
-    it 'should have abillity to pass block' do
+    it 'have abillity to pass block' do
       a = Product.new.decorator { |d| d.awesome_title }
       a.should eql "Awesome Title"
     end
 
-    it 'should be aliased to .decorate' do
+    it 'is aliased to .decorate' do
       subject.decorator.model.should == subject.decorate.model
     end
   end
@@ -23,12 +23,12 @@ describe Draper::ActiveModelSupport do
 
       its(:decorate) { should be_kind_of(Draper::DecoratedEnumerableProxy) }
 
-      it "should decorate the collection" do
+      it "decorate the collection" do
         subject.decorate.size.should == 1
         subject.decorate.to_ary[0].model.should be_a(klass)
       end
 
-      it "should return a new instance each time it is called" do
+      it "return a new instance each time it is called" do
         subject.decorate.should_not == subject.decorate
       end
     end