Issue 725: Remove conflicting source alias (#786)

* Remove source, to_source, source_class and source_class? aliases.

* Remove UninferrableSourceError alias.

lib/draper.rb

@@ -60,6 +60,4 @@ module Draper
       super("Could not infer an object for #{klass}.")
     end
   end
-
-  UninferrableSourceError = UninferrableObjectError # TODO: deprecate this
 end

lib/draper/decorator.rb

@@ -10,8 +10,6 @@ module Draper
     # @return the object being decorated.
     attr_reader :object
     alias_method :model, :object
-    alias_method :source, :object # TODO: deprecate this
-    alias_method :to_source, :object # TODO: deprecate this
 
     # @return [Hash] extra data to be used in user-defined methods.
     attr_accessor :context
@@ -76,11 +74,6 @@ module Draper
       false
     end
 
-    class << self # TODO deprecate this
-      alias_method :source_class, :object_class
-      alias_method :source_class?, :object_class?
-    end
-
     # Automatically decorates ActiveRecord finder methods, so that you can use
     # `ProductDecorator.find(id)` instead of
     # `ProductDecorator.decorate(Product.find(id))`.
@@ -182,7 +175,7 @@ module Draper
 
     # Returns a unique hash for a decorated object based on
     # the decorator class and the object being decorated.
-    # 
+    #
     # @return [Fixnum]
     def hash
       self.class.hash ^ object.hash

spec/draper/decorator_spec.rb

@@ -185,10 +185,6 @@ module Draper
           expect{Decorator.object_class}.to raise_error UninferrableObjectError
         end
 
-        it "supports UninferrableSourceError alias for a backward compatibility" do
-          expect{Decorator.object_class}.to raise_error UninferrableSourceError
-        end
-
         it "raises an UninferrableObjectError for anonymous decorators" do
           expect{Class.new(Decorator).object_class}.to raise_error UninferrableObjectError
         end
@@ -202,11 +198,11 @@ module Draper
           expect{ProductPresenter.object_class}.to raise_error UninferrableObjectError
         end
 
-        it "infers the source for '<Model>Decorator'" do
+        it "infers the object class for '<Model>Decorator'" do
           expect(ProductDecorator.object_class).to be Product
         end
 
-        it "infers namespaced sources" do
+        it "infers the object class for namespaced decorators" do
           expect(Namespaced::ProductDecorator.object_class).to be Namespaced::Product
         end
 
@@ -217,10 +213,6 @@ module Draper
           end
         end
       end
-
-      it "is aliased to .source_class" do
-        expect(ProductDecorator.source_class).to be Product
-      end
     end
 
     describe ".object_class?" do
@@ -235,12 +227,6 @@ module Draper
 
         expect(Decorator.object_class?).to be_falsey
       end
-
-      it "is aliased to .source_class?" do
-        allow(Decorator).to receive(:object_class).and_return(Model)
-
-        expect(Decorator.source_class?).to be_truthy
-      end
     end
 
     describe ".decorates_association" do
@@ -341,7 +327,6 @@ module Draper
 
         expect(decorator.object).to be object
         expect(decorator.model).to be object
-        expect(decorator.to_source).to be object
       end
 
       it "is aliased to #model" do
@@ -350,20 +335,6 @@ module Draper
 
         expect(decorator.model).to be object
       end
-
-      it "is aliased to #source" do
-        object = Model.new
-        decorator = Decorator.new(object)
-
-        expect(decorator.source).to be object
-      end
-
-      it "is aliased to #to_source" do
-        object = Model.new
-        decorator = Decorator.new(object)
-
-        expect(decorator.to_source).to be object
-      end
     end
 
     describe "aliasing object to object class name" do
@@ -491,7 +462,7 @@ module Draper
     end
 
     describe ".model_name" do
-      it "delegates to the source class" do
+      it "delegates to the object class" do
         allow(Decorator).to receive(:object_class).and_return(double(model_name: :delegated))
 
         expect(Decorator.model_name).to be :delegated
@@ -655,14 +626,14 @@ module Draper
       end
 
       context ".method_missing" do
-        context "without a source class" do
+        context "without an object class" do
           it "raises a NoMethodError on missing methods" do
             expect{Decorator.hello_world}.to raise_error NoMethodError
           end
         end
 
-        context "with a source class" do
-          it "delegates methods that exist on the source class" do
+        context "with an object class" do
+          it "delegates methods that exist on the object class" do
             object_class = Class.new
             allow(object_class).to receive_messages hello_world: :delegated
             allow(Decorator).to receive_messages object_class: object_class
@@ -670,7 +641,7 @@ module Draper
             expect(Decorator.hello_world).to be :delegated
           end
 
-          it "does not delegate methods that do not exist on the source class" do
+          it "does not delegate methods that do not exist on the object class" do
             allow(Decorator).to receive_messages object_class: Class.new
 
             expect{Decorator.hello_world}.to raise_error NoMethodError
@@ -710,7 +681,7 @@ module Draper
       end
 
       describe ".respond_to?" do
-        context "without a source class" do
+        context "without a object class" do
           it "returns true for its own class methods" do
             Decorator.class_eval{def self.hello_world; end}
 
@@ -722,7 +693,7 @@ module Draper
           end
         end
 
-        context "with a source class" do
+        context "with a object class" do
           it "returns true for its own class methods" do
             Decorator.class_eval{def self.hello_world; end}
             allow(Decorator).to receive_messages object_class: Class.new
@@ -730,7 +701,7 @@ module Draper
             expect(Decorator).to respond_to :hello_world
           end
 
-          it "returns true for the source's class methods" do
+          it "returns true for the object's class methods" do
             allow(Decorator).to receive_messages object_class: double(hello_world: :delegated)
 
             expect(Decorator).to respond_to :hello_world
@@ -757,7 +728,7 @@ module Draper
     end
 
     describe "class spoofing" do
-      it "pretends to be a kind of the source class" do
+      it "pretends to be a kind of the object class" do
         decorator = Decorator.new(Model.new)
 
         expect(decorator.kind_of?(Model)).to be_truthy
@@ -771,7 +742,7 @@ module Draper
         expect(decorator.is_a?(Decorator)).to be_truthy
       end
 
-      it "pretends to be an instance of the source class" do
+      it "pretends to be an instance of the object class" do
         decorator = Decorator.new(Model.new)
 
         expect(decorator.instance_of?(Model)).to be_truthy