http_streaming_client 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7189a6ab6550219173fc77f1860b797ba3464936
-  data.tar.gz: 3f9739776d6a097ffd9d78a9b84e16e1bd848cf7
+  metadata.gz: d5581509d2fd5ef9ceb88108f0dab57b572aa127
+  data.tar.gz: 8d3203d98d53c23839eb475b05c66767ea44477e
 SHA512:
-  metadata.gz: fa69f597ca4b1285baa68db9f86b16fdf62141fa14157a9c09a80f0ef27486a23f58a655f154d4c29c3e2bb05ad2261899a9a384202a288a80332a692901ce44
-  data.tar.gz: 94f82b7a78be5c054cd2bc395521feed1b4c600544c1ad2e7b8ae16cb9b65777d6e430ec789c1446a58ab66b7a0fa9afe03757b1437815b899f09666b7e2a8f8
+  metadata.gz: 959b75f1f05b14c47d6ec4f0f38a7d66c3d5d6b0734fc1314c017840fff333499bbc99c6697f4aa89cc1151a77347395f6a6674b10ccfa0f4f7c3b31933bc783
+  data.tar.gz: c000c10712d472eebfabfefdac34a1ebc54feca247e9efb51d39ca0af4a116d179983e79ea63e735888ac18aee2d7cb58716528d74c3216984ee4c515808d59c

data/lib/http_streaming_client/client.rb

@@ -426,7 +426,7 @@ module HttpStreamingClient
 
       if uri.scheme.eql? "https"
 	ctx = OpenSSL::SSL::SSLContext.new
-	#ctx.set_params(verify_mode: OpenSSL::SSL::VERIFY_PEER)
+	ctx.set_params(verify_mode: OpenSSL::SSL::VERIFY_PEER)
 	@socket = OpenSSL::SSL::SSLSocket.new(@socket, ctx).tap do |socket|
 	  socket.sync_close = true
 	  socket.connect

data/lib/http_streaming_client/decoders/gzip.rb

@@ -60,10 +60,10 @@ module HttpStreamingClient
 	return unless compressed_packet && compressed_packet.size > 0
 	@buf ||= GZipBufferIO.new
 	@buf << compressed_packet
+	@gzip ||= Zlib::GzipReader.new @buf
 
 	# pass at least GZIP_READER_MIN_BUF_SIZE bytes to GzipReader to avoid zlib EOF
 	while @buf.size > GZIP_READER_MIN_BUF_SIZE do
-	  @gzip ||= Zlib::GzipReader.new @buf
 	  decompressed_packet = nonblock_readline(@gzip)
 	  #logger.debug "GZip:<<:decompressed_packet:#{decompressed_packet}"
 	  break if decompressed_packet.nil?
@@ -73,14 +73,16 @@ module HttpStreamingClient
 
       def close
 	logger.debug "GZip:close"
+	return if @buf.size == 0
+
 	decompressed_packet = ""
 	begin
 	  @gzip ||= Zlib::GzipReader.new @buf
 
 	  while true do
-	    decompressed_packet = nonblock_readline(@gzip)
-	    #logger.debug "GZip:close:decompressed_packet:#{decompressed_packet}"
-	    break if decompressed_packet.nil?
+	    decompressed_packet = nonblock_readline(@gzip, true)
+	    logger.debug "GZip:close:decompressed_packet:#{decompressed_packet}"
+	    break if decompressed_packet.nil? or decompressed_packet.size == 0
 	    process_decompressed_packet(decompressed_packet)
 	  end
 
@@ -93,7 +95,7 @@ module HttpStreamingClient
 	@buf.size
       end
 
-      def nonblock_readline(io)
+      def nonblock_readline(io, on_close = false)
 	@line_buffer ||= ""
 	ch = nil
 	begin
@@ -106,17 +108,38 @@ module HttpStreamingClient
 	    end
 	  end
 	rescue Zlib::GzipFile::Error
-	  # this is raised on EOF by ZLib in MRI, return nil to indicate EOF and leave partial line in the buffer
+	  # this is raised on EOF by ZLib in MRI
+	  # if we get here via a call to close(), then we want to return the line_buffer
+	  # if we get here via any other path, we want to return nil to signal temporary EOF and leave the partial line_buffer contents in place.
 	  logger.debug "Gzip:nonblock_readline:Zlib::GzipFile::Error:line_buffer.size:#{@line_buffer.size}"
+	  if on_close then
+	    result = @line_buffer
+	    @line_buffer = ""
+	    return result
+	  end
 	  return nil
 	rescue IOError
 	  # this is raised on EOF by ZLib in JRuby, return nil to indicate EOF and leave partial line in the buffer
+	  # if we get here via a call to close(), then we want to return the line_buffer
+	  # if we get here via any other path, we want to return nil to signal temporary EOF and leave the partial line_buffer contents in place.
 	  logger.debug "Gzip:nonblock_readline:IOError:line_buffer.size:#{@line_buffer.size}"
+	  if on_close then
+	    result = @line_buffer
+	    @line_buffer = ""
+	    return result
+	  end
 	  return nil
         rescue => e
 	  logger.debug "Gzip:nonblock_readline:error received:#{e.class}:#{e}"
 	  raise e
 	end
+	  
+	if on_close then
+	  result = @line_buffer
+	  @line_buffer = ""
+	  return result
+	end
+
       end
       
       protected

data/lib/http_streaming_client/oauth/adobe.rb

@@ -61,8 +61,13 @@ module HttpStreamingClient
 	url_string = "#{uri.scheme}://#{uri.host}#{uri.path}"
 
 	# POST to uri
-	response = HttpStreamingClient::Client.post(uri, params_string, {:headers => {'Authorization' => "Basic #{basicAuth}"}})
-	response_json = JSON.parse(response)
+	assembled_response = ""
+	response = HttpStreamingClient::Client.post(uri, params_string, {:headers => {'Authorization' => "Basic #{basicAuth}"}}) { |line|
+	  # token server now sending chunked, gzip'd response...
+	  logger.debug "line received: #{line}"
+	  assembled_response << line
+	}
+	response_json = JSON.parse(assembled_response)
 
 	logger.debug "token API response: #{response_json}"
 

data/lib/http_streaming_client/version.rb

@@ -28,5 +28,5 @@
 ###########################################################################
 
 module HttpStreamingClient
-  VERSION = "0.9.7"
+  VERSION = "0.9.8"
 end

data/spec/adobe_spec.rb

@@ -63,7 +63,7 @@ describe HttpStreamingClient do
 
   end
 
-  describe "adobe firehose streaming get test, GZIP compressionu, authorization options factory" do
+  describe "adobe firehose streaming get test, GZIP compression, authorization options factory" do
 
     line_count = 0
 

data/spec/client_spec.rb

@@ -11,7 +11,7 @@ describe HttpStreamingClient do
 
   describe "client instance get test, no chunked transfer encosing and GZIP compression" do
     client = HttpStreamingClient::Client.new
-    response = client.get "http://screamradius.com/"
+    response = client.get "https://screamradius.com/"
     logger.debug "response: #{response}"
     subject { response }
     it { should_not be_nil}

data/spec/twitter_spec.rb

@@ -49,6 +49,7 @@ describe HttpStreamingClient do
 	response = client.get(url, {:headers => {'Authorization' => "#{authorization}" }}) { |line|
 	count = count + 1
 	if count > NUM_JSON_RECORDS_TO_RECEIVE then
+	  logger.debug "#{NUM_JSON_RECORDS_TO_RECEIVE} records received, interrupting..."
 	  client.interrupt
 	  next
 	end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: http_streaming_client
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - David Tompkins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler