wand 0.1 → 0.2

data/Rakefile

@@ -16,6 +16,7 @@ begin
     gem.add_dependency 'mime-types'
     gem.add_development_dependency 'shoulda'
     gem.add_development_dependency 'yard'
+    gem.add_development_dependency 'mocha'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/lib/wand.rb

@@ -1,11 +1,12 @@
 require 'mime/types'
+require 'shellwords'
 
 module Wand
-  Version = '0.1'
+  Version = '0.2'
   
   def self.wave(path)
     type = MIME::Types.type_for(path)[0].to_s
-    type = `#{executable} --mime --brief #{path}`.split(';')[0] if type.nil? || type == ''
+    type = execute_file_cmd(path).split(';')[0].strip if type.nil? || type == ''
     type = nil if type =~ /cannot\sopen/
     type
   end
@@ -18,4 +19,8 @@ module Wand
   def self.executable=(path)
     @executable = path
   end
+  
+  def self.execute_file_cmd(path)
+    `#{executable} --mime --brief #{path.shellescape}`
+  end
 end

data/test/helper.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'test/unit'
 require 'shoulda'
+require 'mocha'
 require 'pathname'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))

data/test/test_wand.rb

@@ -5,7 +5,7 @@ class TestWand < Test::Unit::TestCase
     setup do
       Wand.executable = `which file`.chomp
     end
-    
+
     {
       'AVGARDD.svg'    => 'image/svg+xml',
       'compressed.zip' => 'application/zip',
@@ -44,5 +44,15 @@ class TestWand < Test::Unit::TestCase
       Wand.executable = '/usr/local/bin/file'
       assert_equal '/usr/local/bin/file', Wand.executable
     end
+
+    should "strip newlines and such" do
+      Wand.expects(:execute_file_cmd).returns("image/jpeg\n")
+      assert_equal "image/jpeg", Wand.wave(FilePath.join(name).expand_path.to_s)
+    end
+
+    should "escape path" do
+      output = Wand.execute_file_cmd(FilePath.join(name).expand_path.to_s + ' && echo $USER')
+      assert_match /cannot\sopen/, output
+    end
   end
 end

data/wand.gemspec

@@ -0,0 +1,74 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{wand}
+  s.version = "0.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["John Nunemaker"]
+  s.date = %q{2010-03-08}
+  s.description = %q{Mime-Type gem with fallback to unix file command}
+  s.email = %q{nunemaker@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "lib/wand.rb",
+     "test/files/AVGARDD.eot",
+     "test/files/AVGARDD.svg",
+     "test/files/AVGARDD.ttf",
+     "test/files/AVGARDD.woff",
+     "test/files/compressed.zip",
+     "test/files/example.m4r",
+     "test/files/favicon.ico",
+     "test/files/index.html",
+     "test/files/jquery.js",
+     "test/files/ol_tiny.jpg",
+     "test/files/ol_tiny.png",
+     "test/files/styles.css",
+     "test/helper.rb",
+     "test/test_wand.rb",
+     "wand.gemspec"
+  ]
+  s.homepage = %q{http://github.com/jnunemaker/wand}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Mime-Type gem with fallback to unix file command}
+  s.test_files = [
+    "test/helper.rb",
+     "test/test_wand.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<mime-types>, [">= 0"])
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_development_dependency(%q<mocha>, [">= 0"])
+    else
+      s.add_dependency(%q<mime-types>, [">= 0"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<mocha>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<mime-types>, [">= 0"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<mocha>, [">= 0"])
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wand
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: "0.2"
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-06 00:00:00 -05:00
+date: 2010-03-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,6 +42,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Mime-Type gem with fallback to unix file command
 email: nunemaker@gmail.com
 executables: []
@@ -72,6 +82,7 @@ files:
 - test/files/styles.css
 - test/helper.rb
 - test/test_wand.rb
+- wand.gemspec
 has_rdoc: true
 homepage: http://github.com/jnunemaker/wand
 licenses: []