ruby-mp3info 0.8 → 0.8.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 421738e99b09100f70bdf70796c8f700b8a2abfd
+  data.tar.gz: c3d33ce01228e74e48ceee95696f422800f40323
+SHA512:
+  metadata.gz: 8265aa027cb141ea232c63b3209f9b3e4e42d02cae25626078d2e7eed4d7c972f14b4804195e32c58e5eb42a8ede15da3ecc638a6d1329cf5ebce0a8c172ce54
+  data.tar.gz: f8c3f0d2128173c554f584f0c8b636abe00ae8311b48d4b65003cddc87baf49db074b4fa04fd4f118ad42fa1d65501b95a1634b012055359b9a38a57b2ab401a

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.8.1 / 2013-10-280
+
+* test fixes
+* added dot to temp filename
+
 === 0.8 / 2013-01-28
 
 * allow higher level of reading and writing to APIC tag:

data/README.md

@@ -18,56 +18,64 @@ ruby-mp3info read low-level informations and manipulate tags on mp3 files.
 ## Synopsis
 
 ```ruby
-    require "mp3info"
-
-    # Read and display infos & tags
-
-    Mp3Info.open("myfile.mp3") do |mp3info|
-      puts mp3info
-    end
-    
-    # read/write tag1 and tag2 with Mp3Info#tag attribute
-    # when reading tag2 have priority over tag1
-    # when writing, each tag is written.
-
-    Mp3Info.open("myfile.mp3") do |mp3|
-      puts mp3.tag.title   
-      puts mp3.tag.artist   
-      puts mp3.tag.album
-      puts mp3.tag.tracknum
-      mp3.tag.title = "track title"
-      mp3.tag.artist = "artist name"
-    end
-
-    # tags are written when calling Mp3Info#close or at the end of the #open block
-
-    ### access id3v2 tags
-
-    Mp3Info.open("myfile.mp3") do |mp3|
-      # you can access four letter v2 tags like this
-      puts mp3.tag2.TIT2
-      mp3.tag2.TIT2 = "new TIT2"
-      # or like that
-      mp3.tag2["TIT2"]
-      # at this time, only COMM tag is processed after reading and before writing
-      # according to ID3v2#options hash
-      mp3.tag2.options[:lang] = "FRE"
-      mp3.tag2.COMM = "my comment in french, correctly handled when reading and writing"
-    end
-
-    ### image manipulation
-
-    file = File.new('input_img','rb')
-    Mp3Info.open '1.mp3' do |m|
-       pictures = m.tag2.get_pictures # array of images :
-       pictures.each do |description, data|
-          File.open(description, "wb") { |f| f.write data }
-      end
-      m.tag2.remove_pictures # remove all images
-      m.tag2.add_picture(file.read) # optionally, you may include options for the header:
-      # options = { mime: 'gif', description: "description",
-      #             pic_type: 0 }
-    end
+require "mp3info"
+
+# Read and display infos & tags
+
+Mp3Info.open("myfile.mp3") do |mp3info|
+  puts mp3info
+end
+
+# read/write tag1 and tag2 with Mp3Info#tag attribute
+# when reading tag2 have priority over tag1
+# when writing, each tag is written.
+
+Mp3Info.open("myfile.mp3") do |mp3|
+  puts mp3.tag.title   
+  puts mp3.tag.artist   
+  puts mp3.tag.album
+  puts mp3.tag.tracknum
+  mp3.tag.title = "track title"
+  mp3.tag.artist = "artist name"
+end
+
+# tags are written when calling Mp3Info#close or at the end of the #open block
+
+### access id3v2 tags
+
+Mp3Info.open("myfile.mp3") do |mp3|
+  # you can access four letter v2 tags like this
+  puts mp3.tag2.TIT2
+  mp3.tag2.TIT2 = "new TIT2"
+  # or like that
+  mp3.tag2["TIT2"]
+  # at this time, only COMM tag is processed after reading and before writing
+  # according to ID3v2#options hash
+  mp3.tag2.options[:lang] = "FRE"
+  mp3.tag2.COMM = "my comment in french, correctly handled when reading and writing"
+end
+
+### image manipulation
+
+file = File.new('input_img','rb')
+Mp3Info.open '1.mp3' do |m|
+   pictures = m.tag2.pictures # array of images :
+   pictures.each do |description, data|
+      # description ends with (.jpg / .png) for easy writing to file     
+      File.binwrite(description, data) 
+  end
+  m.tag2.remove_pictures # remove all images
+  
+  m.tag2.add_picture(file.read) # add a single image to APIC tag
+  # **optionally**, you may include options for the image tag to add_picture():
+  # options = { mime: 'jpeg|gif|png', description: "description",
+  #             pic_type: 0 }
+  # There is no need to specify mime or options because the mime is guessed based on the input image
+  # Only one image is permitted in the mp3 for compatibility. add_picture() overwrites all previous images.
+  # Please note: 
+  # If supplying :mime option just supply the mime 'jpeg', 'gif' or 'png', the code adds the "image/.." for you!
+  # e.g. m.tag2.add_picture(file.read, mime: 'jpeg', pic_type: 3) gets a mime "image/jpeg"
+end
 ```
 
 ## Requirements

data/Rakefile

@@ -7,8 +7,6 @@ Hoe.plugin :gemspec
 
 Hoe.spec('ruby-mp3info') do 
   developer "Guillaume Pierronnet", "guillaume.pierronnet@gmail.com"
-  remote_rdoc_dir = ''
-  rdoc_locations << "rubyforge.org:/var/www/gforge-projects/ruby-mp3info/"
 end
 
 # vim: syntax=Ruby

data/lib/mp3info.rb

@@ -1,7 +1,6 @@
 # coding:utf-8
 # License:: Ruby
 # Author:: Guillaume Pierronnet (mailto:guillaume.pierronnet@gmail.com)
-# Website:: http://ruby-mp3info.rubyforge.org/
 
 require "fileutils"
 require "stringio"
@@ -18,7 +17,7 @@ end
 
 class Mp3Info
 
-  VERSION = "0.8"
+  VERSION = "0.8.1"
 
   LAYER = [ nil, 3, 2, 1]
   BITRATE = {
@@ -443,7 +442,9 @@ class Mp3Info
   #        @io.seek(@io.get_syncsafe - 4, IO::SEEK_CUR) if ext_header
   #        @io.seek(tag2_len, IO::SEEK_CUR)
   #      end
-        tempfile_name = @filename_or_io + ".tmp"
+        filename_splitted = File.split(@filename_or_io) 
+        filename_splitted[-1] = ".#{filename_splitted[-1]}.tmp"
+        tempfile_name = File.join(filename_splitted)
         File.open(tempfile_name, "wb") do |tempfile|
           unless @tag2.empty?
             tempfile.write(@tag2.to_bin)

data/lib/mp3info/extension_modules.rb

@@ -1,7 +1,6 @@
 # coding:utf-8
 # License:: Ruby
 # Author:: Guillaume Pierronnet (mailto:guillaume.pierronnet@gmail.com)
-# Website:: http://ruby-mp3info.rubyforge.org/
 
 class Mp3Info 
   module HashKeys #:nodoc:

data/lib/mp3info/id3v2.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 # License:: Ruby
 # Author:: Guillaume Pierronnet (mailto:guillaume.pierronnet@gmail.com)
-# Website:: http://ruby-mp3info.rubyforge.org/
 
 require "delegate"
 
@@ -305,7 +304,7 @@ class ID3v2 < DelegateClass(Hash)
       end
 
       puts "analysing image: #{header.inspect}..." if $DEBUG
-      mim, pic_type, desc, data = pic[mime_pos, pic.length].unpack('Z*hZ*a*')
+      _, _, desc, data = pic[mime_pos, pic.length].unpack('Z*hZ*a*')
 
       if mime != "dat" and (!data.match(start) or data.nil?)
         real_start = pic =~ start
@@ -594,9 +593,8 @@ class ID3v2 < DelegateClass(Hash)
   
   ### this is especially useful for printing out APIC data because
   ### only the header of the APIC tag is of interest
-  ### The result also shows some bytes escaped for cleaner display
   def pretty_header(str, chars=128)
-    "#{str.unpack("a#{chars}").first}<<<...snip...>>>".force_encoding('BINARY').inspect[1..-2]
+    "#{str.unpack("a#{chars}").first}<<<...snip...>>>".inspect[1..-2]
   end
 
 

data/test/test_ruby-mp3info.rb

@@ -64,7 +64,7 @@ class Mp3InfoTest < Test::Unit::TestCase
       f.write(str)
     end
     assert_raises(Mp3InfoError) do
-      mp3 = Mp3Info.new(TEMP_FILE)
+      Mp3Info.new(TEMP_FILE)
     end
   end
 
@@ -142,7 +142,7 @@ class Mp3InfoTest < Test::Unit::TestCase
   end
 
   def test_removetag2
-    w = write_tag2_to_temp_file("TIT2" => "sdfqdsf")
+    write_tag2_to_temp_file("TIT2" => "sdfqdsf")
 
     assert( Mp3Info.hastag2?(TEMP_FILE) )
     Mp3Info.removetag2(TEMP_FILE)
@@ -155,7 +155,7 @@ class Mp3InfoTest < Test::Unit::TestCase
     end
     assert(Mp3Info.hastag1?(TEMP_FILE))
 
-    written_tag = write_tag2_to_temp_file(DUMMY_TAG2)
+    write_tag2_to_temp_file(DUMMY_TAG2)
     assert(Mp3Info.hastag2?(TEMP_FILE))
   end
 
@@ -189,13 +189,21 @@ class Mp3InfoTest < Test::Unit::TestCase
     assert_equal( "2.3.0", written_tag.version )
   end
 
+=begin
+  # test for good output of APIC tag inspect (escaped and snipped)
+  def test_id3v2_to_inspect_hash
+    Mp3Info.open(TEMP_FILE) do |mp3|
+      mp3.tag2.APIC = "\0testing.jpg\0" * 20
+      assert_match(/\\0testing\.jpg\\0.*<<<\.\.\.snip\.\.\.>>>$/, mp3.tag2.to_inspect_hash["APIC"])
+    end
+  end
+=end
+ 
   # test for good output of APIC tag inspect (escaped and snipped)
   def test_id3v2_to_inspect_hash
     Mp3Info.open(TEMP_FILE) do |mp3|
       mp3.tag2.APIC =  "\x00testing.jpg\x00" * 20
-      escaped_str = "\\x00testing.jpg\\x00" * 20
-      snipped_str = escaped_str.unpack('a185').first + "<<<...snip...>>>"     
-      assert_equal(snipped_str, mp3.tag2.to_inspect_hash["APIC"])
+      assert_match(/^(\\x00testing.jpg\\x00)+.*<<<\.\.\.snip\.\.\.>>>$/, mp3.tag2.to_inspect_hash["APIC"])
     end
   end
 
@@ -469,7 +477,7 @@ class Mp3InfoTest < Test::Unit::TestCase
     io = load_string_io
     assert(Mp3Info.hastag1?(io))
 
-    written_tag = write_tag2_to_temp_file(DUMMY_TAG2)
+    write_tag2_to_temp_file(DUMMY_TAG2)
     io = load_string_io
     assert(Mp3Info.hastag2?(io))
   end

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: ruby-mp3info
 version: !ruby/object:Gem::Version
-  version: '0.8'
-  prerelease: 
+  version: 0.8.1
 platform: ruby
 authors:
 - Guillaume Pierronnet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-29 00:00:00.000000000 Z
+date: 2013-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: hoe-yard
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,30 +58,28 @@ files:
 - .gemtest
 homepage: http://github.com/moumar/ruby-mp3info
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --title
-- TestRuby::TestMp3info Documentation
-- --quiet
+- --main
+- README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: ruby-mp3info
-rubygems_version: 1.8.24
+rubygems_version: 2.1.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ruby-mp3info read low-level informations and manipulate tags on mp3 files.
 test_files:
 - test/test_ruby-mp3info.rb