blather 0.4.15 → 0.4.16

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

@@ -1,5 +1,5 @@
-require File.expand_path "../../../../spec_helper", __FILE__
-require File.expand_path "../../../../fixtures/pubsub", __FILE__
+require 'spec_helper'
+require 'fixtures/pubsub'
 
 def control_affiliations
   { :owner => ['node1', 'node2'],

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

@@ -1,5 +1,5 @@
-require File.expand_path "../../../../spec_helper", __FILE__
-require File.expand_path "../../../../fixtures/pubsub", __FILE__
+require 'spec_helper'
+require 'fixtures/pubsub'
 
 describe Blather::Stanza::PubSub::Create do
   it 'registers itself' do
@@ -53,4 +53,4 @@ describe Blather::Stanza::PubSub::Create do
     create = Blather::Stanza::PubSub::Create.new :set, 'host', 'node-name'
     create.node.must_equal 'node-name'
   end
-end
+end

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

@@ -1,5 +1,5 @@
-require File.expand_path "../../../../spec_helper", __FILE__
-require File.expand_path "../../../../fixtures/pubsub", __FILE__
+require 'spec_helper'
+require 'fixtures/pubsub'
 
 describe Blather::Stanza::PubSub::Event do
   it 'registers itself' do

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

@@ -1,5 +1,5 @@
-require File.expand_path "../../../../spec_helper", __FILE__
-require File.expand_path "../../../../fixtures/pubsub", __FILE__
+require 'spec_helper'
+require 'fixtures/pubsub'
 
 describe Blather::Stanza::PubSub::Items do
   it 'registers itself' do

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

@@ -1,5 +1,5 @@
-require File.expand_path "../../../../spec_helper", __FILE__
-require File.expand_path "../../../../fixtures/pubsub", __FILE__
+require 'spec_helper'
+require 'fixtures/pubsub'
 
 describe Blather::Stanza::PubSub::Publish do
   it 'registers itself' do

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

@@ -1,5 +1,5 @@
-require File.expand_path "../../../../spec_helper", __FILE__
-require File.expand_path "../../../../fixtures/pubsub", __FILE__
+require 'spec_helper'
+require 'fixtures/pubsub'
 
 describe Blather::Stanza::PubSub::Retract do
   it 'registers itself' do

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

@@ -1,5 +1,5 @@
-require File.expand_path "../../../../spec_helper", __FILE__
-require File.expand_path "../../../../fixtures/pubsub", __FILE__
+require 'spec_helper'
+require 'fixtures/pubsub'
 
 describe Blather::Stanza::PubSub::Subscribe do
   it 'registers itself' do

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

@@ -1,5 +1,5 @@
-require File.expand_path "../../../../spec_helper", __FILE__
-require File.expand_path "../../../../fixtures/pubsub", __FILE__
+require 'spec_helper'
+require 'fixtures/pubsub'
 
 describe Blather::Stanza::PubSub::Subscription do
   it 'registers itself' do
@@ -93,5 +93,5 @@ describe Blather::Stanza::PubSub::Subscription do
       Blather::Stanza::PubSub::Subscription.new.must_respond_to :"#{valid_type}?"
     end
   end
-  
+
 end

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

@@ -1,5 +1,5 @@
-require File.expand_path "../../../../spec_helper", __FILE__
-require File.expand_path "../../../../fixtures/pubsub", __FILE__
+require 'spec_helper'
+require 'fixtures/pubsub'
 
 def control_subscriptions
   { :subscribed => [{:node => 'node1', :jid => 'francisco@denmark.lit', :subid => 'fd8237yr872h3f289j2'}, {:node => 'node2', :jid => 'francisco@denmark.lit', :subid => 'h8394hf8923ju'}],

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

@@ -1,5 +1,5 @@
-require File.expand_path "../../../../spec_helper", __FILE__
-require File.expand_path "../../../../fixtures/pubsub", __FILE__
+require 'spec_helper'
+require 'fixtures/pubsub'
 
 describe Blather::Stanza::PubSub::Unsubscribe do
   it 'registers itself' do

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

@@ -1,5 +1,5 @@
-require File.expand_path "../../../../spec_helper", __FILE__
-require File.expand_path "../../../../fixtures/pubsub", __FILE__
+require 'spec_helper'
+require 'fixtures/pubsub'
 
 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.expand_path "../../../../spec_helper", __FILE__
-require File.expand_path "../../../../fixtures/pubsub", __FILE__
+require 'spec_helper'
+require 'fixtures/pubsub'
 
 describe Blather::Stanza::PubSubOwner::Purge do
   it 'registers itself' do
@@ -47,4 +47,4 @@ describe Blather::Stanza::PubSubOwner::Purge do
     purge = Blather::Stanza::PubSubOwner::Purge.new :set, 'host', 'node-name'
     purge.node.must_equal 'node-name'
   end
-end
+end

data/spec/blather/stanza/pubsub_owner_spec.rb

@@ -1,5 +1,5 @@
-require File.expand_path "../../../spec_helper", __FILE__
-require File.expand_path "../../../fixtures/pubsub", __FILE__
+require 'spec_helper'
+require 'fixtures/pubsub'
 
 describe Blather::Stanza::PubSubOwner do
   it 'registers itself' do

data/spec/blather/stanza/pubsub_spec.rb

@@ -1,5 +1,5 @@
-require File.expand_path "../../../spec_helper", __FILE__
-require File.expand_path "../../../fixtures/pubsub", __FILE__
+require 'spec_helper'
+require 'fixtures/pubsub'
 
 describe Blather::Stanza::PubSub do
   it 'registers itself' do
@@ -65,10 +65,4 @@ describe Blather::Stanza::PubSub::PubSubItem do
     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.expand_path "../../../spec_helper", __FILE__
+require 'spec_helper'
 
 def x_xml
   <<-XML
@@ -203,11 +203,6 @@ describe Blather::Stanza::X::Field do
     di.options.size.must_equal 2
   end
 
-  it 'raises an error when compared against a non X::Field' do
-    a = Blather::Stanza::X::Field.new('secret_message', 'hidden')
-    lambda { a == 'test' }.must_raise RuntimeError
-  end
-
   it 'can determine equality' do
     a = Blather::Stanza::X::Field.new('subject', 'text-single')
     a.must_equal Blather::Stanza::X::Field.new('subject', 'text-single')

data/spec/blather/stanza_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../../spec_helper", __FILE__
+require 'spec_helper'
 
 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.expand_path "../../../spec_helper", __FILE__
+require 'spec_helper'
 
 describe Blather::Stream::Client do
   class MockServer; end
@@ -1008,12 +1008,12 @@ describe Blather::Stream::Client do
     comp.expects(:send_data).with { |s| s.wont_match(/^<message[^>]*from=/); true }
     comp.send msg
   end
-  
+
   it 'sends xml without formatting' do
     client = mock()
     client.stubs(:jid)
     client.stubs(:jid=)
-    
+
     msg = Blather::Stanza::Message.new 'to@jid.com', 'body'
     msg.xhtml = '<i>xhtml</i> body'
 

data/spec/blather/stream/component_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../../../spec_helper", __FILE__
+require 'spec_helper'
 
 describe Blather::Stream::Component do
   class MockServer; end

data/spec/blather/stream/parser_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../../../spec_helper", __FILE__
+require 'spec_helper'
 
 describe Blather::Stream::Parser do
   before do

data/spec/blather/xmpp_node_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../../spec_helper", __FILE__
+require 'spec_helper'
 
 describe Blather::XMPPNode do
   before { @doc = Nokogiri::XML::Document.new }

data/spec/spec_helper.rb

@@ -1,9 +1,6 @@
-$:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..'))
-$:.unshift File.expand_path(File.join(File.dirname(__FILE__), *%w[.. lib]))
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 
 require 'blather'
-require 'rubygems'
-gem 'minitest', '>=1.7.1'
 require 'minitest/spec'
 require 'mocha'
 require 'mocha/expectation_error'
@@ -22,22 +19,18 @@ module MiniTest
         m
       }.call
 
-      init_val = eval(stmt)
+      init_val = eval stmt
       yield
-      new_val = eval(stmt)
+      new_val = eval stmt
 
       assert_equal(args[:by], (new_val - init_val), msg) if args[:by]
       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
+      msg = Module === args.last ? nil : args.pop
       begin
         line = __LINE__; yield
       rescue Exception => e

data/yard/templates/default/class/html/handlers.erb

@@ -0,0 +1,18 @@
+<!-- <dl class="box">
+  <dt class="r0 last">Handler Stack:</dt>
+  <dd class="r0 last">
+    <span class="inheritName"><%= @handler_stack.first %></span>
+    <ul class="fullTree">
+      <li><%= @handler_stack.first %></li>
+      <% @handler_stack[1..-1].each do |handler| %>
+        <li class="next"><%= handler %></li>
+      <% end %>
+    </ul>
+    <a href="#" class="inheritanceTree">show all</a>
+  </dd>
+</dl>
+<div class="clear"></div> -->
+<p class="note notetag">
+  <strong>Handler Stack:</strong>
+  [<%= @handler_stack * ', ' %>]
+</p>

data/yard/templates/default/class/setup.rb

@@ -0,0 +1,10 @@
+def init
+  super
+  sections.place(:handlers).after(:box_info)
+end
+
+def handlers
+  @handler_stack = object.inheritance_tree.map { |o| o.tag(:handler).name if (o.respond_to?(:tag) && o.tag(:handler)) }.compact
+  return if @handler_stack.empty?
+  erb(:handlers)
+end

data/yard/templates/default/class/text/handlers.erb

@@ -0,0 +1 @@
+<%= indent(wrap("Handler Stack: #{@handler_stack * ', '}")) %>]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: blather
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
+  hash: 47
+  prerelease: 
   segments: 
   - 0
   - 4
-  - 15
-  version: 0.4.15
+  - 16
+  version: 0.4.16
 platform: ruby
 authors: 
 - Jeff Smick
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-09 00:00:00 +05:00
+date: 2010-09-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +24,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 35
         segments: 
@@ -40,7 +40,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 7
         segments: 
@@ -56,7 +56,7 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 9
         segments: 
@@ -66,6 +66,100 @@ dependencies:
         version: 1.7.1
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 35
+        segments: 
+        - 0
+        - 9
+        - 12
+        version: 0.9.12
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 41
+        segments: 
+        - 0
+        - 9
+        - 9
+        version: 0.9.9
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 6
+        - 1
+        version: 0.6.1
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: bluecloth
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 1
+        - 0
+        version: 2.1.0
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id009
 description: An XMPP DSL for Ruby written on top of EventMachine and Nokogiri
 email: sprsquish@gmail.com
 executables: []
@@ -76,6 +170,16 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files: 
+- .autotest
+- .gitignore
+- CHANGELOG
+- Gemfile
+- Gemfile.lock
+- LICENSE
+- README.md
+- Rakefile
+- TODO.md
+- blather.gemspec
 - examples/echo.rb
 - examples/execute.rb
 - examples/ping_pong.rb
@@ -83,6 +187,7 @@ files:
 - examples/rosterprint.rb
 - examples/stream_only.rb
 - examples/xmpp4r/echo.rb
+- lib/.DS_Store
 - lib/blather.rb
 - lib/blather/client.rb
 - lib/blather/client/client.rb
@@ -91,6 +196,7 @@ files:
 - 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/ipaddr.rb
 - lib/blather/core_ext/nokogiri.rb
 - lib/blather/errors.rb
 - lib/blather/errors/sasl_error.rb
@@ -116,6 +222,7 @@ files:
 - lib/blather/stanza/iq/vcard.rb
 - lib/blather/stanza/message.rb
 - lib/blather/stanza/presence.rb
+- lib/blather/stanza/presence/c.rb
 - lib/blather/stanza/presence/status.rb
 - lib/blather/stanza/presence/subscription.rb
 - lib/blather/stanza/pubsub.rb
@@ -143,10 +250,8 @@ files:
 - lib/blather/stream/features/session.rb
 - lib/blather/stream/features/tls.rb
 - lib/blather/stream/parser.rb
+- lib/blather/version.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
@@ -170,6 +275,7 @@ files:
 - spec/blather/stanza/iq/vcard_spec.rb
 - spec/blather/stanza/iq_spec.rb
 - spec/blather/stanza/message_spec.rb
+- spec/blather/stanza/presence/c_spec.rb
 - spec/blather/stanza/presence/status_spec.rb
 - spec/blather/stanza/presence/subscription_spec.rb
 - spec/blather/stanza/presence_spec.rb
@@ -195,6 +301,9 @@ files:
 - spec/blather/xmpp_node_spec.rb
 - spec/fixtures/pubsub.rb
 - spec/spec_helper.rb
+- yard/templates/default/class/html/handlers.erb
+- yard/templates/default/class/setup.rb
+- yard/templates/default/class/text/handlers.erb
 has_rdoc: true
 homepage: http://github.com/sprsquish/blather
 licenses: []
@@ -224,8 +333,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: squishtech
-rubygems_version: 1.3.7
+rubyforge_project: 
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Simpler XMPP built for speed
@@ -253,6 +362,7 @@ test_files:
 - spec/blather/stanza/iq/vcard_spec.rb
 - spec/blather/stanza/iq_spec.rb
 - spec/blather/stanza/message_spec.rb
+- spec/blather/stanza/presence/c_spec.rb
 - spec/blather/stanza/presence/status_spec.rb
 - spec/blather/stanza/presence/subscription_spec.rb
 - spec/blather/stanza/presence_spec.rb