[DRE-commits] [ruby-magic] 01/06: Fix Mime.guess_string_mime_encoding

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-magic.

commit 21392e6eece3ec10dbfed078edcfac0d60a75dfe
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Aug 13 11:47:36 2013 +0200

    Fix Mime.guess_string_mime_encoding
---
 ...0001-Fix-Magic.guess_string_mime_encoding.patch |   48 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 2 files changed, 49 insertions(+)

diff --git a/debian/patches/0001-Fix-Magic.guess_string_mime_encoding.patch b/debian/patches/0001-Fix-Magic.guess_string_mime_encoding.patch
new file mode 100644
index 0000000..9417609
--- /dev/null
+++ b/debian/patches/0001-Fix-Magic.guess_string_mime_encoding.patch
@@ -0,0 +1,48 @@
+From 1d6c5770bd1cf107d3067c353689bda1634c97a4 Mon Sep 17 00:00:00 2001
+From: Antonio Terceiro <terceiro at softwarelivre.org>
+Date: Tue, 13 Aug 2013 11:39:16 +0200
+Subject: [PATCH] Fix Magic.guess_string_mime_encoding
+Forwarded: https://github.com/qoobaa/magic/pull/2
+
+---
+ lib/magic.rb       | 2 +-
+ test/test_magic.rb | 8 ++++++++
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/lib/magic.rb b/lib/magic.rb
+index 53d84ce..9360b43 100644
+--- a/lib/magic.rb
++++ b/lib/magic.rb
+@@ -52,7 +52,7 @@ module Magic
+     #   Magic.guess_string_mime_encoding("Magic® File™")
+     #   # => "utf-8"
+     def guess_string_mime_encoding(string, *args)
+-      guess(*args.unshift(:mime_type)) { |db| db.buffer(string) }
++      guess(*args.unshift(:mime_encoding)) { |db| db.buffer(string) }
+     end
+ 
+     # Guesses mime type of given string
+diff --git a/test/test_magic.rb b/test/test_magic.rb
+index 0a5954b..88ad9e8 100644
+--- a/test/test_magic.rb
++++ b/test/test_magic.rb
+@@ -1,3 +1,5 @@
++# encoding: UTF-8
++
+ require "helper"
+ 
+ class TestMagic < Test::Unit::TestCase
+@@ -44,4 +46,10 @@ class TestMagic < Test::Unit::TestCase
+     Magic.guess(:mime) { |db| result = db.file(fixture("filelogo.jpg")) }
+     assert_equal "image/jpeg; charset=binary", result
+   end
++
++  test "guess encoding from string" do
++    utf8 = "utf-8".force_encoding(Encoding::ASCII_8BIT)
++    assert_equal utf8, Magic.guess_string_mime_encoding('áéíóú')
++  end
++
+ end
+-- 
+1.8.4.rc2
+
diff --git a/debian/patches/series b/debian/patches/series
index 7e9dc02..73d56bf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-remove-rubygems-usage-require-test_declarative.patch
+0001-Fix-Magic.guess_string_mime_encoding.patch

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