blather 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 821cfa57a4b4d947dfe64d18c05c0bd31b8e33bc
-  data.tar.gz: 5f4ed8978cbda2d5c422b5334c87bb02c918896b
+  metadata.gz: b286a91b3b6c3e092a2e0ebdc9812b44d6f17c50
+  data.tar.gz: 126a8aa2caa6063d13dfa8fa32ff4d28f0c12ae0
 SHA512:
-  metadata.gz: 69222c73bc14ba562a45e56681e7cfa868a1ed4c6a492ddbee36a8bcaca6abbf3f571e126eab05c5a589143d4151c6ea16bced0d97a0f3c7e86ccdb28d2afce7
-  data.tar.gz: 92c7c2ba080d2da3143c0fa796c783e5697d3b39079a423aa42295b7eb68b858214c547f7e05d6344967e5effb4925c3e786a24860c05a542703b29e22c21086
+  metadata.gz: 2399dc471ce0bd3d4d0121c43b89040069287ae08155cdf90ba509feb19ceac52bfa91f6e1f7c82f372b1d0b85aff38423afc45c35ff695ac0531e685008dccd
+  data.tar.gz: e56b81fa5316af92a71b6f2886251130a0e075a6aa762a282249f7f208439602cbfe8fec74d0dd1d982281df96081f8ea64c8c5387e83e3b1b797afa9edbdb17

data/.hound.yml

@@ -0,0 +1,2 @@
+LineLength:
+  Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # [develop](https://github.com/adhearsion/blather/compare/master...develop)
 
+# [v1.1.0](https://github.com/adhearsion/blather/compare/v1.0.0...v1.1.0) - [2015-06-12](https://rubygems.org/gems/blather/versions/1.1.0)
+  * Feature: Permit an alternative authentication ID when connection. Used to support [MojoAuth](http://mojoauth.mojolingo.com/) and similar schemes.
+  * Bugfix: Allow sending errors to the wire directly with correct formatting (previously raised)
+  * Bugfix: Don't pass service unavailable response to be processed as roster in client_post_init
+
 # [v1.0.0](https://github.com/adhearsion/blather/compare/v0.8.8...v1.0.0) - [2014-02-10](https://rubygems.org/gems/blather/versions/1.0.0)
   * Stable API promise
   * Bugfix: Fix the DSL module-extended API that was broken by 8327184acc57c20daeaebb975729ff70207eab67

data/Guardfile

@@ -1,4 +1,4 @@
-guard 'rspec', :cli => '--format documentation' do
+guard 'rspec', cmd: 'bundle exec rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec/" }

data/README.md

@@ -1,4 +1,11 @@
-# Blather [![Build Status](https://travis-ci.org/adhearsion/blather.png?branch=develop)](https://travis-ci.org/adhearsion/blather)
+# Blather
+
+[![Gem Version](https://badge.fury.io/rb/blather.png)](https://rubygems.org/gems/blather)
+[![Build Status](https://secure.travis-ci.org/adhearsion/blather.png?branch=develop)](http://travis-ci.org/adhearsion/blather)
+[![Dependency Status](https://gemnasium.com/adhearsion/blather.png?travis)](https://gemnasium.com/adhearsion/blather)
+[![Code Climate](https://codeclimate.com/github/adhearsion/blather.png)](https://codeclimate.com/github/adhearsion/blather)
+[![Coverage Status](https://coveralls.io/repos/adhearsion/blather/badge.png?branch=develop)](https://coveralls.io/r/adhearsion/blather)
+[![Inline docs](http://inch-ci.org/github/adhearsion/blather.png?branch=develop)](http://inch-ci.org/github/adhearsion/blather)
 
 XMPP DSL (and more) for Ruby written on [EventMachine](http://rubyeventmachine.com/) and [Nokogiri](http://nokogiri.org/).
 

data/examples/MUC_echo.rb

@@ -0,0 +1,19 @@
+require 'blather/client/dsl'
+
+module MUC
+  extend Blather::DSL
+  when_ready do
+    puts "Connected ! send messages to #{jid.stripped}."
+    join 'room_name', 'nick_name'
+  end
+
+  message :groupchat?, :body, proc { |m| m.from != jid.stripped }, delay: nil do |m|
+      echo = Blather::Stanza::Message.new
+      echo.to = room
+      echo.body = m.body
+      echo.type = 'groupchat'
+      client.write echo
+  end
+end
+MUC.setup 'username', 'password'
+EM.run { MUC.run }

data/examples/rosterprint.rb

@@ -6,7 +6,7 @@ require 'rubygems'
 require 'blather/client'
 
 when_ready do
-  roster.grouped.each do |group, items|
+  my_roster.grouped.each do |group, items|
     puts "#{'*'*3} #{group || 'Ungrouped'} #{'*'*3}"
     items.each { |item| puts "- #{item.name} (#{item.jid})" }
     puts

data/lib/blather/client/client.rb

@@ -34,7 +34,8 @@ module Blather
   class Client
     attr_reader :jid,
                 :roster,
-                :caps
+                :caps,
+                :queue_size
 
     # Create a new client and set it up
     #
@@ -43,12 +44,17 @@ module Blather
     # @param [String] host if this isn't set it'll be resolved off the JID's
     # domain
     # @param [Fixnum, String] port the port to connect to.
+    # @param [Hash] options a list of options to create the client with
+    # @option options [Number] :workqueue_count (5) the number of threads used to process incoming XMPP messages.
+    #   If this parameter is specified with 0, no background threads are used;
+    #   instead stanzas are handled in the same process that the Client is running in.
     #
     # @return [Blather::Client]
-    def self.setup(jid, password, host = nil, port = nil, certs = nil, connect_timeout = nil)
-      self.new.setup(jid, password, host, port, certs, connect_timeout)
+    def self.setup(jid, password, host = nil, port = nil, certs = nil, connect_timeout = nil, options = {})
+      self.new.setup(jid, password, host, port, certs, connect_timeout, options)
     end
 
+
     def initialize  # @private
       @state = :initializing
 
@@ -58,10 +64,7 @@ module Blather
       @filters = {:before => [], :after => []}
       @roster = Roster.new self
       @caps = Stanza::Capabilities.new
-
-      @handler_queue = GirlFriday::WorkQueue.new :handle_stanza, :size => 5 do |stanza|
-        handle_data stanza
-      end
+      @queue_size = 5
 
       setup_initial_handlers
     end
@@ -168,7 +171,11 @@ module Blather
 
     # Close the connection
     def close
-      EM.next_tick { self.stream.close_connection_after_writing }
+      EM.next_tick {
+        handler_queue.shutdown if handler_queue
+        @handler_queue = nil
+        self.stream.close_connection_after_writing if connected?
+      }
     end
 
     # @private
@@ -185,7 +192,11 @@ module Blather
 
     # @private
     def receive_data(stanza)
-      @handler_queue << stanza
+      if handler_queue
+        handler_queue << stanza
+      else
+        handle_data stanza
+      end
     end
 
     def handle_data(stanza)
@@ -202,16 +213,25 @@ module Blather
     end
 
     # @private
-    def setup(jid, password, host = nil, port = nil, certs = nil, connect_timeout = nil)
+    def setup(jid, password, host = nil, port = nil, certs = nil, connect_timeout = nil, options = {})
       @jid = JID.new(jid)
       @setup = [@jid, password]
       @setup << host
       @setup << port
       @setup << certs
       @setup << connect_timeout
+      @queue_size = options[:workqueue_count] || 5
       self
     end
 
+    # @private
+    def handler_queue
+      return if queue_size == 0
+      @handler_queue ||= GirlFriday::WorkQueue.new :handle_stanza, :size => queue_size do |stanza|
+        handle_data stanza
+      end
+    end
+
     protected
 
     def stream
@@ -257,7 +277,7 @@ module Blather
 
     def client_post_init
       write_with_handler Stanza::Iq::Roster.new do |node|
-        roster.process node
+        roster.process(node) unless node.error?
         write @status
         ready!
       end

data/lib/blather/errors/stanza_error.rb

@@ -95,8 +95,8 @@ class StanzaError < BlatherError
   # Convert the object to a proper node then convert it to a string
   #
   # @return [String]
-  def to_xml
-    to_node.to_s
+  def to_xml(*args)
+    to_node.to_xml(*args)
   end
 
   # @private

data/lib/blather/errors/stream_error.rb

@@ -69,8 +69,8 @@ class StreamError < BlatherError
   # Convert the object to a proper node then convert it to a string
   #
   # @return [String]
-  def to_xml
-    to_node.to_s
+  def to_xml(*args)
+    to_node.to_xml(*args)
   end
 
   # @private

data/lib/blather/stanza/pubsub/subscriptions.rb

@@ -33,11 +33,11 @@ class PubSub
     #
     # @return [Blather::XMPPNode]
     def subscriptions
-      aff = pubsub.find_first('subscriptions', self.class.registered_ns)
-      unless aff
-        (self.pubsub << (aff = XMPPNode.new('subscriptions', self.document)))
+      subs = pubsub.find_first('ns:subscriptions', :ns => self.class.registered_ns)
+      unless subs
+        self.pubsub << (subs = XMPPNode.new('subscriptions', self.document))
       end
-      aff
+      subs
     end
 
     # Iterate over the list of subscriptions

data/lib/blather/stream.rb

@@ -56,7 +56,7 @@ module Blather
     # @private
     STREAM_NS = 'http://etherx.jabber.org/streams'
     attr_accessor :password
-    attr_reader :jid
+    attr_reader :jid, :authcid
 
     # Start the stream between client and server
     #
@@ -71,14 +71,17 @@ module Blather
     # @param [String, nil] certs the trusted cert store in pem format to verify
     # communication with the server is trusted.
     # @param [Fixnum, nil] connect_timeout the number of seconds for which to wait for a successful connection
-    def self.start(client, jid, pass, host = nil, port = nil, certs_directory = nil, connect_timeout = nil)
+    # @param [Hash] opts options for modifying the connection
+    # @options opts [String] :authcid The authentication ID, which defaults to the node part of the specified JID
+    def self.start(client, jid, pass, host = nil, port = nil, certs_directory = nil, connect_timeout = nil, opts = {})
       jid = JID.new jid
       port ||= 5222
       if certs_directory
         @store = CertStore.new(certs_directory)
       end
+      authcid = opts[:authcid]
       if host
-        connect host, port, self, client, jid, pass, connect_timeout
+        connect host, port, self, client, jid, pass, connect_timeout, authcid
       else
         require 'resolv'
         srv = []
@@ -90,7 +93,7 @@ module Blather
         end
 
         if srv.empty?
-          connect jid.domain, port, self, client, jid, pass, connect_timeout
+          connect jid.domain, port, self, client, jid, pass, connect_timeout, authcid
         else
           srv.sort! do |a,b|
             (a.priority != b.priority) ? (a.priority <=> b.priority) :
@@ -98,7 +101,7 @@ module Blather
           end
 
           srv.detect do |r|
-            not connect(r.target.to_s, r.port, self, client, jid, pass, connect_timeout) === false
+            not connect(r.target.to_s, r.port, self, client, jid, pass, connect_timeout, authcid) === false
           end
         end
       end
@@ -108,8 +111,8 @@ module Blather
     # Stream will raise +NoConnection+ if it receives #unbind before #post_init
     # this catches that and returns false prompting for another attempt
     # @private
-    def self.connect(host, port, conn, client, jid, pass, connect_timeout = nil)
-      EM.connect host, port, conn, client, jid, pass, connect_timeout
+    def self.connect(host, port, conn, client, jid, pass, connect_timeout, authcid)
+      EM.connect host, port, conn, client, jid, pass, connect_timeout, authcid
     rescue NoConnection
       false
     end
@@ -131,7 +134,7 @@ module Blather
 
     # Called by EM.connect to initialize stream variables
     # @private
-    def initialize(client, jid, pass, connect_timeout = nil)
+    def initialize(client, jid, pass, connect_timeout = nil, authcid = nil)
       super()
 
       @error = nil
@@ -141,6 +144,7 @@ module Blather
       @to = self.jid.domain
       @password = pass
       @connect_timeout = connect_timeout || 180
+      @authcid = authcid || self.jid.node
     end
 
     # Called when EM completes the connection to the server
@@ -189,20 +193,17 @@ module Blather
     # Called by EM when the connection is closed
     # @private
     def unbind
-      cleanup
-
       raise NoConnection unless @inited
       raise ConnectionFailed unless @connected
 
+      @parser.finish
+
+      @connect_timer.cancel if @connect_timer
       @state = :stopped
       @client.receive_data @error if @error
       @client.unbind
     end
 
-    def cleanup
-      @connect_timer.cancel if @connect_timer
-    end
-
     # Called by the parser with parsed nodes
     # @private
     def receive(node)

data/lib/blather/stream/features/sasl.rb

@@ -20,6 +20,7 @@ class Stream
       super
       @jid = @stream.jid
       @pass = @stream.password
+      @authcid = @stream.authcid
       @mechanisms = []
     end
 
@@ -145,7 +146,7 @@ class Stream
           @response = {
             :nonce        => @nonce,
             :charset      => 'utf-8',
-            :username     => @jid.node,
+            :username     => @authcid,
             :realm        => @realm || @jid.domain,
             :cnonce       => h(Time.new.to_f.to_s),
             :nc           => '00000001',
@@ -174,7 +175,7 @@ class Stream
     # @private
     module Plain
       def authenticate
-        @stream.send auth_node('PLAIN', b64("#{@jid.stripped}\x00#{@jid.node}\x00#{@pass}"))
+        @stream.send auth_node('PLAIN', b64("#{@jid.stripped}\x00#{@authcid}\x00#{@pass}"))
       end
     end #Plain
 

data/lib/blather/version.rb

@@ -1,3 +1,3 @@
 module Blather
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/spec/blather/client/client_spec.rb

@@ -32,34 +32,74 @@ describe Blather::Client do
     subject.caps.should be_kind_of Blather::Stanza::Capabilities
   end
 
-  it 'can be setup' do
-    subject.should respond_to :setup
-    subject.setup('me@me.com', 'pass').should == subject
-  end
+  describe '#setup' do
+    it 'can be setup' do
+      subject.should respond_to :setup
+      subject.setup('me@me.com', 'pass').should == subject
+    end
 
-  it 'knows if it has been setup' do
-    subject.should respond_to :setup?
-    subject.should_not be_setup
-    subject.setup 'me@me.com', 'pass'
-    subject.should be_setup
-  end
+    it 'knows if it has been setup' do
+      subject.should respond_to :setup?
+      subject.should_not be_setup
+      subject.setup 'me@me.com', 'pass'
+      subject.should be_setup
+    end
 
-  it 'cannot be run before being setup' do
-    lambda { subject.run }.should raise_error RuntimeError
-  end
+    it 'cannot be run before being setup' do
+      lambda { subject.run }.should raise_error RuntimeError
+    end
 
-  it 'starts up a Component connection when setup without a node' do
-    setup = 'pubsub.jabber.local', 'secret'
-    subject.setup *setup
-    Blather::Stream::Component.expects(:start).with subject, *setup + [nil, nil, nil, nil]
-    subject.run
-  end
+    it 'starts up a Component connection when setup without a node' do
+      setup = 'pubsub.jabber.local', 'secret'
+      subject.setup *setup
+      Blather::Stream::Component.expects(:start).with subject, *setup + [nil, nil, nil, nil]
+      subject.run
+    end
+
+    it 'starts up a Client connection when setup with a node' do
+      setup = 'test@jabber.local', 'secret'
+      subject.setup *setup
+      Blather::Stream::Client.expects(:start).with subject, *setup + [nil, nil, nil, nil]
+      subject.run
+    end
+
+    context "setting queue size" do
+      let(:jid)        { 'test@jabber.local' }
+      let(:password)   { 'secret' }
+      let(:queue_size) { 3 }
+
+      subject { Blather::Client.setup(jid, password, nil, nil, nil, nil, :workqueue_count => queue_size) }
+
+      it 'sets the queue size on the client' do
+        subject.queue_size.should == queue_size
+      end
 
-  it 'starts up a Client connection when setup with a node' do
-    setup = 'test@jabber.local', 'secret'
-    subject.setup *setup
-    Blather::Stream::Client.expects(:start).with subject, *setup + [nil, nil, nil, nil]
-    subject.run
+      describe 'receiving data' do
+        let(:stanza) { Blather::Stanza::Iq.new }
+
+        context 'when the queue size is 0' do
+          let(:queue_size) { 0 }
+
+          it "has no handler queue" do
+            subject.handler_queue.should be_nil
+          end
+
+          it 'handles the data immediately' do
+            subject.expects(:handle_data).with(stanza)
+            subject.receive_data stanza
+          end
+        end
+
+        context 'when the queue size is non-zero' do
+          let(:queue_size) { 4 }
+
+          it 'enqueues the data on the handler queue' do
+            subject.handler_queue.expects(:<<).with(stanza)
+            subject.receive_data stanza
+          end
+        end
+      end
+    end
   end
 
   it 'knows if it is disconnected' do
@@ -81,12 +121,57 @@ describe Blather::Client do
     end
   end
 
-  it 'writes to the connection the closes when #close is called' do
-    stream.expects(:close_connection_after_writing)
-    EM.stubs(:next_tick).yields
-    subject.setup 'me.com', 'secret'
-    subject.post_init stream, Blather::JID.new('me.com')
-    subject.close
+  describe '#close' do
+    before do
+      EM.stubs(:next_tick).yields
+      subject.setup 'me.com', 'secret'
+    end
+
+    context "without a setup stream" do
+      it "does not close the connection" do
+        stream.expects(:close_connection_after_writing).never
+        subject.close
+      end
+    end
+
+    context "when a stream is setup" do
+      let(:stream_stopped) { false }
+      before do
+        subject.post_init stream, Blather::JID.new('me.com')
+        stream.stubs(:stopped? => stream_stopped)
+      end
+
+      context "when the stream is stopped" do
+        let(:stream_stopped) { true }
+
+        it "does not close the connection, since it's already closed" do
+          stream.expects(:close_connection_after_writing).never
+        end
+      end
+
+      it 'writes to the connection the closes when #close is called' do
+        stream.expects(:close_connection_after_writing)
+        subject.close
+      end
+
+      it 'shuts down the workqueue' do
+        stream.stubs(:close_connection_after_writing)
+        subject.handler_queue.expects(:shutdown)
+        subject.close
+      end
+
+      it 'forces the work queue to be re-created when referenced' do
+        stream.stubs(:close_connection_after_writing)
+        subject.close
+
+        fake_queue = stub('GirlFriday::WorkQueue')
+        GirlFriday::WorkQueue.expects(:new)
+        .with(:handle_stanza, :size => subject.queue_size)
+          .returns(fake_queue)
+
+        subject.handler_queue.should == fake_queue
+      end
+    end
   end
 
   it 'shuts down EM when #unbind is called if it is running' do
@@ -376,6 +461,27 @@ describe Blather::Client do
       subject.register_handler(:ready) { ready.call }
       subject.post_init stream, Blather::JID.new('n@d/r')
     end
+
+    it 'gracefully handles service unavailability upon requesting the roster' do
+      result_roster = Blather::Stanza::Iq.parse <<-XML
+        <iq type="error" to="n@d/r">
+          <error type="cancel">
+            <service-unavailable xmlns="urn:ietf:params:xml:ns:xmpp-stanzas"/>
+          </error>
+        </iq>
+      XML
+
+      stream.stubs(:send).with do |s|
+        result_roster.id = s.id
+        subject.receive_data result_roster
+        true
+      end
+
+      ready = mock
+      ready.expects(:call)
+      subject.register_handler(:ready) { ready.call }
+      subject.post_init stream, Blather::JID.new('n@d/r')
+    end
   end
 
   describe 'filters' do

data/spec/blather/stanza/pubsub/subscriptions_spec.rb

@@ -31,6 +31,15 @@ describe Blather::Stanza::PubSub::Subscriptions do
     subscriptions.find('//ns:pubsub/ns:subscriptions', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
   end
 
+  it 'ensures the subscriptions node is not duplicated when calling #subscriptions' do
+    subscriptions = Blather::Stanza::PubSub::Subscriptions.new
+    subscriptions.pubsub.remove_children :subscriptions
+    subscriptions.find('//ns:pubsub/ns:subscriptions', :ns => Blather::Stanza::PubSub.registered_ns).should be_empty
+
+    5.times { subscriptions.subscriptions }
+    subscriptions.find('//ns:pubsub/ns:subscriptions', :ns => Blather::Stanza::PubSub.registered_ns).count.should eq(1)
+  end
+
   it 'defaults to a get node' do
     aff = Blather::Stanza::PubSub::Subscriptions.new
     aff.type.should == :get

data/spec/blather/stream/client_spec.rb

@@ -5,6 +5,7 @@ describe Blather::Stream::Client do
   let(:client)      { mock 'Client' }
   let(:server_port) { 50000 - rand(1000) }
   let(:jid)         { Blather::JID.new 'n@d/r' }
+  let(:authcid)     { nil }
 
   before do
     [:unbind, :post_init, :jid=].each do |m|
@@ -23,12 +24,10 @@ describe Blather::Stream::Client do
       EventMachine::start_server '127.0.0.1', server_port, ServerMock
 
       # Blather::Stream connection
-      EM.connect('127.0.0.1', server_port, Blather::Stream::Client, client, jid, 'pass') { |c| @stream = c }
+      EM.connect('127.0.0.1', server_port, Blather::Stream::Client, client, jid, 'pass', nil, authcid) { |c| @stream = c }
     }
   end
 
-  after { sleep 0.1; @stream.cleanup if @stream }
-
   it 'can be started' do
     params = [client, 'n@d/r', 'pass', 'host', 1234]
     EM.expects(:connect).with do |*parms|
@@ -134,6 +133,7 @@ describe Blather::Stream::Client do
       val.should match(/stream:stream/)
       server.send_data "<?xml version='1.0'?><stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams'>"
       server.send_data "<message to='a@b/c' from='d@e/f' type='chat' xml:lang='en'><body>Message!</body></message>"
+      server.send_data "</stream:stream>"
       true
     end
   end
@@ -430,6 +430,76 @@ describe Blather::Stream::Client do
     end
   end
 
+  context "with an alternative authcid specified" do
+    let(:authcid) { 'doo' }
+
+    it 'connects via SASL MD5 when asked' do
+      Time.any_instance.stubs(:to_f).returns(1.1)
+
+      state = nil
+      mocked_server(5) 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'><stream:features><mechanisms xmlns='urn:ietf:params:xml:ns:xmpp-sasl'><mechanism>DIGEST-MD5</mechanism></mechanisms></stream:features>"
+          val.should match(/stream:stream/)
+
+        when :started
+          state = :auth_sent
+          server.send_data "<challenge xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>cmVhbG09InNvbWVyZWFsbSIsbm9uY2U9Ik9BNk1HOXRFUUdtMmhoIixxb3A9ImF1dGgiLGNoYXJzZXQ9dXRmLTgsYWxnb3JpdGhtPW1kNS1zZXNzCg==</challenge>"
+          val.should match(/auth.*DIGEST\-MD5/)
+
+        when :auth_sent
+          state = :response1_sent
+          server.send_data "<challenge xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>cnNwYXV0aD1lYTQwZjYwMzM1YzQyN2I1NTI3Yjg0ZGJhYmNkZmZmZAo=</challenge>"
+          val.should ==('<response xmlns="urn:ietf:params:xml:ns:xmpp-sasl">bm9uY2U9Ik9BNk1HOXRFUUdtMmhoIixjaGFyc2V0PXV0Zi04LHVzZXJuYW1lPSJkb28iLHJlYWxtPSJzb21lcmVhbG0iLGNub25jZT0iNzc3ZDQ1YmJiY2RmNTBkNDljNDJjNzBhZDdhY2Y1ZmUiLG5jPTAwMDAwMDAxLHFvcD1hdXRoLGRpZ2VzdC11cmk9InhtcHAvZCIscmVzcG9uc2U9YzBhMzQ4MDkyOWJmMDFiMWUyODc0NTE1YWQ5ZjNlYzE=</response>')
+
+        when :response1_sent
+          state = :response2_sent
+          server.send_data "<success xmlns='urn:ietf:params:xml:ns:xmpp-sasl' />"
+          val.should match(%r{<response xmlns="urn:ietf:params:xml:ns:xmpp-sasl"\s?/>})
+
+        when :response2_sent
+          EM.stop
+          state = :complete
+          val.should match(/stream:stream/)
+
+        else
+          EM.stop
+          false
+
+        end
+      end
+    end
+
+    it 'will connect via SSL PLAIN when asked' do
+      state = nil
+      mocked_server(3) 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'><stream:features><mechanisms xmlns='urn:ietf:params:xml:ns:xmpp-sasl'><mechanism>PLAIN</mechanism></mechanisms></stream:features>"
+          val.should match(/stream:stream/)
+
+        when :started
+          state = :auth_sent
+          server.send_data "<success xmlns='urn:ietf:params:xml:ns:xmpp-sasl' />"
+          Nokogiri::XML(val).to_xml.should == Nokogiri::XML('<auth xmlns="urn:ietf:params:xml:ns:xmpp-sasl" mechanism="PLAIN">bkBkAGRvbwBwYXNz</auth>').to_xml
+
+        when :auth_sent
+          EM.stop
+          state = :complete
+          val.should match(/stream:stream/)
+
+        else
+          EM.stop
+          false
+
+        end
+      end
+    end
+  end
+
   it 'will connect via SSL ANONYMOUS when asked' do
     state = nil
     mocked_server(3) do |val, server|
@@ -1057,6 +1127,21 @@ describe Blather::Stream::Client do
     comp.send msg
   end
 
+  it 'sends stanza errors to the wire correctly' do
+    stanza = Blather::Stanza::Iq.new :set, 'foo@bar.com', '123'
+    error = Blather::StanzaError.new(stanza, 'registration-required', :cancel)
+    comp = Blather::Stream::Client.new nil, client, 'node@jid.com/resource', 'pass'
+    comp.expects(:send_data).with { |s| s.should match(/<error type=\"cancel\"><registration-required/); true }
+    comp.send error
+  end
+
+  it 'sends stream errors to the wire correctly' do
+    error = Blather::StreamError.new('foo-error')
+    comp = Blather::Stream::Client.new nil, client, 'node@jid.com/resource', 'pass'
+    comp.expects(:send_data).with { |s| s.should match(/<stream:error xmlns:stream=\"http:\/\/etherx.jabber.org\/streams\"><foo-error/); true }
+    comp.send error
+  end
+
   it 'sends xml without formatting' do
     msg = Blather::Stanza::Message.new 'to@jid.com', 'body'
     msg.xhtml = '<i>xhtml</i> body'

data/spec/blather/stream/component_spec.rb

@@ -23,8 +23,6 @@ describe Blather::Stream::Component do
     }
   end
 
-  after { sleep 0.1; @stream.cleanup if @stream }
-
   it 'can be started' do
     params = [client, 'comp.id', 'secret', 'host', 1234]
     EM.expects(:connect).with do |*parms|
@@ -70,6 +68,8 @@ describe Blather::Stream::Component do
   end
 
   it 'sends stanzas to the client when the stream is ready' do
+    pending "This hangs the test suite" if jruby?
+
     client.stubs :post_init
     client.expects(:receive_data).with do |n|
       EM.stop

data/spec/blather/stream/parser_spec.rb

@@ -21,7 +21,7 @@ describe Blather::Stream::Parser do
   def process(*data)
     client.latch = CountDownLatch.new 1
     data.each { |d| subject.receive_data d }
-    client.latch.wait(2).should be_true
+    client.latch.wait(2).should be true
   end
 
   def check_parse(data)

data/spec/blather/stream/ssl_spec.rb

@@ -10,7 +10,7 @@ describe Blather::CertStore do
   end
 
   it 'can verify valid cert' do
-    subject.trusted?(cert).should be_true
+    subject.trusted?(cert).should be true
   end
 
   it 'can verify invalid cert' do
@@ -19,6 +19,6 @@ describe Blather::CertStore do
 
   it 'cannot verify when the cert authority is not trusted' do
     @store = Blather::CertStore.new("../")
-    @store.trusted?(cert).should be_false
+    @store.trusted?(cert).should be false
   end
 end

data/spec/blather_spec.rb

@@ -6,10 +6,6 @@ describe Blather do
     it "should return a Logger instance" do
       Blather.logger.should be_instance_of Logger
     end
-
-    it "should config log level to info by default" do
-      Blather.logger.level.should == 1
-    end
   end
 
   describe "while using the log method" do

data/spec/spec_helper.rb

@@ -8,7 +8,11 @@ RSpec.configure do |config|
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
 
-  config.before(:each) { GirlFriday::WorkQueue.immediate! }
+  config.before(:each) do
+    GirlFriday::WorkQueue.immediate!
+    Blather::Stream::Parser.debug = true
+    Blather.logger = Logger.new($stdout).tap { |logger| logger.level = Logger::DEBUG }
+  end
 end
 
 def parse_stanza(xml)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blather
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Jeff Smick
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2015-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -222,6 +222,7 @@ extra_rdoc_files:
 - README.md
 files:
 - ".gitignore"
+- ".hound.yml"
 - ".rspec"
 - ".travis.yml"
 - CHANGELOG.md
@@ -231,6 +232,7 @@ files:
 - README.md
 - Rakefile
 - blather.gemspec
+- examples/MUC_echo.rb
 - examples/certs/README
 - examples/certs/ca-bundle.crt
 - examples/echo.rb
@@ -390,7 +392,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Simpler XMPP built for speed