streamio-magick 0.3.1 → 0.3.2

data/lib/magick/image.rb

@@ -3,20 +3,18 @@
 # Error example:
 # identify: no decode delegate for this image format `file.ext' @ error/constitute.c/ReadImage/532.
 
+require 'shellwords'
+
 class Magick::Image
   attr_reader :width, :height, :codec, :path, :size
   
   def initialize(path)
     raise Errno::ENOENT, "the file '#{path}' does not exist" unless File.exists?(path)
     
-    @path = escape(path)
+    @path = path
     @size = File.size(path)
     
-    stdin, stdout, stderr = Open3.popen3("identify '#{path}'") # Output will land in stderr
-
-    out = stdout.read
-    err = stderr.read
-    
+    out = Open3.popen3("identify #{Shellwords.escape(path)}") { |stdin, stdout, stderr| stdout.read }
     @valid = out.length > 0
     
     if valid?
@@ -32,19 +30,10 @@ class Magick::Image
   end
   
   def transcode(output_file, parameters = "")
-    stdin, stdout, stderr = Open3.popen3("convert #{path} #{escape(parameters)} #{output_file}")
-    
-    out = stdout.read
-    err = stderr.read
+    err = Open3.popen3("convert #{Shellwords.escape(path)} #{parameters} #{Shellwords.escape(output_file)}") { |stdin, stdout, stderr| stderr.read }
     
     raise Magick::Error, err if err.length > 0
     
     self.class.new(output_file)
   end
-  
-  protected
-  def escape(path)
-    map  =  { '\\' => '\\\\', '</' => '<\/', "\r\n" => '\n', "\n" => '\n', "\r" => '\n', '"' => '\\"' }
-    path.gsub(/(\\|<\/|\r\n|[\n\r"])/) { map[$1] }
-  end
 end

data/lib/magick/version.rb

@@ -1,3 +1,3 @@
 module Magick
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: streamio-magick
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-04 00:00:00.000000000 Z
+date: 2012-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70345206698120 !ruby/object:Gem::Requirement
+  requirement: &70355088347620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70345206698120
+  version_requirements: *70355088347620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70345206697540 !ruby/object:Gem::Requirement
+  requirement: &70355088346940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '2.9'
   type: :development
   prerelease: false
-  version_requirements: *70345206697540
+  version_requirements: *70355088346940
 description: Simple yet powerful wrapper around imagemagick cli tools for reading
   metadata and transcoding images.
 email:
@@ -61,7 +61,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4072242714818656611
+      hash: 857626735448748048
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: