http_streaming_client 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb1a938683e59b5e423d48a1e153e9226b641c1d
-  data.tar.gz: 7172637923694eb12349bcd73c182e36e346ca89
+  metadata.gz: 80770e5181fa02ff14ec3ecb822a9a46ca6208fe
+  data.tar.gz: 4910d040593d3edac671776221161b2166c8d0ef
 SHA512:
-  metadata.gz: 76360adaa5c7c21e83a2f531f65fc5849018bb869b8404d36cdd233ba213f7597bbe4e70180d9126a181ad2a0bb565667a589dd6449d899c4421c21fe9d6f98f
-  data.tar.gz: 499dd222df8102d71b64c8cd48e0ebef4d850cc77bba7eee982bfa941b160a9cf6fb3308ae5cdf304ca325f7f90a063e60450b0eaf418b9376daaf51eca3512e
+  metadata.gz: bc55d5c9795a03587c53192ddb0220880fffdae3a347a0dd5e20bace30315de426e2a8857638d6dd7fc33daf6e262fda96f03c7b276dc6deb79437f000a5eb1f
+  data.tar.gz: da081fe39235ef44906e5c334c2b1ad99b32b818a2320946b80cd3cbdc199037302b366f44f190ddbd9841c29834f5e0d0be6d55754cee1afdc3d694633efe5b

data/CHANGELOG

@@ -1,4 +1,9 @@
-http_streaming_client 0.9.2 (05.09.2014)
+http_streaming_client 0.9.4 (05.22.2014)
+========================================
+* Fixed bug with reconnect management and lazy authorization header generation
+* Tested and updated for MRI ruby-2.1.1p76 and JRuby jruby-1.7.12
+
+http_streaming_client 0.9.3 (05.09.2014)
 ========================================
 * Critical bug fix for GZip chunked deceompression handling
 

data/README.md

@@ -7,7 +7,7 @@ Ruby HTTP client with support for HTTP 1.1 streaming, GZIP and zlib compressed s
 
 ## Ruby Version
 
-MRI ruby-2.0.0-p451 and JRuby jruby-1.7.12. Install via rvm: https://rvm.io/
+MRI 2.1.1p76 and JRuby jruby-1.7.12. Install via rvm: https://rvm.io/
 
 ## Installation
 

data/lib/http_streaming_client/client.rb

@@ -124,52 +124,55 @@ module HttpStreamingClient
 	uri = URI.parse(uri)
       end
 
-      options_factory = opts.delete(:options_factory)
-      if !options_factory.nil? then
-	if options_factory.respond_to? "get_options" then
-          logger.debug("Client::request:options_factory detected")
-	  generated_options = options_factory.get_options
-          logger.debug("Client::request:options_factory:#{generated_options}")
-	  opts.merge!(generated_options || {})
-	else
-          logger.warn("Client::request:options_factory detected, but does not respond to get_options(). Ignoring.")
-	end
-      end
+      @reconnect_count = 0 if @reconnect_requested
+      @options_factory = opts.delete(:options_factory)
+      @static_body_option = opts[:body]
+
+      begin
 
-      default_headers = {
-	"User-Agent" => opts["User-Agent"] || "HttpStreamingClient #{HttpStreamingClient::VERSION}",
-	"Accept" => "*/*",
-	"Accept-Charset" => "utf-8"
-      }
-
-      if method == "POST" || method == "PUT"
-	default_headers["Content-Type"] = opts["Content-Type"] || "application/x-www-form-urlencoded;charset=UTF-8"
-	body = opts.delete(:body)
-	if body.is_a?(Hash)
-	  body = body.keys.collect {|param| "#{URI.escape(param.to_s)}=#{URI.escape(body[param].to_s)}"}.join('&')
+	opts[:body] = @static_body_option unless @static_body_option.nil?
+
+	if !@options_factory.nil? then
+	  if @options_factory.respond_to? "get_options" then
+	    logger.info("Client::request:options_factory detected")
+	    generated_options = @options_factory.get_options
+	    logger.info("Client::request:options_factory:#{generated_options}")
+	    opts.merge!(generated_options || {})
+	  else
+	    logger.warn("Client::request:options_factory detected, but does not respond to get_options(). Ignoring.")
+	  end
 	end
-	default_headers["Content-Length"] = body.length
-      end
 
-      unless uri.userinfo.nil?
-	default_headers["Authorization"] = "Basic #{[uri.userinfo].pack('m').strip!}\r\n"
-      end
+	default_headers = {
+	  "User-Agent" => opts["User-Agent"] || "HttpStreamingClient #{HttpStreamingClient::VERSION}",
+	  "Accept" => "*/*",
+	  "Accept-Charset" => "utf-8"
+	}
+
+	if method == "POST" || method == "PUT"
+	  default_headers["Content-Type"] = opts["Content-Type"] || "application/x-www-form-urlencoded;charset=UTF-8"
+	  body = opts.delete(:body)
+	  if body.is_a?(Hash)
+	    body = body.keys.collect {|param| "#{URI.escape(param.to_s)}=#{URI.escape(body[param].to_s)}"}.join('&')
+	  end
+	  default_headers["Content-Length"] = body.length
+	end
 
-      encodings = []
-      encodings << "gzip" if (@compression_requested and opts[:compression].nil?) or opts[:compression]
-      if encodings.any?
-	default_headers["Accept-Encoding"] = "#{encodings.join(',')}"
-      end
+	unless uri.userinfo.nil?
+	  default_headers["Authorization"] = "Basic #{[uri.userinfo].pack('m').strip!}\r\n"
+	end
 
-      headers = default_headers.merge(opts[:headers] || {})
-      logger.debug "request headers: #{headers}"
+	encodings = []
+	encodings << "gzip" if (@compression_requested and opts[:compression].nil?) or opts[:compression]
+	if encodings.any?
+	  default_headers["Accept-Encoding"] = "#{encodings.join(',')}"
+	end
 
-      begin
+	headers = default_headers.merge(opts[:headers] || {})
+	logger.debug "request headers: #{headers}"
 
 	socket = initialize_socket(uri, opts)
 
-	@reconnect_count = 0 if @reconnect_requested
-
 	request = "#{method} #{uri.path}#{uri.query ? "?"+uri.query : nil} HTTP/1.1\r\n"
 	request << "Host: #{uri.host}\r\n"
 	headers.each do |k, v|
@@ -254,7 +257,7 @@ module HttpStreamingClient
 		logger.debug "read #{line.size} uncompressed bytes, #{response.size} bytes total, decoder queue bytes:#{decoder.size}"
 		response << line unless @interrupted }
 	    end
-          else
+	  else
 	    logger.debug "chunked transfer encoding with no compression detected"
 	    if block_given? then
 	      decoder = HttpStreamingClient::Decoders::Chunked.new { |line|
@@ -295,8 +298,8 @@ module HttpStreamingClient
 	    decoder << partial
 
 	    if !block_given? then
-              logger.debug "no block specified, returning chunk results and halting streaming response"
-              return response
+	      logger.debug "no block specified, returning chunk results and halting streaming response"
+	      return response
 	    else
 	      return if @interrupted and response_compression
 	      return response if @interrupted
@@ -380,11 +383,12 @@ module HttpStreamingClient
 	if @reconnect_requested then
 	  logger.info "Connection closed. Reconnect requested. Trying..."
 	  @reconnect_count = @reconnect_count + 1
+	  logger.info "@reconnect_count is #{@reconnect_count} of #{@reconnect_attempts}, sleeping for #{@reconnect_interval}..."
 	  sleep @reconnect_interval
 	  retry if @reconnect_count < @reconnect_attempts
 	  logger.info "Maximum number of failed reconnect attempts reached (#{@reconnect_attempts}). Exiting."
 	end
-	
+
 	raise e unless e.instance_of? ReconnectRequest
       end
     ensure

data/lib/http_streaming_client/version.rb

@@ -28,5 +28,5 @@
 ###########################################################################
 
 module HttpStreamingClient
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

data/spec/reconnect_spec.rb

@@ -10,7 +10,7 @@ describe HttpStreamingClient do
   
     count = 0
     client = HttpStreamingClient::Client.new(compression: false)
-    response = client.get("http://localhost:3000/outbounds/consumer/1") { |line|
+    response = client.get("http://localhost:3000/outbounds/consumer") { |line|
       logger.debug "line received: #{line}"
       count = count + 1
     }
@@ -18,12 +18,12 @@ describe HttpStreamingClient do
     expect(count).to be(10)
   end
   
-  #it "should reconnect on any error or EOF" do
-  it "should reconnect on any error or EOF", :disabled => true do
+  it "should reconnect on any error or EOF" do
+  #it "should reconnect on any error or EOF", :disabled => true do
 
-    client = HttpStreamingClient::Client.new(compression: false, reconnect: true, reconnect_attempts: 5, reconnect_interval: 1)
+    client = HttpStreamingClient::Client.new(compression: false, reconnect: true, reconnect_attempts: 5, reconnect_interval: 5)
     count = 0
-    response = client.get("http://localhost:3000/outbounds/consumer/1") { |line|
+    response = client.get("http://localhost:3000/outbounds/consumer") { |line|
       logger.debug "line received: #{line}"
       count = count + 1
       client.interrupt if count > 20

metadata

@@ -1,127 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: http_streaming_client
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - David Tompkins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-09 00:00:00.000000000 Z
+date: 2014-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.1.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.0
 description: Ruby HTTP client with streaming support for GZIP compressed streams and
@@ -133,7 +133,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - AUTHORS
 - CHANGELOG
 - Gemfile
@@ -178,12 +178,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []