[DRE-commits] [ruby-json-schema] 04/11: apply patch proposed upstream to work with addressable 2.4+

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-json-schema.

commit 9fd502e2e803302632e17eec72c37980c68a7cd6
Author: Cédric Boutillier <boutil at debian.org>
Date:   Tue Jun 7 00:00:59 2016 +0200

    apply patch proposed upstream to work with addressable 2.4+
---
 debian/patches/series                      |  1 +
 debian/patches/update-addressable-24.patch | 31 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d8d567a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+update-addressable-24.patch
diff --git a/debian/patches/update-addressable-24.patch b/debian/patches/update-addressable-24.patch
new file mode 100644
index 0000000..cbef607
--- /dev/null
+++ b/debian/patches/update-addressable-24.patch
@@ -0,0 +1,31 @@
+From: Iain Beeston <iain at thoughtbot.com>
+Origin: https://github.com/iainbeeston/json-schema/commit/f5e07d5c07d50a9cdf6d4bbe615e4ff79b982142.patch
+Forwarded: https://github.com/ruby-json-schema/json-schema/pull/312/
+Date: Fri, 26 Feb 2016 09:02:18 +0000
+Subject: [PATCH] Allowed addressable 2.4+ to work with json-schema
+
+I've had to change one of the specs because of this. It seems that
+addressable now raises an error if you parse a uri that looks like a
+json text, which was one of our test cases.
+
+This fixes and supersedes #301
+--- a/json-schema.gemspec
++++ b/json-schema.gemspec
+@@ -23,5 +23,5 @@
+   s.add_development_dependency "webmock"
+   s.add_development_dependency "bundler"
+ 
+-  s.add_runtime_dependency "addressable", '~> 2.3.8'
++  s.add_runtime_dependency "addressable", '>= 2.4'
+ end
+--- a/test/test_initialize_data.rb
++++ b/test/test_initialize_data.rb
+@@ -40,7 +40,7 @@
+ 
+     assert(JSON::Validator.validate(schema, data, :json => true))
+ 
+-    assert_raises(JSON::Schema::JsonLoadError) { JSON::Validator.validate(schema, data, :uri => true) }
++    assert_raises(JSON::Schema::UriError) { JSON::Validator.validate(schema, data, :uri => true) }
+   end
+ 
+   def test_parse_json_string

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