hcatlin-mini_magick 1.3.0 → 1.3.1

data/README.rdoc

@@ -2,6 +2,7 @@
 
 A ruby wrapper for ImageMagick or GraphicsMagick command line.
 
+Tested on both Ruby 1.9.2 and Ruby 1.8.7.
 
 == Why?
 

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.3.1

data/lib/mini_magick.rb

@@ -1,12 +1,18 @@
 require 'tempfile'
-require 'subexec'
 
 module MiniMagick
   class << self
     attr_accessor :processor
+    attr_accessor :use_subexec
     attr_accessor :timeout
   end
   
+  # Subexec only works with 1.9
+  if RUBY_VERSION[0..2].to_f < 1.8
+    self.use_subexec = true
+    require 'subexec'
+  end
+  
   class Error < RuntimeError; end
   class Invalid < StandardError; end
 
@@ -67,7 +73,12 @@ module MiniMagick
         # Get the EXIF original capture as a Time object
         Time.local(*self["EXIF:DateTimeOriginal"].split(/:|\s+/)) rescue nil
       when /^EXIF\:/i
-        run_command('identify', '-format', "\"%[#{value}]\"", @path).chop
+        result = run_command('identify', '-format', "\"%[#{value}]\"", @path).chop
+        if result.include?(",")
+          read_character_data(result)
+        else
+          result
+        end
       else
         run_command('identify', '-format', "\"#{value}\"", @path).split("\n")[0]
       end
@@ -159,20 +170,28 @@ module MiniMagick
       end
 
       command = "#{MiniMagick.processor} #{command} #{args.join(' ')}".strip
-      sub = Subexec.run(command, :timeout => MiniMagick.timeout)
+
+      if ::MiniMagick.use_subexec
+        sub = Subexec.run(command, :timeout => MiniMagick.timeout)
+        exit_status = sub.exitstatus
+        output = sub.output
+      else
+        output = `#{command} 2>&1`
+        exit_status = $?.exitstatus
+      end
       
-      if sub.exitstatus != 0
+      if exit_status != 0
         # Clean up after ourselves in case of an error
         destroy!
         
         # Raise the appropriate error
-        if sub.output =~ /no decode delegate/i || sub.output =~ /did not return an image/i
-          raise Invalid, sub.output
+        if output =~ /no decode delegate/i || output =~ /did not return an image/i
+          raise Invalid, output
         else
-          raise Error, "Command (#{command.inspect}) failed: #{{:status_code => sub.exitstatus, :output => sub.output}.inspect}"
+          raise Error, "Command (#{command.inspect}) failed: #{{:status_code => exit_status, :output => output}.inspect}"
         end
       else
-        sub.output
+        output
       end
     end
     
@@ -181,6 +200,17 @@ module MiniMagick
       File.unlink(tempfile.path)
       @tempfile = nil
     end
+    
+    private
+      # Sometimes we get back a list of character values
+      def read_character_data(list_of_characters)
+        chars = list_of_characters.gsub(" ", "").split(",")
+        result = ""
+        chars.each do |val|
+          result << ("%c" % val.to_i)
+        end
+        result
+      end
   end
 
   class CommandBuilder

data/test/command_builder_test.rb

@@ -1,5 +1,5 @@
 require 'test/unit'
-require File.join(File.dirname(__FILE__), '../lib/mini_magick')
+require File.expand_path('../../lib/mini_magick', __FILE__)
 
 class CommandBuilderTest < Test::Unit::TestCase
   include MiniMagick

data/test/image_test.rb

@@ -1,7 +1,7 @@
 require 'test/unit'
-require File.join(File.dirname(__FILE__), '../lib/mini_magick')
+require File.expand_path('../../lib/mini_magick', __FILE__)
 
-MiniMagick.processor = :gm
+#MiniMagick.processor = :gm
 
 class ImageTest < Test::Unit::TestCase
   include MiniMagick

metadata

@@ -1,15 +1,17 @@
 --- !ruby/object:Gem::Specification 
 name: hcatlin-mini_magick
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 3
-  - 0
-  version: 1.3.0
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - Corey Johnson
+- Hampton Catlin
 - Peter Kieltyka
 autorequire: 
 bindir: bin
@@ -26,6 +28,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 0
         - 0
@@ -33,9 +36,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   version_requirements: *id001
-description: Manipulate images with minimal use of memory via ImageMagick / GraphicsMagick
+description: ""
 email: 
 - probablycorey@gmail.com
+- hcatlin@gmail.com
 - peter@nulayer.com
 executables: []
 
@@ -60,7 +64,7 @@ files:
 - test/simple.gif
 - test/trogdor.jpg
 has_rdoc: true
-homepage: http://github.com/nulayer/mini_magick
+homepage: http://github.com/hcatlin/mini_magick
 licenses: []
 
 post_install_message: 
@@ -73,6 +77,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -81,6 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"