draper 1.2.0 → 1.2.1

data/spec/draper/factory_spec.rb

@@ -15,7 +15,7 @@ module Draper
     end
 
     describe "#decorate" do
-      context "when source is nil" do
+      context "when object is nil" do
         it "returns nil" do
           factory = Factory.new
 
@@ -31,12 +31,12 @@ module Draper
         expect(factory.decorate(double)).to be :decorated
       end
 
-      it "passes the source to the worker" do
+      it "passes the object to the worker" do
         factory = Factory.new
-        source = double
+        object = double
 
-        Factory::Worker.should_receive(:new).with(anything(), source).and_return(->(*){})
-        factory.decorate(source)
+        Factory::Worker.should_receive(:new).with(anything(), object).and_return(->(*){})
+        factory.decorate(object)
       end
 
       context "when the :with option was given" do
@@ -95,13 +95,13 @@ module Draper
 
     describe "#call" do
       it "calls the decorator method" do
-        source = double
+        object = double
         options = {foo: "bar"}
-        worker = Factory::Worker.new(double, source)
+        worker = Factory::Worker.new(double, object)
         decorator = ->(*){}
         worker.stub decorator: decorator
 
-        decorator.should_receive(:call).with(source, options).and_return(:decorated)
+        decorator.should_receive(:call).with(object, options).and_return(:decorated)
         expect(worker.call(options)).to be :decorated
       end
 
@@ -159,7 +159,7 @@ module Draper
     end
 
     describe "#decorator" do
-      context "for a singular source" do
+      context "for a singular object" do
         context "when decorator_class is specified" do
           it "returns the .decorate method from the decorator" do
             decorator_class = Class.new(Decorator)
@@ -170,21 +170,21 @@ module Draper
         end
 
         context "when decorator_class is unspecified" do
-          context "and the source is decoratable" do
-            it "returns the source's #decorate method" do
-              source = double
+          context "and the object is decoratable" do
+            it "returns the object's #decorate method" do
+              object = double
               options = {foo: "bar"}
-              worker = Factory::Worker.new(nil, source)
+              worker = Factory::Worker.new(nil, object)
 
-              source.should_receive(:decorate).with(options).and_return(:decorated)
-              expect(worker.decorator.call(source, options)).to be :decorated
+              object.should_receive(:decorate).with(options).and_return(:decorated)
+              expect(worker.decorator.call(object, options)).to be :decorated
             end
           end
 
-          context "and the source is not decoratable" do
+          context "and the object is not decoratable" do
             it "raises an error" do
-              source = double
-              worker = Factory::Worker.new(nil, source)
+              object = double
+              worker = Factory::Worker.new(nil, object)
 
               expect{worker.decorator}.to raise_error UninferrableDecoratorError
             end
@@ -192,7 +192,7 @@ module Draper
         end
       end
 
-      context "for a collection source" do
+      context "for a collection object" do
         context "when decorator_class is a CollectionDecorator" do
           it "returns the .decorate method from the collection decorator" do
             decorator_class = Class.new(CollectionDecorator)
@@ -212,18 +212,20 @@ module Draper
         end
 
         context "when decorator_class is unspecified" do
-          context "and the source is decoratable" do
-            it "returns the source's #decorate method" do
-              source = []
-              options = {foo: "bar"}
-              worker = Factory::Worker.new(nil, source)
-
-              source.should_receive(:decorate).with(options).and_return(:decorated)
-              expect(worker.decorator.call(source, options)).to be :decorated
+          context "and the object is decoratable" do
+            it "returns the .decorate_collection method from the object's decorator" do
+              object = []
+              decorator_class = Class.new(Decorator)
+              object.stub decorator_class: decorator_class
+              object.stub decorate: nil
+              worker = Factory::Worker.new(nil, object)
+
+              decorator_class.should_receive(:decorate_collection).with(object, foo: "bar", with: nil).and_return(:decorated)
+              expect(worker.decorator.call(object, foo: "bar")).to be :decorated
             end
           end
 
-          context "and the source is not decoratable" do
+          context "and the object is not decoratable" do
             it "returns the .decorate method from CollectionDecorator" do
               worker = Factory::Worker.new(nil, [])
 

data/spec/draper/finders_spec.rb

@@ -16,7 +16,7 @@ module Draper
         Product.stub(:find).and_return(found)
         decorator = ProductDecorator.find(1)
         expect(decorator).to be_a ProductDecorator
-        expect(decorator.source).to be found
+        expect(decorator.object).to be found
       end
 
       it "passes context to the decorator" do
@@ -39,7 +39,7 @@ module Draper
         Product.stub(:find_by_name).and_return(found)
         decorator = ProductDecorator.find_by_name("apples")
         expect(decorator).to be_a ProductDecorator
-        expect(decorator.source).to be found
+        expect(decorator.object).to be found
       end
 
       it "proxies complex ProductDecorators" do
@@ -127,7 +127,7 @@ module Draper
         Product.stub(:first).and_return(first)
         decorator = ProductDecorator.first
         expect(decorator).to be_a ProductDecorator
-        expect(decorator.source).to be first
+        expect(decorator.object).to be first
       end
 
       it "passes context to the decorator" do
@@ -150,7 +150,7 @@ module Draper
         Product.stub(:last).and_return(last)
         decorator = ProductDecorator.last
         expect(decorator).to be_a ProductDecorator
-        expect(decorator.source).to be last
+        expect(decorator.object).to be last
       end
 
       it "passes context to the decorator" do

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

@@ -15,7 +15,7 @@ class PostDecorator < Draper::Decorator
   end
 
   def path_with_model
-    h.post_path(source)
+    h.post_path(object)
   end
 
   def path_with_id
@@ -23,7 +23,7 @@ class PostDecorator < Draper::Decorator
   end
 
   def url_with_model
-    h.post_url(source)
+    h.post_url(object)
   end
 
   def url_with_id

data/spec/dummy/fast_spec/post_decorator_spec.rb

@@ -9,8 +9,8 @@ Draper::ViewContext.test_strategy :fast
 Post = Struct.new(:id) { extend ActiveModel::Naming }
 
 describe PostDecorator do
-  let(:decorator) { PostDecorator.new(source) }
-  let(:source) { Post.new(42) }
+  let(:decorator) { PostDecorator.new(object) }
+  let(:object) { Post.new(42) }
 
   it "can use built-in helpers" do
     expect(decorator.truncated).to eq "Once upon a..."

data/spec/dummy/spec/decorators/post_decorator_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe PostDecorator do
-  let(:decorator) { PostDecorator.new(source) }
-  let(:source) { Post.create }
+  let(:decorator) { PostDecorator.new(object) }
+  let(:object) { Post.create }
 
   it "can use built-in helpers" do
     expect(decorator.truncated).to eq "Once upon a..."
@@ -17,23 +17,23 @@ describe PostDecorator do
   end
 
   it "can use path helpers with its model" do
-    expect(decorator.path_with_model).to eq "/en/posts/#{source.id}"
+    expect(decorator.path_with_model).to eq "/en/posts/#{object.id}"
   end
 
   it "can use path helpers with its id" do
-    expect(decorator.path_with_id).to eq "/en/posts/#{source.id}"
+    expect(decorator.path_with_id).to eq "/en/posts/#{object.id}"
   end
 
   it "can use url helpers with its model" do
-    expect(decorator.url_with_model).to eq "http://www.example.com:12345/en/posts/#{source.id}"
+    expect(decorator.url_with_model).to eq "http://www.example.com:12345/en/posts/#{object.id}"
   end
 
   it "can use url helpers with its id" do
-    expect(decorator.url_with_id).to eq "http://www.example.com:12345/en/posts/#{source.id}"
+    expect(decorator.url_with_id).to eq "http://www.example.com:12345/en/posts/#{object.id}"
   end
 
   it "can be passed implicitly to url_for" do
-    expect(decorator.link).to eq "<a href=\"/en/posts/#{source.id}\">#{source.id}</a>"
+    expect(decorator.link).to eq "<a href=\"/en/posts/#{object.id}\">#{object.id}</a>"
   end
 
   it "serializes overriden attributes" do

data/spec/dummy/test/minitest_helper.rb

@@ -1,4 +1,2 @@
-ENV['RAILS_ENV'] ||= 'test'
-require File.expand_path('../../config/environment', __FILE__)
-require 'minitest/autorun'
+require 'test_helper'
 require 'minitest/rails'

data/spec/generators/decorator/decorator_generator_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'rails'
 require 'ammeter/init'
 require 'generators/decorator/decorator_generator'
 

data/spec/support/shared_examples/decoratable_equality.rb

@@ -8,32 +8,32 @@ shared_examples_for "decoration-aware #==" do |subject|
   end
 
   it "is true for a decorated version of itself" do
-    decorated = double(source: subject, decorated?: true)
+    decorated = double(object: subject, decorated?: true)
 
     expect(subject == decorated).to be_true
   end
 
   it "is false for a decorated other object" do
-    decorated = double(source: Object.new, decorated?: true)
+    decorated = double(object: Object.new, decorated?: true)
 
     expect(subject == decorated).to be_false
   end
 
-  it "is false for a decoratable object with a `source` association" do
-    decoratable = double(source: subject, decorated?: false)
+  it "is false for a decoratable object with a `object` association" do
+    decoratable = double(object: subject, decorated?: false)
 
     expect(subject == decoratable).to be_false
   end
 
-  it "is false for an undecoratable object with a `source` association" do
-    undecoratable = double(source: subject)
+  it "is false for an undecoratable object with a `object` association" do
+    undecoratable = double(object: subject)
 
     expect(subject == undecoratable).to be_false
   end
 
   it "is true for a multiply-decorated version of itself" do
-    decorated = double(source: subject, decorated?: true)
-    redecorated = double(source: decorated, decorated?: true)
+    decorated = double(object: subject, decorated?: true)
+    redecorated = double(object: decorated, decorated?: true)
 
     expect(subject == redecorated).to be_true
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: draper
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Jeff Casimir
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-01 00:00:00.000000000 Z
+date: 2013-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport