blather 0.3.0 → 0.3.1

data/spec/blather/client/dsl_spec.rb

@@ -1,4 +1,105 @@
 require File.join(File.dirname(__FILE__), *%w[.. .. spec_helper])
+require 'blather/client/dsl'
 
 describe 'Blather::DSL' do
+  before do
+    @client = mock()
+    @dsl = class MockDSL; include Blather::DSL; end.new
+    Client.stubs(:new).returns(@client)
+  end
+
+  it 'wraps the setup' do
+    args = ['jid', 'pass', 'host', 0000]
+    @client.expects(:setup).with *args
+    @dsl.setup *args
+  end
+
+  it 'allows host to be nil in setup' do
+    args = ['jid', 'pass']
+    @client.expects(:setup).with *(args + [nil, nil])
+    @dsl.setup *args
+  end
+
+  it 'allows port to be nil in setup' do
+    args = ['jid', 'pass', 'host']
+    @client.expects(:setup).with *(args + [nil])
+    @dsl.setup *args
+  end
+
+  it 'stops when shutdown is called' do
+    @client.expects(:close)
+    @dsl.shutdown
+  end
+
+  it 'sets up handlers' do
+    type = :message
+    guards = [:chat?, {:body => 'exit'}]
+    @client.expects(:register_handler).with type, *guards
+    @dsl.handle type, *guards
+  end
+
+  it 'provides a helper for ready state' do
+    @client.expects(:register_handler).with :ready
+    @dsl.when_ready
+  end
+
+  it 'sets the initial status' do
+    state = :away
+    msg = 'do not disturb'
+    @client.expects(:status=).with [state, msg]
+    @dsl.set_status state, msg
+  end
+
+  it 'provides a roster accessor' do
+    @client.expects :roster
+    @dsl.my_roster
+  end
+
+  it 'provides a writer' do
+    stanza = Blather::Stanza::Iq.new
+    @client.expects(:write).with stanza
+    @dsl.write stanza
+  end
+
+  it 'provides a "say" helper' do
+    to, msg = 'me@me.com', 'hello!'
+    Blather::Stanza::Message.stubs(:next_id).returns 0
+    @client.expects(:write).with Blather::Stanza::Message.new(to, msg)
+    @dsl.say to, msg
+  end
+
+  it 'provides a JID accessor' do
+    @client.expects :jid
+    @dsl.jid
+  end
+
+  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'
+    expected_stanza = Blather::Stanza::Disco::DiscoItems.new
+    expected_stanza.to = who
+    expected_stanza.node = where
+    @client.expects(:write).with expected_stanza
+    @dsl.discover what, who, where
+  end
+
+  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'
+    expected_stanza = Blather::Stanza::Disco::DiscoInfo.new
+    expected_stanza.to = who
+    expected_stanza.node = where
+    @client.expects(:write).with expected_stanza
+    @dsl.discover what, who, where
+  end
+
+  Blather::Stanza.handler_list.each do |handler_method|
+    it "provides a helper method for #{handler_method}" do
+      guards = [:chat?, {:body => 'exit'}]
+      @client.expects(:register_handler).with handler_method, *guards
+      @dsl.__send__(handler_method, *guards)
+    end
+  end
 end

data/spec/blather/stream/client_spec.rb

@@ -11,7 +11,7 @@ describe 'Blather::Stream::Client' do
 
   def mocked_server(times = nil, &block)
     @client ||= mock()
-    @client.stubs(:stopped) unless @client.respond_to?(:stopped)
+    @client.stubs(:unbind) unless @client.respond_to?(:unbind)
     @client.stubs(:jid=) unless @client.respond_to?(:jid=)
 
     MockServer.any_instance.expects(:receive_data).send(*(times ? [:times, times] : [:at_least, 1])).with &block
@@ -58,7 +58,7 @@ describe 'Blather::Stream::Client' do
 
   it 'sends stanzas to the client when the stream is ready' do
     @client = mock()
-    @client.expects(:call).with do |n|
+    @client.expects(:receive_data).with do |n|
       EM.stop
       n.kind_of?(Stanza::Message) && @stream.ready?.must_equal(true)
     end
@@ -72,7 +72,7 @@ describe 'Blather::Stream::Client' do
 
   it 'puts itself in the stopped state and calls @client.stopped when stopped' do
     @client = mock()
-    @client.expects(:stopped).at_least_once
+    @client.expects(:unbind).at_least_once
 
     started = false
     mocked_server(2) do |val, server|
@@ -95,8 +95,8 @@ describe 'Blather::Stream::Client' do
   it 'will be in the negotiating state during feature negotiations' do
     state = nil
     @client = mock()
-    @client.stubs(:stream_started)
-    @client.expects(:call).with do |n|
+    @client.stubs(:post_init)
+    @client.expects(:receive_data).with do |n|
       EM.stop
       state.must_equal(:negotiated) && @stream.negotiating?.must_equal(false)
     end
@@ -154,7 +154,7 @@ describe 'Blather::Stream::Client' do
 
   it 'sends client an error on stream:error' do
     @client = mock()
-    @client.expects(:call).with do |v|
+    @client.expects(:receive_data).with do |v|
       v.name.must_equal :conflict
       v.text.must_equal 'Already signed in'
       v.to_s.must_equal "Stream Error (conflict): #{v.text}"
@@ -216,7 +216,7 @@ describe 'Blather::Stream::Client' do
   it 'will fail if TLS negotiation fails' do
     state = nil
     @client = mock()
-    @client.expects(:call).with { |v| v.must_be_kind_of TLSFailure }
+    @client.expects(:receive_data).with { |v| v.must_be_kind_of TLSFailure }
     mocked_server(3) do |val, server|
       case state
       when nil
@@ -245,7 +245,7 @@ describe 'Blather::Stream::Client' do
   it 'will fail if a bad node comes through TLS negotiations' do
     state = nil
     @client = mock()
-    @client.expects(:call).with do |v|
+    @client.expects(:receive_data).with do |v|
       v.must_be_kind_of UnknownResponse
       v.node.element_name.must_equal 'foo-bar'
     end
@@ -400,7 +400,7 @@ describe 'Blather::Stream::Client' do
   it 'tries each possible mechanism until it fails completely' do
     state = nil
     @client = mock()
-    @client.expects(:call).with do |n|
+    @client.expects(:receive_data).with do |n|
       n.must_be_kind_of(SASLError)
       n.name.must_equal :not_authorized
     end
@@ -473,7 +473,7 @@ describe 'Blather::Stream::Client' do
 
   it 'sends client an error when an unknown mechanism is sent' do
     @client = mock()
-    @client.expects(:call).with { |v| v.must_be_kind_of(Stream::SASL::UnknownMechanism) }
+    @client.expects(:receive_data).with { |v| v.must_be_kind_of(Stream::SASL::UnknownMechanism) }
     started = false
     mocked_server(2) do |val, server|
       if !started
@@ -500,7 +500,7 @@ describe 'Blather::Stream::Client' do
   ].each do |error_type|
     it "fails on #{error_type}" do
       @client = mock()
-      @client.expects(:call).with do |n|
+      @client.expects(:receive_data).with do |n|
         n.name.must_equal error_type.gsub('-','_').to_sym
       end
       state = nil
@@ -532,7 +532,7 @@ describe 'Blather::Stream::Client' do
 
   it 'fails when an unkown node comes through during SASL negotiation' do
     @client = mock()
-    @client.expects(:call).with do |n|
+    @client.expects(:receive_data).with do |n|
       n.must_be_instance_of UnknownResponse
       n.node.element_name.must_equal 'foo-bar'
     end
@@ -629,7 +629,7 @@ describe 'Blather::Stream::Client' do
   it 'will return an error if resource binding errors out' do
     state = nil
     @client = mock()
-    @client.expects(:call).with do |n|
+    @client.expects(:receive_data).with do |n|
       n.name.must_equal :bad_request
     end
     mocked_server(3) do |val, server|
@@ -660,7 +660,7 @@ describe 'Blather::Stream::Client' do
   it 'will return an error if an unkown node comes through during resouce binding' do
     state = nil
     @client = mock()
-    @client.expects(:call).with do |n|
+    @client.expects(:receive_data).with do |n|
       n.must_be_instance_of UnknownResponse
       n.node.element_name.must_equal 'foo-bar'
     end
@@ -692,7 +692,7 @@ describe 'Blather::Stream::Client' do
   it 'will establish a session if requested' do
     state = nil
     @client = mock()
-    @client.expects(:stream_started)
+    @client.expects(:post_init)
 
     mocked_server(3) do |val, server|
       case state
@@ -723,7 +723,7 @@ describe 'Blather::Stream::Client' do
   it 'will return an error if session establishment errors out' do
     state = nil
     @client = mock()
-    @client.expects(:call).with do |n|
+    @client.expects(:receive_data).with do |n|
       n.name.must_equal :internal_server_error
     end
     mocked_server(3) do |val, server|
@@ -754,7 +754,7 @@ describe 'Blather::Stream::Client' do
   it 'will return an error if an unknown node come through during session establishment' do
     state = nil
     @client = mock()
-    @client.expects(:call).with do |n|
+    @client.expects(:receive_data).with do |n|
       n.must_be_instance_of UnknownResponse
       n.node.element_name.must_equal 'foo-bar'
     end
@@ -785,7 +785,7 @@ describe 'Blather::Stream::Client' do
 
   it 'sends client an error on parse error' do
     @client = mock()
-    @client.expects(:call).with do |v|
+    @client.expects(:receive_data).with do |v|
       v.must_be_kind_of ParseError
       v.message.must_match(/generate\-parse\-error/)
     end

data/spec/blather/stream/component_spec.rb

@@ -11,7 +11,7 @@ describe 'Blather::Stream::Component' do
 
   def mocked_server(times = nil, &block)
     @client ||= mock()
-    @client.stubs(:stopped) unless @client.respond_to?(:stopped)
+    @client.stubs(:unbind) unless @client.respond_to?(:unbind)
     @client.stubs(:jid=) unless @client.respond_to?(:jid=)
 
     MockServer.any_instance.expects(:receive_data).send(*(times ? [:times, times] : [:at_least, 1])).with &block
@@ -60,8 +60,8 @@ describe 'Blather::Stream::Component' do
   end
 
   it 'sends stanzas to the client when the stream is ready' do
-    @client = mock(:stream_started)
-    @client.expects(:call).with do |n|
+    @client = mock(:post_init)
+    @client.expects(:receive_data).with do |n|
       EM.stop
       n.kind_of?(Stanza::Message) && @stream.ready?.must_equal(true)
     end

data/spec/spec_helper.rb

@@ -1,4 +1,7 @@
-require File.expand_path(File.join(File.dirname(__FILE__), *%w[.. lib blather]))
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..'))
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__), *%w[.. lib]))
+
+require 'blather'
 require 'rubygems'
 require 'minitest/spec'
 require 'mocha'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: blather
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Jeff Smick
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-12 00:00:00 -07:00
+date: 2009-05-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.3
+        version: 1.1.2
     version: 
 description: 
 email: sprsquish@gmail.com
@@ -44,6 +44,7 @@ extra_rdoc_files:
 files: 
 - examples/drb_client.rb
 - examples/echo.rb
+- examples/ping_pong.rb
 - examples/print_heirarchy.rb
 - ext/extconf.rb
 - ext/push_parser.c
@@ -71,7 +72,6 @@ files:
 - lib/blather/stanza/presence.rb
 - lib/blather/stanza/presence/status.rb
 - lib/blather/stanza/presence/subscription.rb
-- lib/blather/stanza/pubsub/subscriber.rb
 - lib/blather/stream.rb
 - lib/blather/stream/client.rb
 - lib/blather/stream/component.rb
@@ -115,7 +115,6 @@ summary: An evented XMPP library written on EventMachine and libxml-ruby
 test_files: 
 - spec/blather/client/client_spec.rb
 - spec/blather/client/dsl_spec.rb
-- spec/blather/client_spec.rb
 - spec/blather/core_ext/libxml_spec.rb
 - spec/blather/errors/sasl_error_spec.rb
 - spec/blather/errors/stanza_error_spec.rb
@@ -133,7 +132,6 @@ test_files:
 - spec/blather/stanza/presence/status_spec.rb
 - spec/blather/stanza/presence/subscription_spec.rb
 - spec/blather/stanza/presence_spec.rb
-- spec/blather/stanza/pubsub/subscriber_spec.rb
 - spec/blather/stanza_spec.rb
 - spec/blather/stream/client_spec.rb
 - spec/blather/stream/component_spec.rb

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

@@ -1,64 +0,0 @@
-module Blather
-class Stanza
-class PubSub
-
-  module Subscriber
-    def self.included(base)
-      base.class_eval do
-        extend ClassMethods
-        include InstanceMethods
-      end
-    end
-
-    module ClassMethods
-      def subscribe(host, node, jid)
-        stanza = self.new(:set, host)
-        subscription = XMPPNode.new 'subscription'
-        subscription.attributes[:node] = node
-        subscription.attributes[:jid] = JID.new(jid).stripped
-        stanza.pubsub << subscription
-        stanza
-      end
-
-      def unsubscribe(host, node, jid, subid = nil)
-        stanza = self.new(:set, host)
-        unsubscription = XMPPNode.new 'unsubscribe'
-        unsubscription.attributes[:node] = node
-        unsubscription.attributes[:jid] = JID.new(jid).stripped
-        unsubscription.attributes[:subid] = subid
-        stanza.pubsub << unsubscription
-        stanza
-      end
-    end
-
-    module InstanceMethods
-      def subscription
-        if sub = subscription?
-          { :node         => sub.attributes[:node],
-            :jid          => JID.new(sub.attributes[:jid]),
-            :subid        => sub.attributes[:subid],
-            :subscription => sub.attributes[:subscription] }
-        end
-      end
-
-      def subscription?
-        find_first('//pubsub_ns:pubsub/pubsub_ns:subscription', :pubsub_ns => self.ns)
-      end
-
-      def unsubscribe
-        if sub = unsubscribe?
-          { :node => sub.attributes[:node],
-            :jid  => JID.new(sub.attributes[:jid]) }
-        end
-      end
-
-      def unsubscribe?
-        find_first('//pubsub_ns:pubsub/pubsub_ns:unsubscribe', :pubsub_ns => self.ns)
-      end
-    end
-
-  end #Subscriber
-
-end #PubSub
-end #Stanza
-end #Blather

data/spec/blather/stanza/pubsub/subscriber_spec.rb

@@ -1,70 +0,0 @@
-__END__
-require File.join(File.dirname(__FILE__), *%w[.. .. .. spec_helper])
-require File.join(File.dirname(__FILE__), *%w[.. .. .. fixtures pubsub])
-
-describe 'Blather::Stanza::PubSub::Subscriber' do
-  it 'can request a subscription' do
-    sub = Blather::Stanza::PubSub.subscribe 'host.name', 'node_name', 'j@i.d'
-    sub.to.must_equal JID.new('host.name')
-    sub.set?.must_equal true
-    sub.find_first('//pubsub/subscription[@node="node_name" and @jid="j@i.d"]').wont_be_nil
-  end
-
-  it 'can request an unsubscribe' do
-    sub = Blather::Stanza::PubSub.unsubscribe 'host.name', 'node_name', 'j@i.d'
-    sub.to.must_equal JID.new('host.name')
-    sub.set?.must_equal true
-    sub.find_first('//pubsub/unsubscribe[@node="node_name" and @jid="j@i.d"]').wont_be_nil
-  end
-  
-  it 'can request an unsubscribe with a subscription id' do
-    sub = Blather::Stanza::PubSub.unsubscribe 'host.name', 'node_name', 'j@i.d', 'subid'
-    sub.to.must_equal JID.new('host.name')
-    sub.set?.must_equal true
-    sub.find_first('//pubsub/unsubscribe[@node="node_name" and @jid="j@i.d" and @subid="subid"]').wont_be_nil
-  end
-
-  it 'knows if it is a subscription' do
-    node = XML::Document.string(subscriber_xml).root
-    stanza = Blather::Stanza::PubSub.import node
-    stanza.subscription?.wont_be_nil
-  end
-
-  it 'knows if it is not a subscription' do
-    node = XML::Document.string(unsubscribe_xml).root
-    stanza = Blather::Stanza::PubSub.import node
-    stanza.subscription?.must_be_nil
-  end
-
-  it 'knows the values of a subscription' do
-    node = XML::Document.string(subscriber_xml).root
-    stanza = Blather::Stanza::PubSub.import node
-    stanza.subscription.must_equal({
-      :node         => 'princely_musings',
-      :jid          => JID.new('francisco@denmark.lit'),
-      :subid        => 'ba49252aaa4f5d320c24d3766f0bdcade78c78d3',
-      :subscription => 'subscribed'
-    })
-  end
-
-  it 'knows if it is a unsubscribe' do
-    node = XML::Document.string(unsubscribe_xml).root
-    stanza = Blather::Stanza::PubSub.import node
-    stanza.unsubscribe?.wont_be_nil
-  end
-
-  it 'knows if it is not a unsubscribe' do
-    node = XML::Document.string(subscriber_xml).root
-    stanza = Blather::Stanza::PubSub.import node
-    stanza.unsubscribe?.must_be_nil
-  end
-
-  it 'knows the values of the unsubscribe' do
-    node = XML::Document.string(unsubscribe_xml).root
-    stanza = Blather::Stanza::PubSub.import node
-    stanza.unsubscribe.must_equal({
-      :node => 'princely_musings',
-      :jid  => JID.new('francisco@denmark.lit')
-    })
-  end
-end