wand 0.2.1 → 0.3

data/.gitignore

@@ -19,3 +19,4 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+.bundle

data/Gemfile

@@ -0,0 +1,2 @@
+source "http://rubygems.org"
+gemspec

data/Gemfile.lock

@@ -0,0 +1,23 @@
+PATH
+  remote: .
+  specs:
+    wand (0.2.1)
+      mime-types
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    mime-types (1.16)
+    mocha (0.9.10)
+      rake
+    rake (0.8.7)
+    shoulda (2.11.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  mime-types
+  mocha
+  shoulda
+  wand!

data/Rakefile

@@ -1,27 +1,5 @@
-require 'rubygems'
-require 'rake'
-
-require File.dirname(__FILE__) + '/lib/wand'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name     = 'wand'
-    gem.summary  = gem.description = 'Mime-Type gem with fallback to unix file command'
-    gem.email    = 'nunemaker@gmail.com'
-    gem.homepage = 'http://github.com/jnunemaker/wand'
-    gem.authors  = ['John Nunemaker']
-    gem.version  = Wand::Version
-    
-    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
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
@@ -31,14 +9,4 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-task :test => :check_dependencies
-task :default => :test
-
-begin
-  require 'yard'
-  YARD::Rake::YardocTask.new
-rescue LoadError
-  task :yardoc do
-    abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"
-  end
-end
+task :default => :test

data/lib/wand.rb

@@ -1,12 +1,10 @@
 require 'mime/types'
 
 module Wand
-  Version = '0.2.1'
-  
-  def self.wave(path)
-    type = MIME::Types.type_for(path)[0].to_s
+  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 = nil if type =~ /cannot\sopen/
+    type = nil if type =~ /^cannot/i
     type
   end
 
@@ -17,8 +15,8 @@ module Wand
   def self.executable=(path)
     @executable = path
   end
-  
+
   def self.execute_file_cmd(path)
     `#{executable} --mime --brief #{path}`
   end
-end
+end

data/lib/wand/version.rb

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

data/test/files/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2009 John Nunemaker
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/test/test_wand.rb

@@ -15,6 +15,7 @@ class TestWand < Test::Unit::TestCase
       'ol_tiny.jpg'    => 'image/jpeg',
       'ol_tiny.png'    => 'image/png',
       'styles.css'     => 'text/css',
+      'LICENSE'        => 'text/plain',
     }.each_pair do |name, type|
       should "use mime type gem if it returns type #{name}" do
         assert_equal type, Wand.wave(FilePath.join(name).expand_path.to_s)
@@ -32,6 +33,10 @@ class TestWand < Test::Unit::TestCase
       end
     end
 
+    should "return value from mime type when original_filename provided" do
+      assert_equal 'audio/mpeg', Wand.wave('some_temp_file', :original_filename => 'test.mp3')
+    end
+
     should "return nil when mime type and file fail" do
       assert_nil Wand.wave('AVGARDD.eot')
     end
@@ -49,5 +54,15 @@ class TestWand < Test::Unit::TestCase
       Wand.expects(:execute_file_cmd).returns("image/jpeg\n")
       assert_equal "image/jpeg", Wand.wave(FilePath.join(name).expand_path.to_s)
     end
+
+    should "support old file output format" do
+      Wand.expects(:execute_file_cmd).returns("text/plain; charset=us-ascii\n")
+      assert_equal "text/plain", Wand.wave('')
+    end
+
+    should "return nil if file output matches cannot" do
+      Wand.expects(:execute_file_cmd).returns("cannot open file")
+      assert_equal nil, Wand.wave('')
+    end
   end
 end

data/wand.gemspec

@@ -1,74 +1,24 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "wand/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{wand}
-  s.version = "0.2.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["John Nunemaker"]
-  s.date = %q{2010-03-10}
+  s.name        = "wand"
+  s.version     = Wand::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["John Nunemaker"]
+  s.email       = ["nunemaker@gmail.com"]
+  s.homepage    = "http://github.com/jnunemaker/wand"
+  s.summary     = %q{Mime-Type gem with fallback to unix file command}
   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
+  s.add_dependency 'mime-types'
 
-    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
+  s.add_development_dependency 'shoulda'
+  s.add_development_dependency 'mocha'
 
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: wand
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  hash: 13
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  version: "0.3"
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,69 +14,75 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-10 00:00:00 -05:00
+date: 2010-12-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mime-types
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: yard
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: mocha
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id003
 description: Mime-Type gem with fallback to unix file command
-email: nunemaker@gmail.com
+email: 
+- nunemaker@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - .document
 - .gitignore
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
 - lib/wand.rb
+- lib/wand/version.rb
 - test/files/AVGARDD.eot
 - test/files/AVGARDD.svg
 - test/files/AVGARDD.ttf
 - test/files/AVGARDD.woff
+- test/files/LICENSE
 - test/files/compressed.zip
 - test/files/example.m4r
 - test/files/favicon.ico
@@ -88,29 +99,48 @@ homepage: http://github.com/jnunemaker/wand
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Mime-Type gem with fallback to unix file command
 test_files: 
+- test/files/AVGARDD.eot
+- test/files/AVGARDD.svg
+- test/files/AVGARDD.ttf
+- test/files/AVGARDD.woff
+- test/files/LICENSE
+- 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