[DRE-commits] [ruby-grape-entity] 04/08: Update patches

[Lucas Kanashiro]

This is an automated email from the git hooks/post-receive script.

kanashiro pushed a commit to branch master
in repository ruby-grape-entity.

commit 1b449fb5ea8827abd597391e6212d10957cb2b79
Author: Lucas Kanashiro <kanashiro.duarte at gmail.com>
Date:   Tue Nov 29 15:23:30 2016 -0200

    Update patches
---
 debian/changelog                                   |  1 +
 ...helper.patch => 0001-cleanup_spec_helper.patch} | 16 ++------
 ...d-kind_of-to-OutputBuilder-to-check-its-o.patch | 43 ----------------------
 debian/patches/series                              |  3 +-
 4 files changed, 6 insertions(+), 57 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9c2916b..c0b5379 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ruby-grape-entity (0.6.0-1) UNRELEASED; urgency=medium
 
   * New upstream version 0.6.0
   * Update years of upstream copyright
+  * Update patches
 
  -- Lucas Kanashiro <kanashiro at debian.org>  Tue, 29 Nov 2016 14:58:48 -0200
 
diff --git a/debian/patches/0001-Cleanup-require-stuff-in-spec_helper.patch b/debian/patches/0001-cleanup_spec_helper.patch
similarity index 53%
rename from debian/patches/0001-Cleanup-require-stuff-in-spec_helper.patch
rename to debian/patches/0001-cleanup_spec_helper.patch
index 3882b44..14431ac 100644
--- a/debian/patches/0001-Cleanup-require-stuff-in-spec_helper.patch
+++ b/debian/patches/0001-cleanup_spec_helper.patch
@@ -1,16 +1,10 @@
-From: Hleb Valoshka <375gnu at gmail.com>
-Date: Thu, 2 Jul 2015 18:10:24 +0300
-Subject: Cleanup require stuff in spec_helper
+Description: clean up require stuff from spec_helper
+Author: Lucas Kanashiro <kanashiro at debian.org>
+Last-Updated: 2016-11-29
 
----
- spec/spec_helper.rb | 11 +----------
- 1 file changed, 1 insertion(+), 10 deletions(-)
-
-diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index bfb32e8..42c88af 100644
 --- a/spec/spec_helper.rb
 +++ b/spec/spec_helper.rb
-@@ -1,12 +1,3 @@
+@@ -1,10 +1,3 @@
 -$LOAD_PATH.unshift(File.dirname(__FILE__))
 -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'support'))
@@ -19,8 +13,6 @@ index bfb32e8..42c88af 100644
 -require 'bundler'
 -
 -Bundler.require :default, :test
--
--require 'pry'
 +require 'grape_entity'
  
  RSpec.configure(&:raise_errors_for_deprecations!)
diff --git a/debian/patches/0004-Add-is_a-and-kind_of-to-OutputBuilder-to-check-its-o.patch b/debian/patches/0004-Add-is_a-and-kind_of-to-OutputBuilder-to-check-its-o.patch
deleted file mode 100644
index 918cd45..0000000
--- a/debian/patches/0004-Add-is_a-and-kind_of-to-OutputBuilder-to-check-its-o.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: Alexander Yunin <use.skills at gmail.com>
-Date: Mon, 4 Jul 2016 22:09:59 +0300
-Subject: Add #is_a? and #kind_of? to OutputBuilder to check its output object
- class, specify rack,
- json and active_support version for supporting old rubies (#232)
-Applied-Upstream: https://github.com/ruby-grape/grape-entity/commit/c5abc1bc83ee01f8cb23b4e77e21846bcb733157
-Bug: https://github.com/ruby-grape/grape/issues/1350
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=826316
-Reviewed-by: Cédric Boutillier <boutil at debian.org>
-
----
- lib/grape_entity/exposure/nesting_exposure/output_builder.rb | 5 +++++
- spec/grape_entity/entity_spec.rb                             | 1 +
- 2 files changed, 6 insertions(+)
-
-diff --git a/lib/grape_entity/exposure/nesting_exposure/output_builder.rb b/lib/grape_entity/exposure/nesting_exposure/output_builder.rb
-index 0064759..5fc4a63 100644
---- a/lib/grape_entity/exposure/nesting_exposure/output_builder.rb
-+++ b/lib/grape_entity/exposure/nesting_exposure/output_builder.rb
-@@ -25,6 +25,11 @@ module Grape
-             end
-           end
- 
-+          def kind_of?(klass)
-+            klass == output.class || super
-+          end
-+          alias_method :is_a?, :kind_of?
-+
-           def __getobj__
-             output
-           end
-diff --git a/spec/grape_entity/entity_spec.rb b/spec/grape_entity/entity_spec.rb
-index 0b3069e..2100b7a 100644
---- a/spec/grape_entity/entity_spec.rb
-+++ b/spec/grape_entity/entity_spec.rb
-@@ -905,6 +905,7 @@ describe Grape::Entity do
- 
-         representation = subject.represent(4.times.map { Object.new }, serializable: true)
-         expect(representation).to be_kind_of(Grape::Entity::Exposure::NestingExposure::OutputBuilder)
-+        expect(representation).to be_kind_of(Hash)
-         expect(representation).to have_key :my_items
-         expect(representation[:my_items]).to be_kind_of Array
-         expect(representation[:my_items].size).to be 4
diff --git a/debian/patches/series b/debian/patches/series
index e9fe89c..5ff184d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
+0001-cleanup_spec_helper.patch
 use-unshift-in-gemspec.patch
 0002-require_activesupport_hash.patch
-0001-Cleanup-require-stuff-in-spec_helper.patch
-0004-Add-is_a-and-kind_of-to-OutputBuilder-to-check-its-o.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-grape-entity.git