blather 0.6.0 → 0.6.1

data/CHANGELOG

@@ -1,5 +1,8 @@
 develop
 
+v0.6.1
+  Bugfix(benlangfeld): Ensure MUC presence nodes (joining) have a form element on creation
+
 v0.6.0
   Feature(benlangfeld): Very basic MUC and delayed message support
   Bugfix(theozaurus): Disable connection timeout timer if client deliberately disconnects

data/lib/blather/stanza/presence/muc.rb

@@ -5,13 +5,19 @@ class Presence
   class MUC < Status
     register :muc_join, :x, "http://jabber.org/protocol/muc"
 
-    private
-      def muc
-        unless muc = find_first('ns:x', :ns => self.class.registered_ns)
-          self << (muc = XMPPNode.new('x', self.document))
-        end
-        muc
+    def self.new(*args)
+      new_node = super
+      new_node.muc
+      new_node
+    end
+
+    def muc
+      unless muc = find_first('ns:x', :ns => self.class.registered_ns)
+        self << (muc = XMPPNode.new('x', self.document))
+        muc.namespace = self.class.registered_ns
       end
+      muc
+    end
   end # MUC
 
 end # Presence

data/lib/blather/version.rb

@@ -1,4 +1,4 @@
 module Blather
   # Blather version number
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

data/spec/blather/stanza/presence/muc_spec.rb

@@ -18,4 +18,18 @@ describe 'Blather::Stanza::Presence::MUC' do
   it 'must be importable' do
     c = Blather::XMPPNode.import(parse_stanza(muc_xml).root).must_be_instance_of Blather::Stanza::Presence::MUC
   end
+
+  it 'ensures a form node is present on create' do
+    c = Blather::Stanza::Presence::MUC.new
+    c.xpath('ns:x', :ns => Blather::Stanza::Presence::MUC.registered_ns).wont_be_empty
+  end
+
+  it 'ensures a form node exists when calling #muc' do
+    c = Blather::Stanza::Presence::MUC.new
+    c.remove_children :x
+    c.xpath('ns:x', :ns => Blather::Stanza::Presence::MUC.registered_ns).must_be_empty
+
+    c.muc.wont_be_nil
+    c.xpath('ns:x', :ns => Blather::Stanza::Presence::MUC.registered_ns).wont_be_empty
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blather
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-24 00:00:00.000000000 Z
+date: 2012-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2152558880 !ruby/object:Gem::Requirement
+  requirement: &2164385480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.12.6
   type: :runtime
   prerelease: false
-  version_requirements: *2152558880
+  version_requirements: *2164385480
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2152558220 !ruby/object:Gem::Requirement
+  requirement: &2164384740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152558220
+  version_requirements: *2164384740
 - !ruby/object:Gem::Dependency
   name: niceogiri
-  requirement: &2152557520 !ruby/object:Gem::Requirement
+  requirement: &2164384120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152557520
+  version_requirements: *2164384120
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2152556180 !ruby/object:Gem::Requirement
+  requirement: &2164383500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *2152556180
+  version_requirements: *2164383500
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2152554880 !ruby/object:Gem::Requirement
+  requirement: &2164382640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.7.1
   type: :development
   prerelease: false
-  version_requirements: *2152554880
+  version_requirements: *2164382640
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2152554100 !ruby/object:Gem::Requirement
+  requirement: &2164381420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *2152554100
+  version_requirements: *2164381420
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152553380 !ruby/object:Gem::Requirement
+  requirement: &2164380680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152553380
+  version_requirements: *2164380680
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2152552260 !ruby/object:Gem::Requirement
+  requirement: &2164379680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.9.9
   type: :development
   prerelease: false
-  version_requirements: *2152552260
+  version_requirements: *2164379680
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2152551640 !ruby/object:Gem::Requirement
+  requirement: &2164378720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *2152551640
+  version_requirements: *2164378720
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152551040 !ruby/object:Gem::Requirement
+  requirement: &2164378200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152551040
+  version_requirements: *2164378200
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &2152550100 !ruby/object:Gem::Requirement
+  requirement: &2164377560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152550100
+  version_requirements: *2164377560
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &2152548880 !ruby/object:Gem::Requirement
+  requirement: &2164376360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152548880
+  version_requirements: *2164376360
 - !ruby/object:Gem::Dependency
   name: growl_notify
-  requirement: &2152547320 !ruby/object:Gem::Requirement
+  requirement: &2164373280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152547320
+  version_requirements: *2164373280
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &2152546580 !ruby/object:Gem::Requirement
+  requirement: &2164372620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +164,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152546580
+  version_requirements: *2164372620
 description: An XMPP DSL for Ruby written on top of EventMachine and Nokogiri
 email: sprsquish@gmail.com
 executables: []