New Upstream Snapshot - ruby-gon
Ready changes
Summary
Merged new upstream version: 6.4.0+git20210414.2.ab7e611 (was: 6.4.0+git20210414.1.ab7e611).
Resulting package
Built on 2023-01-19T13:55 (took 2m47s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-snapshots ruby-gon
Lintian Result
Diff
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
deleted file mode 100644
index a8143cc..0000000
--- a/.github/FUNDING.yml
+++ /dev/null
@@ -1 +0,0 @@
-tidelift: "rubygems/gon"
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 6d8f5aa..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-*.gem
-.bundle
-Gemfile.lock
-pkg/*
-tmp/*
-.rvmrc
-*.idea
diff --git a/.travis.yml b/.travis.yml
index 8748e01..5ba0e20 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,10 +5,10 @@ env:
- "RABL_GEM=rabl-rails"
rvm:
- - 2.2.10
- 2.3.8
- 2.4.10
- 2.5.8
- 2.6.6
- 2.7.1
- ruby-head
+ - truffleruby-head
diff --git a/debian/changelog b/debian/changelog
index ffda2ad..d9f6c2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ruby-gon (6.4.0+git20210414.2.ab7e611-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+ * Drop patch 1002098-fix-tests-ruby3.patch, present upstream.
+ * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk> Thu, 19 Jan 2023 13:53:41 -0000
+
ruby-gon (6.4.0-2) unstable; urgency=medium
[ Debian Janitor ]
diff --git a/debian/patches/1002098-fix-tests-ruby3.patch b/debian/patches/1002098-fix-tests-ruby3.patch
deleted file mode 100644
index 02f2503..0000000
--- a/debian/patches/1002098-fix-tests-ruby3.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Origin: upstream,https://github.com/gazay/gon/commit/ab7e6113d0ba002fe4a7f2b72a423d602805c1ce
-From ffe97fd8c255568330ce86026651ee4e2cfa57fd Mon Sep 17 00:00:00 2001
-From: novoi <igor.novokshonov@pega.com>
-Date: Tue, 13 Apr 2021 18:26:15 +0200
-Bug-Debian: https://bugs.debian.org/1002098
-
----
- spec/gon/basic_spec.rb | 4 ++--
- spec/gon/global_spec.rb | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
---- a/spec/gon/basic_spec.rb
-+++ b/spec/gon/basic_spec.rb
-@@ -89,7 +89,7 @@
- Gon::Request.
- instance_variable_set(:@request_id, request.object_id)
- expect(ActionView::Base.instance_methods).to include(:include_gon)
-- @base = ActionView::Base.new
-+ @base = ActionView::Base.new(nil,{}, nil)
- @base.request = request
- end
-
-@@ -255,7 +255,7 @@
- before(:each) do
- Gon::Request.
- instance_variable_set(:@request_id, request.object_id)
-- @base = ActionView::Base.new
-+ @base = ActionView::Base.new(nil, {}, nil)
- @base.request = request
- end
-
---- a/spec/gon/global_spec.rb
-+++ b/spec/gon/global_spec.rb
-@@ -33,7 +33,7 @@
- before(:each) do
- Gon.clear
- expect(ActionView::Base.instance_methods).to include(:include_gon)
-- @base = ActionView::Base.new
-+ @base = ActionView::Base.new(nil, {}, nil)
- @base.request = request
- end
-
diff --git a/debian/patches/fix-json-scaping-on-tests-strings b/debian/patches/fix-json-scaping-on-tests-strings
index c7c971c..b168e2a 100644
--- a/debian/patches/fix-json-scaping-on-tests-strings
+++ b/debian/patches/fix-json-scaping-on-tests-strings
@@ -6,9 +6,11 @@ Forwarded: https://github.com/gazay/gon/pull/159
Bug-Debian: https://bugs.debian.org/759909
Last-Update: 2014-10-11
---- a/spec/gon/basic_spec.rb
-+++ b/spec/gon/basic_spec.rb
-@@ -110,7 +110,11 @@
+Index: ruby-gon.git/spec/gon/basic_spec.rb
+===================================================================
+--- ruby-gon.git.orig/spec/gon/basic_spec.rb
++++ ruby-gon.git/spec/gon/basic_spec.rb
+@@ -110,7 +110,11 @@ describe Gon do
it 'outputs correct js with a script string' do
Gon.str = %q(</script><script>alert('!')</script>)
@@ -21,9 +23,11 @@ Last-Update: 2014-10-11
expect(@base.include_gon).to eq(wrap_script(
'window.gon={};' +
%Q(gon.str="#{escaped_str}";))
---- a/spec/gon/global_spec.rb
-+++ b/spec/gon/global_spec.rb
-@@ -71,7 +71,11 @@
+Index: ruby-gon.git/spec/gon/global_spec.rb
+===================================================================
+--- ruby-gon.git.orig/spec/gon/global_spec.rb
++++ ruby-gon.git/spec/gon/global_spec.rb
+@@ -71,7 +71,11 @@ describe Gon::Global do
it 'outputs correct js with a script string' do
Gon.global.str = %q(</script><script>alert('!')</script>)
@@ -36,9 +40,11 @@ Last-Update: 2014-10-11
expect(@base.include_gon).to eq("<script>" +
"\n//<![CDATA[\n" +
"window.gon={};" +
---- a/spec/gon/watch_spec.rb
-+++ b/spec/gon/watch_spec.rb
-@@ -64,7 +64,11 @@
+Index: ruby-gon.git/spec/gon/watch_spec.rb
+===================================================================
+--- ruby-gon.git.orig/spec/gon/watch_spec.rb
++++ ruby-gon.git/spec/gon/watch_spec.rb
+@@ -64,7 +64,11 @@ describe Gon::Watch do
end
context 'when request variable is json unsafe content' do
diff --git a/debian/patches/remove_lib_from_loadpath_for_spec.patch b/debian/patches/remove_lib_from_loadpath_for_spec.patch
index dce7462..a4771b8 100644
--- a/debian/patches/remove_lib_from_loadpath_for_spec.patch
+++ b/debian/patches/remove_lib_from_loadpath_for_spec.patch
@@ -6,10 +6,10 @@ Origin: vendor
Forwarded: not-needed
Last-Update: 2014-11-19
-Index: ruby-gon/spec/spec_helper.rb
+Index: ruby-gon.git/spec/spec_helper.rb
===================================================================
---- ruby-gon.orig/spec/spec_helper.rb
-+++ ruby-gon/spec/spec_helper.rb
+--- ruby-gon.git.orig/spec/spec_helper.rb
++++ ruby-gon.git/spec/spec_helper.rb
@@ -11,6 +11,9 @@ module Rails
end
end
diff --git a/debian/patches/series b/debian/patches/series
index a08c81e..116b609 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
remove_lib_from_loadpath_for_spec.patch
#change_watch_js_location.patch
fix-json-scaping-on-tests-strings
-1002098-fix-tests-ruby3.patch
diff --git a/spec/gon/basic_spec.rb b/spec/gon/basic_spec.rb
index 0f31efd..03fc929 100644
--- a/spec/gon/basic_spec.rb
+++ b/spec/gon/basic_spec.rb
@@ -89,7 +89,7 @@ describe Gon do
Gon::Request.
instance_variable_set(:@request_id, request.object_id)
expect(ActionView::Base.instance_methods).to include(:include_gon)
- @base = ActionView::Base.new
+ @base = ActionView::Base.new(nil,{}, nil)
@base.request = request
end
@@ -251,7 +251,7 @@ describe Gon do
before(:each) do
Gon::Request.
instance_variable_set(:@request_id, request.object_id)
- @base = ActionView::Base.new
+ @base = ActionView::Base.new(nil, {}, nil)
@base.request = request
end
diff --git a/spec/gon/global_spec.rb b/spec/gon/global_spec.rb
index ccd8961..6af37c3 100644
--- a/spec/gon/global_spec.rb
+++ b/spec/gon/global_spec.rb
@@ -33,7 +33,7 @@ describe Gon::Global do
before(:each) do
Gon.clear
expect(ActionView::Base.instance_methods).to include(:include_gon)
- @base = ActionView::Base.new
+ @base = ActionView::Base.new(nil, {}, nil)
@base.request = request
end
Debdiff
File lists identical (after any substitutions)
No differences were encountered in the control files