blather 0.3.3 → 0.3.4

data/ext/push_parser.c

@@ -80,24 +80,6 @@ push_parser_receive (
 /*********
  CALLBACKS
 **********/
-static void
-push_parser_start_document_callback (
-  void *ctx)
-{
-  VALUE handler = (VALUE) ctx;
-  if (handler != Qnil)
-    rb_funcall (handler, rb_intern("on_start_document"), 0);
-}
-
-static void
-push_parser_end_document_callback (
-  void *ctx)
-{
-  VALUE handler = (VALUE) ctx;
-  if (handler != Qnil)
-    rb_funcall (handler, rb_intern("on_end_document"), 0);
-}
-
 static void
 push_parser_start_element_ns_callback (
   void * ctx,
@@ -177,16 +159,6 @@ push_parser_characters_callback (
     rb_funcall (handler, rb_intern("on_characters"), 1, rb_str_new(chars, len));
 }
 
-static void
-push_parser_structured_error_callback (
-  void *ctx,
-  xmlErrorPtr error)
-{
-  VALUE handler = (VALUE) ctx;
-  if (handler != Qnil)
-    rb_funcall (handler, rb_intern("on_error"), 1, rb_str_new2((const char*)error->message));
-}
-
 xmlSAXHandler saxHandler = {
   0, //internalSubset
   0, //isStandalone
@@ -200,8 +172,8 @@ xmlSAXHandler saxHandler = {
   0, //elementDecl
   0, //unparsedEntityDecl
   0, //setDocumentLocator
-  (startDocumentSAXFunc) push_parser_start_document_callback,
-  (endDocumentSAXFunc) push_parser_end_document_callback,
+  0, //(startDocument)
+  0, //(endDocument)
   0, //startElement
   0, //endElement
   0, //reference
@@ -210,7 +182,7 @@ xmlSAXHandler saxHandler = {
   0, //processingInstruction
   0, //comment
   0, //warning
-  (errorSAXFunc) push_parser_structured_error_callback,
+  0, //error
   0, //fatalError
   0, //getParameterEntity
   0, //cdataBlock
@@ -219,7 +191,7 @@ xmlSAXHandler saxHandler = {
   0, //_private
   (startElementNsSAX2Func) push_parser_start_element_ns_callback,
   (endElementNsSAX2Func) push_parser_end_element_ns_callback,
-  (xmlStructuredErrorFunc) push_parser_structured_error_callback
+  0 // LibXML handles this globally
 };
 
 void

data/lib/blather/errors.rb

@@ -40,14 +40,25 @@ module Blather
     register :tls_failure
   end
 
+  class ParseWarning < BlatherError
+    register :parse_warning
+    attr_reader :libxml_error, :message
+
+    def initialize(err)
+      @libxml_error = err
+      @message = err.to_s
+    end
+  end
+
   ##
   # Something bad happened while parsing the incoming stream
   class ParseError < BlatherError
     register :parse_error
-    attr_reader :message
+    attr_reader :libxml_error, :message
 
-    def initialize(message)
-      @message = message
+    def initialize(err)
+      @libxml_error = err
+      @message = err.to_s
     end
   end
 end

data/lib/blather/stream.rb

@@ -77,8 +77,11 @@ module Blather
       LOG.debug "<< #{data}"
       @parser.receive_data data
 
+    rescue ParseWarning => e
+      @client.receive_data e
     rescue ParseError => e
       @error = e
+      send "<stream:error><xml-not-well-formed xmlns='urn:ietf:params:xml:ns:xmpp-streams'/></stream:error>"
       stop
     end
 

data/lib/blather/stream/parser.rb

@@ -9,8 +9,6 @@ class Stream # :nodoc:
     def self.debug; @@debug; end
     def self.debug=(debug); @@debug = debug; end
 
-    include XML::SaxParser::Callbacks
-
     def initialize(receiver)
       @receiver = receiver
       @current = nil
@@ -68,8 +66,14 @@ class Stream # :nodoc:
       end
     end
 
-    def on_error(msg)
-      raise ParseError.new(msg.to_s)
+    def on_error(err)
+      err_klass = case err.level
+      when XML::Error::WARNING
+        ParseWarning
+      when XML::Error::ERROR, XML::Error::FATAL
+        ParseError
+      end
+      raise err_klass.new(err)
     end
   end #Parser
 

data/spec/blather/stream/client_spec.rb

@@ -783,6 +783,38 @@ describe 'Blather::Stream::Client' do
     end
   end
 
+  it 'sends the client a warning on parse warning' do
+    @client = mock()
+    @client.expects(:receive_data).with do |v|
+      EM.stop
+      v.must_be_kind_of ParseWarning
+      v.message.must_match(/vcard\-temp/)
+    end
+    state = nil
+    mocked_server(2) do |val, server|
+      case state
+      when nil
+        state = :started
+        server.send_data "<?xml version='1.0'?><stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' version='1.0'>"
+        server.send_data "<stream:features><bind xmlns='urn:ietf:params:xml:ns:xmpp-bind' /></stream:features>"
+        val.must_match(/stream:stream/)
+
+      when :started
+        server.send_data <<-XML
+          <iq xmlns="jabber:client" to="utterance.localhost" type="get" id="2590">
+            <vCard xmlns="vcard-temp" />
+          </iq>
+        XML
+        true
+
+      else
+        EM.stop
+        false
+
+      end
+    end
+  end
+
   it 'sends client an error on parse error' do
     @client = mock()
     @client.expects(:receive_data).with do |v|
@@ -804,7 +836,7 @@ describe 'Blather::Stream::Client' do
 
       when :parse_error
         EM.stop
-        val.must_equal "</stream:stream>"
+        val.must_equal "<stream:error><xml-not-well-formed xmlns='urn:ietf:params:xml:ns:xmpp-streams'/></stream:error></stream:stream>"
 
       else
         EM.stop

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: blather
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Jeff Smick
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-18 00:00:00 -07:00
+date: 2009-05-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency