blather 0.1 → 0.2

data/lib/blather/stanza/error.rb

@@ -0,0 +1,31 @@
+module Blather
+class Stanza
+
+  ##
+  # Base Error stanza
+  class Error < Stanza
+    def self.new_from(stanza, defined_condition, type, text = nil)
+      err = XMPPNode.new(defined_condition)
+      err['type'] = type
+      err.xmlns = 'urn:ietf:params:xml:ns:xmpp-stanzas'
+
+      if text
+        text = XMPPNode.new('text', text)
+        text.xmlns = 'urn:ietf:params:xml:ns:xmpp-stanzas'
+        err << text
+      end
+
+      elem = stanza.copy(true)
+      elem.type = 'error'
+      elem << err
+
+      elem
+    end
+
+    def error?
+      true
+    end
+  end #ErrorStanza
+
+end #Stanza
+end

data/lib/blather/{core/stanza → stanza}/iq.rb

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

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

@@ -0,0 +1,50 @@
+module Blather
+class Stanza
+class Iq
+
+  class Query < Iq
+    register :query, :query
+
+    ##
+    # Ensure the namespace is set to the query node
+    def self.new(type = nil)
+      elem = super
+      elem.query.xmlns = self.xmlns
+      elem
+    end
+
+    ##
+    # Kill the query node before running inherit
+    def inherit(node)
+      query.remove!
+      @query = nil
+      super
+    end
+
+    ##
+    # Query node accessor
+    # This will ensure there actually is a query node
+    def query
+      (self << (q = XMPPNode.new('query'))) unless q = find_first('query')
+      q
+    end
+
+    ##
+    # A query reply should have type set to "result"
+    def reply
+      elem = super
+      elem.type = :result
+      elem
+    end
+
+    ##
+    # A query reply should have type set to "result"
+    def reply!
+      self.type = :result
+      super
+    end
+  end #Query
+
+end #Iq
+end #Stanza
+end

data/lib/blather/{core/stanza → stanza}/iq/roster.rb

@@ -5,9 +5,9 @@ class Iq
   class Roster < Query
     register :roster, nil, 'jabber:iq:roster'
 
-    def self.new(type, item = nil)
+    def self.new(type = nil, item = nil)
       elem = super(type)
-      elem.query << item
+      elem.query << item if item
       elem
     end
 
@@ -21,7 +21,7 @@ class Iq
     end
 
     def items
-      @items ||= query.find('item')#.map { |g| RosterItem.new g }
+      query.find('item')#.map { |g| RosterItem.new g }
     end
 
     class RosterItem < XMPPNode

data/lib/blather/{core/stanza → stanza}/message.rb

@@ -8,7 +8,7 @@ class Stanza
 
     register :message
 
-    def self.new(to = nil, type = nil, body = nil)
+    def self.new(to = nil, body = nil, type = :chat)
       elem = super()
       elem.to = to
       elem.type = type
@@ -16,6 +16,10 @@ class Stanza
       elem
     end
 
+    VALID_TYPES.each do |valid_type|
+      define_method("#{valid_type}?") { self.type == valid_type }
+    end
+
     ##
     # Ensures type is :chat, :error, :groupchat, :headline or :normal
     def type=(type)
@@ -43,7 +47,7 @@ class Stanza
 
     def thread=(thread)
       remove_child :thread
-      self << XMPPNode.new('body', body) if body
+      self << XMPPNode.new('thread', thread) if thread
     end
 
     def thread

data/lib/blather/{core/stanza → stanza}/presence.rb

@@ -8,6 +8,12 @@ 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
@@ -22,6 +28,10 @@ class Stanza
       klass.new.inherit(node)
     end
 
+    VALID_TYPES.each do |valid_type|
+      define_method("#{valid_type}?") { self.type == valid_type }
+    end
+
     ##
     # Ensures type is one of :unavailable, :subscribe, :subscribed, :unsubscribe, :unsubscribed, :probe or :error
     def type=(type)

data/lib/blather/{core/stanza → stanza}/presence/status.rb

@@ -7,7 +7,7 @@ class Presence
 
     include Comparable
 
-    register :status
+    register :status, :status
 
     def self.new(state = nil, message = nil)
       elem = super()
@@ -42,15 +42,15 @@ class Presence
 
     ##
     # Ensure priority is between -128 and 127
-    def priority=(priority)
-      raise ArgumentError, 'Priority must be between -128 and +127' if priority && !(-128..127).include?(priority.to_i)
+    def priority=(new_priority)
+      raise ArgumentError, 'Priority must be between -128 and +127' if new_priority && !(-128..127).include?(new_priority.to_i)
 
       remove_child :priority
-      self << XMPPNode.new('priority', priority) if priority
+      self << XMPPNode.new('priority', new_priority) if new_priority
     end
 
     def priority
-      @priority ||= content_from(:priority).to_i
+      content_from(:priority).to_i
     end
 
     def message=(msg)
@@ -66,7 +66,9 @@ class Presence
     # Compare status based on priority
     # raises an error if the JIDs aren't the same
     def <=>(o)
-      raise "Cannot compare status from different JIDs: #{[self.from, o.from].inspect}" unless self.from.stripped == o.from.stripped
+      unless self.from && o.from && self.from.stripped == o.from.stripped
+        raise ArgumentError, "Cannot compare status from different JIDs: #{[self.from, o.from].inspect}"
+      end
       self.priority <=> o.priority
     end
 

data/lib/blather/{core/stanza → stanza}/presence/subscription.rb

@@ -3,7 +3,7 @@ class Stanza
 class Presence
 
   class Subscription < Presence
-    register :subscription
+    register :subscription, :subscription
 
     def self.new(to = nil, type = nil)
       elem = super()

data/lib/blather/{core/stream.rb → stream.rb}

@@ -42,7 +42,7 @@ module Blather
 
     def unbind # :nodoc:
 #      @keepalive.cancel
-      @state == :stopped
+      @state = :stopped
     end
 
     def receive(node) # :nodoc:

data/lib/blather/{core/stream → stream}/parser.rb

@@ -50,11 +50,6 @@ module Stream # :nodoc:
       @current << XML::Node.new_text(chars) if @current
     end
 
-    def on_cdata_block(block)
-      LOG.debug "CDATA: #{block}" if @@debug
-      @current << XML::Node.new_cdata(block) if @current
-    end
-
     def on_end_element(elem)
       return if elem =~ STREAM_REGEX
 

data/lib/blather/{core/stream → stream}/sasl.rb

@@ -2,6 +2,8 @@ module Blather # :nodoc:
 module Stream # :nodoc:
 
   class SASL # :nodoc:
+    class UnknownMechanism < BlatherError; end
+
     SASL_NS = 'urn:ietf:params:xml:ns:xmpp-sasl'
 
     def initialize(stream, jid, pass = nil)
@@ -9,20 +11,24 @@ module Stream # :nodoc:
       @jid = jid
       @pass = pass
       @callbacks = {}
+      @mechanism = 0
+      @mechanisms = []
 
       init_callbacks
     end
 
     def init_callbacks
-      @callbacks['mechanisms'] = proc { set_mechanism; authenticate }
+      @callbacks['mechanisms'] = proc { @mechanisms = @node.children; set_mechanism; authenticate }
     end
 
     def set_mechanism
-      mod = case (mechanism = @node.first.content)
+      mod = case (mechanism = @mechanisms[@mechanism].content)
       when 'DIGEST-MD5' then DigestMD5
       when 'PLAIN'      then Plain
       when 'ANONYMOUS'  then Anonymous
-      else raise "Unknown SASL mechanism (#{mechanism})"
+      else
+        @stream.send "<failure xmlns='urn:ietf:params:xml:ns:xmpp-sasl'><invalid-mechanism/></failure>"
+        raise UnknownMechanism, "Unknown SASL mechanism (#{mechanism})"
       end
 
       extend mod
@@ -30,7 +36,12 @@ module Stream # :nodoc:
 
     def receive(node)
       @node = node
-      @callbacks[@node.element_name].call if @callbacks[@node.element_name]
+      if @node.element_name == 'failure' && @mechanisms[@mechanism += 1]
+        set_mechanism
+        authenticate
+      else
+        @callbacks[@node.element_name].call if @callbacks[@node.element_name]
+      end
     end
 
     def success(&callback)
@@ -106,7 +117,7 @@ module Stream # :nodoc:
           LOG.debug "CH RESP TXT: #{@response.map { |k,v| "#{k}=#{v}" } * ','}"
 
           # order is to simplify testing
-          order = [:nonce, :charset, :username, :realm, :cnonce, :nc, :qop, :'digest-uri']
+          order = [:nonce, :charset, :username, :realm, :cnonce, :nc, :qop, :'digest-uri', :response]
           node.content = b64(order.map { |k| v = @response[k]; "#{k}=#{v}" } * ',')
         end
 

data/lib/blather/{core/sugar.rb → sugar.rb}

@@ -1,6 +1,10 @@
 module LibXML # :nodoc:
   module XML # :nodoc:
 
+    class Node
+      alias_method :element_name, :name
+    end
+
     class Attributes
       # Helper method for removing attributes
       def remove(name)

data/lib/blather/{core/xmpp_node.rb → xmpp_node.rb}

@@ -7,8 +7,6 @@ module Blather
   class XMPPNode < XML::Node
     @@registrations = {}
 
-    alias_method :element_name, :name
-
     class_inheritable_accessor  :xmlns,
                                 :name
 
@@ -35,7 +33,7 @@ module Blather
     def self.register(name, xmlns = nil)
       self.name = name.to_s
       self.xmlns = xmlns
-      @@registrations[[name, xmlns]] = self
+      @@registrations[[self.name, self.xmlns]] = self
     end
 
     ##

data/spec/blather/{core/jid_spec.rb → jid_spec.rb}

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[.. .. spec_helper])
+require File.join(File.dirname(__FILE__), *%w[.. spec_helper])
 
 describe 'Blather::JID' do
   it 'does nothing if creaded from JID' do
@@ -75,4 +75,19 @@ describe 'Blather::JID' do
     JID.new('n', 'd', 'r').to_s.must_equal 'n@d/r'
     JID.new('n', 'd').to_s.must_equal 'n@d'
   end
+
+  it 'falls back to basic ruby if idn gem is not present' do
+    JID.const_set 'USE_STRINGPREP', false
+    jid = JID.new 'AB#$cdE@&^FE'
+    jid.node.must_equal 'ab#$cde'
+    jid.domain.must_equal '&^fe'
+  end
+
+  it 'provides a #stripped? helper' do
+    jid = JID.new 'a@b/c'
+    jid.must_respond_to :stripped?
+    jid.stripped?.wont_equal true
+    jid.strip!
+    jid.stripped?.must_equal true
+  end
 end

data/spec/blather/{core/roster_item_spec.rb → roster_item_spec.rb}

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[.. .. spec_helper])
+require File.join(File.dirname(__FILE__), *%w[.. spec_helper])
 
 describe 'Blather::RosterItem' do
   it 'initializes with JID' do

data/spec/blather/{core/roster_spec.rb → roster_spec.rb}

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[.. .. spec_helper])
+require File.join(File.dirname(__FILE__), *%w[.. spec_helper])
 
 describe 'Blather::Roster' do
   before do
@@ -40,6 +40,16 @@ describe 'Blather::Roster' do
     @roster[jid].wont_be_nil
   end
 
+  it 'aliases #<< to #push and returns self to allow for chaining' do
+    jid = 'a@b/c'
+    item = RosterItem.new(JID.new(jid))
+    jid2 = 'd@e/f'
+    item2 = RosterItem.new(JID.new(jid2))
+    proc { @roster << item << item2 }.must_change('@roster.items', :length, :by => 2)
+    @roster[jid].wont_be_nil
+    @roster[jid2].wont_be_nil
+  end
+
   it 'sends a @roster addition over the wire' do
     stream = mock()
     stream.expects(:send_data)

data/spec/blather/stanza/iq/query_spec.rb

@@ -0,0 +1,34 @@
+require File.join(File.dirname(__FILE__), *%w[.. .. .. spec_helper])
+
+describe 'Blather::Stanza::Iq::Query' do
+  it 'registers itself' do
+    XMPPNode.class_from_registration(:query, nil).must_equal Stanza::Iq::Query
+  end
+
+  it 'ensures a query node is present on create' do
+    query = Stanza::Iq::Query.new
+    query.children.detect { |n| n.element_name == 'query' }.wont_be_nil
+  end
+
+  it 'ensures a query node exists when calling #query' do
+    query = Stanza::Iq::Query.new
+    query.remove_child :query
+    query.children.detect { |n| n.element_name == 'query' }.must_be_nil
+
+    query.query.wont_be_nil
+    query.children.detect { |n| n.element_name == 'query' }.wont_be_nil
+  end
+
+  it 'sets type to "reslut" on reply' do
+    query = Stanza::Iq::Query.new
+    query.type.must_equal :get
+    reply = query.reply.type.must_equal :result
+  end
+
+  it 'sets type to "reslut" on reply!' do
+    query = Stanza::Iq::Query.new
+    query.type.must_equal :get
+    query.reply!
+    query.type.must_equal :result
+  end
+end

data/spec/blather/stanza/iq/roster_spec.rb

@@ -0,0 +1,7 @@
+require File.join(File.dirname(__FILE__), *%w[.. .. .. spec_helper])
+
+describe 'Blather::Stanza::Iq::Roster' do
+  it 'registers itself' do
+    XMPPNode.class_from_registration(:query, 'jabber:iq:roster').must_equal Stanza::Iq::Roster
+  end
+end

data/spec/blather/stanza/iq_spec.rb

@@ -0,0 +1,11 @@
+require File.join(File.dirname(__FILE__), *%w[.. .. spec_helper])
+
+describe 'Blather::Stanza::Iq' do
+  it 'registers itself' do
+    XMPPNode.class_from_registration(:iq, nil).must_equal Stanza::Iq
+  end
+
+  it 'creates a new Iq stanza defaulted as a get' do
+    Stanza::Iq.new.type.must_equal :get
+  end
+end