ruby-ogginfo 0.6.5 → 0.6.6

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.6.6 / 2011-12-23
+
+* fixes for ruby 1.9 (thanks to gwolf)
+
 === 0.6.5 / 2011-04-07
 
 * internal reorganization, leading to more robust and faster library 

data/Manifest.txt

@@ -1,6 +1,6 @@
 History.txt
 Manifest.txt
-README.rdoc
+README.txt
 Rakefile
 lib/ogg/codecs/comments.rb
 lib/ogg/codecs/speex.rb

data/Rakefile

@@ -1,6 +1,5 @@
 # -*- ruby -*-
 
-require 'rubygems'
 require 'hoe'
 
 Hoe.plugin :yard
@@ -10,7 +9,9 @@ Hoe.plugin :rcov
 Hoe.spec('ruby-ogginfo') do 
   developer('Guillaume Pierronnet','moumar@rubyforge.org')
   developer('Grant Gardner','grant@lastweekend.com.au')
-  summary = 'ruby-ogginfo is a pure-ruby library that gives low level informations on ogg files'
+  #summary = 'ruby-ogginfo is a pure-ruby library that gives low level informations on ogg files'
+  remote_rdoc_dir = ''
+  rdoc_locations << "rubyforge.org:/var/www/gforge-projects/ruby-ogginfo/"
 end
 
 # vim: syntax=Ruby

data/lib/ogg.rb

@@ -86,7 +86,7 @@ module Ogg
         input.rewind
       end
       
-      codecs = Ogg::Codecs.constants.map { |module_name| Ogg::Codecs.class_eval(module_name) }.select { |c| c.is_a?(Class) }
+      codecs = Ogg::Codecs.constants.map { |module_name| Ogg::Codecs.class_eval(module_name.to_s) }.select { |c| c.is_a?(Class) }
       codec = codecs.detect { |c| c.match?(first_page.segments.first) }
       unless codec
         raise(StreamError,"unknown codec")

data/lib/ogginfo.rb

@@ -26,7 +26,7 @@ end
 class OggInfoError < StandardError ; end
 
 class OggInfo
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
   extend Forwardable
   include Ogg
   

data/test/test_ruby-ogginfo.rb

@@ -146,7 +146,14 @@ class OggInfoTest < Test::Unit::TestCase
     end
 
     OggInfo.open(tf.path, "iso-8859-1") do |ogg|
-      assert_equal "hello\xe9", ogg.tag["title"] 
+      if RUBY_VERSION[0..2] == '1.8'
+        assert_equal "hello\xe9", ogg.tag["title"] 
+      else
+        string = ''
+        string.force_encoding 'iso-8859-1'
+        [104, 101, 108, 108, 111, 233].each {|chr| string << chr}
+        assert_equal string, ogg.tag["title"] 
+      end
     end
   end
 

data/test/test_ruby-spxinfo.rb

@@ -91,12 +91,33 @@ class SpxInfoTest < Test::Unit::TestCase
   def test_charset
     generate_spx
     FileUtils.cp("test.spx",GEN_FILE)
-    OggInfo.open(GEN_FILE, "utf-8") do |spx|
+    if RUBY_VERSION[0..2] == '1.8'
+      OggInfo.open(GEN_FILE, "utf-8") do |spx|
     	assert_equal "hello\303\251",spx.tag["test"] 
-    end
+      end
+
+      OggInfo.open(GEN_FILE, "iso-8859-1") do |spx|
+        assert_equal "hello\xe9", spx.tag["test"] 
+      end
+
+    else
+      # In Ruby >= 1.9, all strings are UTF-8, and are made up by
+      # characters (and not anymore bytes). So, we hand-craft it in a
+      # dumb-enough encoding.
+      OggInfo.open(GEN_FILE, "utf-8") do |spx|
+        string = ''
+        string.force_encoding 'ascii-8bit'
+        [104, 101, 108, 108, 111, 195, 169].each {|chr| string << chr}
+        assert_equal string, spx.tag["test"]
+      end
+
+      OggInfo.open(GEN_FILE, "iso-8859-1") do |spx|
+        string = ''
+        string.force_encoding 'iso-8859-1'
+        [104, 101, 108, 108, 111, 233].each {|chr| string << chr}
+        assert_equal string, spx.tag["test"]
+      end
 
-    OggInfo.open(GEN_FILE, "iso-8859-1") do |spx|
-      assert_equal "hello\xe9", spx.tag["test"] 
     end
   end
   

metadata

@@ -1,69 +1,58 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby-ogginfo
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 6
-  - 5
-  version: 0.6.5
+version: !ruby/object:Gem::Version
+  version: 0.6.6
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Guillaume Pierronnet
 - Grant Gardner
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-07 00:00:00 +02:00
+date: 2011-12-23 00:00:00.000000000 +01:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: hoe-yard
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        - 2
-        version: 0.1.2
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &2156269120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 8
-        - 0
-        version: 2.8.0
+  version_requirements: *2156269120
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &2156268300 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.12'
   type: :development
-  version_requirements: *id002
-description: |-
-  ruby-ogginfo gives you access to low level information on ogg files
+  prerelease: false
+  version_requirements: *2156268300
+description: ! 'ruby-ogginfo gives you access to low level information on ogg files
+
   (bitrate, length, samplerate, encoder, etc... ), as well as tag.
-  It is written in pure ruby.
-email: 
+
+  It is written in pure ruby.'
+email:
 - moumar@rubyforge.org
 - grant@lastweekend.com.au
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - Manifest.txt
-files: 
+- README.txt
+files:
 - History.txt
 - Manifest.txt
-- README.rdoc
+- README.txt
 - Rakefile
 - lib/ogg/codecs/comments.rb
 - lib/ogg/codecs/speex.rb
@@ -76,38 +65,35 @@ files:
 - setup.rb
 - test/test_ruby-ogginfo.rb
 - test/test_ruby-spxinfo.rb
-has_rdoc: yard
+- .gemtest
+has_rdoc: true
 homepage: http://ruby-ogginfo.rubyforge.org/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --title
-- RubyOgginfo Documentation
-- --quiet
-require_paths: 
+rdoc_options:
+- --main
+- README.txt
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+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-ogginfo
-rubygems_version: 1.3.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: ruby-ogginfo gives you access to low level information on ogg files (bitrate, length, samplerate, encoder, etc..
-test_files: 
-- test/test_ruby-spxinfo.rb
+summary: ruby-ogginfo gives you access to low level information on ogg files (bitrate,
+  length, samplerate, encoder, etc..
+test_files:
 - test/test_ruby-ogginfo.rb
+- test/test_ruby-spxinfo.rb