ethon 0.6.3 → 0.7.0

data/.travis.yml

@@ -10,9 +10,9 @@ rvm:
   - jruby-head
   - jruby-18mode
   - jruby-19mode
-  - rbx-18mode
-  - rbx-19mode
 matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
+    - rvm: rbx-18mode
+    - rvm: rbx-19mode

data/CHANGELOG.md

@@ -2,14 +2,24 @@
 
 ## Master
 
-[Full Changelog](https://github.com/typhoeus/ethon/compare/v0.6.2...master)
+Not backwards compatible changes:
+
+* `mime-types` are no longer a dependency. The gem will be still used if available to determine the mime type of a file which is uploaded. That means you have to have take care of the gem installation yourself.
+
+[Full Changelog](https://github.com/typhoeus/ethon/compare/v0.7.0...master)
+
+## 0.7.0
+
+[Full Changelog](https://github.com/typhoeus/ethon/compare/v0.6.3...v0.7.0)
+
+## 0.6.3
+
+[Full Changelog](https://github.com/typhoeus/ethon/compare/v0.6.2...v0.6.3)
 
 ## 0.6.2
 
 [Full Changelog](https://github.com/typhoeus/ethon/compare/v0.6.1...v0.6.2)
 
-The changelog entries are coming soon!
-
 ## 0.6.1
 
 [Full Changelog](https://github.com/typhoeus/ethon/compare/v0.6.0...v0.6.1)

data/Gemfile

@@ -8,6 +8,7 @@ group :development, :test do
 
   gem "sinatra", :git => "https://github.com/sinatra/sinatra.git"
   gem "json"
+  gem "mime-types", "~> 1.18"
 
   unless ENV["CI"]
     gem "guard-rspec", "~> 0.7"

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Hans Hasselberg
+Copyright (c) 2012-2014 Hans Hasselberg
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -71,7 +71,7 @@ everything up correctly.
 
 (The MIT License)
 
-Copyright © 2012-2013 [Hans Hasselberg](http://www.hans.io)
+Copyright © 2012-2014 [Hans Hasselberg](http://www.hans.io)
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

data/ethon.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
   s.license = 'MIT'
 
   s.add_dependency('ffi', ['>= 1.3.0'])
-  s.add_dependency('mime-types', ['~> 1.18'])
 
   s.files        = `git ls-files`.split("\n")
   s.test_files   = `git ls-files -- spec/*`.split("\n")

data/lib/ethon.rb

@@ -1,7 +1,10 @@
 require 'logger'
 require 'ffi'
 require 'thread'
-require 'mime/types'
+begin
+  require 'mime/types'
+rescue LoadError
+end
 require 'tempfile'
 
 require 'ethon/libc'

data/lib/ethon/easy/queryable.rb

@@ -75,16 +75,23 @@ module Ethon
       # @return [ Array ] Array of informations.
       def file_info(file)
         filename = File.basename(file.path)
-        types = MIME::Types.type_for(filename)
         [
           filename,
-          types.empty? ? 'application/octet-stream' : types[0].to_s,
+          mime_type(filename),
           File.expand_path(file.path)
         ]
       end
 
       private
 
+      def mime_type(filename)
+        if defined?(MIME) && t = MIME::Types.type_for(filename).first
+          t.to_s
+        else
+          'application/octet-stream'
+        end
+      end
+
       def recursively_generate_pairs(h, prefix, pairs)
         case h
         when Hash

data/lib/ethon/version.rb

@@ -1,5 +1,5 @@
 module Ethon
 
   # Ethon version.
-  VERSION = '0.6.3'
+  VERSION = '0.7.0'
 end

data/spec/ethon/easy/queryable_spec.rb

@@ -131,13 +131,37 @@ describe Ethon::Easy::Queryable do
       end
 
       context "when file" do
-        let(:file) { Tempfile.new("fubar") }
+        let(:file) { File.open("spec/spec_helper.rb") }
         let(:file_info) { params.method(:file_info).call(file) }
         let(:hash) { {:a => {:b => [file]}} }
+        let(:mime_type) { file_info[1] }
 
         it "transforms" do
           expect(pairs).to eq([["a[b][0]", file_info]])
         end
+
+        context "when MIME" do
+          context "when mime type" do
+            it "sets mime type to text" do
+              expect(mime_type).to eq("application/x-ruby")
+            end
+          end
+
+          context "when no mime type" do
+            let(:file) { Tempfile.new("fubar") }
+
+            it "sets mime type to default application/octet-stream" do
+              Object.send(:remove_const, :MIME)
+              expect(mime_type).to eq("application/octet-stream")
+            end
+          end
+        end
+
+        context "when no MIME" do
+          it "sets mime type to default application/octet-stream" do
+            expect(mime_type).to eq("application/octet-stream")
+          end
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ethon
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -27,22 +27,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.0
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.18'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.18'
 description: Very lightweight libcurl wrapper.
 email:
 - me@hans.io
@@ -165,7 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3291920420856765924
+      hash: -1989061620893792868
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: