mediainfo 0.7.0 → 0.7.1

data/Changelog

@@ -1,7 +1,15 @@
+v0.7.1 Tweakage
+- Removed Mediainfo#parsed_response accessor which always returned nil after
+  multi-stream API updates
+- Added Mediainfo::Stream#parsed_response reader to restore the ability to 
+  access metadata not surfaced through explicit :mediainfo_attr_reader declarations
+- Added more compatible shell escaping style [d--j]
+
 v0.7.0 Multiple Stream Support
-- ***NOTE*** MAJOR API CHANGE ***NOTE***
-- updated API to support files with multiple streams of one type,
-  e.g. a Quicktime with multiple video tracks
+- updated API to support files with multiple streams of one type(NOTE: MAJOR API CHANGE!)
+  e.g. many Quicktime files have multiple video streams
+- removed support for some top level accessors that implied certain track types 
+  e.g. mediainfo.height would now most likely be mediainfo.video.height or mediainfo.image.height
 
 v0.6.2 XML Configuration Examples
 - added examples on how to configure XML back end

data/README.markdown

@@ -4,7 +4,7 @@ Mediainfo is a class wrapping [the mediainfo CLI](http://mediainfo.sourceforge.n
 
 ## Installation
   
-    $ gem install mediainfo -s http://gemcutter.org
+    $ gem install mediainfo
   
 ## Usage
   
@@ -16,7 +16,12 @@ You can specify an alternate path if necessary:
     Mediainfo.path = "/opt/local/bin/mediainfo"
   
 
-By default, REXML is used as the XML parser. If you'd like, you can 
+Now, from this point, I bet some *actual* usage examples would be great. Unfortunately, 
+I haven't really gotten around to proper documentation, yet. HOWEVER, please see the 
+very reasonable test suite accompanying the source code for this library. It contains 
+a bunch of relevant usage examples.
+
+Moving on, REXML is used as the XML parser by default. If you'd like, you can 
 configure Mediainfo to use Hpricot or Nokogiri instead using one of 
 the following approaches:
 
@@ -53,5 +58,6 @@ generate XML output, and is no longer supported.
 ## Contributors
 
 * Seth Thomas Rasmussen - [http://greatseth.com](http://greatseth.com)
-* Peter Vandenberk - [http://github.com/pvdb](http://github.com/pvdb)
-* Ned Campion - [http://github.com/nedcampion](http://github.com/nedcampion)
+* Peter Vandenberk      - [http://github.com/pvdb](http://github.com/pvdb)
+* Ned Campion           - [http://github.com/nedcampion](http://github.com/nedcampion)
+* Daniel Jagszent       - [http://github.com/d--j](http://github.com/d--j)

data/lib/mediainfo.rb

@@ -160,6 +160,8 @@ class Mediainfo
       @parsed_response = { @stream_type => {} }
     end
     
+    attr_reader :parsed_response
+    
     def [](k); @parsed_response[@stream_type][k]; end
     def []=(k,v); @parsed_response[@stream_type][k] = v; end
     
@@ -321,8 +323,7 @@ class Mediainfo
   
   ###
   
-  attr_reader :raw_response, :parsed_response,
-    :full_filename, :filename, :path, :escaped_full_filename
+  attr_reader :raw_response, :full_filename, :filename, :path, :escaped_full_filename
   
   ###
   
@@ -343,7 +344,7 @@ class Mediainfo
       raise ArgumentError, "need a path to a video file, got nil" unless @full_filename
       raise ArgumentError, "need a path to a video file, #{@full_filename} does not exist" unless File.exist? @full_filename
       
-      @escaped_full_filename = @full_filename.shell_escape
+      @escaped_full_filename = @full_filename.shell_escape_double_quotes
       
       self.raw_response = mediainfo!
     end

data/lib/mediainfo/string.rb

@@ -1,11 +1,17 @@
 class String
-  def shell_escape
-    # The gsub is for ANSI-C style quoting.
-    # 
-    # The $'' is for bash, see http://www.faqs.org/docs/bashman/bashref_12.html,
-    # but appears to be working for other shells: sh, zsh, ksh, dash
-    "$'#{gsub(/\\|'/) { |c| "\\#{c}" }}'"
-  end unless method_defined?(:shell_escape)
+  # returns the string enclosed in double quotes.
+  # all characters in the string that could be harmful will be escaped.
+  # 
+  # e.g. 
+  # 'test'.shell_escape_double_quotes   # => "test"
+  # '$\\'"`'.shell_escape_double_quotes # => "\$\\'\"\`"
+  #
+  # This should work in al POSIX compatible shells.
+  #
+  # see: http://www.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html#tag_02_02_03
+  def shell_escape_double_quotes
+    '"'+gsub(/\\|"|\$|`/, '\\\\\0')+'"'
+  end unless method_defined?(:shell_escape_double_quotes)
   
   # stolen from active_support/inflector
   # TODO require "active_support/core_ext/string/inflections" when 3.0 is released

data/mediainfo.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mediainfo}
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Seth Thomas Rasmussen"]
-  s.date = %q{2010-04-05}
+  s.date = %q{2010-04-06}
   s.description = %q{Mediainfo is a class wrapping the mediainfo CLI (http://mediainfo.sourceforge.net)}
   s.email = %q{sethrasmussen@gmail.com}
   s.extra_rdoc_files = ["LICENSE", "README.markdown", "lib/mediainfo.rb", "lib/mediainfo/attr_readers.rb", "lib/mediainfo/string.rb"]

data/test/mediainfo_string_test.rb

@@ -3,10 +3,18 @@ require "mediainfo_test_helper"
 
 class MediainfoStringTest < ActiveSupport::TestCase
   test "escaping slashes" do
-    assert_equal '$\'foo\\\bar\'', 'foo\bar'.shell_escape
+    assert_equal '"foo\\\bar"', 'foo\bar'.shell_escape_double_quotes
   end
   
   test "escaping quotes" do
-    assert_equal '$\'foo\\\'bar\'', "foo'bar".shell_escape
+    assert_equal '"foo\"bar"', 'foo"bar'.shell_escape_double_quotes
+  end
+  
+  test "escaping ticks" do
+    assert_equal '"foo\`bar"', 'foo`bar'.shell_escape_double_quotes
+  end
+  
+  test "escaping dollar signs" do
+    assert_equal '"foo\$bar"', 'foo$bar'.shell_escape_double_quotes
   end
 end

data/test/mediainfo_test.rb

@@ -100,7 +100,7 @@ class MediainfoTest < ActiveSupport::TestCase
   test "retains last system command generated" do
     p = File.expand_path "./test/fixtures/dinner.3g2.xml"
     m = Mediainfo.new p
-    assert_equal "mediainfo $'#{p}' --Output=XML", m.last_command
+    assert_equal "mediainfo \"#{p}\" --Output=XML", m.last_command
   end
   
   test "allows customization of path to mediainfo binary" do
@@ -109,7 +109,7 @@ class MediainfoTest < ActiveSupport::TestCase
     assert_equal "mediainfo", Mediainfo.path
     
     m = Mediainfo.new "/dev/null"
-    assert_equal "mediainfo $'/dev/null' --Output=XML", m.last_command
+    assert_equal "mediainfo \"/dev/null\" --Output=XML", m.last_command
     
     Mediainfo.any_instance.stubs(:mediainfo_version).returns("0.7.25")
     
@@ -117,7 +117,7 @@ class MediainfoTest < ActiveSupport::TestCase
     assert_equal "/opt/local/bin/mediainfo", Mediainfo.path
     
     m = Mediainfo.new "/dev/null"
-    assert_equal "/opt/local/bin/mediainfo $'/dev/null' --Output=XML", m.last_command
+    assert_equal "/opt/local/bin/mediainfo \"/dev/null\" --Output=XML", m.last_command
   end
   
   test "can be initialized with a raw response" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Seth Thomas Rasmussen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-05 00:00:00 -04:00
+date: 2010-04-06 00:00:00 -04:00
 default_executable: 
 dependencies: []