ruby-mp3info 0.6 → 0.6.1

data/History.txt

@@ -1,4 +1,8 @@
-=== 0.6 / 1970-01-01
+=== 0.6.1 / 2008-02-28
+
+* FIXED: fails to read id3v2 tags when iconv fails
+
+=== 0.6 / 2008-02-24
 
 * FIXED: correct handling of encoding in id3v2 tags
 

data/lib/mp3info.rb

@@ -1,4 +1,4 @@
-# $Id: mp3info.rb 64 2008-02-24 02:11:57Z moumar $
+# $Id: mp3info.rb 69 2008-02-28 09:29:08Z moumar $
 # License:: Ruby
 # Author:: Guillaume Pierronnet (mailto:moumar_AT__rubyforge_DOT_org)
 # Website:: http://ruby-mp3info.rubyforge.org/
@@ -18,7 +18,7 @@ end
 
 class Mp3Info
 
-  VERSION = "0.6"
+  VERSION = "0.6.1"
 
   LAYER = [ nil, 3, 2, 1]
   BITRATE = [

data/lib/mp3info/id3v2.rb

@@ -231,7 +231,11 @@ class ID3v2 < DelegateClass(Hash)
     # we need to convert the string in order to match
     # the requested encoding
     if encoding && encoding != @text_encoding_index
-      out = Iconv.iconv(@options[:encoding], TEXT_ENCODINGS[encoding], out)[0]
+      begin
+        return Iconv.iconv(@options[:encoding], TEXT_ENCODINGS[encoding], out)[0]
+      rescue Iconv::Failure
+        return out
+      end
     end
     out
   end

data/test/test_ruby-mp3info.rb

@@ -386,6 +386,14 @@ EOF
     end
   end
 
+  def test_should_raises_exception_when_writing_badly_encoded_frames
+    assert_raises(Iconv::Failure) do 
+      Mp3Info.open(TEMP_FILE, :encoding => 'utf-8') do |mp3|
+	mp3.tag2['TEST'] = "all\xc3"
+      end
+    end
+  end
+
   def write_temp_file(tag)
     Mp3Info.open(TEMP_FILE) do |mp3|
       mp3.tag2.update(tag)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-mp3info
 version: !ruby/object:Gem::Version 
-  version: "0.6"
+  version: 0.6.1
 platform: ruby
 authors: 
 - Guillaume Pierronnet
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-24 00:00:00 +01:00
+date: 2008-02-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency