excon 0.13.1 → 0.13.2

data/changelog.txt

@@ -1,3 +1,8 @@
+0.13.2 03/26/12
+===============
+
+* fix to avoid issues when Tempfile is not required/defined. Thanks nextmat
+
 0.13.1 03/26/12
 ===============
 

data/excon.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'excon'
-  s.version           = '0.13.1'
+  s.version           = '0.13.2'
   s.date              = '2012-03-26'
   s.rubyforge_project = 'excon'
 

data/lib/excon/connection.rb

@@ -145,6 +145,21 @@ module Excon
 
   private
 
+    def detect_content_length(body)
+      if body.respond_to?(:binmode)
+        # IO object: File, Tempfile, etc.
+        body.binmode
+        File.size(body)
+      elsif body.is_a?(String)
+        if FORCE_ENC
+          body.force_encoding('BINARY')
+        end
+        body.length
+      else
+        0
+      end
+    end
+
     def request_kernel(params)
       begin
         response = if params[:mock]
@@ -184,18 +199,7 @@ module Excon
           elsif ! (params[:method].to_s.casecmp('GET') == 0 && params[:body].nil?)
             # The HTTP spec isn't clear on it, but specifically, GET requests don't usually send bodies;
             # if they don't, sending Content-Length:0 can cause issues.
-            params[:headers]['Content-Length'] = case params[:body]
-            when File, Tempfile
-              params[:body].binmode
-              File.size(params[:body])
-            when String
-              if FORCE_ENC
-                params[:body].force_encoding('BINARY')
-              end
-              params[:body].length
-            else
-              0
-            end
+            params[:headers]['Content-Length'] = detect_content_length(params[:body])
           end
 
           # add headers to request

data/lib/excon/constants.rb

@@ -1,6 +1,6 @@
 module Excon
   unless const_defined?(:VERSION)
-    VERSION = '0.13.1'
+    VERSION = '0.13.2'
   end
 
   unless const_defined?(:CHUNK_SIZE)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ date: 2012-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70201828051100 !ruby/object:Gem::Requirement
+  requirement: &70350701665240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70201828051100
+  version_requirements: *70350701665240
 - !ruby/object:Gem::Dependency
   name: delorean
-  requirement: &70201828050080 !ruby/object:Gem::Requirement
+  requirement: &70350701664560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70201828050080
+  version_requirements: *70350701664560
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &70201828049280 !ruby/object:Gem::Requirement
+  requirement: &70350701658060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70201828049280
+  version_requirements: *70350701658060
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70201828048840 !ruby/object:Gem::Requirement
+  requirement: &70350701657600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70201828048840
+  version_requirements: *70350701657600
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70201828048420 !ruby/object:Gem::Requirement
+  requirement: &70350701657120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70201828048420
+  version_requirements: *70350701657120
 - !ruby/object:Gem::Dependency
   name: shindo
-  requirement: &70201828047800 !ruby/object:Gem::Requirement
+  requirement: &70350701656540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70201828047800
+  version_requirements: *70350701656540
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70201828047240 !ruby/object:Gem::Requirement
+  requirement: &70350701655960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,7 +89,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70201828047240
+  version_requirements: *70350701655960
 description: EXtended http(s) CONnections
 email: geemus@gmail.com
 executables: []