blather 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c8d4444b9fed6c401deb5d97c8c984fead573f8
-  data.tar.gz: 1e303cf3c013030d2ce92be183ec13ce3410f1e4
+  metadata.gz: 814d92df4c498de84d675ae72989b9fd37a44f71
+  data.tar.gz: 30e5f51f563153e26fd4bb7941295a4102a86507
 SHA512:
-  metadata.gz: 1dcd5964fee72197c4d90c97ecc002fbdafa036645f4066467b03b55e3d5017d297626c0fc7fb22624bc46179397292a3decab49c0a189726ba614319eefcfd0
-  data.tar.gz: 5df62c1b0c02c5054c84fcfc05f34259ed64e16917d32fabed0227c055343cc966729f012e3d44550bd000ab13c8f7c76c15e495325b71ef6bb09813d506c6d9
+  metadata.gz: d73eeabd9156c0a01810b82e46540cc95689128260ec131d8a01f7633fdb84e06e8b9219258e0ad392c18d1572b8e5a72134ffc674f30a8dc05e1dd3ad62c35f
+  data.tar.gz: e7f514173219c93df7af0858ecdfa6cbe16e17a2c6c86f8e053df9f0f7c63a3869ae86c75b4401b8d85b988dab3b413c39fb972aca5958d12f77380154048602

data/.travis.yml

@@ -5,5 +5,8 @@ rvm:
   - jruby-19mode
   - rbx-19mode
   - ruby-head
+matrix:
+  allow_failures:
+    - rvm: jruby-19mode
 notifications:
   irc: "irc.freenode.org#adhearsion"

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # [develop](https://github.com/adhearsion/blather/compare/master...develop)
 
+# [v0.8.5](https://github.com/adhearsion/blather/compare/v0.8.4...v0.8.5) - [2013-06-01](https://rubygems.org/gems/blather/versions/0.8.5)
+  * Bugfix: Ensure that binding is always performed before session creation, regardless of the order of elements in the feature set provided by the server. This was causing incompatability with Tigase.
+
 # [v0.8.4](https://github.com/adhearsion/blather/compare/v0.8.3...v0.8.4) - [2013-03-20](https://rubygems.org/gems/blather/versions/0.8.4)
   * Bugfix: Only finish stream parser if there is one. This prevents crashes on failure to connect.
 

data/lib/blather/stream/features.rb

@@ -26,6 +26,12 @@ class Stream
     end
 
     def next!
+      bind = @features.at_xpath('ns:bind', ns: 'urn:ietf:params:xml:ns:xmpp-bind')
+      session = @features.at_xpath('ns:session', ns: 'urn:ietf:params:xml:ns:xmpp-session')
+      if bind && session && @features.children.last != session
+        @features.children.after session
+      end
+
       @idx = @idx ? @idx+1 : 0
       if stanza = @features.children[@idx]
         if stanza.namespaces['xmlns'] && (klass = self.class.from_namespace(stanza.namespaces['xmlns']))

data/lib/blather/version.rb

@@ -1,3 +1,3 @@
 module Blather
-  VERSION = '0.8.4'
+  VERSION = '0.8.5'
 end

data/spec/blather/stream/client_spec.rb

@@ -877,6 +877,41 @@ describe Blather::Stream::Client do
     end
   end
 
+  it 'will establish a session only after a bind' do
+    # fixes #95 client auth issue w/ Tigase: handles random order of stream:features items, f.e. <session> before <bind>
+    # thx @pmashchak
+
+    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'>"
+        server.send_data "<stream:features><session xmlns='urn:ietf:params:xml:ns:xmpp-session' /><bind xmlns='urn:ietf:params:xml:ns:xmpp-bind'/></stream:features>"
+        val.should match(/stream:stream/)
+
+      when :started
+        state = :complete
+        doc = parse_stanza val
+        doc.find('/iq[@type="set"]/bind_ns:bind', :bind_ns => Blather::Stream::Resource::BIND_NS).should_not be_empty
+        server.send_data "<iq type='result' id='#{doc.find_first('iq')['id']}'><bind xmlns='urn:ietf:params:xml:ns:xmpp-bind'><jid>#{client.jid}</jid></bind></iq>"
+        true
+
+      when :complete
+        doc = parse_stanza val
+        doc.find('/iq[@type="set"]/sess_ns:session', :sess_ns => Blather::Stream::Session::SESSION_NS).should_not be_empty
+        EM.stop
+        true
+
+      else
+        EM.stop
+        false
+
+      end
+    end
+  end
+
+
   it 'will return an error if session establishment errors out' do
     client.expects(:receive_data).with do |n|
       n.name.should == :internal_server_error

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blather
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Jeff Smick
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2013-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -389,7 +389,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Simpler XMPP built for speed