blather 0.2.3 → 0.3.0

data/spec/blather/stanza/{iq/discos → discos}/disco_info_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[.. .. .. .. spec_helper])
+require File.join(File.dirname(__FILE__), *%w[.. .. .. spec_helper])
 
 def disco_info_xml
   <<-XML
@@ -24,7 +24,7 @@ describe 'Blather::Stanza::Iq::DiscoInfo' do
   end
 
   it 'has a node attribute' do
-    n = Blather::Stanza::Iq::DiscoInfo.new nil, [], [], 'music'
+    n = Blather::Stanza::Iq::DiscoInfo.new nil, 'music', [], []
     n.node.must_equal 'music'
     n.node = :foo
     n.node.must_equal 'foo'
@@ -55,7 +55,7 @@ describe 'Blather::Stanza::Iq::DiscoInfo identities' do
     control = [ Stanza::Iq::DiscoInfo::Identity.new(*%w[name type category]),
                 Stanza::Iq::DiscoInfo::Identity.new(*%w[name1 type1 category1])]
 
-    di = Stanza::Iq::DiscoInfo.new nil, ids
+    di = Stanza::Iq::DiscoInfo.new nil, nil, ids
     di.identities.size.must_equal 2
     di.identities.each { |i| control.include?(i).must_equal true }
   end
@@ -64,7 +64,7 @@ describe 'Blather::Stanza::Iq::DiscoInfo identities' do
     control = [ Stanza::Iq::DiscoInfo::Identity.new(*%w[name type category]),
                 Stanza::Iq::DiscoInfo::Identity.new(*%w[name1 type1 category1])]
 
-    di = Stanza::Iq::DiscoInfo.new nil, control
+    di = Stanza::Iq::DiscoInfo.new nil, nil, control
     di.identities.size.must_equal 2
     di.identities.each { |i| control.include?(i).must_equal true }
   end
@@ -72,7 +72,7 @@ describe 'Blather::Stanza::Iq::DiscoInfo identities' do
   it 'takes a single hash as identity' do
     control = [Stanza::Iq::DiscoInfo::Identity.new(*%w[name type category])]
 
-    di = Stanza::Iq::DiscoInfo.new nil, {:name => 'name', :type => 'type', :category => 'category'}
+    di = Stanza::Iq::DiscoInfo.new nil, nil, {:name => 'name', :type => 'type', :category => 'category'}
     di.identities.size.must_equal 1
     di.identities.each { |i| control.include?(i).must_equal true }
   end
@@ -80,7 +80,7 @@ describe 'Blather::Stanza::Iq::DiscoInfo identities' do
   it 'takes a single identity object as identity' do
     control = [Stanza::Iq::DiscoInfo::Identity.new(*%w[name type category])]
 
-    di = Stanza::Iq::DiscoInfo.new nil, control.first
+    di = Stanza::Iq::DiscoInfo.new nil, nil, control.first
     di.identities.size.must_equal 1
     di.identities.each { |i| control.include?(i).must_equal true }
   end
@@ -94,7 +94,7 @@ describe 'Blather::Stanza::Iq::DiscoInfo identities' do
     control = [ Stanza::Iq::DiscoInfo::Identity.new(*%w[name type category]),
                 Stanza::Iq::DiscoInfo::Identity.new(*%w[name1 type1 category1])]
 
-    di = Stanza::Iq::DiscoInfo.new nil, ids
+    di = Stanza::Iq::DiscoInfo.new nil, nil, ids
     di.identities.size.must_equal 2
     di.identities.each { |i| control.include?(i).must_equal true }
   end
@@ -105,7 +105,7 @@ describe 'Blather::Stanza::Iq::DiscoInfo features' do
     features = %w[feature1 feature2 feature3]
     control = features.map { |f| Stanza::Iq::DiscoInfo::Feature.new f }
 
-    di = Stanza::Iq::DiscoInfo.new nil, [], features
+    di = Stanza::Iq::DiscoInfo.new nil, nil, [], features
     di.features.size.must_equal 3
     di.features.each { |f| control.include?(f).must_equal true }
   end
@@ -114,7 +114,7 @@ describe 'Blather::Stanza::Iq::DiscoInfo features' do
     features = %w[feature1 feature2 feature3]
     control = features.map { |f| Stanza::Iq::DiscoInfo::Feature.new f }
 
-    di = Stanza::Iq::DiscoInfo.new nil, [], control
+    di = Stanza::Iq::DiscoInfo.new nil, nil, [], control
     di.features.size.must_equal 3
     di.features.each { |f| control.include?(f).must_equal true }
   end
@@ -122,7 +122,7 @@ describe 'Blather::Stanza::Iq::DiscoInfo features' do
   it 'takes a single string' do
     control = [Stanza::Iq::DiscoInfo::Feature.new('feature1')]
 
-    di = Stanza::Iq::DiscoInfo.new nil, [], 'feature1'
+    di = Stanza::Iq::DiscoInfo.new nil, nil, [], 'feature1'
     di.features.size.must_equal 1
     di.features.each { |f| control.include?(f).must_equal true }
   end
@@ -130,7 +130,7 @@ describe 'Blather::Stanza::Iq::DiscoInfo features' do
   it 'takes a single Feature object' do
     control = [Stanza::Iq::DiscoInfo::Feature.new('feature1')]
 
-    di = Stanza::Iq::DiscoInfo.new nil, [], control.first
+    di = Stanza::Iq::DiscoInfo.new nil, nil, [], control.first
     di.features.size.must_equal 1
     di.features.each { |f| control.include?(f).must_equal true }
   end
@@ -140,7 +140,7 @@ describe 'Blather::Stanza::Iq::DiscoInfo features' do
     control = features.map { |f| Stanza::Iq::DiscoInfo::Feature.new f }
     features[1] = control[1]
 
-    di = Stanza::Iq::DiscoInfo.new nil, [], features
+    di = Stanza::Iq::DiscoInfo.new nil, nil, [], features
     di.features.size.must_equal 3
     di.features.each { |f| control.include?(f).must_equal true }
   end

data/spec/blather/stanza/{iq/discos → discos}/disco_items_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[.. .. .. .. spec_helper])
+require File.join(File.dirname(__FILE__), *%w[.. .. .. spec_helper])
 
 def disco_items_xml
   <<-XML

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

@@ -19,6 +19,13 @@ describe 'Blather::Stanza::Iq::Query' do
     query.children.detect { |n| n.element_name == 'query' }.wont_be_nil
   end
 
+  [:get, :set, :result, :error].each do |type|
+    it "can be set as \"#{type}\"" do
+      query = Stanza::Iq::Query.new type
+      query.type.must_equal type
+    end
+  end
+
   it 'sets type to "result" on reply' do
     query = Stanza::Iq::Query.new
     query.type.must_equal :get

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

@@ -1,27 +1,27 @@
 require File.join(File.dirname(__FILE__), *%w[.. .. .. spec_helper])
 
 def roster_xml
-  <<-XML
-  <iq to='juliet@example.com/balcony' type='result' id='roster_1'>
-    <query xmlns='jabber:iq:roster'>
-      <item jid='romeo@example.net'
-            name='Romeo'
-            subscription='both'>
-        <group>Friends</group>
-      </item>
-      <item jid='mercutio@example.org'
-            name='Mercutio'
-            subscription='from'>
-        <group>Friends</group>
-      </item>
-      <item jid='benvolio@example.org'
-            name='Benvolio'
-            subscription='both'>
-        <group>Friends</group>
-      </item>
-    </query>
-  </iq>
-  XML
+<<-XML
+<iq to='juliet@example.com/balcony' type='result' id='roster_1'>
+  <query xmlns='jabber:iq:roster'>
+    <item jid='romeo@example.net'
+          name='Romeo'
+          subscription='both'>
+      <group>Friends</group>
+    </item>
+    <item jid='mercutio@example.org'
+          name='Mercutio'
+          subscription='from'>
+      <group>Friends</group>
+    </item>
+    <item jid='benvolio@example.org'
+          name='Benvolio'
+          subscription='both'>
+      <group>Friends</group>
+    </item>
+  </query>
+</iq>
+XML
 end
 
 describe 'Blather::Stanza::Iq::Roster' do

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

@@ -0,0 +1,70 @@
+__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

data/spec/blather/stanza_spec.rb

@@ -96,12 +96,6 @@ describe 'Blather::Stanza' do
   it 'can be converted into an error by error name' do
     s = Stanza.new('message')
     err = s.as_error 'internal-server-error', 'cancel'
-    err.must_be_instance_of StanzaError::InternalServerError
-  end
-
-  it 'can be converted into an error by error class' do
-    s = Stanza.new('message')
-    err = s.as_error StanzaError::InternalServerError, 'cancel'
-    err.must_be_instance_of StanzaError::InternalServerError
+    err.name.must_equal :internal_server_error
   end
 end

data/spec/blather/stream/client_spec.rb

@@ -155,7 +155,7 @@ describe 'Blather::Stream::Client' do
   it 'sends client an error on stream:error' do
     @client = mock()
     @client.expects(:call).with do |v|
-      v.must_be_instance_of(StreamError::Conflict)
+      v.name.must_equal :conflict
       v.text.must_equal 'Already signed in'
       v.to_s.must_equal "Stream Error (conflict): #{v.text}"
     end
@@ -353,7 +353,7 @@ describe 'Blather::Stream::Client' do
       when :started
         state = :auth_sent
         server.send_data "<success xmlns='urn:ietf:params:xml:ns:xmpp-sasl' />"
-        val.must_equal('<auth xmlns="urn:ietf:params:xml:ns:xmpp-sasl" mechanism="ANONYMOUS">bg==</auth>')
+        val.must_equal('<auth xmlns="urn:ietf:params:xml:ns:xmpp-sasl" mechanism="ANONYMOUS"/>')
 
       when :auth_sent
         EM.stop
@@ -368,12 +368,41 @@ describe 'Blather::Stream::Client' do
     end
   end
 
-  it 'tried each possible mechanism until it fails completely' do
+  it 'connects via ANONYMOUS if the JID has a blank node' do
+    state = nil
+    @jid = JID.new '@d'
+
+    mocked_server(3) do |val, server|
+      case state
+      when nil
+        state = :started
+        server.send_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>"
+        val.must_match(/stream:stream/)
+
+      when :started
+        state = :auth_sent
+        server.send_data "<success xmlns='urn:ietf:params:xml:ns:xmpp-sasl' />"
+        val.must_equal('<auth xmlns="urn:ietf:params:xml:ns:xmpp-sasl" mechanism="ANONYMOUS"/>')
+
+      when :auth_sent
+        EM.stop
+        state = :complete
+        val.must_match(/stream:stream/)
+
+      else
+        EM.stop
+        false
+
+      end
+    end
+  end
+
+  it 'tries each possible mechanism until it fails completely' do
     state = nil
     @client = mock()
     @client.expects(:call).with do |n|
       n.must_be_kind_of(SASLError)
-      n.must_be_instance_of SASLError::NotAuthorized
+      n.name.must_equal :not_authorized
     end
 
     mocked_server(5) do |val, server|
@@ -472,7 +501,7 @@ describe 'Blather::Stream::Client' do
     it "fails on #{error_type}" do
       @client = mock()
       @client.expects(:call).with do |n|
-        n.must_be_instance_of SASLError.class_from_registration(error_type)
+        n.name.must_equal error_type.gsub('-','_').to_sym
       end
       state = nil
       mocked_server(3) do |val, server|
@@ -601,7 +630,7 @@ describe 'Blather::Stream::Client' do
     state = nil
     @client = mock()
     @client.expects(:call).with do |n|
-      n.must_be_instance_of StanzaError::BadRequest
+      n.name.must_equal :bad_request
     end
     mocked_server(3) do |val, server|
       case state
@@ -695,7 +724,7 @@ describe 'Blather::Stream::Client' do
     state = nil
     @client = mock()
     @client.expects(:call).with do |n|
-      n.must_be_instance_of StanzaError::InternalServerError
+      n.name.must_equal :internal_server_error
     end
     mocked_server(3) do |val, server|
       case state

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[.. lib blather])
+require File.expand_path(File.join(File.dirname(__FILE__), *%w[.. lib 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.2.3
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jeff Smick
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-07 00:00:00 -07:00
+date: 2009-05-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,16 +44,13 @@ extra_rdoc_files:
 files: 
 - examples/drb_client.rb
 - examples/echo.rb
-- ext/Makefile
+- examples/print_heirarchy.rb
 - ext/extconf.rb
-- ext/mkmf.log
-- ext/push_parser.bundle
 - ext/push_parser.c
-- ext/push_parser.o
-- lib/autotest/discover.rb
-- lib/autotest/spec.rb
 - lib/blather.rb
 - lib/blather/client.rb
+- lib/blather/client/client.rb
+- lib/blather/client/dsl.rb
 - lib/blather/core_ext/active_support.rb
 - lib/blather/core_ext/libxml.rb
 - lib/blather/errors.rb
@@ -64,16 +61,17 @@ files:
 - lib/blather/roster.rb
 - lib/blather/roster_item.rb
 - lib/blather/stanza.rb
+- lib/blather/stanza/disco.rb
+- lib/blather/stanza/disco/disco_info.rb
+- lib/blather/stanza/disco/disco_items.rb
 - lib/blather/stanza/iq.rb
-- lib/blather/stanza/iq/disco.rb
-- lib/blather/stanza/iq/discos/disco_info.rb
-- lib/blather/stanza/iq/discos/disco_items.rb
 - lib/blather/stanza/iq/query.rb
 - lib/blather/stanza/iq/roster.rb
 - lib/blather/stanza/message.rb
 - 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
@@ -110,11 +108,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: squishtech
-rubygems_version: 1.3.2
+rubygems_version: 1.3.3
 signing_key: 
 specification_version: 3
 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
@@ -123,8 +124,8 @@ test_files:
 - spec/blather/jid_spec.rb
 - spec/blather/roster_item_spec.rb
 - spec/blather/roster_spec.rb
-- spec/blather/stanza/iq/discos/disco_info_spec.rb
-- spec/blather/stanza/iq/discos/disco_items_spec.rb
+- spec/blather/stanza/discos/disco_info_spec.rb
+- spec/blather/stanza/discos/disco_items_spec.rb
 - spec/blather/stanza/iq/query_spec.rb
 - spec/blather/stanza/iq/roster_spec.rb
 - spec/blather/stanza/iq_spec.rb
@@ -132,12 +133,9 @@ 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/event_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
 - spec/blather/xmpp_node_spec.rb
-- spec/build_safe.rb
 - spec/spec_helper.rb
-- examples/drb_client.rb
-- examples/echo.rb