id3lib-ruby 0.3.1-mswin32 → 0.4.0-mswin32

data/CHANGES

@@ -1,5 +1,11 @@
 = id3lib-ruby changes
 
+=== 0.4.0 (r41)
+
+* Fixed Unicode problems (bug 4768).
+* Renamed ID3Lib::API methods to be more like the id3lib method names.
+  For example, the GetType() method is now named get_type instead of type.
+
 === 0.3.1 (r32)
 
 * Added check and messages for -lstdc++ and -lz to extconf.rb.

data/Rakefile

@@ -10,15 +10,22 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 
 
-PKG_VERSION = '0.3.1'
+PKG_VERSION = '0.4.0'
 
-PKG_COMMON = FileList[
+FILES_COMMON = FileList[
   'lib/**/*.rb',
   'test/test_*.rb',
   'test/data/*.mp3',
   'test/data/cover.jpg',
   'Rakefile',
-  'setup.rb'
+  '*.rb'
+]
+
+FILES_EXT = FileList[
+  'ext/*.rb',
+  'ext/*.cxx',
+  'ext/*.i',
+  'ext/Rakefile'
 ]
 
 
@@ -42,7 +49,7 @@ Rake::TestTask.new do |t|
 end
 
 
-RDOC_OPTS = ['--line-numbers', '--main', 'README']
+RDOC_OPTS = ['--inline-source', '--line-numbers', '--main', 'README']
 
 desc "Generate RDOC documentation."
 Rake::RDocTask.new :rdoc do |rdoc|
@@ -63,7 +70,7 @@ if defined? Gem
       'id3lib-ruby provides a Ruby interface to the id3lib C++ library for ' +
       'easily editing ID3 tags (v1 and v2) like with pyid3lib.'
     s.requirements << 'id3lib C++ library'
-    s.files       = PKG_COMMON + FileList['ext/extconf.rb', 'ext/*.cxx']
+    s.files       = FILES_COMMON + FILES_EXT
     s.extensions  = ['ext/extconf.rb']
     s.test_files  = FileList['test/test_*.rb']
     s.has_rdoc    = true
@@ -81,7 +88,7 @@ if defined? Gem
   end
 
   spec_mswin32 = spec.clone
-  spec_mswin32.files = PKG_COMMON + FileList['ext/mswin32/id3lib_api.so']
+  spec_mswin32.files = FILES_COMMON + FileList['ext/mswin32/id3lib_api.so']
   spec_mswin32.extensions = []
   spec_mswin32.require_paths = ['lib', 'ext/mswin32']
   spec_mswin32.platform = Gem::Platform::WIN32
@@ -99,14 +106,15 @@ end  # defined? Gem
 task :web => [:web_doc] do
   puts "# Now execute the following:"
   puts "scp web/* robinstocker@rubyforge.org:/var/www/gforge-projects/id3lib-ruby/"
-  puts "scp -r web/doc robinstocker@rubyforge.org:/var/www/gforge-projects/id3lib-ruby/doc"
+  puts "scp -r web/doc robinstocker@rubyforge.org:/var/www/gforge-projects/id3lib-ruby/"
 end
 
 desc "Generate RDOC documentation on web."
 Rake::RDocTask.new :web_doc do |rdoc|
   rdoc.rdoc_dir = 'web/doc'
   rdoc.title = 'id3lib-ruby'
-  rdoc.options << '--line-numbers' << '--main' << 'ID3Lib::Tag'
+  rdoc.options = RDOC_OPTS.clone
+  rdoc.options << '--main' << 'ID3Lib::Tag'
   rdoc.rdoc_files.include('README', 'TODO', 'CHANGES')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/lib/id3lib.rb

@@ -327,25 +327,26 @@ module ID3Lib
 
     def self.read(libframe)
       frame = {}
-      info = Info.frame_num(libframe.num)
+      info = Info.frame_num(libframe.get_id)
       frame[:id] = info[ID]
-      if info[FIELDS].include?(:textenc)
-        textenc = field(libframe, :textenc).integer
-        frame[:textenc] = textenc
-      end
+
       info[FIELDS].each do |field_id|
-        next if field_id == :textenc
         libfield = field(libframe, field_id)
-        frame[field_id] = if textenc and textenc > 0
-          libfield.unicode
-        else
-          case Info::FieldType[libfield.type]
-          when :integer : libfield.integer
-          when :binary  : libfield.binary
-          when :text    : libfield.ascii
+        frame[field_id] =
+          case Info::FieldType[libfield.get_type]
+          when :integer
+            libfield.get_integer
+          when :binary
+            libfield.get_binary
+          when :text
+            if libfield.get_encoding > 0
+              libfield.get_unicode
+            else
+              libfield.get_ascii
+            end
           end
-        end
       end
+
       frame
     end
 
@@ -353,29 +354,35 @@ module ID3Lib
       if textenc = frame[:textenc]
         field(libframe, :textenc).set_integer(textenc)
       end
+
       frame.each do |field_id, value|
         next if field_id == :textenc
         unless Info.frame(frame[:id])[FIELDS].include?(field_id)
           # Ignore invalid fields
           next
         end
+
         libfield = field(libframe, field_id)
-        if textenc and textenc > 0
-          # Special treatment for Unicode
-          libfield.set_encoding(textenc)
-          libfield.set_unicode(value)
-        else
-          case Info::FieldType[libfield.type]
-          when :integer : libfield.set_integer(value)
-          when :binary  : libfield.set_binary(value)
-          when :text    : libfield.set_ascii(value)
+        case Info::FieldType[libfield.get_type]
+        when :integer
+          libfield.set_integer(value)
+        when :binary
+          libfield.set_binary(value)
+        when :text
+          if textenc and textenc > 0 and
+             [:text, :description, :filename].include?(field_id)
+            # Special treatment for Unicode
+            libfield.set_encoding(textenc)
+            libfield.set_unicode(value)
+          else
+            libfield.set_ascii(value)
           end
         end
       end
     end
 
     def self.field(libframe, id)
-      libframe.field(Info.field(id)[NUM])
+      libframe.get_field(Info.field(id)[NUM])
     end
 
   end

data/test/test_writing.rb

@@ -172,12 +172,19 @@ class TestWriting < Test::Unit::TestCase
   
   def test_unicode
     nihao = "\x4f\x60\x59\x7d"
-    @tag.reject!{ |f| f[:id] == :TIT2 }
-    @tag << {:id => :TIT2, :text => nihao, :textenc => 1}
+    frame = {
+      :id          => :COMM,
+      :text        => nihao,
+      :description => nihao,
+      :language    => "zho",
+      :textenc     => 1
+    }
+    @tag.comment = nil
+    @tag << frame
     @tag.update!(ID3Lib::V2)
-    assert_equal nihao, @tag.title
+    assert_equal frame, @tag.frame(:COMM)
     reload!(ID3Lib::V2)
-    assert_equal nihao, @tag.title
+    assert_equal frame, @tag.frame(:COMM)
   end
 
   def test_unicode_invalid_data

data/usage.rb

@@ -0,0 +1,40 @@
+
+require 'rubygems'
+require 'id3lib'
+
+# Load a tag from a file
+tag = ID3Lib::Tag.new('talk.mp3')
+
+# Get and set text frames with convenience methods
+tag.title  #=> "Talk"
+tag.album = 'X&Y'
+tag.track = '5/13'
+
+# Tag is a subclass of Array and each frame is a Hash
+tag[0]
+#=> { :id => :TPE1, :textenc => 0, :text => "Coldplay" }
+
+# Get the number of frames
+tag.length  #=> 7
+
+# Remove all comment frames
+tag.delete_if{ |frame| frame[:id] == :COMM }
+
+# Get info about APIC frame to see which fields are allowed
+ID3Lib::Info.frame(:APIC)
+#=> [ 2, :APIC, "Attached picture",
+#=>   [:textenc, :mimetype, :picturetype, :description, :data] ]
+
+# Add an attached picture frame
+cover = {
+  :id          => :APIC,
+  :mimetype    => 'image/jpeg',
+  :picturetype => 3,
+  :description => 'A pretty picture',
+  :textenc     => 0,
+  :data        => File.read('cover.jpg')
+}
+tag << cover
+
+# Last but not least, apply changes
+tag.update!

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.8.99
 specification_version: 1
 name: id3lib-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
-date: 2006-06-05 00:00:00 +02:00
+  version: 0.4.0
+date: 2006-06-27 00:00:00 +02:00
 summary: id3lib-ruby provides a Ruby interface to the id3lib C++ library for easily editing ID3 tags (v1 and v2) like with pyid3lib.
 require_paths: 
 - lib
@@ -26,6 +26,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: mswin32
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Robin Stocker
 files: 
@@ -38,6 +39,7 @@ files:
 - test/data/unicode.mp3
 - test/data/cover.jpg
 - Rakefile
+- usage.rb
 - setup.rb
 - ext/mswin32/id3lib_api.so
 - README
@@ -47,6 +49,7 @@ test_files:
 - test/test_writing.rb
 - test/test_reading.rb
 rdoc_options: 
+- --inline-source
 - --line-numbers
 - --main
 - README