[DRE-commits] [ruby-hashie] 02/03: Drop upstream applied patch for Ruby 2.3

[zeha at debian.org]

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

zeha pushed a commit to branch master
in repository ruby-hashie.

commit 7d07908e4be53fdc6f6c291ac7593ce4930a78e0
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Thu May 5 23:02:26 2016 +0000

    Drop upstream applied patch for Ruby 2.3
---
 debian/patches/github-pr-349.patch | 46 --------------------------------------
 debian/patches/series              |  1 -
 2 files changed, 47 deletions(-)

diff --git a/debian/patches/github-pr-349.patch b/debian/patches/github-pr-349.patch
deleted file mode 100644
index ae6991a..0000000
--- a/debian/patches/github-pr-349.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 1433295e22c49db5851d16b5aef7b590a3bf2d40 Mon Sep 17 00:00:00 2001
-From: Takashi Kokubun <takashikkbn at gmail.com>
-Date: Sat, 6 Feb 2016 23:41:55 +0900
-Subject: [PATCH] Convert Mash keys for #dig
-
-[Debian note: edited to drop changes to CHANGELOG.md, .rubocop_todo.yml]
-
----
-
-Index: ruby-hashie/lib/hashie/mash.rb
-===================================================================
---- ruby-hashie.orig/lib/hashie/mash.rb
-+++ ruby-hashie/lib/hashie/mash.rb
-@@ -250,6 +250,12 @@ module Hashie
-       Hashie::Mash.new(other_hash).merge(self)
-     end
- 
-+    if RUBY_VERSION >= '2.3.0'
-+      def dig(*keys)
-+        super(*keys.map { |key| convert_key(key) })
-+      end
-+    end
-+
-     protected
- 
-     def method_name_and_suffix(method_name)
-Index: ruby-hashie/spec/hashie/mash_spec.rb
-===================================================================
---- ruby-hashie.orig/spec/hashie/mash_spec.rb
-+++ ruby-hashie/spec/hashie/mash_spec.rb
-@@ -679,4 +679,15 @@ describe Hashie::Mash do
-       expect(subject.reverse_merge(a: 5).a).to eq subject.a
-     end
-   end
-+
-+  if RUBY_VERSION >= '2.3.0'
-+    describe '#dig' do
-+      subject { described_class.new(a: { b: 1 }) }
-+
-+      it 'accepts both string and symbol as key' do
-+        expect(subject.dig(:a, :b)).to eq(1)
-+        expect(subject.dig('a', 'b')).to eq(1)
-+      end
-+    end
-+  end
- end
diff --git a/debian/patches/series b/debian/patches/series
index 09b8189..e15b691 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 0001-spec-spec_helper.rb-don-t-load-pry.patch
 fixup-tests.patch
-github-pr-349.patch

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