temper 1.0.0 → 1.0.1

data/lib/temper.rb

@@ -1,6 +1,7 @@
 require 'tempfile'
 require 'stringio'
 require 'mime/types'
+require 'shellter'
 
 module Temper
   autoload :Base, 'temper/base'

data/lib/temper/base.rb

@@ -7,6 +7,18 @@ module Temper
       raise RuntimeException, "No @storage set" unless @storage
       self.original_filename = options[:original_filename] || ::File.basename(path)
       self.content_type = options[:content_type] || infer_content_type || "text/plain"
+      
+      if block_given?
+        begin
+          yield self
+        ensure
+          close
+        end
+      end
+    end
+    
+    def close
+      #noop
     end
 
     def fingerprint
@@ -42,13 +54,11 @@ module Temper
     def type_from_file_command
       #  On BSDs, `file` doesn't give a result code of 1 if the file doesn't exist.
       type = (self.original_filename.match(/\.(\w+)$/)[1] rescue "octet-stream").downcase
-      mime_type = (run("file", "-b --mime-type :file", :file => self.path).split(':').last.strip rescue "application/x-#{type}")
+      result = Shellter.run("file", "-b --mime-type :file", :file => self.path)
+      result = Shellter.run("file", "-b --mime-type :file", :file => self.path) unless result.success?
+      mime_type = (result.stdout.split(";").first.split(':').last.strip rescue "application/x-#{type}")
       mime_type = "application/x-#{type}" if mime_type.match(/\(.*?\)/)
       mime_type
     end
-
-    def run(command, *arguments)
-      Cocaine::CommandLine.new(command, *arguments).run
-    end
   end
 end

data/lib/temper/file.rb

@@ -7,7 +7,11 @@ module Temper
       if path && ::File.exists?(path)
         options[:original_filename] ||= ::File.basename(path) 
       end
-      super options
+      super options    
+    end
+    
+    def close
+      @storage.close(true)
     end
     
     private 

data/lib/temper/version.rb

@@ -1,3 +1,3 @@
 module Temper
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/temper.gemspec

@@ -16,7 +16,8 @@ Gem::Specification.new do |gem|
   gem.version       = Temper::VERSION
   
   gem.add_runtime_dependency "mime-types"
-  gem.add_runtime_dependency "cocaine"
+  gem.add_runtime_dependency "shellter"
+  gem.add_runtime_dependency "popen4"
   
   gem.add_development_dependency "rspec", "> 2.0"
 end

metadata

@@ -1,75 +1,87 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: temper
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 1.0.1
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
 platform: ruby
-authors: 
+authors:
 - Andrew Eberbach
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-06 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: shellter
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: cocaine
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: popen4
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: A gem for a slightly smarter temporary file and temporary directory maintenance
-email: 
+email:
 - andrew@ebertech.ca
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - Gemfile
@@ -88,40 +100,31 @@ files:
 - temper.gemspec
 homepage: https://github.com/ebertech/temper
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Combines the best parts of Upfile from paperclip and Rack::Multipart::UploadedFile from rack.
-test_files: 
+summary: Combines the best parts of Upfile from paperclip and Rack::Multipart::UploadedFile
+  from rack.
+test_files:
 - spec/examples/sample.txt
 - spec/file/basic_spec.rb
 - spec/spec_helper.rb
 - spec/stringio/basic_spec.rb
-has_rdoc: