[DRE-maint] Bug#769725: unblock: ruby-gon/5.2.0-2

[Cédric Boutillier]

Package: release.debian.org
Severity: normal
User: release.debian.org at packages.debian.org
Usertags: unblock

Dear release team,

Please unblock package ruby-gon. The version 5.2.0-2 in unstable is
closing a bug #768693. This bug was caused by an incompatibility with
the version of ruby-rabl-rails present in testing, which was used in the
tests. 5.2.0-2 includes a patch from upstream, to make the package work
with this newer version of ruby-rabl-rails.


unblock ruby-gon/5.2.0-2

-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (990, 'unstable'), (500, 'testing'), (100, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-------------- next part --------------
diff -Nru ruby-gon-5.2.0/debian/changelog ruby-gon-5.2.0/debian/changelog
--- ruby-gon-5.2.0/debian/changelog	2014-10-12 23:14:00.000000000 +0200
+++ ruby-gon-5.2.0/debian/changelog	2014-11-15 16:29:10.000000000 +0100
@@ -1,3 +1,14 @@
+ruby-gon (5.2.0-2) unstable; urgency=medium
+
+  * Add fix_tests_with_rabl_rails.patch imported from upstream
+    to fix tests with ruby-rabl-rails 0.4.x
+    The new version of ruby-rabl-rails uses a slightly different layout, and
+    files to require in tests should be updated.
+  * Tighten Build-Depends on ruby-rabl-rails to force a version greater than
+    0.4.x
+
+ -- C?dric Boutillier <boutil at debian.org>  Sat, 15 Nov 2014 16:26:55 +0100
+
 ruby-gon (5.2.0-1) unstable; urgency=medium
 
   * Team upload
diff -Nru ruby-gon-5.2.0/debian/control ruby-gon-5.2.0/debian/control
--- ruby-gon-5.2.0/debian/control	2014-10-12 23:14:00.000000000 +0200
+++ ruby-gon-5.2.0/debian/control	2014-11-15 16:26:20.000000000 +0100
@@ -11,7 +11,7 @@
                ruby-multi-json,
                ruby-oj | ruby-json,
                ruby-rabl,
-               ruby-rabl-rails,
+               ruby-rabl-rails (>= 0.4~),
                ruby-request-store,
                ruby-rspec
 Standards-Version: 3.9.6
diff -Nru ruby-gon-5.2.0/debian/patches/fix_tests_with_rabl_rails.patch ruby-gon-5.2.0/debian/patches/fix_tests_with_rabl_rails.patch
--- ruby-gon-5.2.0/debian/patches/fix_tests_with_rabl_rails.patch	1970-01-01 01:00:00.000000000 +0100
+++ ruby-gon-5.2.0/debian/patches/fix_tests_with_rabl_rails.patch	2014-11-15 16:23:54.000000000 +0100
@@ -0,0 +1,43 @@
+From 117c78bb3f2b78989e14187fccd8843b6e98f4fd Mon Sep 17 00:00:00 2001
+Author: Alexey Gaziev <alex.gaziev at gmail.com>
+Origin: commit:https://github.com/gazay/gon/commit/117c78bb3f2b78989e14187fccd8843b6e98f4fd.patch
+Bug-Debian: https://bugs.debian.org/768693
+Reviewed-by: C?dric Boutillier <boutil at debian.org>
+Last-Update: 2014-11-15
+Description: Fix specs for ruby-rabl-rails version 0.4
+ 
+--- a/spec/gon/rabl_with_rabl_rails_spec.rb
++++ b/spec/gon/rabl_with_rabl_rails_spec.rb
+@@ -4,6 +4,7 @@
+ 
+   before(:all) do
+     ensure_rabl_rails_is_loaded
++    RablRails.configuration.cache_templates = false
+   end
+ 
+   describe '.rabl with rabl-rails gem' do
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -31,14 +31,17 @@
+ def ensure_rabl_rails_is_loaded
+   Object.send(:remove_const, :Rabl) if defined? Rabl
+   unless defined? RablRails
+-    load 'rabl-rails/template.rb'
+-    load 'rabl-rails/condition.rb'
++    load 'rabl-rails/renderer.rb'
++    load 'rabl-rails/helpers.rb'
++    load 'rabl-rails/configuration.rb'
++    load 'rabl-rails/nodes/node.rb'
++    load 'rabl-rails/nodes/attribute.rb'
+     load 'rabl-rails/compiler.rb'
+-    load 'rabl-rails/renderers/base.rb'
++    load 'rabl-rails/renderers/hash.rb'
+     load 'rabl-rails/renderers/json.rb'
+-    load 'rabl-rails/renderer.rb'
+-    load 'rabl-rails/library.rb'
+     load 'rabl-rails.rb'
++    load 'rabl-rails/template.rb'
++    load 'rabl-rails/library.rb'
+   end
+ end
+ 
diff -Nru ruby-gon-5.2.0/debian/patches/series ruby-gon-5.2.0/debian/patches/series
--- ruby-gon-5.2.0/debian/patches/series	2014-10-12 23:14:00.000000000 +0200
+++ ruby-gon-5.2.0/debian/patches/series	2014-11-15 16:24:51.000000000 +0100
@@ -1,3 +1,4 @@
 change_watch_js_location.patch
 remove_lib_from_loadpath_for_spec.patch
 fix-json-scaping-on-tests-strings
+fix_tests_with_rabl_rails.patch
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-ruby-extras-maintainers/attachments/20141115/18963808/attachment.sig>