blather 0.4.14 → 0.4.15

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

@@ -1,5 +1,5 @@
-require File.join(File.dirname(__FILE__), *%w[.. .. .. spec_helper])
-require File.join(File.dirname(__FILE__), *%w[.. .. .. fixtures pubsub])
+require File.expand_path "../../../../spec_helper", __FILE__
+require File.expand_path "../../../../fixtures/pubsub", __FILE__
 
 describe Blather::Stanza::PubSub::Subscribe do
   it 'registers itself' do

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

@@ -1,5 +1,5 @@
-require File.join(File.dirname(__FILE__), *%w[.. .. .. spec_helper])
-require File.join(File.dirname(__FILE__), *%w[.. .. .. fixtures pubsub])
+require File.expand_path "../../../../spec_helper", __FILE__
+require File.expand_path "../../../../fixtures/pubsub", __FILE__
 
 describe Blather::Stanza::PubSub::Subscription do
   it 'registers itself' do

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

@@ -1,8 +1,8 @@
-require File.join(File.dirname(__FILE__), *%w[.. .. .. spec_helper])
-require File.join(File.dirname(__FILE__), *%w[.. .. .. fixtures pubsub])
+require File.expand_path "../../../../spec_helper", __FILE__
+require File.expand_path "../../../../fixtures/pubsub", __FILE__
 
 def control_subscriptions
-  { :subscribed => [{:node => 'node1', :jid => 'francisco@denmark.lit'}, {:node => 'node2', :jid => 'francisco@denmark.lit'}],
+  { :subscribed => [{:node => 'node1', :jid => 'francisco@denmark.lit', :subid => 'fd8237yr872h3f289j2'}, {:node => 'node2', :jid => 'francisco@denmark.lit', :subid => 'h8394hf8923ju'}],
     :unconfigured => [{:node => 'node3', :jid => 'francisco@denmark.lit'}],
     :pending => [{:node => 'node4', :jid => 'francisco@denmark.lit'}],
     :none => [{:node => 'node5', :jid => 'francisco@denmark.lit'}] }

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

@@ -1,5 +1,5 @@
-require File.join(File.dirname(__FILE__), *%w[.. .. .. spec_helper])
-require File.join(File.dirname(__FILE__), *%w[.. .. .. fixtures pubsub])
+require File.expand_path "../../../../spec_helper", __FILE__
+require File.expand_path "../../../../fixtures/pubsub", __FILE__
 
 describe Blather::Stanza::PubSub::Unsubscribe do
   it 'registers itself' do
@@ -58,4 +58,17 @@ describe Blather::Stanza::PubSub::Unsubscribe do
     unsubscribe.find('//ns:pubsub/ns:unsubscribe[@jid="n@d/r"]', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
     unsubscribe.jid.must_equal Blather::JID.new('n@d/r')
   end
+
+  it 'has a subid attribute' do
+    unsubscribe = Blather::Stanza::PubSub::Unsubscribe.new :set, 'host', 'node-name', 'jid'
+    unsubscribe.find('//ns:pubsub/ns:unsubscribe[@subid="subid"]', :ns => Blather::Stanza::PubSub.registered_ns).must_be_empty
+
+    unsubscribe = Blather::Stanza::PubSub::Unsubscribe.new :set, 'host', 'node-name', 'jid', 'subid'
+    unsubscribe.find('//ns:pubsub/ns:unsubscribe[@subid="subid"]', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+    unsubscribe.subid.must_equal 'subid'
+
+    unsubscribe.subid = 'newsubid'
+    unsubscribe.find('//ns:pubsub/ns:unsubscribe[@subid="newsubid"]', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+    unsubscribe.subid.must_equal 'newsubid'
+  end
 end

data/spec/blather/stanza/pubsub_owner/delete_spec.rb

@@ -1,5 +1,5 @@
-require File.join(File.dirname(__FILE__), *%w[.. .. .. spec_helper])
-require File.join(File.dirname(__FILE__), *%w[.. .. .. fixtures pubsub])
+require File.expand_path "../../../../spec_helper", __FILE__
+require File.expand_path "../../../../fixtures/pubsub", __FILE__
 
 describe Blather::Stanza::PubSubOwner::Delete do
   it 'registers itself' do

data/spec/blather/stanza/pubsub_owner/purge_spec.rb

@@ -1,5 +1,5 @@
-require File.join(File.dirname(__FILE__), *%w[.. .. .. spec_helper])
-require File.join(File.dirname(__FILE__), *%w[.. .. .. fixtures pubsub])
+require File.expand_path "../../../../spec_helper", __FILE__
+require File.expand_path "../../../../fixtures/pubsub", __FILE__
 
 describe Blather::Stanza::PubSubOwner::Purge do
   it 'registers itself' do

data/spec/blather/stanza/pubsub_owner_spec.rb

@@ -1,5 +1,5 @@
-require File.join(File.dirname(__FILE__), *%w[.. .. spec_helper])
-require File.join(File.dirname(__FILE__), *%w[.. .. fixtures pubsub])
+require File.expand_path "../../../spec_helper", __FILE__
+require File.expand_path "../../../fixtures/pubsub", __FILE__
 
 describe Blather::Stanza::PubSubOwner do
   it 'registers itself' do

data/spec/blather/stanza/pubsub_spec.rb

@@ -1,5 +1,5 @@
-require File.join(File.dirname(__FILE__), *%w[.. .. spec_helper])
-require File.join(File.dirname(__FILE__), *%w[.. .. fixtures pubsub])
+require File.expand_path "../../../spec_helper", __FILE__
+require File.expand_path "../../../fixtures/pubsub", __FILE__
 
 describe Blather::Stanza::PubSub do
   it 'registers itself' do
@@ -59,4 +59,16 @@ describe Blather::Stanza::PubSub::PubSubItem do
     item.payload = nil
     item.payload.must_be_nil
   end
+
+  it 'makes payloads readable as string' do
+    payload = Blather::XMPPNode.new 'foo'
+    item = Blather::Stanza::PubSub::Items::PubSubItem.new 'bar', payload
+    item.payload.must_equal payload.to_s
+  end
+
+  it 'makes payloads readable as node' do
+    payload = Blather::XMPPNode.new 'foo'
+    item = Blather::Stanza::PubSub::Items::PubSubItem.new 'bar', payload
+    item.payload_node.must_equal payload
+  end
 end

data/spec/blather/stanza/x_spec.rb

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

data/spec/blather/stanza_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[.. spec_helper])
+require File.expand_path "../../spec_helper", __FILE__
 
 describe Blather::Stanza do
   it 'provides .next_id helper for generating new IDs' do

data/spec/blather/stream/client_spec.rb

@@ -1,5 +1,5 @@
 require 'resolv'
-require File.join(File.dirname(__FILE__), *%w[.. .. spec_helper])
+require File.expand_path "../../../spec_helper", __FILE__
 
 describe Blather::Stream::Client do
   class MockServer; end

data/spec/blather/stream/component_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[.. .. spec_helper])
+require File.expand_path "../../../spec_helper", __FILE__
 
 describe Blather::Stream::Component do
   class MockServer; end

data/spec/blather/stream/parser_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[.. .. spec_helper])
+require File.expand_path "../../../spec_helper", __FILE__
 
 describe Blather::Stream::Parser do
   before do
@@ -69,6 +69,10 @@ describe Blather::Stream::Parser do
     check_parse '<foo bar="baz"/>'
   end
 
+  it 'handles attributes with entities properly' do
+    check_parse '<a href="http://example.com?a=1&amp;b=2">example</a>'
+  end
+
   it 'handles character input' do
     check_parse '<foo>bar baz fizbuz</foo>'
   end
@@ -89,6 +93,12 @@ describe Blather::Stream::Parser do
     @client.data[0].xpath('//*[namespace-uri()="urn:ietf:params:xml:ns:xmpp-stanzas"]').size.must_equal 2
   end
 
+  it 'handles not absolute namespaces' do
+    assert_nothing_raised do
+      @parser.receive_data '<iq type="result" id="blather0007" to="n@d/r"><vCard xmlns="vcard-temp"/></iq>'
+    end
+  end
+
   it 'responds with stream:stream as a separate response' do
     data = [
       '<stream:stream xmlns="jabber:client" xmlns:stream="http://etherx.jabber.org/streams" to="example.com" version="1.0">',

data/spec/blather/xmpp_node_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[.. spec_helper])
+require File.expand_path "../../spec_helper", __FILE__
 
 describe Blather::XMPPNode do
   before { @doc = Nokogiri::XML::Document.new }

data/spec/fixtures/pubsub.rb

@@ -164,8 +164,8 @@ def subscriptions_xml
     id='affil1'>
   <pubsub xmlns='http://jabber.org/protocol/pubsub'>
     <subscriptions>
-      <subscription node='node1' jid='francisco@denmark.lit' subscription='subscribed'/>
-      <subscription node='node2' jid='francisco@denmark.lit' subscription='subscribed'/>
+      <subscription node='node1' jid='francisco@denmark.lit' subscription='subscribed' subid='fd8237yr872h3f289j2'/>
+      <subscription node='node2' jid='francisco@denmark.lit' subscription='subscribed' subid='h8394hf8923ju'/>
       <subscription node='node3' jid='francisco@denmark.lit' subscription='unconfigured'/>
       <subscription node='node4' jid='francisco@denmark.lit' subscription='pending'/>
       <subscription node='node5' jid='francisco@denmark.lit' subscription='none'/>

data/spec/spec_helper.rb

@@ -30,6 +30,33 @@ module MiniTest
       assert_equal([args[:from], args[:to]], [(init_val if args[:from]), new_val], msg) if args[:to]
       refute_equal(init_val, new_val, msg) if args.empty?
     end
+    
+    def assert_nothing_raised(*args)
+      self._assertions += 1
+      if Module === args.last
+        msg = nil
+      else
+        msg = args.pop
+      end
+      begin
+        line = __LINE__; yield
+      rescue Exception => e
+        bt = e.backtrace
+        as = e.instance_of?(MiniTest::Assertion)
+        if as
+          ans = /\A#{Regexp.quote(__FILE__)}:#{line}:in /o
+          bt.reject! {|ln| ans =~ ln}
+        end
+        if ((args.empty? && !as) ||
+            args.any? {|a| a.instance_of?(Module) ? e.is_a?(a) : e.class == a })
+          msg = message(msg) { "Exception raised:\n<#{mu_pp(e)}>" }
+          raise MiniTest::Assertion, msg.call, bt
+        else
+          raise
+        end
+      end
+      nil
+    end
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: blather
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 4
-  - 14
-  version: 0.4.14
+  - 15
+  version: 0.4.15
 platform: ruby
 authors: 
 - Jeff Smick
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-02 00:00:00 -07:00
+date: 2011-01-09 00:00:00 +05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -90,11 +90,15 @@ files:
 - lib/blather/client/dsl/pubsub.rb
 - lib/blather/core_ext/active_support.rb
 - lib/blather/core_ext/active_support/inheritable_attributes.rb
+- lib/blather/core_ext/eventmachine.rb
 - lib/blather/core_ext/nokogiri.rb
 - lib/blather/errors.rb
 - lib/blather/errors/sasl_error.rb
 - lib/blather/errors/stanza_error.rb
 - lib/blather/errors/stream_error.rb
+- lib/blather/file_transfer.rb
+- lib/blather/file_transfer/ibb.rb
+- lib/blather/file_transfer/s5b.rb
 - lib/blather/jid.rb
 - lib/blather/roster.rb
 - lib/blather/roster_item.rb
@@ -104,8 +108,12 @@ files:
 - lib/blather/stanza/disco/disco_items.rb
 - lib/blather/stanza/iq.rb
 - lib/blather/stanza/iq/command.rb
+- lib/blather/stanza/iq/ibb.rb
 - lib/blather/stanza/iq/query.rb
 - lib/blather/stanza/iq/roster.rb
+- lib/blather/stanza/iq/s5b.rb
+- lib/blather/stanza/iq/si.rb
+- lib/blather/stanza/iq/vcard.rb
 - lib/blather/stanza/message.rb
 - lib/blather/stanza/presence.rb
 - lib/blather/stanza/presence/status.rb
@@ -136,8 +144,57 @@ files:
 - lib/blather/stream/features/tls.rb
 - lib/blather/stream/parser.rb
 - lib/blather/xmpp_node.rb
+- lib/test.rb
 - LICENSE
 - README.md
+- spec/blather/client/client_spec.rb
+- spec/blather/client/dsl/pubsub_spec.rb
+- spec/blather/client/dsl_spec.rb
+- spec/blather/core_ext/nokogiri_spec.rb
+- spec/blather/errors/sasl_error_spec.rb
+- spec/blather/errors/stanza_error_spec.rb
+- spec/blather/errors/stream_error_spec.rb
+- spec/blather/errors_spec.rb
+- spec/blather/file_transfer_spec.rb
+- spec/blather/jid_spec.rb
+- spec/blather/roster_item_spec.rb
+- spec/blather/roster_spec.rb
+- spec/blather/stanza/discos/disco_info_spec.rb
+- spec/blather/stanza/discos/disco_items_spec.rb
+- spec/blather/stanza/iq/command_spec.rb
+- spec/blather/stanza/iq/ibb_spec.rb
+- spec/blather/stanza/iq/query_spec.rb
+- spec/blather/stanza/iq/roster_spec.rb
+- spec/blather/stanza/iq/s5b_spec.rb
+- spec/blather/stanza/iq/si_spec.rb
+- spec/blather/stanza/iq/vcard_spec.rb
+- spec/blather/stanza/iq_spec.rb
+- spec/blather/stanza/message_spec.rb
+- spec/blather/stanza/presence/status_spec.rb
+- spec/blather/stanza/presence/subscription_spec.rb
+- spec/blather/stanza/presence_spec.rb
+- spec/blather/stanza/pubsub/affiliations_spec.rb
+- spec/blather/stanza/pubsub/create_spec.rb
+- spec/blather/stanza/pubsub/event_spec.rb
+- spec/blather/stanza/pubsub/items_spec.rb
+- spec/blather/stanza/pubsub/publish_spec.rb
+- spec/blather/stanza/pubsub/retract_spec.rb
+- spec/blather/stanza/pubsub/subscribe_spec.rb
+- spec/blather/stanza/pubsub/subscription_spec.rb
+- spec/blather/stanza/pubsub/subscriptions_spec.rb
+- spec/blather/stanza/pubsub/unsubscribe_spec.rb
+- spec/blather/stanza/pubsub_owner/delete_spec.rb
+- spec/blather/stanza/pubsub_owner/purge_spec.rb
+- spec/blather/stanza/pubsub_owner_spec.rb
+- spec/blather/stanza/pubsub_spec.rb
+- spec/blather/stanza/x_spec.rb
+- spec/blather/stanza_spec.rb
+- spec/blather/stream/client_spec.rb
+- spec/blather/stream/component_spec.rb
+- spec/blather/stream/parser_spec.rb
+- spec/blather/xmpp_node_spec.rb
+- spec/fixtures/pubsub.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/sprsquish/blather
 licenses: []
@@ -168,41 +225,37 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: squishtech
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Simpler XMPP built for speed
 test_files: 
-- spec/spec_helper.rb
-- spec/blather/errors_spec.rb
-- spec/blather/jid_spec.rb
-- spec/blather/roster_item_spec.rb
-- spec/blather/roster_spec.rb
-- spec/blather/stanza_spec.rb
-- spec/blather/xmpp_node_spec.rb
-- spec/fixtures/pubsub.rb
 - spec/blather/client/client_spec.rb
+- spec/blather/client/dsl/pubsub_spec.rb
 - spec/blather/client/dsl_spec.rb
 - spec/blather/core_ext/nokogiri_spec.rb
 - spec/blather/errors/sasl_error_spec.rb
 - spec/blather/errors/stanza_error_spec.rb
 - spec/blather/errors/stream_error_spec.rb
-- spec/blather/stanza/iq_spec.rb
-- spec/blather/stanza/message_spec.rb
-- spec/blather/stanza/presence_spec.rb
-- spec/blather/stanza/pubsub_owner_spec.rb
-- spec/blather/stanza/pubsub_spec.rb
-- spec/blather/stanza/x_spec.rb
-- spec/blather/stream/client_spec.rb
-- spec/blather/stream/component_spec.rb
-- spec/blather/stream/parser_spec.rb
+- spec/blather/errors_spec.rb
+- spec/blather/file_transfer_spec.rb
+- spec/blather/jid_spec.rb
+- spec/blather/roster_item_spec.rb
+- spec/blather/roster_spec.rb
 - spec/blather/stanza/discos/disco_info_spec.rb
 - spec/blather/stanza/discos/disco_items_spec.rb
 - spec/blather/stanza/iq/command_spec.rb
+- spec/blather/stanza/iq/ibb_spec.rb
 - spec/blather/stanza/iq/query_spec.rb
 - spec/blather/stanza/iq/roster_spec.rb
+- spec/blather/stanza/iq/s5b_spec.rb
+- spec/blather/stanza/iq/si_spec.rb
+- spec/blather/stanza/iq/vcard_spec.rb
+- spec/blather/stanza/iq_spec.rb
+- spec/blather/stanza/message_spec.rb
 - spec/blather/stanza/presence/status_spec.rb
 - spec/blather/stanza/presence/subscription_spec.rb
+- spec/blather/stanza/presence_spec.rb
 - spec/blather/stanza/pubsub/affiliations_spec.rb
 - spec/blather/stanza/pubsub/create_spec.rb
 - spec/blather/stanza/pubsub/event_spec.rb
@@ -215,4 +268,13 @@ test_files:
 - spec/blather/stanza/pubsub/unsubscribe_spec.rb
 - spec/blather/stanza/pubsub_owner/delete_spec.rb
 - spec/blather/stanza/pubsub_owner/purge_spec.rb
-- spec/blather/client/dsl/pubsub_spec.rb
+- spec/blather/stanza/pubsub_owner_spec.rb
+- spec/blather/stanza/pubsub_spec.rb
+- spec/blather/stanza/x_spec.rb
+- spec/blather/stanza_spec.rb
+- spec/blather/stream/client_spec.rb
+- spec/blather/stream/component_spec.rb
+- spec/blather/stream/parser_spec.rb
+- spec/blather/xmpp_node_spec.rb
+- spec/fixtures/pubsub.rb
+- spec/spec_helper.rb