blather 0.4.2 → 0.4.3

data/README.rdoc

@@ -20,6 +20,8 @@ RubyForge:: http://rubyforge.org/projects/squishtech
 
 RDocs:: http://squishtech.rubyforge.org/blather
 
+Google Group:: http://groups.google.com/group/xmpp-blather
+
 = Usage
 
 == Installation

data/lib/blather/client/client.rb

@@ -78,7 +78,7 @@ module Blather #:nodoc:
     def run
       raise 'not setup!' unless setup?
       klass = @setup[0].node ? Blather::Stream::Client : Blather::Stream::Component
-      @stream = klass.start self, *@setup
+      klass.start self, *@setup
     end
 
     ##
@@ -111,7 +111,7 @@ module Blather #:nodoc:
     ##
     # Write data to the stream
     def write(stanza)
-      @stream.send(stanza) if @stream
+      self.stream.send(stanza)
     end
 
     ##
@@ -131,10 +131,12 @@ module Blather #:nodoc:
     ##
     # Close the connection
     def close
-      @stream.close_connection_after_writing
+      self.stream.close_connection_after_writing
     end
 
-    def post_init # :nodoc:
+    def post_init(stream, jid = nil) # :nodoc:
+      @stream = stream
+      @jid = JID.new(jid) if jid
       self.jid.node ? client_post_init : ready!
     end
 
@@ -150,10 +152,6 @@ module Blather #:nodoc:
       end
     end
 
-    def jid=(new_jid) # :nodoc :
-      @jid = JID.new new_jid
-    end
-
     def setup? # :nodoc:
       @setup.is_a? Array
     end
@@ -167,6 +165,11 @@ module Blather #:nodoc:
     end
 
   protected
+    def stream
+      raise 'Stream not ready!' unless @stream
+      @stream
+    end
+
     def check_handler(type, guards)
       Blather.logger.warn "Handler for type \"#{type}\" will never be called as it's not a registered type" unless current_handlers.include?(type)
       check_guards guards
@@ -233,10 +236,11 @@ module Blather #:nodoc:
     end
 
     def call_handler(handler, guards, stanza) # :nodoc:
-      if guards.first.respond_to?(:to_str) && !(result = stanza.find(*guards)).empty?
-        handler.call(stanza, result)
-      elsif !guarded?(guards, stanza)
-        handler.call(stanza)
+      if guards.first.respond_to?(:to_str)
+        result = stanza.find(*guards)
+        handler.call(stanza, result) unless result.empty?
+      else
+        handler.call(stanza) unless guarded?(guards, stanza)
       end
     end
 
@@ -256,8 +260,9 @@ module Blather #:nodoc:
           # return FALSE unless any inequality is found
           guard.find do |method, test|
             value = stanza.__send__(method)
+            # last_match is the only method found unique to Regexp classes
             if test.class.respond_to?(:last_match)
-              !(test =~ value)
+              !(test =~ value.to_s)
             elsif test.is_a?(Array)
               !test.include? value
             else

data/lib/blather/client/dsl.rb

@@ -115,7 +115,7 @@ module Blather
       stanza.to = who
       stanza.node = where
 
-      client.temporary_handler stanza.id, &callback
+      client.register_tmp_handler stanza.id, &callback
       write stanza
     end
 

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

@@ -98,7 +98,9 @@ class Presence
     ##
     # :available if state is nil
     def state # :nodoc:
-      (type || content_from(:show) || :available).to_sym
+      state = type || content_from(:show)
+      state = :available if state.blank?
+      state.to_sym
     end
 
     ##

data/lib/blather/stanza/pubsub/event.rb

@@ -25,7 +25,7 @@ class PubSub
     end
 
     def retractions
-      items_node.find('ns:retract', :ns => self.class.registered_ns).map { |i| i[:id] }
+      items_node.find('//ns:retract', :ns => self.class.registered_ns).map { |i| i[:id] }
     end
 
     def retractions?
@@ -33,7 +33,7 @@ class PubSub
     end
 
     def items
-      items_node.find('ns:item', :ns => self.class.registered_ns).map { |i| PubSubItem.new(nil,nil,self.document).inherit i }
+      items_node.find('//ns:item', :ns => self.class.registered_ns).map { |i| PubSubItem.new(nil,nil,self.document).inherit i }
     end
 
     def items?
@@ -45,8 +45,8 @@ class PubSub
     end
 
     def event_node
-      node = find_first('ns:event', :ns => self.class.registered_ns)
-      node = find_first('event', self.class.registered_ns) unless node
+      node = find_first('//ns:event', :ns => self.class.registered_ns)
+      node = find_first('//event', self.class.registered_ns) unless node
       unless node
         (self << (node = XMPPNode.new('event', self.document)))
         node.namespace = self.class.registered_ns
@@ -55,7 +55,7 @@ class PubSub
     end
 
     def items_node
-      node = find_first('event/ns:items', :ns => self.class.registered_ns)
+      node = find_first('ns:event/ns:items', :ns => self.class.registered_ns)
       unless node
         (self.event_node << (node = XMPPNode.new('items', self.document)))
         node.namespace = event_node.namespace
@@ -64,7 +64,7 @@ class PubSub
     end
 
     def purge_node
-      event_node.find_first('ns:purge', :ns => self.class.registered_ns)
+      event_node.find_first('//ns:purge', :ns => self.class.registered_ns)
     end
 
     def subscription_ids

data/lib/blather/stream.rb

@@ -4,7 +4,8 @@ module Blather
     class NoConnection < RuntimeError; end
 
     STREAM_NS = 'http://etherx.jabber.org/streams'
-    attr_accessor :jid, :password
+    attr_accessor :password
+    attr_reader :jid
 
     ##
     # Start the stream between client and server
@@ -25,9 +26,7 @@ module Blather
           connect jid.domain, port, self, client, jid, pass
         else
           srv.sort! { |a,b| (a.priority != b.priority) ? (a.priority <=> b.priority) : (b.weight <=> a.weight) }
-          conn = nil
-          srv.each { |r| break unless (conn = connect(r.target.to_s, r.port, self, client, jid, pass)) === false }
-          conn
+          srv.each { |r| break unless connect(r.target.to_s, r.port, self, client, jid, pass) === false }
         end
       end
     end
@@ -139,7 +138,6 @@ module Blather
     def jid=(new_jid) # :nodoc:
       Blather.logger.debug "NEW JID: #{new_jid}"
       @jid = JID.new new_jid
-      @client.jid = @jid
     end
 
   protected
@@ -160,7 +158,7 @@ module Blather
     def ready!
       @state = :started
       @receiver = @client
-      @client.post_init
+      @client.post_init self, @jid
     end
   end
 end

data/lib/blather/stream/features/resource.rb

@@ -51,7 +51,7 @@ class Stream # :nodoc:
       Blather.logger.debug "RESOURCE NODE #{@node}"
       # ensure this is a response to our original request
       if @id == @node['id']
-        @stream.jid = JID.new @node.find_first('//bind/bind_ns:jid', :bind_ns => BIND_NS).content
+        @stream.jid = JID.new @node.find_first('bind_ns:bind/bind_ns:jid', :bind_ns => BIND_NS).content
         succeed!
       else
         fail!("BIND result ID mismatch. Expected: #{@id}. Received: #{@node['id']}")

data/lib/blather/stream/parser.rb

@@ -6,7 +6,7 @@ class Stream # :nodoc:
   class Parser # :nodoc:
     NS_TO_IGNORE = %w[jabber:client jabber:component:accept]
 
-    @@debug = !false
+    @@debug = false
     def self.debug; @@debug; end
     def self.debug=(debug); @@debug = debug; end
 
@@ -27,9 +27,11 @@ class Stream # :nodoc:
 
     def start_document; end
     def end_document; end
+    def start_element(*args); end
+    def end_element(*args); end
     def warning(*args); end
 
-    def start_element_ns(elem, attrs, prefix, uri, namespaces)
+    def start_element_namespace(elem, attrs, prefix, uri, namespaces)
       Blather.logger.debug "START ELEM: (#{{:elem => elem, :attrs => attrs, :prefix => prefix, :uri => uri, :ns => namespaces}.inspect})" if @@debug
 
       args = [elem]
@@ -37,13 +39,17 @@ class Stream # :nodoc:
       node = XMPPNode.new *args
       node.document.root = node unless @current
 
-      attrs.each { |k,v| node[k] = v if k }
+      attrs.each do |attr|
+        node[attr.localname] = attr.value
+      end
 
       if !@receiver.stopped?
         @current << node if @current
         @current = node
       end
 
+
+      ns_keys = namespaces.map { |pre, href| pre }
       namespaces.delete_if { |pre, href| NS_TO_IGNORE.include? href }
       @namespace_definitions.push []
       namespaces.each do |pre, href|
@@ -51,7 +57,7 @@ class Stream # :nodoc:
         ns = node.add_namespace(pre, href)
         @namespaces[[pre, href]] ||= ns
       end
-      @namespaces[[prefix, uri]] ||= node.add_namespace(prefix, uri) if prefix && !namespaces[prefix]
+      @namespaces[[prefix, uri]] ||= node.add_namespace(prefix, uri) if prefix && !ns_keys.include?(prefix)
       node.namespace = @namespaces[[prefix, uri]]
 
       deliver(node) if elem == 'stream'
@@ -66,7 +72,7 @@ class Stream # :nodoc:
 =end
     end
 
-    def end_element_ns(elem, prefix, uri)
+    def end_element_namespace(elem, prefix, uri)
       Blather.logger.debug "END ELEM: #{{:elem => elem, :prefix => prefix, :uri => uri}.inspect}" if @@debug
 
       if elem == 'stream'

data/lib/blather/xmpp_node.rb

@@ -251,7 +251,11 @@ module Blather
     def inherit(stanza)
       set_namespace stanza.namespace if stanza.namespace
       inherit_attrs stanza.attributes
-      stanza.children.each { |c| self << c.dup }
+      stanza.children.each do |c|
+        self << (n = c.dup)
+        ns = n.namespace_definitions.find { |ns| ns.prefix == c.namespace.prefix }
+        n.namespace = ns if ns
+      end
       self
     end
 

data/spec/blather/client/client_spec.rb

@@ -4,17 +4,15 @@ require 'blather/client/client'
 describe Blather::Client do
   before do
     @client = Blather::Client.new
+    @stream = mock()
+    @stream.stubs(:send)
+    @jid = Blather::JID.new('n@d/r')
+    @client.post_init @stream, @jid
   end
 
-  it 'provides a JID accessor' do
+  it 'provides a Blather::JID reader' do
     @client.must_respond_to :jid
-    @client.jid.must_be_nil
-
-    jid = 'me@me.com/test'
-    @client.must_respond_to :jid=
-    @client.jid = jid
-    @client.jid.must_be_kind_of Blather::JID
-    @client.jid.must_equal Blather::JID.new(jid)
+    @client.jid.must_equal @jid
   end
 
   it 'provides a reader for the roster' do
@@ -61,8 +59,8 @@ describe Blather::Client do
   it 'writes to the connection the closes when #close is called' do
     stream = mock()
     stream.expects(:close_connection_after_writing)
-    Blather::Stream::Component.stubs(:start).returns stream
-    @client.setup('me.com', 'secret').run
+    @client.setup('me.com', 'secret')
+    @client.post_init stream, Blather::JID.new('me.com')
     @client.close
   end
 
@@ -162,8 +160,8 @@ describe 'Blather::Client#write' do
     stanza = Blather::Stanza::Iq.new
     stream = mock()
     stream.expects(:send).with stanza
-    Blather::Stream::Client.expects(:start).returns stream
-    @client.setup('me@me.com', 'me').run
+    @client.setup('me@me.com', 'me')
+    @client.post_init stream, Blather::JID.new('me.com')
     @client.write stanza
   end
 end
@@ -171,15 +169,20 @@ end
 describe 'Blather::Client#status=' do
   before do
     @client = Blather::Client.new
+    @stream = mock()
+    @stream.stubs(:send)
+    @client.post_init @stream, Blather::JID.new('n@d/r')
   end
 
-  it 'updates the state when not sending to a JID' do
+  it 'updates the state when not sending to a Blather::JID' do
+    @stream.stubs(:write)
     @client.status.wont_equal :away
     @client.status = :away, 'message'
     @client.status.must_equal :away
   end
 
-  it 'does not update the state when sending to a JID' do
+  it 'does not update the state when sending to a Blather::JID' do
+    @stream.stubs(:write)
     @client.status.wont_equal :away
     @client.status = :away, 'message', 'me@me.com'
     @client.status.wont_equal :away
@@ -188,7 +191,7 @@ describe 'Blather::Client#status=' do
   it 'writes the new status to the stream' do
     Blather::Stanza::Presence::Status.stubs(:next_id).returns 0
     status = [:away, 'message']
-    @client.expects(:write).with do |s|
+    @stream.expects(:send).with do |s|
       s.must_be_kind_of Blather::Stanza::Presence::Status
       s.to_s.must_equal Blather::Stanza::Presence::Status.new(*status).to_s
     end
@@ -199,6 +202,9 @@ end
 describe 'Blather::Client default handlers' do
   before do
     @client = Blather::Client.new
+    @stream = mock()
+    @stream.stubs(:send)
+    @client.post_init @stream, Blather::JID.new('n@d/r')
   end
 
   it 're-raises errors' do
@@ -227,7 +233,7 @@ describe 'Blather::Client default handlers' do
     @client.receive_data get
   end
 
-  it 'handles status changes by updating the roster if the status is from a JID in the roster' do
+  it 'handles status changes by updating the roster if the status is from a Blather::JID in the roster' do
     jid = 'friend@jabber.local'
     status = Blather::Stanza::Presence::Status.new :away
     status.stubs(:from).returns jid
@@ -275,16 +281,17 @@ end
 describe 'Blather::Client with a Component stream' do
   before do
     class MockComponent < Blather::Stream::Component; def initialize(); end; end
+    @stream = MockComponent.new('')
+    @stream.stubs(:send_data)
     @client = Blather::Client.new 
-    Blather::Stream::Component.stubs(:start).returns MockComponent.new('')
-    @client.setup('me.com', 'secret').run
+    @client.setup('me.com', 'secret')
   end
 
   it 'calls the ready handler when sent post_init' do
     ready = mock()
     ready.expects(:call)
     @client.register_handler(:ready) { ready.call }
-    @client.post_init
+    @client.post_init @stream
   end
 end
 
@@ -299,7 +306,7 @@ describe 'Blather::Client with a Client stream' do
 
   it 'sends a request for the roster when post_init is called' do
     @stream.expects(:send).with { |stanza| stanza.must_be_kind_of Blather::Stanza::Iq::Roster }
-    @client.post_init
+    @client.post_init @stream, Blather::JID.new('n@d/r')
   end
 
   it 'calls the ready handler after post_init and roster is received' do
@@ -309,13 +316,16 @@ describe 'Blather::Client with a Client stream' do
     ready = mock()
     ready.expects(:call)
     @client.register_handler(:ready) { ready.call }
-    @client.post_init
+    @client.post_init @stream, Blather::JID.new('n@d/r')
   end
 end
 
 describe 'Blather::Client filters' do
   before do
     @client = Blather::Client.new
+    @stream = mock()
+    @stream.stubs(:send)
+    @client.post_init @stream, Blather::JID.new('n@d/r')
   end
 
   it 'raises an error when an invalid filter type is registered' do
@@ -383,7 +393,10 @@ end
 
 describe 'Blather::Client guards' do
   before do
+    stream = mock()
+    stream.stubs(:send)
     @client = Blather::Client.new
+    @client.post_init stream, Blather::JID.new('n@d/r')
     @stanza = Blather::Stanza::Iq.new
     @response = mock()
   end
@@ -430,6 +443,9 @@ describe 'Blather::Client guards' do
 
     @stanza.expects(:body).returns 'keyword not found'
     @client.receive_data @stanza
+
+    @stanza.expects(:body).returns nil
+    @client.receive_data @stanza
   end
 
   it 'can be a hash with an array' do
@@ -500,6 +516,17 @@ describe 'Blather::Client guards' do
     @client.receive_data @stanza
   end
 
+  it 'can be an xpath with namespaces and will send the result to the handler' do
+    @stanza = Blather::Stanza.import(parse_stanza('<message><foo xmlns="http://bar.com"></message>').root)
+    @response.expects(:call).with do |stanza, xpath|
+      xpath.must_be_instance_of Nokogiri::XML::NodeSet
+      xpath.wont_be_empty
+      stanza.must_equal @stanza
+    end
+    @client.register_handler(:message, "/message/bar:foo", :bar => 'http://bar.com') { |stanza, xpath| @response.call stanza, xpath }
+    @client.receive_data @stanza
+  end
+
   it 'raises an error when a bad guard is tried' do
     lambda { @client.register_handler(:iq, 0) {} }.must_raise RuntimeError
   end

data/spec/blather/client/dsl/pubsub_spec.rb

@@ -274,8 +274,7 @@ describe 'Blather::DSL::PubSub callbacks' do
   before do
     @host = 'host.name'
     @pubsub = Blather::DSL::PubSub.new @host
-    @client = Blather::Client.new
-    @client.jid = Blather::JID.new('n@d/r')
+    @client = Blather::Client.setup Blather::JID.new('n@d/r'), 'pass'
     Blather::DSL.stubs(:client).returns @client
   end
 

data/spec/blather/client/dsl_spec.rb

@@ -102,7 +102,7 @@ describe Blather::DSL do
   it 'provides a disco helper for items' do
     what, who, where = :items, 'me@me.com', 'my/node'
     Blather::Stanza::Disco::DiscoItems.stubs(:next_id).returns 0
-    @client.expects(:temporary_handler).with '0'
+    @client.expects(:register_tmp_handler).with '0'
     expected_stanza = Blather::Stanza::Disco::DiscoItems.new
     expected_stanza.to = who
     expected_stanza.node = where
@@ -113,7 +113,7 @@ describe Blather::DSL do
   it 'provides a disco helper for info' do
     what, who, where = :info, 'me@me.com', 'my/node'
     Blather::Stanza::Disco::DiscoInfo.stubs(:next_id).returns 0
-    @client.expects(:temporary_handler).with '0'
+    @client.expects(:register_tmp_handler).with '0'
     expected_stanza = Blather::Stanza::Disco::DiscoInfo.new
     expected_stanza.to = who
     expected_stanza.node = where

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

@@ -49,6 +49,13 @@ describe Blather::Stanza::Presence::Status do
     Blather::Stanza::Presence::Status.new.state.must_equal :available
   end
 
+  it 'returns :available if <show/> is blank' do
+    status = Blather::XMPPNode.import(parse_stanza(<<-NODE).root)
+      <presence><show/><presence/>
+    NODE
+    status.state.must_equal :available
+  end
+
   it 'returns :unavailable if type is :unavailable' do
     status = Blather::Stanza::Presence::Status.new
     status.type = :unavailable

data/spec/blather/stream/client_spec.rb

@@ -721,7 +721,7 @@ describe Blather::Stream::Client do
 
       when :complete
         EM.stop
-        @client.jid.must_equal Blather::JID.new('n@d/server_resource')
+        @stream.jid.must_equal Blather::JID.new('n@d/server_resource')
 
       else
         EM.stop
@@ -754,7 +754,7 @@ describe Blather::Stream::Client do
 
       when :complete
         EM.stop
-        @client.jid.must_equal Blather::JID.new('n@d/r')
+        @stream.jid.must_equal Blather::JID.new('n@d/r')
 
       else
         EM.stop

data/spec/blather/xmpp_node_spec.rb

@@ -213,7 +213,7 @@ describe Blather::XMPPNode do
     n2.element_name.must_equal n.element_name
   end
 
-  it 'provides an inhert mechanism' do
+  it 'provides an inherit mechanism' do
     n = Blather::XMPPNode.new 'foo'
     n2 = Blather::XMPPNode.new 'foo'
     n2.content = 'bar'
@@ -222,6 +222,13 @@ describe Blather::XMPPNode do
     n.inherit(n2)
     n['foo'].must_equal 'bar'
     n.content.must_equal 'bar'
+    n2.to_s.must_equal n.to_s
+  end
+
+  it 'holds on to namespaces when inheriting content' do
+    n = parse_stanza('<message><bar:foo xmlns:bar="http://bar.com"></message>').root
+    n2 = Blather::XMPPNode.new('message').inherit n
+    n2.to_s.must_equal n.to_s
   end
 
   it 'provides a mechanism to inherit attrs' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: blather
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors: 
 - Jeff Smick
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-13 00:00:00 -07:00
+date: 2009-07-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.0
+        version: 1.3.2
     version: 
 description: An XMPP DSL for Ruby written on top of EventMachine and Nokogiri
 email: sprsquish@gmail.com