datasift 1.2.1 → 1.3.0

data/README.md

@@ -52,6 +52,14 @@ more details.
 Changelog
 ---------
 
+* v.1.3.0 Improved error handling (2012-03-08)
+
+  Added onError and onWarning events - see examples/consume-stream.rb for an
+  example.
+
+  Stopped the HTTP consumer from attempting to reconnect when it receives a
+  4xx response from the server.
+
 * v.1.2.0 Twitter Compliance (2012-02-28)
 
   The consumer now has an onDeleted method to which you can assign a block

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.3.0

data/examples/consume-stream.rb

@@ -37,6 +37,16 @@ consumer.onStopped do |reason|
 	puts
 end
 
+# Set up the warning event handler.
+consumer.onWarning do |message|
+	puts 'WARNING: ' + message
+end
+
+# Set up the error event handler.
+consumer.onError do |message|
+	puts 'ERROR: ' + message
+end
+
 # And start consuming
 puts 'Consuming...'
 puts '--'

data/lib/DataSift/stream_consumer.rb

@@ -75,6 +75,34 @@ module DataSift
 			end
 		end
 
+		# This is called when an error message is received.
+		# === Parameters
+		#
+		# * +message+ - The error message.
+		#
+		def onError(&block)
+			if block_given?
+				@on_error = block
+				self
+			else
+				@on_error
+			end
+		end
+
+		# This is called when an error message is received.
+		# === Parameters
+		#
+		# * +message+ - The error message.
+		#
+		def onWarning(&block)
+			if block_given?
+				@on_warning = block
+				self
+			else
+				@on_warning
+			end
+		end
+
 		# This is called when the consumer is stopped.
 		# === Parameters
 		#
@@ -103,10 +131,20 @@ module DataSift
 			# Start consuming
 			@state = STATE_STARTING
 			onStart do |interaction|
-				if interaction.has_key?('deleted') and interaction['deleted']
-					onDeleted.call(interaction) unless onDeleted.nil?
+				if interaction.has_key?('status')
+					if interaction['status'] == 'error' || interaction['status'] == 'failure'
+						onError.call(interaction['message'])
+					elsif interaction['status'] == 'warning'
+						onWarning.call(interaction['message'])
+					else
+						# Tick
+					end
 				else
-					block.call(interaction) unless block.nil?
+					if interaction.has_key?('deleted') and interaction['deleted']
+						onDeleted.call(interaction) unless onDeleted.nil?
+					else
+						block.call(interaction) unless block.nil?
+					end
 				end
 			end
 		end

data/lib/DataSift/stream_consumer_http.rb

@@ -45,7 +45,10 @@ module DataSift
 								end
 							else
 								# received only part of the chunk, grab the rest
-								parser << @socket.read(chunkLeft)
+								received_data = @socket.read(chunkLeft)
+								if not received_data.nil?
+									parser << received_data
+								end
 							end
 						end
 					else
@@ -130,16 +133,24 @@ module DataSift
 					if @response_head[:code] == 200
 						# Success!
 						@state = StreamConsumer::STATE_RUNNING
-					elsif @response_head[:code] == 404
-						raise StreamError, 'Hash not found!'
+					elsif @response_head[:code] >= 400 && @response_head[:code] < 500 && @response_head[:code] != 420
+						line = ''
+						while !@socket.eof? && line.length < 10
+							line = @socket.gets
+						end
+						data = Yajl::Parser.parse(line)
+						if data.has_key?('message')
+							raise StreamError, data['message']
+						else
+							raise StreamError, 'Connection refused: ' + @response_head[:code] + ' ' + @response_head[:msg]
+						end
 					else
-						puts 'Connection failed: ' + @response_head[:code] + ' ' + @response_head[:msg]
 						if connection_delay == 0
 							connection_delay = 10;
 						elsif connection_delay < 240
 							connection_delay *= 2;
 						else
-							raise StreamError, 'Connection failed: ' + @response_head[:code] + ' ' + @response_head[:msg]
+							raise StreamError, 'Connection refused: ' + @response_head[:code] + ' ' + @response_head[:msg]
 						end
 					end
 				#rescue

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: datasift
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
-  - 2
-  - 1
-  version: 1.2.1
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - DataSift
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-02 00:00:00 Z
+date: 2012-03-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client