call on_error on parser errors

coreyhaines · Jun 8, 2011 · 6685098 · 6685098
1 parent 2e878d1
commit 6685098
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/tweetstream/client.rb b/lib/tweetstream/client.rb
@@ -230,11 +230,12 @@ def start(path, query_parameters = {}, &block) #:nodoc:
           begin
             raw_hash = @parser.decode(item)
           rescue MultiJson::DecodeError
+            error_proc.call("MultiJson::DecodeError occured in stream: #{item}") if error_proc.is_a?(Proc)
             next
           end
 
           unless raw_hash.is_a?(::Hash)
-            error_proc.call("Unexpected JSON object in stream: #{item}")
+            error_proc.call("Unexpected JSON object in stream: #{item}") if error_proc.is_a?(Proc)
             next
           end
 

diff --git a/spec/tweetstream/client_spec.rb b/spec/tweetstream/client_spec.rb
@@ -133,6 +133,13 @@
           message.should == 'Unexpected JSON object in stream: ["favorited"]'
         end.track('abc')
       end
+
+      it 'should call on_error if a json parse error occurs' do
+        @stream.should_receive(:each_item).and_yield("{'a_key':}")
+        @client.on_error do |message|
+          message.should == "MultiJson::DecodeError occured in stream: {'a_key':}"
+        end.track('abc')
+      end
     end
 
     describe '#on_error' do