draper 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c47812d7403dd6f95f65a8ba4ff8065de00aaabd
-  data.tar.gz: 4c365d791003670fe44e5609f14de4126c74e8fa
+  metadata.gz: b85cf531330b6947bd3bd6970e527ca62149975a
+  data.tar.gz: e063ca4cd9757a4bfc7ad5eb3970b852fa62f1f8
 SHA512:
-  metadata.gz: 3a439210f626b0cffe6afcfe8d1b7c6cc9991a7fbaf1209b22ffc7470e25ab282e8953214736b1c6335091cf250203dc85d8273a6e4baaba301d638b9a5359da
-  data.tar.gz: 02a4b232c025ab87b83fd18ae33c91b6e58bdca92df60439291a1a37b56123054a1cd6793377e883492fb0696ebbb5eae586232a12753c556f1677237b263d97
+  metadata.gz: d51ffa67dbb810f7d093bf2bf7c7b0c216cc03231150dbec62b0915fc098ac7bd28b8975541ac99abe3fcdae541d98133d3e7fc176335f16615c6cd6169111bb
+  data.tar.gz: 0006c748a474980dcc613530ed51fa1b9b469e3bbf63eb5ed3eb72d06ab2d5c692c439d5cc43cc139c00ce0032329ac77518600efc351c10b0b1c5b6fa81af51

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Draper Changelog
 
+## 2.1.0 - 2015-03-26
+
+* Cleared most issues and merged a few PRs
+* Improved behavior when decorating structs
+* Improved how equality is handled
+* Minor improvements to the README
+
 ## 2.0.0 - 2015-03-26
 
 Working to breathe new life into the project by shedding baggage.

data/README.md

@@ -2,6 +2,7 @@
 
 [![TravisCI Build Status](https://travis-ci.org/drapergem/draper.svg?branch=master)](http://travis-ci.org/drapergem/draper)
 [![Code Climate](https://codeclimate.com/github/drapergem/draper.png)](https://codeclimate.com/github/drapergem/draper)
+[![Inline docs](http://inch-ci.org/github/drapergem/draper.png?branch=master)](http://inch-ci.org/github/drapergem/draper)
 
 Draper adds an object-oriented layer of presentation logic to your Rails
 application.
@@ -260,7 +261,7 @@ the `object`:
 
 ```ruby
 class PaginatingDecorator < Draper::CollectionDecorator
-  delegate :current_page, :total_pages, :limit_value
+  delegate :current_page, :total_pages, :limit_value, :entry_name, :total_count, :offset_value, :last_page?
 end
 ```
 

data/lib/draper/decorator.rb

@@ -173,6 +173,21 @@ module Draper
       Draper::Decoratable::Equality.test(object, other)
     end
 
+    # Delegates equality to :== as expected
+    #
+    # @return [Boolean]
+    def eql?(other)
+      self == other
+    end
+
+    # 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
+    end
+
     # Checks if `self.kind_of?(klass)` or `object.kind_of?(klass)`
     #
     # @param [Class] klass

data/lib/draper/factory.rb

@@ -75,7 +75,7 @@ module Draper
       end
 
       def collection?
-        object.respond_to?(:first)
+        object.respond_to?(:first) && !object.is_a?(Struct)
       end
 
       def decoratable?

data/lib/draper/tasks/test.rake

@@ -15,7 +15,7 @@ namespace :test do
   end
 end
 
-if Rake::Task.task_defined?('test:run')
+if Rails.version.to_f < 4.2 && Rake::Task.task_defined?('test:run')
   Rake::Task['test:run'].enhance do
     Rake::Task['test:decorators'].invoke
   end

data/lib/draper/version.rb

@@ -1,3 +1,3 @@
 module Draper
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

data/spec/draper/decorator_spec.rb

@@ -526,13 +526,12 @@ module Draper
         object.should_receive(:==).with(other).and_return(false)
         expect(decorator == other).to be_falsey
       end
-
     end
 
     describe "#===" do
       it "is true when #== is true" do
         decorator = Decorator.new(Model.new)
-        decorator.stub(:==).with(:anything).and_return(true)
+        allow(decorator).to receive(:==) { true }
 
         expect(decorator === :anything).to be_truthy
       end
@@ -545,6 +544,32 @@ module Draper
       end
     end
 
+    describe "#eql?" do
+      it "is true when #eql? is true" do
+        first = Decorator.new('foo')
+        second = Decorator.new('foo')
+
+        expect(first.eql? second).to be
+      end
+
+      it "is false when #eql? is false" do
+        first = Decorator.new('foo')
+        second = Decorator.new('bar')
+
+        expect(first.eql? second).to_not be
+      end
+    end
+
+    describe "#hash" do
+      it "is consistent for equal objects" do
+        object = Model.new
+        first = Decorator.new(object)
+        second = Decorator.new(object)
+
+        expect(first.hash == second.hash).to be
+      end
+    end
+
     describe ".delegate" do
       protect_class Decorator
 
@@ -757,5 +782,35 @@ module Draper
       end
     end
 
+    describe "Enumerable hash and equality functionality" do
+      describe "#uniq" do
+        it "removes duplicate objects with same decorator" do
+          object = Model.new
+          array = [Decorator.new(object), Decorator.new(object)]
+
+          expect(array.uniq.count).to eq(1)
+        end
+
+        it "separates different objects with identical decorators" do
+          array = [Decorator.new('foo'), Decorator.new('bar')]
+
+          expect(array.uniq.count).to eq(2)
+        end
+
+        it "separates identical objects with different decorators" do
+          object = Model.new
+          array = [Decorator.new(object), OtherDecorator.new(object)]
+
+          expect(array.uniq.count).to eq(2)
+        end
+
+        it "distinguishes between an objects and its decorated version" do
+          object = Model.new
+          array = [Decorator.new(object), object]
+
+          expect(array.uniq.count).to eq(2)
+        end
+      end
+    end
   end
 end

data/spec/draper/factory_spec.rb

@@ -190,6 +190,17 @@ module Draper
             end
           end
         end
+
+        context "when the object is a struct" do
+          it "returns a singular decorator" do
+            object = Struct.new(:stuff).new("things")
+
+            decorator_class = Class.new(Decorator)
+            worker = Factory::Worker.new(decorator_class, object)
+
+            expect(worker.decorator).to eq decorator_class.method(:decorate)
+          end
+        end
       end
 
       context "for a collection object" do

data/spec/dummy/spec/spec_helper.rb

@@ -3,7 +3,6 @@ require File.expand_path('../../config/environment', __FILE__)
 require 'rspec/rails'
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.expect_with(:rspec) {|c| c.syntax = :expect}
   config.order = :random
 end

data/spec/spec_helper.rb

@@ -5,7 +5,6 @@ require 'action_controller'
 require 'action_controller/test_case'
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.expect_with(:rspec) {|c| c.syntax = :expect}
   config.order = :random
   config.mock_with :rspec do |mocks|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: draper
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Jeff Casimir