excon 0.16.2 → 0.16.3

data/README.md

@@ -76,9 +76,9 @@ You can make `Transfer-Encoding: chunked` requests by passing a block that will
     file = File.open('data')
 
     chunker = lambda do
-      # Excon::CHUNK_SIZE defaults to 1048576, ie 1MB
+      # Excon.defaults[:chunk_size] defaults to 1048576, ie 1MB
       # to_s will convert the nil receieved after everything is read to the final empty chunk
-      file.read(Excon::CHUNK_SIZE).to_s
+      file.read(Excon.defaults[:chunk_size]).to_s
     end
 
     Excon.post('http://geemus.com', :request_block => chunker)

data/excon.gemspec

@@ -13,8 +13,8 @@ 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.16.2'
-  s.date              = '2012-08-27'
+  s.version           = '0.16.3'
+  s.date              = '2012-09-20'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long

data/lib/excon.rb

@@ -16,6 +16,7 @@ module Excon
     # @return [Hash] defaults for Excon connections
     def defaults
       @defaults ||= {
+        :chunk_size         => CHUNK_SIZE || DEFAULT_CHUNK_SIZE,
         :connect_timeout    => 60,
         :headers            => {},
         :instrumentor_name  => 'excon',

data/lib/excon/connection.rb

@@ -258,7 +258,7 @@ module Excon
               if params[:body].respond_to?(:binmode)
                 params[:body].binmode
               end
-              while chunk = params[:body].read(CHUNK_SIZE)
+              while chunk = params[:body].read(params[:chunk_size])
                 socket.write(chunk)
               end
             end
@@ -340,9 +340,9 @@ module Excon
             content_length = remaining = body.bytesize
             i = 0
             while i < body.length
-              params[:response_block].call(body[i, CHUNK_SIZE], [remaining - CHUNK_SIZE, 0].max, content_length)
-              remaining -= CHUNK_SIZE
-              i += CHUNK_SIZE
+              params[:response_block].call(body[i, params[:chunk_size]], [remaining - params[:chunk_size], 0].max, content_length)
+              remaining -= params[:chunk_size]
+              i += params[:chunk_size]
             end
           end
           return Excon::Response.new(response_attributes)

data/lib/excon/constants.rb

@@ -1,43 +1,29 @@
 module Excon
-  unless const_defined?(:VERSION)
-    VERSION = '0.16.2'
-  end
 
-  unless const_defined?(:CHUNK_SIZE)
-    CHUNK_SIZE = 1048576 # 1 megabyte
-  end
+  CR_NL = "\r\n"
 
-  unless const_defined?(:CR_NL)
-    CR_NL = "\r\n"
-  end
+  DEFAULT_CA_FILE = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "data", "cacert.pem"))
 
-  unless const_defined?(:DEFAULT_CA_FILE)
-    DEFAULT_CA_FILE = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "data", "cacert.pem"))
-  end
+  DEFAULT_CHUNK_SIZE = 1048576 # 1 megabyte
 
-  unless const_defined?(:DEFAULT_RETRY_LIMIT)
-    DEFAULT_RETRY_LIMIT = 4
+  # avoid overwrite if somebody has redefined
+  unless const_defined?(:CHUNK_SIZE)
+    CHUNK_SIZE = DEFAULT_CHUNK_SIZE
   end
 
-  unless const_defined?(:FORCE_ENC)
-    FORCE_ENC = CR_NL.respond_to?(:force_encoding)
-  end
+  DEFAULT_RETRY_LIMIT = 4
 
-  unless const_defined?(:HTTP_1_1)
-    HTTP_1_1 = " HTTP/1.1\r\n"
-  end
+  FORCE_ENC = CR_NL.respond_to?(:force_encoding)
 
-  unless const_defined?(:HTTP_VERBS)
-    HTTP_VERBS = %w{connect delete get head options post put trace}
-  end
+  HTTP_1_1 = " HTTP/1.1\r\n"
 
-  unless const_defined?(:HTTPS)
-    HTTPS = 'https'
-  end
+  HTTP_VERBS = %w{connect delete get head options post put trace}
 
-  unless const_defined?(:NO_ENTITY)
-    NO_ENTITY = [204, 205, 304].freeze
-  end
+  HTTPS = 'https'
+
+  NO_ENTITY = [204, 205, 304].freeze
+
+  VERSION = '0.16.3'
 
   unless ::IO.const_defined?(:WaitReadable)
     class ::IO
@@ -50,4 +36,5 @@ module Excon
       module WaitWritable; end
     end
   end
+
 end

data/lib/excon/response.rb

@@ -46,11 +46,11 @@ module Excon
             socket.read(2)
           elsif remaining = content_length
             while remaining > 0
-              params[:response_block].call(socket.read([CHUNK_SIZE, remaining].min), [remaining - CHUNK_SIZE, 0].max, content_length)
-              remaining -= CHUNK_SIZE
+              params[:response_block].call(socket.read([params[:chunk_size], remaining].min), [remaining - params[:chunk_size], 0].max, content_length)
+              remaining -= params[:chunk_size]
             end
           else
-            while remaining = socket.read(CHUNK_SIZE)
+            while remaining = socket.read(params[:chunk_size])
               params[:response_block].call(remaining, remaining.length, content_length)
             end
           end
@@ -62,8 +62,8 @@ module Excon
             socket.read(2) # 2 == "/r/n".length
           elsif remaining = content_length
             while remaining > 0
-              response.body << socket.read([CHUNK_SIZE, remaining].min)
-              remaining -= CHUNK_SIZE
+              response.body << socket.read([params[:chunk_size], remaining].min)
+              remaining -= params[:chunk_size]
             end
           else
             response.body << socket.read

data/lib/excon/socket.rb

@@ -87,7 +87,7 @@ module Excon
             end
           else
             while true
-              @read_buffer << @socket.read_nonblock(CHUNK_SIZE)
+              @read_buffer << @socket.read_nonblock(@params[:chunk_size])
             end
           end
         rescue OpenSSL::SSL::SSLError => error

data/tests/stub_tests.rb

@@ -132,9 +132,9 @@ Shindo.tests('Excon stubs') do
 
   Excon.stubs.clear
 
-  tests("stub({}, {:body => 'x' * (Excon::CHUNK_SIZE + 1)})") do
+  tests("stub({}, {:body => 'x' * (Excon::DEFAULT_CHUNK_SIZE + 1)})") do
     connection = Excon.new('http://127.0.0.1:9292', :mock => true)
-    Excon.stub({}, {:body => 'x' * (Excon::CHUNK_SIZE + 1)})
+    Excon.stub({}, {:body => 'x' * (Excon::DEFAULT_CHUNK_SIZE + 1)})
 
     test("with response_block") do
       chunks = []
@@ -142,7 +142,7 @@ Shindo.tests('Excon stubs') do
         chunks << chunk
       end
       connection.request(:method => :get, :path => '/content-length/100', :response_block => response_block)
-      chunks == ['x' * Excon::CHUNK_SIZE, 'x']
+      chunks == ['x' * Excon::DEFAULT_CHUNK_SIZE, 'x']
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.16.2
+  version: 0.16.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-27 00:00:00.000000000 Z
+date: 2012-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70244964150240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70244964150240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: delorean
-  requirement: &70244964163380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +39,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70244964163380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &70244964162220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +55,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70244964162220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70244964160980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +71,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70244964160980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70244964159980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +87,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70244964159980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shindo
-  requirement: &70244964159080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +103,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70244964159080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70244964157680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,7 +119,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70244964157680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: EXtended http(s) CONnections
 email: geemus@gmail.com
 executables: []
@@ -169,7 +204,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3145610774015695237
+      hash: -910496643222039172
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -178,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: excon
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 2
 summary: speed, persistence, http(s)