RubyGems - blather - Versions diffs - 0.3.4 → 0.4.0 - Mend

blather 0.3.4 → 0.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (110) hide show

data/LICENSE +1 -1
data/README.rdoc +41 -12
data/examples/echo.rb +1 -1
data/examples/execute.rb +0 -5
data/examples/pubsub/cli.rb +64 -0
data/examples/pubsub/ping_pong.rb +18 -0
data/examples/rosterprint.rb +14 -0
data/examples/xmpp4r/echo.rb +35 -0
data/lib/blather.rb +35 -12
data/lib/blather/client.rb +1 -1
data/lib/blather/client/client.rb +19 -13
data/lib/blather/client/dsl.rb +16 -0
data/lib/blather/client/dsl/pubsub.rb +133 -0
data/lib/blather/core_ext/active_support.rb +1 -117
data/lib/blather/core_ext/active_support/inheritable_attributes.rb +117 -0
data/lib/blather/core_ext/nokogiri.rb +35 -0
data/lib/blather/errors.rb +3 -20
data/lib/blather/errors/sasl_error.rb +3 -1
data/lib/blather/errors/stanza_error.rb +10 -17
data/lib/blather/errors/stream_error.rb +11 -14
data/lib/blather/jid.rb +1 -0
data/lib/blather/roster.rb +9 -0
data/lib/blather/roster_item.rb +6 -1
data/lib/blather/stanza.rb +35 -18
data/lib/blather/stanza/disco.rb +7 -1
data/lib/blather/stanza/disco/disco_info.rb +45 -33
data/lib/blather/stanza/disco/disco_items.rb +32 -21
data/lib/blather/stanza/iq.rb +13 -8
data/lib/blather/stanza/iq/query.rb +16 -8
data/lib/blather/stanza/iq/roster.rb +33 -22
data/lib/blather/stanza/message.rb +20 -31
data/lib/blather/stanza/presence.rb +3 -5
data/lib/blather/stanza/presence/status.rb +13 -21
data/lib/blather/stanza/presence/subscription.rb +11 -16
data/lib/blather/stanza/pubsub.rb +63 -0
data/lib/blather/stanza/pubsub/affiliations.rb +50 -0
data/lib/blather/stanza/pubsub/create.rb +43 -0
data/lib/blather/stanza/pubsub/errors.rb +9 -0
data/lib/blather/stanza/pubsub/event.rb +77 -0
data/lib/blather/stanza/pubsub/items.rb +63 -0
data/lib/blather/stanza/pubsub/publish.rb +58 -0
data/lib/blather/stanza/pubsub/retract.rb +53 -0
data/lib/blather/stanza/pubsub/subscribe.rb +42 -0
data/lib/blather/stanza/pubsub/subscription.rb +66 -0
data/lib/blather/stanza/pubsub/subscriptions.rb +55 -0
data/lib/blather/stanza/pubsub/unsubscribe.rb +42 -0
data/lib/blather/stanza/pubsub_owner.rb +41 -0
data/lib/blather/stanza/pubsub_owner/delete.rb +34 -0
data/lib/blather/stanza/pubsub_owner/purge.rb +34 -0
data/lib/blather/stream.rb +76 -168
data/lib/blather/stream/client.rb +1 -2
data/lib/blather/stream/component.rb +9 -5
data/lib/blather/stream/features.rb +53 -0
data/lib/blather/stream/features/resource.rb +63 -0
data/lib/blather/stream/{sasl.rb → features/sasl.rb} +53 -52
data/lib/blather/stream/features/session.rb +44 -0
data/lib/blather/stream/features/tls.rb +28 -0
data/lib/blather/stream/parser.rb +70 -46
data/lib/blather/xmpp_node.rb +113 -52
data/spec/blather/client/client_spec.rb +44 -58
data/spec/blather/client/dsl/pubsub_spec.rb +465 -0
data/spec/blather/client/dsl_spec.rb +19 -6
data/spec/blather/core_ext/nokogiri_spec.rb +83 -0
data/spec/blather/errors/sasl_error_spec.rb +8 -8
data/spec/blather/errors/stanza_error_spec.rb +25 -33
data/spec/blather/errors/stream_error_spec.rb +21 -16
data/spec/blather/errors_spec.rb +4 -11
data/spec/blather/jid_spec.rb +31 -30
data/spec/blather/roster_item_spec.rb +34 -23
data/spec/blather/roster_spec.rb +27 -12
data/spec/blather/stanza/discos/disco_info_spec.rb +61 -42
data/spec/blather/stanza/discos/disco_items_spec.rb +47 -35
data/spec/blather/stanza/iq/query_spec.rb +34 -11
data/spec/blather/stanza/iq/roster_spec.rb +47 -30
data/spec/blather/stanza/iq_spec.rb +19 -14
data/spec/blather/stanza/message_spec.rb +30 -17
data/spec/blather/stanza/presence/status_spec.rb +43 -20
data/spec/blather/stanza/presence/subscription_spec.rb +41 -21
data/spec/blather/stanza/presence_spec.rb +34 -21
data/spec/blather/stanza/pubsub/affiliations_spec.rb +57 -0
data/spec/blather/stanza/pubsub/create_spec.rb +56 -0
data/spec/blather/stanza/pubsub/event_spec.rb +84 -0
data/spec/blather/stanza/pubsub/items_spec.rb +79 -0
data/spec/blather/stanza/pubsub/publish_spec.rb +83 -0
data/spec/blather/stanza/pubsub/retract_spec.rb +75 -0
data/spec/blather/stanza/pubsub/subscribe_spec.rb +61 -0
data/spec/blather/stanza/pubsub/subscription_spec.rb +97 -0
data/spec/blather/stanza/pubsub/subscriptions_spec.rb +59 -0
data/spec/blather/stanza/pubsub/unsubscribe_spec.rb +61 -0
data/spec/blather/stanza/pubsub_owner/delete_spec.rb +50 -0
data/spec/blather/stanza/pubsub_owner/purge_spec.rb +50 -0
data/spec/blather/stanza/pubsub_owner_spec.rb +27 -0
data/spec/blather/stanza/pubsub_spec.rb +62 -0
data/spec/blather/stanza_spec.rb +53 -38
data/spec/blather/stream/client_spec.rb +231 -88
data/spec/blather/stream/component_spec.rb +14 -5
data/spec/blather/stream/parser_spec.rb +145 -0
data/spec/blather/xmpp_node_spec.rb +192 -96
data/spec/fixtures/pubsub.rb +311 -0
data/spec/spec_helper.rb +5 -4
metadata +54 -18
data/Rakefile +0 -139
data/ext/extconf.rb +0 -65
data/ext/push_parser.c +0 -209
data/lib/blather/core_ext/libxml.rb +0 -28
data/lib/blather/stream/resource.rb +0 -48
data/lib/blather/stream/session.rb +0 -36
data/lib/blather/stream/stream_handler.rb +0 -39
data/lib/blather/stream/tls.rb +0 -33
data/spec/blather/core_ext/libxml_spec.rb +0 -58

data/lib/blather/xmpp_node.rb CHANGED

@@ -4,13 +4,13 @@ module Blather
   # Base XML Node
   # All XML classes subclass XMPPNode
   # it allows the addition of helpers
-  class XMPPNode < XML::Node
+  class XMPPNode < Nokogiri::XML::Node
     BASE_NAMES = %w[presence message iq].freeze
     @@registrations = {}
-    class_inheritable_accessor  :ns,
-                                :name
+    class_inheritable_accessor  :registered_ns,
+                                :registered_name
     ##
     # Lets a subclass register itself
@@ -19,9 +19,9 @@ module Blather
     # up the class name of the object to instantiate when a new
     # stanza is received
     def self.register(name, ns = nil)
-      self.name = name.to_s
-      self.ns = ns
-      @@registrations[[self.name, self.ns]] = self
+      self.registered_name = name.to_s
+      self.registered_ns = ns
+      @@registrations[[self.registered_name, self.registered_ns]] = self
     end
     ##
@@ -36,7 +36,7 @@ module Blather
     # of that class and imports all the <tt>node</tt>'s attributes
     # and children into it.
     def self.import(node)
-      klass = class_from_registration(node.element_name, node.namespace)
+      klass = class_from_registration(node.element_name, (node.namespace.href if node.namespace))
       if klass && klass != self
         klass.import(node)
       else
@@ -55,16 +55,18 @@ module Blather
     #   end
     #
     #   n = Node.new
-    #   n.attributes[:type] = 'foo'
+    #   n[:type] = 'foo'
     #   n.type == :foo
-    #   n.attributes[:name] = 'bar'
+    #   n[:name] = 'bar'
     #   n.name == 'bar'
     def self.attribute_reader(*syms)
       opts = syms.last.is_a?(Hash) ? syms.pop : {}
+      convert_str = "val.#{opts[:call]} if val" if opts[:call]
       syms.flatten.each do |sym|
         class_eval(<<-END, __FILE__, __LINE__)
           def #{sym}
-            attributes[:#{sym}]#{".to_sym unless attributes[:#{sym}].blank?" unless opts[:to_sym] == false}
+            val = self[:#{sym}]
+            #{convert_str}
           end
         END
       end
@@ -79,13 +81,13 @@ module Blather
     #
     #   n = Node.new
     #   n.type = 'foo'
-    #   n.attributes[:type] == 'foo'
+    #   n[:type] == 'foo'
     def self.attribute_writer(*syms)
       syms.flatten.each do |sym|
         next if sym.is_a?(Hash)
         class_eval(<<-END, __FILE__, __LINE__)
           def #{sym}=(value)
-            attributes[:#{sym}] = value
+            self[:#{sym}] = value
           end
         END
       end
@@ -110,14 +112,74 @@ module Blather
       attribute_writer *syms
     end
+    ##
+    # Provides a content reader helper that returns the content of a node
+    # +method+ is the method to create
+    # +conversion+ is a method to call on the content before sending it back
+    # +node+ is the name of the content node (this defaults to the method name)
+    #
+    #   class Node
+    #     content_attr_reader :body
+    #     content_attr_reader :type, :to_sym
+    #     content_attr_reader :id, :to_i, :identity
+    #   end
+    #
+    #   n = Node.new 'foo'
+    #   n.to_s == "<foo><body>foobarbaz</body><type>error</type><identity>1000</identity></foo>"
+    #   n.body == 'foobarbaz'
+    #   n.type == :error
+    #   n.id == 1000
+    def self.content_attr_reader(method, conversion = nil, node = nil)
+      node ||= method
+      conversion = "val.#{conversion} if val.respond_to?(:#{conversion})" if conversion
+      class_eval(<<-END, __FILE__, __LINE__)
+        def #{method}
+          val = content_from :#{node}
+          #{conversion}
+        end
+      END
+    end
+    ##
+    # Provides a content writer helper that creates or updates the content of a node
+    # +method+ is the method to create
+    # +node+ is the name of the node to create (defaults to the method name)
+    #
+    #   class Node
+    #     content_attr_writer :body
+    #     content_attr_writer :id, :identity
+    #   end
+    #
+    #   n = Node.new 'foo'
+    #   n.body = 'thebodytext'
+    #   n.id = 'id-text'
+    #   n.to_s == '<foo><body>thebodytext</body><identity>id-text</identity></foo>'
+    def self.content_attr_writer(method, node = nil)
+      node ||= method
+      class_eval(<<-END, __FILE__, __LINE__)
+        def #{method}=(val)
+          set_content_for :#{node}, val
+        end
+      END
+    end
+    ##
+    # Provides a quick way of building +content_attr_reader+ and +content_attr_writer+
+    # for the same method and node
+    def self.content_attr_accessor(method, conversion = nil, node = nil)
+      content_attr_reader method, conversion, node
+      content_attr_writer method, node
+    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
+    def self.new(name = nil, doc = nil)
+      name ||= self.registered_name
-      super name.to_s, content
-      self.namespace = self.class.ns unless BASE_NAMES.include?(name.to_s)
+      node = super name.to_s, (doc || Nokogiri::XML::Document.new)
+      node.document.root = node unless doc
+      node.namespace = self.registered_ns unless BASE_NAMES.include?(name.to_s)
+      node
     end
     ##
@@ -126,80 +188,79 @@ module Blather
       self.class.import self
     end
+    alias_method :nokogiri_namespace=, :namespace=
     def namespace=(namespaces)
       case namespaces
-      when XML::Namespace
-        self.namespaces.namespace = namespaces
+      when Nokogiri::XML::Namespace
+        self.nokogiri_namespace = namespaces
       when String
-        self.namespaces.namespace = XML::Namespace.new(self, nil, namespaces)
+        self.add_namespace nil, namespaces
       when Hash
+        if ns = namespaces.delete(nil)
+          self.add_namespace nil, ns
+        end
         namespaces.each do |p, n|
-          self.namespaces.namespace = XML::Namespace.new(self, p, n)
+          ns = self.add_namespace p, n
+          self.nokogiri_namespace = ns
         end
       end
     end
-    def namespace(prefix = nil)
-      (ns = namespaces.find_by_prefix(prefix)) ? ns.href : nil
+    def namespace_href
+      namespace.href if namespace
     end
     ##
     # Remove a child with the name and (optionally) namespace given
     def remove_child(name, ns = nil)
-      name = name.to_s
-      self.detect { |n| n.remove! if n.element_name == name && (!ns || n.namespace == ns) }
+      child = xpath(name, ns).first
+      child.remove if child
     end
     ##
     # Remove all children with a given name
     def remove_children(name)
-      name = name.to_s
-      self.find(name).each { |n| n.remove! }
+      xpath("./*[local-name()='#{name}']").remove
     end
     ##
     # Pull the content from a child
-    def content_from(name)
-      name = name.to_s
-      (child = self.detect { |n| n.element_name == name }) ? child.content : nil
+    def content_from(name, ns = nil)
+      child = xpath(name, ns).first
+      child.content if child
     end
     ##
-    # Create a copy
-    def copy(deep = true)
-      copy = self.class.new.inherit(self)
-      copy.element_name = self.element_name
-      copy
+    # Sets the content for the specified node.
+    # If the node exists it is updated. If not a new node is created
+    # If the node exists and the content is nil, the node will be removed entirely
+    def set_content_for(node, content = nil)
+      if content
+        child = xpath(node).first
+        self << (child = XMPPNode.new(node, self.document)) unless child
+        child.content = content
+      else
+        remove_child node
+      end
     end
+    alias_method :copy, :dup
     ##
     # Inherit all of <tt>stanza</tt>'s attributes and children
     def inherit(stanza)
+      set_namespace stanza.namespace if stanza.namespace
       inherit_attrs stanza.attributes
-      stanza.children.each { |c| self << c.copy(true) }
+      stanza.children.each { |c| self << c.dup }
       self
     end
     ##
     # Inherit only <tt>stanza</tt>'s attributes
     def inherit_attrs(attrs)
-      attrs.each  { |a| attributes[a.name] = a.value }
+      attrs.each  { |name, value| self[name] = value }
       self
     end
-    ##
-    # Turn itself into an XML string and remove all whitespace between nodes
-    def to_xml
-      # TODO: Fix this for HTML nodes (and any other that might require whitespace)
-      to_s.gsub(">\n<", '><')
-    end
-    ##
-    # Override #find to work when a node isn't attached to a document
-    def find(what, nslist = nil)
-      what = what.to_s
-      (self.doc ? super(what, nslist) : select { |i| i.element_name == what })
-    end
   end #XMPPNode
-end
+end

data/spec/blather/client/client_spec.rb CHANGED

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), *%w[.. .. spec_helper])
 require 'blather/client/client'
-describe 'Blather::Client' do
+describe Blather::Client do
   before do
     @client = Blather::Client.new
   end
@@ -13,13 +13,13 @@ describe 'Blather::Client' do
     jid = 'me@me.com/test'
     @client.must_respond_to :jid=
     @client.jid = jid
-    @client.jid.must_be_kind_of JID
-    @client.jid.must_equal JID.new(jid)
+    @client.jid.must_be_kind_of Blather::JID
+    @client.jid.must_equal Blather::JID.new(jid)
   end
   it 'provides a reader for the roster' do
     @client.must_respond_to :roster
-    @client.roster.must_be_kind_of Roster
+    @client.roster.must_be_kind_of Blather::Roster
   end
   it 'provides a status reader' do
@@ -78,14 +78,8 @@ describe 'Blather::Client' do
     @client.unbind
   end
-  it 'raises an error if the stream type somehow is not supported' do
-    Blather::Stream::Component.stubs(:start).returns nil
-    @client.setup('me.com', 'secret').run
-    lambda { @client.post_init }.must_raise RuntimeError
-  end
   it 'can register a temporary handler based on stanza ID' do
-    stanza = Stanza::Iq.new
+    stanza = Blather::Stanza::Iq.new
     response = mock()
     response.expects(:call)
     @client.register_tmp_handler(stanza.id) { |_| response.call }
@@ -93,7 +87,7 @@ describe 'Blather::Client' do
   end
   it 'removes a tmp handler as soon as it is used' do
-    stanza = Stanza::Iq.new
+    stanza = Blather::Stanza::Iq.new
     response = mock()
     response.expects(:call)
     @client.register_tmp_handler(stanza.id) { |_| response.call }
@@ -102,7 +96,7 @@ describe 'Blather::Client' do
   end
   it 'will create a handler then write the stanza' do
-    stanza = Stanza::Iq.new
+    stanza = Blather::Stanza::Iq.new
     response = mock()
     response.expects(:call)
     @client.expects(:write).with do |s|
@@ -113,7 +107,7 @@ describe 'Blather::Client' do
   end
   it 'can register a handler' do
-    stanza = Stanza::Iq.new
+    stanza = Blather::Stanza::Iq.new
     response = mock()
     response.expects(:call).times(2)
     @client.register_handler(:iq) { |_| response.call }
@@ -127,26 +121,8 @@ describe 'Blather::Client#write' do
     @client = Blather::Client.new
   end
-  it 'sets the from attr on a stanza' do
-    jid = 'me@me.com'
-    stanza = mock(:from => nil)
-    stanza.expects(:from=).with jid
-    @client.jid = jid
-    @client.write stanza
-  end
-  it 'does not set the from attr if it already exists' do
-    jid = 'me@me.com'
-    stanza = Stanza::Iq.new
-    stanza.from = jid
-    stanza.expects(:from).returns jid
-    stanza.expects(:from=).never
-    @client.jid = jid
-    @client.write stanza
-  end
   it 'writes to the stream' do
-    stanza = Stanza::Iq.new
+    stanza = Blather::Stanza::Iq.new
     stream = mock()
     stream.expects(:send).with stanza
     Blather::Stream::Client.expects(:start).returns stream
@@ -173,11 +149,11 @@ describe 'Blather::Client#status=' do
   end
   it 'writes the new status to the stream' do
-    Stanza::Presence::Status.stubs(:next_id).returns 0
+    Blather::Stanza::Presence::Status.stubs(:next_id).returns 0
     status = [:away, 'message']
     @client.expects(:write).with do |s|
-      s.must_be_kind_of Stanza::Presence::Status
-      s.to_s.must_equal Stanza::Presence::Status.new(*status).to_s
+      s.must_be_kind_of Blather::Stanza::Presence::Status
+      s.to_s.must_equal Blather::Stanza::Presence::Status.new(*status).to_s
     end
     @client.status = status
   end
@@ -189,34 +165,34 @@ describe 'Blather::Client default handlers' do
   end
   it 're-raises errors' do
-    err = BlatherError.new
-    lambda { @client.receive_data err }.must_raise BlatherError
+    err = Blather::BlatherError.new
+    lambda { @client.receive_data err }.must_raise Blather::BlatherError
   end
   it 'responds to iq:get with a "service-unavailable" error' do
-    get = Stanza::Iq.new :get
-    err = StanzaError.new(get, 'service-unavailable', :cancel).to_node
+    get = Blather::Stanza::Iq.new :get
+    err = Blather::StanzaError.new(get, 'service-unavailable', :cancel).to_node
     @client.expects(:write).with err
     @client.receive_data get
   end
   it 'responds to iq:get with a "service-unavailable" error' do
-    get = Stanza::Iq.new :get
-    err = StanzaError.new(get, 'service-unavailable', :cancel).to_node
-    @client.expects(:write).with err
+    get = Blather::Stanza::Iq.new :get
+    err = Blather::StanzaError.new(get, 'service-unavailable', :cancel).to_node
+    @client.expects(:write).with { |n| n.to_s.must_equal err.to_s }
     @client.receive_data get
   end
   it 'responds to iq:set with a "service-unavailable" error' do
-    get = Stanza::Iq.new :set
-    err = StanzaError.new(get, 'service-unavailable', :cancel).to_node
-    @client.expects(:write).with err
+    get = Blather::Stanza::Iq.new :set
+    err = Blather::StanzaError.new(get, 'service-unavailable', :cancel).to_node
+    @client.expects(:write).with { |n| n.to_s.must_equal err.to_s }
     @client.receive_data get
   end
   it 'handles status changes by updating the roster if the status is from a JID in the roster' do
     jid = 'friend@jabber.local'
-    status = Stanza::Presence::Status.new :away
+    status = Blather::Stanza::Presence::Status.new :away
     status.stubs(:from).returns jid
     roster_item = mock()
     roster_item.expects(:status=).with status
@@ -225,7 +201,7 @@ describe 'Blather::Client default handlers' do
   end
   it 'handles an incoming roster node by processing it through the roster' do
-    roster = Stanza::Iq::Roster.new
+    roster = Blather::Stanza::Iq::Roster.new
     client_roster = mock()
     client_roster.expects(:process).with roster
     @client.stubs(:roster).returns client_roster
@@ -259,12 +235,12 @@ describe 'Blather::Client with a Client stream' do
   end
   it 'sends a request for the roster when post_init is called' do
-    @stream.expects(:send).with { |stanza| stanza.must_be_kind_of Stanza::Iq::Roster }
+    @stream.expects(:send).with { |stanza| stanza.must_be_kind_of Blather::Stanza::Iq::Roster }
     @client.post_init
   end
   it 'calls the ready handler after post_init and roster is received' do
-    result_roster = Stanza::Iq::Roster.new :result
+    result_roster = Blather::Stanza::Iq::Roster.new :result
     @stream.stubs(:send).with { |s| result_roster.id = s.id; @client.receive_data result_roster; true }
     ready = mock()
@@ -277,7 +253,7 @@ end
 describe 'Blather::Client guards' do
   before do
     @client = Blather::Client.new
-    @stanza = Stanza::Iq.new
+    @stanza = Blather::Stanza::Iq.new
     @response = mock()
   end
@@ -329,15 +305,15 @@ describe 'Blather::Client guards' do
     @response.expects(:call).times(2)
     @client.register_handler(:iq, :type => [:result, :error]) { |_| @response.call }
-    stanza = Stanza::Iq.new
+    stanza = Blather::Stanza::Iq.new
     stanza.expects(:type).at_least_once.returns :result
     @client.receive_data stanza
-    stanza = Stanza::Iq.new
+    stanza = Blather::Stanza::Iq.new
     stanza.expects(:type).at_least_once.returns :error
     @client.receive_data stanza
-    stanza = Stanza::Iq.new
+    stanza = Blather::Stanza::Iq.new
     stanza.expects(:type).at_least_once.returns :get
     @client.receive_data stanza
   end
@@ -346,12 +322,12 @@ describe 'Blather::Client guards' do
     @response.expects :call
     @client.register_handler(:iq, :type => :get, :body => 'test') { |_| @response.call }
-    stanza = Stanza::Iq.new
+    stanza = Blather::Stanza::Iq.new
     stanza.expects(:type).at_least_once.returns :get
     stanza.expects(:body).returns 'test'
     @client.receive_data stanza
-    stanza = Stanza::Iq.new
+    stanza = Blather::Stanza::Iq.new
     stanza.expects(:type).at_least_once.returns :set
     stanza.expects(:body).never
     @client.receive_data stanza
@@ -361,12 +337,12 @@ describe 'Blather::Client guards' do
     @response.expects(:call).times 2
     @client.register_handler(:iq, [{:type => :get}, {:body => 'test'}]) { |_| @response.call }
-    stanza = Stanza::Iq.new
+    stanza = Blather::Stanza::Iq.new
     stanza.expects(:type).at_least_once.returns :set
     stanza.expects(:body).returns 'test'
     @client.receive_data stanza
-    stanza = Stanza::Iq.new
+    stanza = Blather::Stanza::Iq.new
     stanza.stubs(:type).at_least_once.returns :get
     stanza.expects(:body).never
     @client.receive_data stanza
@@ -383,6 +359,16 @@ describe 'Blather::Client guards' do
     @client.receive_data @stanza
   end
+  it 'can be an xpath and will send the result to the handler' do
+    @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(:iq, "/iq[@id='#{@stanza.id}']") { |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