blather 0.8.6 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14b758953e449e83539a7b2f7056f9f4a755a247
-  data.tar.gz: fc6cb44dd2015306f8c1e5b1a6beb8d2e9d132c6
+  metadata.gz: da6bc686ab486904f981a9007d6083c5ac957db9
+  data.tar.gz: 2db0ad2f0cdb531daa2e15bac1cd2ec3cd099267
 SHA512:
-  metadata.gz: ba7f5d07dce4c3f114b33a998c42a8f5db5f958fb5a38713b25219417bcbe5f42c1467093c58731d390dd062f49ce1c1e7a055d6ccfedbaddd2f1831211718da
-  data.tar.gz: 79d8bed1bbe6816bc84c66aebeb69a086e21bc30dddfc294f01b621d9f30a0f1c1dc3d58ec447e29c91759ed23797b8ab145a73620a95e4a41fc5b04a42c2389
+  metadata.gz: 6a2c4f652c8df341f950cabf944338ada3ef177cf5e49e9bb5f5b9e843a2b52646b490edabbb796848bddfe491b49a6ffd81087eec0193d4a361e7f16ad5631b
+  data.tar.gz: 1183457bcecc981430d272c3d90e6a7942a6b2a35b2f3ac5817cc91cd07f3efcfc4ba4d7883d0c4f1b3a038f77a83ac9f4a9725729a1989f59b4f0d0d0da3763

data/.travis.yml

@@ -2,11 +2,13 @@ language: ruby
 rvm:
   - 1.9.2
   - 1.9.3
+  - 2.0.0
   - jruby-19mode
   - rbx-19mode
   - ruby-head
 matrix:
   allow_failures:
     - rvm: jruby-19mode
+    - rvm: ruby-head
 notifications:
   irc: "irc.freenode.org#adhearsion"

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # [develop](https://github.com/adhearsion/blather/compare/master...develop)
 
+# [v0.8.7](https://github.com/adhearsion/blather/compare/v0.8.6...v0.8.7) - [2013-08-26](https://rubygems.org/gems/blather/versions/0.8.7)
+  * Bugfix: Handle stanzas with nested elements that don't have a decorator module or are not stanzas
+  * Bugfix: Fix the roster which was broken by the DSL being included in Object
+
 # [v0.8.6](https://github.com/adhearsion/blather/compare/v0.8.5...v0.8.6) - [2013-08-23](https://rubygems.org/gems/blather/versions/0.8.6)
   * Bugfix: Ensure that session creation always comes immediately after binding. Fixes incompatibility with ejabberd.
   * Bugfix: Close streams on next EM tick to avoid hanging.

data/Gemfile

@@ -1,4 +1,5 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in blather.gemspec
 gemspec
+
+gem 'activesupport', '~> 3.0' if RUBY_VERSION == "1.9.2"

data/lib/blather/roster.rb

@@ -47,7 +47,7 @@ module Blather
     # @param [true, false] send send the update over the wire
     # @see Blather::JID
     def push(elem, send = true)
-      jid = elem.respond_to?(:jid) ? elem.jid : JID.new(elem)
+      jid = elem.respond_to?(:jid) && elem.jid ? elem.jid : JID.new(elem)
       @items[key(jid)] = node = RosterItem.new(elem)
 
       @stream.write(node.to_stanza(:set)) if send

data/lib/blather/version.rb

@@ -1,3 +1,3 @@
 module Blather
-  VERSION = '0.8.6'
+  VERSION = '0.8.7'
 end

data/lib/blather/xmpp_node.rb

@@ -69,7 +69,11 @@ module Blather
     end
 
     def self.decorator_modules
-      [self::InstanceMethods]
+      if self.const_defined?(:InstanceMethods)
+        [self::InstanceMethods]
+      else
+        []
+      end
     end
 
     def decorate(*decorators)
@@ -78,7 +82,7 @@ module Blather
           extend mod
         end
 
-        @handler_hierarchy.unshift decorator.handler_hierarchy.first
+        @handler_hierarchy.unshift decorator.handler_hierarchy.first if decorator.respond_to?(:handler_hierarchy)
       end
       self
     end

data/spec/blather/stanza/presence_spec.rb

@@ -122,4 +122,30 @@ describe Blather::Stanza::Presence do
     s.handler_hierarchy.should include(Blather::Stanza::Presence::C.registered_name.to_sym)
     s.handler_hierarchy.should include(Blather::Stanza::Presence::Status.registered_name.to_sym)
   end
+
+  it "handle stanzas with nested elements that don't have a decorator module or are not stanzas" do
+    string = <<-XML
+      <presence from="me@gmx.net/GMX MultiMessenger" to="receiver@gmail.com/480E24CF" lang="de">
+        <show>away</show>
+        <priority>0</priority>
+        <nick xmlns="http://jabber.org/protocol/nick">Me</nick>
+        <x xmlns="jabber:x:data" type="submit">
+          <field var="FORM_TYPE" type="hidden">
+            <value>http://jabber.org/protocol/profile</value>
+          </field>
+          <field var="x-sip_capabilities" type="text-single">
+            <value>19</value>
+          </field>
+        </x>
+        <x xmlns="vcard-temp:x:update">
+          <photo/>
+        </x>
+        <ignore xmlns="http://gmx.net/protocol/gateway"/>
+        <delay xmlns="urn:xmpp:delay" from="me@gmx.net/GMX MultiMessenger" stamp="2013-08-26T22:18:41Z"/>
+        <x xmlns="jabber:x:delay" stamp="20130826T22:18:41"/>
+      </presence>
+    XML
+    s = Blather::Stanza::Presence.parse string
+    s.should be_a Blather::Stanza::Presence
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blather
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
 platform: ruby
 authors:
 - Jeff Smick
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-23 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine