blather 0.2 → 0.2.1

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.2.1 Upgrade to libxml 0.9.7
+
 v0.2 Overhaul the DSL to look more like Sinatra
 
 v0.1 Initial release (birth!)

data/Manifest

@@ -3,6 +3,8 @@ examples/drb_client.rb
 examples/echo.rb
 lib/autotest/discover.rb
 lib/autotest/spec.rb
+lib/blather/core_ext/active_support.rb
+lib/blather/core_ext/libxml.rb
 lib/blather/errors.rb
 lib/blather/jid.rb
 lib/blather/roster.rb
@@ -22,7 +24,6 @@ lib/blather/stream/sasl.rb
 lib/blather/stream/session.rb
 lib/blather/stream/tls.rb
 lib/blather/stream.rb
-lib/blather/sugar.rb
 lib/blather/xmpp_node.rb
 lib/blather.rb
 LICENSE

data/README.rdoc

@@ -46,7 +46,13 @@ This will auto-accept any subscription requests and echo back any chat messages.
     write(m.reply) if m.chat? && m.body
   end
   
-  
+= TODO
+
+* Cleanup API
+* Better Documentation
+* Service Discovery (XEP-0030: http://xmpp.org/extensions/xep-0030.html)
+* PubSub (XEP-0060: http://xmpp.org/extensions/xep-0060.html)
+* ?? (suggestions)
 
 = License
 

data/Rakefile

@@ -9,7 +9,7 @@ Echoe.new('blather') do |p|
   p.project = 'squishtech'
   p.summary = 'An evented XMPP library written on EventMachine and libxml-ruby'
 
-  p.runtime_dependencies = ['eventmachine', 'libxml-ruby >=0.9.2']
+  p.runtime_dependencies = ['eventmachine', 'libxml-ruby >=0.9.7']
   p.rdoc_options += %w[-S -T hanna --main README.rdoc --exclude autotest]
 
   p.test_pattern = 'spec/**/*_spec.rb'

data/blather.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{blather}
-  s.version = "0.2"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Smick"]
-  s.date = %q{2008-12-19}
+  s.date = %q{2008-12-21}
   s.description = %q{An evented XMPP library written on EventMachine and libxml-ruby}
   s.email = %q{sprsquish@gmail.com}
-  s.extra_rdoc_files = ["CHANGELOG", "lib/autotest/discover.rb", "lib/autotest/spec.rb", "lib/blather/errors.rb", "lib/blather/jid.rb", "lib/blather/roster.rb", "lib/blather/roster_item.rb", "lib/blather/stanza/error.rb", "lib/blather/stanza/iq/query.rb", "lib/blather/stanza/iq/roster.rb", "lib/blather/stanza/iq.rb", "lib/blather/stanza/message.rb", "lib/blather/stanza/presence/status.rb", "lib/blather/stanza/presence/subscription.rb", "lib/blather/stanza/presence.rb", "lib/blather/stanza.rb", "lib/blather/stream/parser.rb", "lib/blather/stream/resource.rb", "lib/blather/stream/sasl.rb", "lib/blather/stream/session.rb", "lib/blather/stream/tls.rb", "lib/blather/stream.rb", "lib/blather/sugar.rb", "lib/blather/xmpp_node.rb", "lib/blather.rb", "LICENSE", "README.rdoc"]
-  s.files = ["CHANGELOG", "examples/drb_client.rb", "examples/echo.rb", "lib/autotest/discover.rb", "lib/autotest/spec.rb", "lib/blather/errors.rb", "lib/blather/jid.rb", "lib/blather/roster.rb", "lib/blather/roster_item.rb", "lib/blather/stanza/error.rb", "lib/blather/stanza/iq/query.rb", "lib/blather/stanza/iq/roster.rb", "lib/blather/stanza/iq.rb", "lib/blather/stanza/message.rb", "lib/blather/stanza/presence/status.rb", "lib/blather/stanza/presence/subscription.rb", "lib/blather/stanza/presence.rb", "lib/blather/stanza.rb", "lib/blather/stream/parser.rb", "lib/blather/stream/resource.rb", "lib/blather/stream/sasl.rb", "lib/blather/stream/session.rb", "lib/blather/stream/tls.rb", "lib/blather/stream.rb", "lib/blather/sugar.rb", "lib/blather/xmpp_node.rb", "lib/blather.rb", "LICENSE", "Manifest", "Rakefile", "README.rdoc", "spec/blather/jid_spec.rb", "spec/blather/roster_item_spec.rb", "spec/blather/roster_spec.rb", "spec/blather/stanza/iq/query_spec.rb", "spec/blather/stanza/iq/roster_spec.rb", "spec/blather/stanza/iq_spec.rb", "spec/blather/stanza/message_spec.rb", "spec/blather/stanza/presence/status_spec.rb", "spec/blather/stanza/presence/subscription_spec.rb", "spec/blather/stanza/presence_spec.rb", "spec/blather/stanza_spec.rb", "spec/blather/stream_spec.rb", "spec/blather/xmpp_node_spec.rb", "spec/build_safe.rb", "spec/spec_helper.rb", "blather.gemspec"]
+  s.extra_rdoc_files = ["CHANGELOG", "lib/autotest/discover.rb", "lib/autotest/spec.rb", "lib/blather/core_ext/active_support.rb", "lib/blather/core_ext/libxml.rb", "lib/blather/errors.rb", "lib/blather/jid.rb", "lib/blather/roster.rb", "lib/blather/roster_item.rb", "lib/blather/stanza/error.rb", "lib/blather/stanza/iq/query.rb", "lib/blather/stanza/iq/roster.rb", "lib/blather/stanza/iq.rb", "lib/blather/stanza/message.rb", "lib/blather/stanza/presence/status.rb", "lib/blather/stanza/presence/subscription.rb", "lib/blather/stanza/presence.rb", "lib/blather/stanza.rb", "lib/blather/stream/parser.rb", "lib/blather/stream/resource.rb", "lib/blather/stream/sasl.rb", "lib/blather/stream/session.rb", "lib/blather/stream/tls.rb", "lib/blather/stream.rb", "lib/blather/xmpp_node.rb", "lib/blather.rb", "LICENSE", "README.rdoc"]
+  s.files = ["CHANGELOG", "examples/drb_client.rb", "examples/echo.rb", "lib/autotest/discover.rb", "lib/autotest/spec.rb", "lib/blather/core_ext/active_support.rb", "lib/blather/core_ext/libxml.rb", "lib/blather/errors.rb", "lib/blather/jid.rb", "lib/blather/roster.rb", "lib/blather/roster_item.rb", "lib/blather/stanza/error.rb", "lib/blather/stanza/iq/query.rb", "lib/blather/stanza/iq/roster.rb", "lib/blather/stanza/iq.rb", "lib/blather/stanza/message.rb", "lib/blather/stanza/presence/status.rb", "lib/blather/stanza/presence/subscription.rb", "lib/blather/stanza/presence.rb", "lib/blather/stanza.rb", "lib/blather/stream/parser.rb", "lib/blather/stream/resource.rb", "lib/blather/stream/sasl.rb", "lib/blather/stream/session.rb", "lib/blather/stream/tls.rb", "lib/blather/stream.rb", "lib/blather/xmpp_node.rb", "lib/blather.rb", "LICENSE", "Manifest", "Rakefile", "README.rdoc", "spec/blather/jid_spec.rb", "spec/blather/roster_item_spec.rb", "spec/blather/roster_spec.rb", "spec/blather/stanza/iq/query_spec.rb", "spec/blather/stanza/iq/roster_spec.rb", "spec/blather/stanza/iq_spec.rb", "spec/blather/stanza/message_spec.rb", "spec/blather/stanza/presence/status_spec.rb", "spec/blather/stanza/presence/subscription_spec.rb", "spec/blather/stanza/presence_spec.rb", "spec/blather/stanza_spec.rb", "spec/blather/stream_spec.rb", "spec/blather/xmpp_node_spec.rb", "spec/build_safe.rb", "spec/spec_helper.rb", "blather.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/sprsquish/blather/tree/master}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Blather", "--main", "README.rdoc", "-S", "-T", "hanna", "--main", "README.rdoc", "--exclude", "autotest"]
@@ -26,16 +26,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<eventmachine>, [">= 0"])
-      s.add_runtime_dependency(%q<libxml-ruby>, [">= 0.9.2"])
+      s.add_runtime_dependency(%q<libxml-ruby>, [">= 0.9.7"])
       s.add_development_dependency(%q<echoe>, [">= 0"])
     else
       s.add_dependency(%q<eventmachine>, [">= 0"])
-      s.add_dependency(%q<libxml-ruby>, [">= 0.9.2"])
+      s.add_dependency(%q<libxml-ruby>, [">= 0.9.7"])
       s.add_dependency(%q<echoe>, [">= 0"])
     end
   else
     s.add_dependency(%q<eventmachine>, [">= 0"])
-    s.add_dependency(%q<libxml-ruby>, [">= 0.9.2"])
+    s.add_dependency(%q<libxml-ruby>, [">= 0.9.7"])
     s.add_dependency(%q<echoe>, [">= 0"])
   end
 end

data/lib/blather.rb

@@ -1,5 +1,6 @@
 $:.unshift File.dirname(__FILE__)
 
+# Require the necessary files
 %w[
   rubygems
   xml/libxml
@@ -7,11 +8,13 @@ $:.unshift File.dirname(__FILE__)
   digest/md5
   logger
 
+  blather/core_ext/active_support
+  blather/core_ext/libxml
+
   blather/errors
   blather/jid
   blather/roster
   blather/roster_item
-  blather/sugar
   blather/xmpp_node
 
   blather/stanza
@@ -36,6 +39,8 @@ XML.indent_tree_output = false
 
 module Blather
   LOG = Logger.new(STDOUT)
+  Stream::Parser.debug = true
+#  LOG.level = Logger::INFO
 
   class Client
     attr_accessor :jid,

data/lib/blather/{sugar.rb → core_ext/active_support.rb}

@@ -1,22 +1,9 @@
-module LibXML # :nodoc:
-  module XML # :nodoc:
+# Thanks to Rails ActiveSupport for everything in this file
 
-    class Node
-      alias_method :element_name, :name
-    end
-
-    class Attributes
-      # Helper method for removing attributes
-      def remove(name)
-        name = name.to_s
-        self.each { |a| a.remove! or break if a.name == name }
-      end
-    end #Attributes
-
-  end #XML
-end #LibXML
-
-## Thanks to ActiveSupport for everything below this line
+# Allows attributes to be shared within an inheritance hierarchy, but where each descendant gets a copy of
+# their parents' attributes, instead of just a pointer to the same. This means that the child can add elements
+# to, for example, an array without those additions being shared with either their parent, siblings, or
+# children, which is unlike the regular class-level attributes that are shared across the entire hierarchy.
 class Class # :nodoc:
   def class_inheritable_reader(*syms)
     syms.each do |sym|
@@ -131,18 +118,35 @@ end #Class
 
 class Object # :nodoc:
   def duplicable?; true; end
+  def blank?; respond_to?(:empty?) ? empty? : !self; end
+  def present?; !blank?; end
+end
+
+class Array #:nodoc:
+  alias_method :blank?, :empty?
+end
+
+class Hash #:nodoc:
+  alias_method :blank?, :empty?
+end
+
+class String #:nodoc:
+  def blank?; self !~ /\S/; end
 end
 
 class NilClass #:nodoc:
   def duplicable?; false; end
+  def blank?; true; end
 end
 
 class FalseClass #:nodoc:
   def duplicable?; false; end
+  def blank?; true; end
 end
 
 class TrueClass #:nodoc:
   def duplicable?; false; end
+  def blank?; false; end
 end
 
 class Symbol #:nodoc:
@@ -151,4 +155,5 @@ end
 
 class Numeric #:nodoc:
   def duplicable?; false; end
+  def blank?; false; end
 end

data/lib/blather/core_ext/libxml.rb

@@ -0,0 +1,22 @@
+module LibXML # :nodoc:
+  module XML # :nodoc:
+
+    class Node
+      alias_method :element_name, :name
+    end
+
+    class Attributes
+      # Helper method for removing attributes
+      def remove(name)
+        attribute = get_attribute(name.to_s)
+        attribute.remove! if attribute
+      end
+
+      alias_method :old_hash_set, :[]=
+      def []=(name, val)
+        val.nil? ? remove(name.to_s) : old_hash_set(name.to_s, val.to_s)
+      end
+    end #Attributes
+
+  end #XML
+end #LibXML

data/lib/blather/errors.rb

@@ -2,6 +2,9 @@ module Blather
   # Main error class
   class BlatherError < StandardError; end
 
+    #Parse Errors
+    class ParseError < BlatherError; end
+
     # Stream errors
     class StreamError < BlatherError
       attr_accessor :type, :text

data/lib/blather/stanza.rb

@@ -2,6 +2,8 @@ module Blather
   ##
   # Base XMPP Stanza
   class Stanza < XMPPNode
+    @@last_id = 0
+
     class_inheritable_array :handler_heirarchy
 
     ##
@@ -22,7 +24,6 @@ module Blather
     ##
     # Helper method that creates a unique ID for stanzas
     def self.next_id
-      @@last_id ||= 0
       @@last_id += 1
       'blather%04x' % @@last_id
     end
@@ -35,15 +36,17 @@ module Blather
     end
 
     ##
-    # Creates a new Stanza with the name given
-    # then attaches an ID and document (to enable searching)
-    def self.new(elem_name = nil)
-      elem = super
-      elem.id = next_id
-      XML::Document.new.root = elem
-      elem
+    # Automatically set the stanza's ID
+    # and attach it to a document so XPath searching works
+    def initialize(name = nil)
+      super
+      XML::Document.new.root = self
+      self.name = name.to_s if name
+      self.id = self.class.next_id
     end
 
+    ##
+    # Helper method to ask the object if it's an error
     def error?
       self.type == :error
     end
@@ -63,45 +66,41 @@ module Blather
     end
 
     def id=(id)
-      attributes.remove :id
-      self['id'] = id if id
+      attributes['id'] = id
     end
 
     def id
-      self['id']
+      attributes['id']
     end
 
     def to=(to)
-      attributes.remove :to
-      self['to'] = to.to_s if to
+      attributes['to'] = to
     end
 
     ##
     # returns:: JID created from the "to" value of the stanza
     def to
-      JID.new(self['to']) if self['to']
+      JID.new(attributes['to']) if attributes['to']
     end
 
     def from=(from)
-      attributes.remove :from
-      self['from'] = from.to_s if from
+      attributes['from'] = from
     end
 
     ##
     # returns:: JID created from the "from" value of the stanza
     def from
-      JID.new(self['from']) if self['from']
+      JID.new(attributes['from']) if attributes['from']
     end
 
     def type=(type)
-      attributes.remove :type
-      self['type'] = type.to_s
+      attributes['type'] = type
     end
 
     ##
     # returns:: a symbol of the type
     def type
-      self['type'].to_sym unless self['type'].nil? || self['type'].empty?
+      attributes['type'].to_sym unless attributes['type'].blank?
     end
 
   end

data/lib/blather/stanza/iq.rb

@@ -13,13 +13,12 @@ class Stanza
       (klass || self).new(node['type']).inherit(node)
     end
 
-    def self.new(type = nil, to = nil, id = nil)
-      elem = super :iq
-      elem.xmlns = nil
-      elem.type = type || :get
-      elem.to = to
-      elem.id = id if id
-      elem
+    def initialize(type = nil, to = nil, id = nil)
+      super :iq
+      self.xmlns = nil
+      self.type = type || :get
+      self.to = to
+      self.id = id if id
     end
   end
 

data/lib/blather/stanza/iq/query.rb

@@ -7,10 +7,9 @@ class Iq
 
     ##
     # Ensure the namespace is set to the query node
-    def self.new(type = nil)
-      elem = super
-      elem.query.xmlns = self.xmlns
-      elem
+    def initialize(type = nil)
+      super
+      query.xmlns = self.class.xmlns
     end
 
     ##

data/lib/blather/stanza/iq/roster.rb

@@ -5,10 +5,9 @@ class Iq
   class Roster < Query
     register :roster, nil, 'jabber:iq:roster'
 
-    def self.new(type = nil, item = nil)
-      elem = super(type)
-      elem.query << item if item
-      elem
+    def initialize(type = nil, item = nil)
+      super(type)
+      query << item if item
     end
 
     def inherit(node)
@@ -25,53 +24,48 @@ class Iq
     end
 
     class RosterItem < XMPPNode
-      def self.new(jid = nil, name = nil, subscription = nil, ask = nil)
-        elem = super('item')
+      def initialize(jid = nil, name = nil, subscription = nil, ask = nil)
+        super('item')
         if jid.is_a?(XML::Node)
-          elem.inherit jid
+          self.inherit jid
         else
-          elem.jid = jid
-          elem.name = name
-          elem.subscription = subscription
-          elem.ask = ask
+          self.jid = jid
+          self.name = name
+          self.subscription = subscription
+          self.ask = ask
         end
-        elem
       end
 
       def jid
-        (j = self['jid']) ? JID.new(j) : nil
+        (j = attributes['jid']) ? JID.new(j) : nil
       end
 
       def jid=(jid)
-        attributes.remove :jid
-        self['jid'] = jid.to_s if jid
+        attributes['jid'] = jid
       end
 
       def name
-        self['name']
+        attributes['name']
       end
 
       def name=(name)
-        attributes.remove :name
-        self['name'] = name if name
+        attributes['name'] = name
       end
 
       def subscription
-        self['subscription'].to_sym if self['subscription']
+        attributes['subscription'].to_sym if attributes['subscription']
       end
 
       def subscription=(subscription)
-        attributes.remove :subscription
-        self['subscription'] = subscription.to_s if subscription
+        attributes['subscription'] = subscription
       end
 
       def ask
-        self['ask'].to_sym if self['ask']
+        attributes['ask'].to_sym if attributes['ask']
       end
 
       def ask=(ask)
-        attributes.remove :ask
-        self['ask'] = ask if ask
+        attributes['ask'] = ask
       end
 
       def groups
@@ -82,7 +76,7 @@ class Iq
         find('group').each { |g| g.remove! }
         @groups = nil
 
-        grps.uniq.each { |g| add_node XML::Node.new('group', g.to_s) } if grps
+        grps.uniq.each { |g| add_node XMPPNode.new('group', g.to_s) } if grps
       end
 
       def to_stanza

data/lib/blather/stanza/message.rb

@@ -8,12 +8,11 @@ class Stanza
 
     register :message
 
-    def self.new(to = nil, body = nil, type = :chat)
-      elem = super()
-      elem.to = to
-      elem.type = type
-      elem.body = body
-      elem
+    def initialize(to = nil, body = nil, type = :chat)
+      super()
+      self.to = to
+      self.type = type
+      self.body = body
     end
 
     VALID_TYPES.each do |valid_type|

data/lib/blather/stanza/presence.rb

@@ -8,12 +8,6 @@ class Stanza
 
     register :presence
 
-    ##
-    # Ensure element_name is "presence" for all subclasses
-    def self.new
-      super :presence
-    end
-
     ##
     # Creates a class based on the presence type
     # either a Status or Subscription object is created based
@@ -28,6 +22,12 @@ class Stanza
       klass.new.inherit(node)
     end
 
+    ##
+    # Ensure element_name is "presence" for all subclasses
+    def initialize
+      super :presence
+    end
+
     VALID_TYPES.each do |valid_type|
       define_method("#{valid_type}?") { self.type == valid_type }
     end

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

@@ -9,11 +9,10 @@ class Presence
 
     register :status, :status
 
-    def self.new(state = nil, message = nil)
-      elem = super()
-      elem.state = state
-      elem.message = message
-      elem
+    def initialize(state = nil, message = nil)
+      super()
+      self.state = state
+      self.message = message
     end
 
     ##

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

@@ -5,11 +5,10 @@ class Presence
   class Subscription < Presence
     register :subscription, :subscription
 
-    def self.new(to = nil, type = nil)
-      elem = super()
-      elem.to = to
-      elem.type = type
-      elem
+    def initialize(to = nil, type = nil)
+      super()
+      self.to = to
+      self.type = type
     end
 
     def inherit(node)

data/lib/blather/stream/parser.rb

@@ -3,6 +3,7 @@ module Stream # :nodoc:
 
   class Parser # :nodoc:
     STREAM_REGEX = %r{(/)?stream:stream}.freeze
+    ERROR_REGEX = /^<(stream:[a-z]+)/.freeze
 
     @@debug = false
     def self.debug; @@debug; end
@@ -15,6 +16,7 @@ module Stream # :nodoc:
       @current = nil
 
       @parser = XML::SaxParser.new
+      @parser.io = StringIO.new
       @parser.callbacks = self
     end
 
@@ -24,16 +26,19 @@ module Stream # :nodoc:
         @receiver.receive XMPPNode.new('stream:end')
       else
         string << "</stream:stream>" if string =~ STREAM_REGEX && !$1
+        string.gsub!(ERROR_REGEX, "<\\1 xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams'")
 
         @parser.string = string
         @parser.parse
       end
     end
 
-    def on_start_element(elem, attrs)
-      LOG.debug "START ELEM: (#{[elem, attrs].inspect})" if @@debug
+    NON_ATTRS = [nil, 'stream'].freeze
+    def on_start_element_ns(elem, attrs, prefix, uri, namespaces)
+      LOG.debug "START ELEM: (#{{:elem => elem, :attrs => attrs, :prefix => prefix, :ns => namespaces}.inspect})" if @@debug
+      elem = "#{"#{prefix}:" if prefix}#{elem}"
       e = XMPPNode.new elem
-      attrs.each { |n,v| e[n] = v }
+      attrs.each { |n,v| n = "xmlns#{":#{n}" if n}" if NON_ATTRS.include?(n); e.attributes[n] = v }
 
       if elem == 'stream:stream'
         @receiver.receive e
@@ -50,10 +55,12 @@ module Stream # :nodoc:
       @current << XML::Node.new_text(chars) if @current
     end
 
-    def on_end_element(elem)
+    def on_end_element_ns(elem, prefix, uri)
+      LOG.debug "END ELEM: #{{:elem => elem, :prefix => prefix, :uri => uri, :current => @current}.inspect}" if @@debug
+
+      elem = "#{"#{prefix}:" if prefix}#{elem}"
       return if elem =~ STREAM_REGEX
 
-      LOG.debug "END ELEM: (#{@current}) #{elem}" if @@debug
       if @current.parent?
         @current = @current.parent
 
@@ -62,6 +69,10 @@ module Stream # :nodoc:
         @receiver.receive c
 
       end
+
+      def on_error(msg)
+        raise Blather::ParseError, msg.to_s
+      end
     end
   end #Parser
 

data/lib/blather/stream/sasl.rb

@@ -18,7 +18,11 @@ module Stream # :nodoc:
     end
 
     def init_callbacks
-      @callbacks['mechanisms'] = proc { @mechanisms = @node.children; set_mechanism; authenticate }
+      @callbacks['mechanisms'] = proc {
+        @mechanisms = @node.children
+        set_mechanism
+        authenticate
+      }
     end
 
     def set_mechanism

data/lib/blather/xmpp_node.rb

@@ -10,20 +10,6 @@ module Blather
     class_inheritable_accessor  :xmlns,
                                 :name
 
-    ##
-    # Automatically sets the namespace registered by the subclass
-    def self.new(name = nil, content = nil)
-      name ||= self.name
-
-      args = []
-      args << name.to_s if name
-      args << content if content
-
-      elem = super *args
-      elem.xmlns = xmlns
-      elem
-    end
-
     ##
     # Lets a subclass register itself
     #
@@ -56,6 +42,16 @@ module Blather
       end
     end
 
+    ##
+    # Automatically sets the namespace registered by the subclass
+    def initialize(name = nil, content = nil)
+      name ||= self.class.name
+      content = content.to_s if content
+
+      super name.to_s, content
+      self.xmlns = self.class.xmlns
+    end
+
     ##
     # Quickway of turning itself into a proper object
     def to_stanza
@@ -63,12 +59,11 @@ module Blather
     end
 
     def xmlns=(ns)
-      attributes.remove :xmlns
-      self['xmlns'] = ns if ns
+      attributes['xmlns'] = ns
     end
 
     def xmlns
-      self['xmlns']
+      attributes['xmlns']
     end
 
     ##

data/spec/blather/stream_spec.rb

@@ -52,7 +52,7 @@ describe 'Blather::Stream' do
 
     stream.expects(:send_data).with do |val|
       val.must_match(/stream:stream/)
-      stream.receive_data "<stream:stream><message to='a@b/c' from='d@e/f' type='chat' xml:lang='en'><body>Message!</body></message>"
+      stream.receive_data "<?xml version='1.0'?><stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams'><message to='a@b/c' from='d@e/f' type='chat' xml:lang='en'><body>Message!</body></message>"
     end
     stream.connection_completed
   end
@@ -60,7 +60,7 @@ describe 'Blather::Stream' do
   it 'puts itself in the stopped state when unbound' do
     stream = mock_stream do |val|
       val.must_match(/stream:stream/)
-      stream.receive_data "<stream:stream>"
+      stream.receive_data "<?xml version='1.0'?><stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams'>"
 
       stream.stopped?.wont_equal true
       stream.unbind
@@ -94,7 +94,7 @@ describe 'Blather::Stream' do
       end
     end
     stream.connection_completed
-    stream.receive_data "<stream:stream><stream:features><starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls' /></stream:features>"
+    stream.receive_data "<?xml version='1.0'?><stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams'><stream:features><starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls' /></stream:features>"
   end
 
   it 'raises an error when it receives stream:error' do
@@ -123,7 +123,7 @@ describe 'Blather::Stream' do
          end
        end
        stream.connection_completed
-       stream.receive_data "<stream:stream><stream:features><starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls' /></stream:features>"
+       stream.receive_data "<?xml version='1.0'?><stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams'><stream:features><starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls' /></stream:features>"
      end.must_raise(StreamError)
    end
 
@@ -145,7 +145,7 @@ describe 'Blather::Stream' do
       end
     end
     stream.connection_completed
-    stream.receive_data "<stream:stream><stream:features><starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls' /></stream:features>"
+    stream.receive_data "<?xml version='1.0'?><stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams'><stream:features><starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls' /></stream:features>"
   end
 
   it 'connects via SASL MD5 when asked' do
@@ -161,7 +161,7 @@ describe 'Blather::Stream' do
       when nil
         val.must_match(/stream:stream/)
         state = :started
-        stream.receive_data "<stream:stream><stream:features><mechanisms xmlns='urn:ietf:params:xml:ns:xmpp-sasl'><mechanism>DIGEST-MD5</mechanism></mechanisms></stream:features>"
+        stream.receive_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>"
         true
 
       when :started
@@ -206,7 +206,7 @@ describe 'Blather::Stream' do
       when nil
         val.must_match(/stream:stream/)
         state = :started
-        stream.receive_data "<stream:stream><stream:features><mechanisms xmlns='urn:ietf:params:xml:ns:xmpp-sasl'><mechanism>PLAIN</mechanism></mechanisms></stream:features>"
+        stream.receive_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>"
         true
 
       when :started
@@ -239,7 +239,7 @@ describe 'Blather::Stream' do
       when nil
         val.must_match(/stream:stream/)
         state = :started
-        stream.receive_data "<stream:stream><stream:features><mechanisms xmlns='urn:ietf:params:xml:ns:xmpp-sasl'><mechanism>ANONYMOUS</mechanism></mechanisms></stream:features>"
+        stream.receive_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>ANONYMOUS</mechanism></mechanisms></stream:features>"
         true
 
       when :started
@@ -272,7 +272,7 @@ describe 'Blather::Stream' do
       when nil
         val.must_match(/stream:stream/)
         state = :started
-        stream.receive_data "<stream:stream><stream:features><mechanisms xmlns='urn:ietf:params:xml:ns:xmpp-sasl'><mechanism>DIGEST-MD5</mechanism><mechanism>PLAIN</mechanism><mechanism>ANONYMOUS</mechanism></mechanisms></stream:features>"
+        stream.receive_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><mechanism>PLAIN</mechanism><mechanism>ANONYMOUS</mechanism></mechanisms></stream:features>"
         true
 
       when :started
@@ -317,7 +317,7 @@ describe 'Blather::Stream' do
       when nil
         val.must_match(/stream:stream/)
         state = :started
-        stream.receive_data "<stream:stream><stream:features><mechanisms xmlns='urn:ietf:params:xml:ns:xmpp-sasl'><mechanism>DIGEST-MD5</mechanism><mechanism>PLAIN</mechanism><mechanism>ANONYMOUS</mechanism></mechanisms></stream:features>"
+        stream.receive_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><mechanism>PLAIN</mechanism><mechanism>ANONYMOUS</mechanism></mechanisms></stream:features>"
         true
 
       when :started
@@ -356,7 +356,7 @@ describe 'Blather::Stream' do
         state = :started
         val.must_match(/stream:stream/)
         lambda do
-          stream.receive_data "<stream:stream><stream:features><mechanisms xmlns='urn:ietf:params:xml:ns:xmpp-sasl'><mechanism>UNKNOWN</mechanism></mechanisms></stream:features>"
+          stream.receive_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>UNKNOWN</mechanism></mechanisms></stream:features>"
         end.must_raise(Stream::SASL::UnknownMechanism)
 
       else
@@ -380,11 +380,11 @@ describe 'Blather::Stream' do
       when nil
         val.must_match(/stream:stream/)
         state = :started
-        stream.receive_data "<stream:stream><stream:features><bind xmlns='urn:ietf:params:xml:ns:xmpp-bind'/></stream:features>"
+        stream.receive_data "<?xml version='1.0'?><stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams'><stream:features><bind xmlns='urn:ietf:params:xml:ns:xmpp-bind'/></stream:features>"
         true
 
       when :started
-        val.must_match(%r{<bind xmlns="urn:ietf:params:xml:ns:xmpp-bind"\s*/>})
+        val.must_match(%r{<bind xmlns="urn:ietf:params:xml:ns:xmpp-bind"/>})
         val =~ %r{<iq[^>]+id="([^"]+)"}
         state = :complete
         stream.receive_data "<iq type='result' id='#{$1}'><bind xmlns='urn:ietf:params:xml:ns:xmpp-bind'><jid>#{jid}/server_resource</jid></bind></iq>"
@@ -412,7 +412,7 @@ describe 'Blather::Stream' do
       when nil
         val.must_match(/stream:stream/)
         state = :started
-        stream.receive_data "<stream:stream><stream:features><bind xmlns='urn:ietf:params:xml:ns:xmpp-bind'/></stream:features>"
+        stream.receive_data "<?xml version='1.0'?><stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams'><stream:features><bind xmlns='urn:ietf:params:xml:ns:xmpp-bind'/></stream:features>"
         true
 
       when :started
@@ -443,7 +443,7 @@ describe 'Blather::Stream' do
       when nil
         val.must_match(/stream:stream/)
         state = :started
-        stream.receive_data "<stream:stream><stream:features><session xmlns='urn:ietf:params:xml:ns:xmpp-session'/></stream:features>"
+        stream.receive_data "<?xml version='1.0'?><stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams'><stream:features><session xmlns='urn:ietf:params:xml:ns:xmpp-session'/></stream:features>"
         true
 
       when :started

data/spec/spec_helper.rb

@@ -33,9 +33,7 @@ end
 
 class Object
   def must_change *args, &block
-    return MiniTest::Spec.current.assert_change(*args, &self)     if Proc === self
-    return MiniTest::Spec.current.assert_change(args.first, self) if args.size == 1
-    return MiniTest::Spec.current.assert_change(self, *args)
+    return MiniTest::Spec.current.assert_change(*args, &self)
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: blather
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: 0.2.1
 platform: ruby
 authors: 
 - Jeff Smick
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-19 00:00:00 -08:00
+date: 2008-12-21 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.2
+        version: 0.9.7
     version: 
 - !ruby/object:Gem::Dependency 
   name: echoe
@@ -52,6 +52,8 @@ extra_rdoc_files:
 - CHANGELOG
 - lib/autotest/discover.rb
 - lib/autotest/spec.rb
+- lib/blather/core_ext/active_support.rb
+- lib/blather/core_ext/libxml.rb
 - lib/blather/errors.rb
 - lib/blather/jid.rb
 - lib/blather/roster.rb
@@ -71,7 +73,6 @@ extra_rdoc_files:
 - lib/blather/stream/session.rb
 - lib/blather/stream/tls.rb
 - lib/blather/stream.rb
-- lib/blather/sugar.rb
 - lib/blather/xmpp_node.rb
 - lib/blather.rb
 - LICENSE
@@ -82,6 +83,8 @@ files:
 - examples/echo.rb
 - lib/autotest/discover.rb
 - lib/autotest/spec.rb
+- lib/blather/core_ext/active_support.rb
+- lib/blather/core_ext/libxml.rb
 - lib/blather/errors.rb
 - lib/blather/jid.rb
 - lib/blather/roster.rb
@@ -101,7 +104,6 @@ files:
 - lib/blather/stream/session.rb
 - lib/blather/stream/tls.rb
 - lib/blather/stream.rb
-- lib/blather/sugar.rb
 - lib/blather/xmpp_node.rb
 - lib/blather.rb
 - LICENSE