draper 1.0.0.beta6 → 1.0.0

data/spec/draper/decorator_spec.rb

@@ -15,7 +15,7 @@ describe Draper::Decorator do
       end
 
       it "raises error on invalid options" do
-        expect { decorator_class.new(source, valid_options.merge(foo: 'bar')) }.to raise_error(ArgumentError, 'Unknown key: foo')
+        expect { decorator_class.new(source, valid_options.merge(foo: 'bar')) }.to raise_error(ArgumentError, /Unknown key/)
       end
     end
 
@@ -49,21 +49,29 @@ describe Draper::Decorator do
       end
     end
 
-    it "decorates other decorators" do
-      decorator = ProductDecorator.new(source)
-      SpecificProductDecorator.new(decorator).source.should be decorator
-    end
+    context "when decorating other decorators" do
+      it "redecorates" do
+        decorator = ProductDecorator.new(source)
+        SpecificProductDecorator.new(decorator).source.should be decorator
+      end
+
+      context "when the same decorator has been applied earlier in the chain" do
+        let(:decorator) { SpecificProductDecorator.new(ProductDecorator.new(Product.new)) }
+
+        it "warns" do
+          warning_message = nil
+          Object.any_instance.stub(:warn) {|message| warning_message = message }
 
-    it "warns if target is already decorated with the same decorator class" do
-      warning_message = nil
-      Object.any_instance.stub(:warn) { |message| warning_message = message }
+          expect{ProductDecorator.new(decorator)}.to change{warning_message}
+          warning_message.should =~ /ProductDecorator/
+          warning_message.should include caller(1).first
+        end
 
-      deep_decorator = SpecificProductDecorator.new(ProductDecorator.new(Product.new))
-      expect {
-        ProductDecorator.new(deep_decorator)
-      }.to change { warning_message }
-      warning_message.should =~ /ProductDecorator/
-      warning_message.should include caller(1).first
+        it "redecorates" do
+          Object.any_instance.stub(:warn)
+          ProductDecorator.new(decorator).source.should be decorator
+        end
+      end
     end
   end
 
@@ -76,7 +84,6 @@ describe Draper::Decorator do
   end
 
   describe ".decorate_collection" do
-    subject { ProductDecorator.decorate_collection(source) }
     let(:source) { [Product.new, Widget.new] }
 
     describe "options validation" do
@@ -88,17 +95,34 @@ describe Draper::Decorator do
       end
 
       it "raises error on invalid options" do
-        expect { ProductDecorator.decorate_collection(source, valid_options.merge(foo: 'bar')) }.to raise_error(ArgumentError, 'Unknown key: foo')
+        expect { ProductDecorator.decorate_collection(source, valid_options.merge(foo: 'bar')) }.to raise_error(ArgumentError, /Unknown key/)
       end
     end
 
-    it "returns a collection decorator" do
-      subject.should be_a Draper::CollectionDecorator
-      subject.should == source
+    context "when a custom collection decorator does not exist" do
+      subject { WidgetDecorator.decorate_collection(source) }
+
+      it "returns a regular collection decorator" do
+        subject.should be_a Draper::CollectionDecorator
+        subject.should == source
+      end
+
+      it "uses itself as the item decorator by default" do
+        subject.each {|item| item.should be_a WidgetDecorator}
+      end
     end
 
-    it "uses itself as the item decorator by default" do
-      subject.each {|item| item.should be_a ProductDecorator}
+    context "when a custom collection decorator exists" do
+      subject { ProductDecorator.decorate_collection(source) }
+
+      it "returns the custom collection decorator" do
+        subject.should be_a ProductsDecorator
+        subject.should == source
+      end
+
+      it "uses itself as the item decorator by default" do
+        subject.each {|item| item.should be_a ProductDecorator}
+      end
     end
 
     context "with context" do
@@ -256,7 +280,7 @@ describe Draper::Decorator do
         end
 
         it "raises error on invalid options" do
-          expect { decorator_class.decorates_association :similar_products, valid_options.merge(foo: 'bar') }.to raise_error(ArgumentError, 'Unknown key: foo')
+          expect { decorator_class.decorates_association :similar_products, valid_options.merge(foo: 'bar') }.to raise_error(ArgumentError, /Unknown key/)
         end
       end
 
@@ -415,101 +439,45 @@ describe Draper::Decorator do
     end
   end
 
-  describe "#respond_to?" do
-    let(:decorator_class) { Class.new(ProductDecorator) }
-
-    it "returns true for its own methods" do
-      subject.should respond_to :awesome_title
-    end
-
-    it "returns true for the source's methods" do
-      subject.should respond_to :title
-    end
-
-    context "with include_private" do
-      it "returns true for its own private methods" do
-        subject.respond_to?(:awesome_private_title, true).should be_true
-      end
-
-      it "returns false for the source's private methods" do
-        subject.respond_to?(:private_title, true).should be_false
-      end
-    end
-
-    context "with method security" do
-      it "respects allows" do
-        subject.class.allows :hello_world
-
-        subject.should respond_to :hello_world
-        subject.should_not respond_to :goodnight_moon
-      end
-
-      it "respects denies" do
-        subject.class.denies :goodnight_moon
-
-        subject.should respond_to :hello_world
-        subject.should_not respond_to :goodnight_moon
-      end
-
-      it "respects denies_all" do
-        subject.class.denies_all
-
-        subject.should_not respond_to :hello_world
-        subject.should_not respond_to :goodnight_moon
-      end
-    end
-  end
-
-  describe ".respond_to?" do
-    subject { Class.new(ProductDecorator) }
-
-    context "without a source class" do
-      it "returns true for its own class methods" do
-        subject.should respond_to :my_class_method
-      end
+  describe ".delegate" do
+    subject { Class.new(Draper::Decorator) }
 
-      it "returns false for other class methods" do
-        subject.should_not respond_to :sample_class_method
-      end
+    it "defaults the :to option to :source" do
+      Draper::Decorator.superclass.should_receive(:delegate).with(:foo, :bar, to: :source)
+      subject.delegate :foo, :bar
     end
 
-    context "with a source_class" do
-      before { subject.decorates :product }
-
-      it "returns true for its own class methods" do
-        subject.should respond_to :my_class_method
-      end
-
-      it "returns true for the source's class methods" do
-        subject.should respond_to :sample_class_method
-      end
+    it "does not overwrite the :to option if supplied" do
+      Draper::Decorator.superclass.should_receive(:delegate).with(:foo, :bar, to: :baz)
+      subject.delegate :foo, :bar, to: :baz
     end
   end
 
-  describe "proxying" do
-    context "instance methods" do
-      let(:decorator_class) { Class.new(ProductDecorator) }
+  describe ".delegate_all" do
+    let(:decorator_class) { Class.new(ProductDecorator) }
+    before { decorator_class.delegate_all }
 
-      it "does not proxy methods that are defined on the decorator" do
+    describe "#method_missing" do
+      it "does not delegate methods that are defined on the decorator" do
         subject.overridable.should be :overridden
       end
 
-      it "does not proxy methods inherited from Object" do
+      it "does not delegate methods inherited from Object" do
         subject.inspect.should_not be source.inspect
       end
 
-      it "proxies missing methods that exist on the source" do
-        source.stub(:hello_world).and_return(:proxied)
-        subject.hello_world.should be :proxied
+      it "delegates missing methods that exist on the source" do
+        source.stub(:hello_world).and_return(:delegated)
+        subject.hello_world.should be :delegated
       end
 
-      it "adds proxied methods to the decorator when they are used" do
+      it "adds delegated methods to the decorator when they are used" do
         subject.methods.should_not include :hello_world
         subject.hello_world
         subject.methods.should include :hello_world
       end
 
-      it "passes blocks to proxied methods" do
+      it "passes blocks to delegated methods" do
         subject.block{"marker"}.should == "marker"
       end
 
@@ -517,75 +485,83 @@ describe Draper::Decorator do
         Array(subject).should be_a Array
       end
 
-      it "proxies delegated methods" do
+      it "delegates already-delegated methods" do
         subject.delegated_method.should == "Yay, delegation"
       end
 
-      it "does not proxy private methods" do
+      it "does not delegate private methods" do
         expect{subject.private_title}.to raise_error NoMethodError
       end
+    end
 
-      context "with method security" do
-        it "respects allows" do
-          source.stub(:hello_world, :goodnight_moon).and_return(:proxied)
-          subject.class.allows :hello_world
+    context ".method_missing" do
+      subject { decorator_class }
 
-          subject.hello_world.should be :proxied
-          expect{subject.goodnight_moon}.to raise_error NameError
+      context "without a source class" do
+        it "raises a NoMethodError on missing methods" do
+          expect{subject.hello_world}.to raise_error NoMethodError
         end
+      end
 
-        it "respects denies" do
-          source.stub(:hello_world, :goodnight_moon).and_return(:proxied)
-          subject.class.denies :goodnight_moon
+      context "with a source class" do
+        let(:source_class) { Product }
+        before { subject.decorates source_class }
 
-          subject.hello_world.should be :proxied
-          expect{subject.goodnight_moon}.to raise_error NameError
+        it "does not delegate methods that are defined on the decorator" do
+          subject.overridable.should be :overridden
         end
 
-        it "respects denies_all" do
-          source.stub(:hello_world, :goodnight_moon).and_return(:proxied)
-          subject.class.denies_all
-
-          expect{subject.hello_world}.to raise_error NameError
-          expect{subject.goodnight_moon}.to raise_error NameError
+        it "delegates missing methods that exist on the source" do
+          source_class.stub(:hello_world).and_return(:delegated)
+          subject.hello_world.should be :delegated
         end
       end
     end
 
-    context "class methods" do
-      subject { Class.new(ProductDecorator) }
-      let(:source_class) { Product }
-      before { subject.decorates source_class }
+    describe "#respond_to?" do
+      it "returns true for its own methods" do
+        subject.should respond_to :awesome_title
+      end
 
-      it "does not proxy methods that are defined on the decorator" do
-        subject.overridable.should be :overridden
+      it "returns true for the source's methods" do
+        subject.should respond_to :title
       end
 
-      it "proxies missing methods that exist on the source" do
-        source_class.stub(:hello_world).and_return(:proxied)
-        subject.hello_world.should be :proxied
+      context "with include_private" do
+        it "returns true for its own private methods" do
+          subject.respond_to?(:awesome_private_title, true).should be_true
+        end
+
+        it "returns false for the source's private methods" do
+          subject.respond_to?(:private_title, true).should be_false
+        end
       end
     end
-  end
 
-  describe "method security" do
-    subject(:decorator_class) { Draper::Decorator }
-    let(:security) { stub }
-    before { decorator_class.stub(:security).and_return(security) }
+    describe ".respond_to?" do
+      subject { decorator_class }
 
-    it "delegates .denies to Draper::Security" do
-      security.should_receive(:denies).with(:foo, :bar)
-      decorator_class.denies :foo, :bar
-    end
+      context "without a source class" do
+        it "returns true for its own class methods" do
+          subject.should respond_to :my_class_method
+        end
 
-    it "delegates .denies_all to Draper::Security" do
-      security.should_receive(:denies_all)
-      decorator_class.denies_all
-    end
+        it "returns false for other class methods" do
+          subject.should_not respond_to :sample_class_method
+        end
+      end
+
+      context "with a source_class" do
+        before { subject.decorates :product }
 
-    it "delegates .allows to Draper::Security" do
-      security.should_receive(:allows).with(:foo, :bar)
-      decorator_class.allows :foo, :bar
+        it "returns true for its own class methods" do
+          subject.should respond_to :my_class_method
+        end
+
+        it "returns true for the source's class methods" do
+          subject.should respond_to :sample_class_method
+        end
+      end
     end
   end
 
@@ -623,6 +599,14 @@ describe Draper::Decorator do
     subject.is_a?(subject.class).should be_true
   end
 
+  it "pretends to be an instance of the source class" do
+    subject.instance_of?(source.class).should be_true
+  end
+
+  it "is still an instance of its own class" do
+    subject.instance_of?(subject.class).should be_true
+  end
+
   describe ".decorates_finders" do
     it "extends the Finders module" do
       ProductDecorator.should be_a_kind_of Draper::Finders
@@ -637,28 +621,4 @@ describe Draper::Decorator do
     end
   end
 
-  describe ".method_missing" do
-    context "when called on an anonymous decorator" do
-      subject { ->{ Class.new(Draper::Decorator).fizzbuzz } }
-      it { should raise_error NoMethodError }
-    end
-
-    context "when called on an uninferrable decorator" do
-      subject { ->{ SpecificProductDecorator.fizzbuzz } }
-      it { should raise_error NoMethodError }
-    end
-
-    context "when called on an inferrable decorator" do
-      context "for a method known to the inferred class" do
-        subject { ->{ ProductDecorator.model_name } }
-        it { should_not raise_error }
-      end
-
-      context "for a method unknown to the inferred class" do
-        subject { ->{ ProductDecorator.fizzbuzz } }
-        it { should raise_error NoMethodError }
-      end
-    end
-  end
-
 end

data/spec/draper/finders_spec.rb

@@ -129,17 +129,4 @@ describe Draper::Finders do
       decorator.context.should == {some: 'context'}
     end
   end
-
-  describe "scopes" do
-    it "proxies to the model class" do
-      Product.should_receive(:where).with({name: "apples"})
-      ProductDecorator.where(name: "apples")
-    end
-
-    it "doesn't decorate the result" do
-      found = [Product.new]
-      Product.stub(:where).and_return(found)
-      ProductDecorator.where(name: "apples").should be found
-    end
-  end
 end

data/spec/dummy/app/controllers/localized_urls.rb

@@ -1,5 +1,5 @@
 module LocalizedUrls
   def default_url_options(options = {})
-    {locale: I18n.locale, host: "www.example.com", port: nil}
+    {locale: I18n.locale, host: "www.example.com", port: 12345}
   end
 end

data/spec/dummy/app/controllers/posts_controller.rb

@@ -1,17 +1,11 @@
 class PostsController < ApplicationController
   def show
-    fetch_post
+    @post = Post.find(params[:id]).decorate
   end
 
   def mail
-    fetch_post
-    email = PostMailer.decorated_email(@post).deliver
+    post = Post.find(params[:id])
+    email = PostMailer.decorated_email(post).deliver
     render text: email.body
   end
-
-  private
-
-  def fetch_post
-    @post = Post.find(params[:id]).decorate
-  end
 end

data/spec/dummy/app/decorators/post_decorator.rb

@@ -1,6 +1,9 @@
 class PostDecorator < Draper::Decorator
+  # need to delegate id and new_record? for AR::Base#== (Rails 3.0 only)
+  delegate :id, :new_record?
+
   def posted_date
-    if created_at.to_date == DateTime.now.utc.to_date
+    if source.created_at.to_date == DateTime.now.utc.to_date
       "Today"
     else
       "Not Today"