wand 0.3 → 0.4

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    wand (0.2.1)
+    wand (0.3)
       mime-types
+      safe_shell (~> 1.0.0)
 
 GEM
   remote: http://rubygems.org/
@@ -11,6 +12,7 @@ GEM
     mocha (0.9.10)
       rake
     rake (0.8.7)
+    safe_shell (1.0.0)
     shoulda (2.11.3)
 
 PLATFORMS
@@ -19,5 +21,6 @@ PLATFORMS
 DEPENDENCIES
   mime-types
   mocha
+  safe_shell (~> 1.0.0)
   shoulda
   wand!

data/lib/wand.rb

@@ -1,9 +1,10 @@
 require 'mime/types'
+require 'safe_shell'
 
 module Wand
   def self.wave(path, options={})
     type = MIME::Types.type_for(options[:original_filename] || path)[0].to_s
-    type = execute_file_cmd(path).split(';')[0].strip if type.nil? || type == ''
+    type = parse_type(execute_file_cmd(path)) if blank?(type)
     type = nil if type =~ /^cannot/i
     type
   end
@@ -16,7 +17,18 @@ module Wand
     @executable = path
   end
 
+private
+  def self.parse_type(output)
+    type = output.split(';')[0]
+    type = type.strip unless type.nil?
+    type
+  end
+
   def self.execute_file_cmd(path)
-    `#{executable} --mime --brief #{path}`
+    SafeShell.execute("#{executable}", "--mime", "--brief", path)
+  end
+
+  def self.blank?(str)
+    str.nil? || str == ''
   end
 end

data/lib/wand/version.rb

@@ -1,3 +1,3 @@
 module Wand
-  VERSION = "0.3"
+  VERSION = "0.4"
 end

data/test/test_wand.rb

@@ -3,7 +3,7 @@ require 'helper'
 class TestWand < Test::Unit::TestCase
   context "Wand" do
     setup do
-      Wand.executable = `which file`.chomp
+      Wand.executable = nil
     end
 
     {
@@ -64,5 +64,14 @@ class TestWand < Test::Unit::TestCase
       Wand.expects(:execute_file_cmd).returns("cannot open file")
       assert_equal nil, Wand.wave('')
     end
+
+    should "properly handle bad stuff" do
+      assert_nothing_raised { Wand.wave(';blah') }
+    end
+
+    should "handle unexpected results frome execute file command" do
+      Wand.expects(:execute_file_cmd).returns('')
+      assert_equal nil, Wand.wave('')
+    end
   end
 end

data/wand.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |s|
   s.description = %q{Mime-Type gem with fallback to unix file command}
 
   s.add_dependency 'mime-types'
+  s.add_dependency 'safe_shell', '~> 1.0.0'
 
   s.add_development_dependency 'shoulda'
   s.add_development_dependency 'mocha'

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: wand
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: false
   segments: 
   - 0
-  - 3
-  version: "0.3"
+  - 4
+  version: "0.4"
 platform: ruby
 authors: 
 - John Nunemaker
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-20 00:00:00 -05:00
+date: 2011-01-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,9 +32,25 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: safe_shell
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -44,11 +60,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -58,7 +74,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 description: Mime-Type gem with fallback to unix file command
 email: 
 - nunemaker@gmail.com