blather 0.2.2 → 0.2.3

data/spec/blather/stanza/{discos → iq/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,13 +19,6 @@ 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/event_spec.rb

@@ -0,0 +1,13 @@
+require File.join(File.dirname(__FILE__), *%w[.. .. .. spec_helper])
+require File.join(File.dirname(__FILE__), *%w[.. .. .. fixtures pubsub])
+
+describe 'Blather::Stanza::PubSub::Event' do
+  it 'registers itself' do
+    XMPPNode.class_from_registration(:pubsub_subscriptions, 'http://jabber.org/protocol/pubsub').must_equal Stanza::PubSub::Subscriptions
+  end
+
+  it 'ensures an subscriptions node is present on create' do
+    subscriptions = Stanza::PubSub::Subscriptions.new
+    subscriptions.pubsub.children.detect { |n| n.element_name == 'subscriptions' }.wont_be_nil
+  end
+end

data/spec/build_safe.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+require 'yaml'
+
+if ARGV.size < 1
+  puts "Usage: github-test.rb my-project.gemspec"
+  exit
+end
+
+require 'rubygems/specification'
+data = File.read(ARGV[0])
+spec = nil
+
+if data !~ %r{!ruby/object:Gem::Specification}
+  Thread.new { spec = eval("$SAFE = 3\n#{data}") }.join
+else
+  spec = YAML.load(data)
+end
+
+puts spec
+puts "OK"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: blather
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Jeff Smick
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-05 00:00:00 -07:00
+date: 2009-05-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,36 +32,28 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.1.3
     version: 
-description: An evented XMPP library written on EventMachine and libxml-ruby
+description: 
 email: sprsquish@gmail.com
 executables: []
 
 extensions: 
-- ext/extconf.rb
+- Rakefile
 extra_rdoc_files: 
 - LICENSE
 - README.rdoc
 files: 
-- LICENSE
-- README.rdoc
-- Rakefile
-- VERSION.yml
 - examples/drb_client.rb
 - examples/echo.rb
-- examples/pubsub/cli.rb
-- examples/pubsub/ping_pong.rb
-- examples/pubsub/pubsub_dsl.rb
-- examples/pubsub_client.rb
-- examples/rosterprint.rb
-- examples/xmpp4r/echo.rb
+- ext/Makefile
+- 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/client/pubsub.rb
-- lib/blather/client/pubsub/node.rb
 - lib/blather/core_ext/active_support.rb
 - lib/blather/core_ext/libxml.rb
 - lib/blather/errors.rb
@@ -72,23 +64,16 @@ 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.rb
-- lib/blather/stanza/pubsub/affiliations.rb
-- lib/blather/stanza/pubsub/errors.rb
-- lib/blather/stanza/pubsub/event.rb
-- lib/blather/stanza/pubsub/items.rb
-- lib/blather/stanza/pubsub/owner.rb
-- lib/blather/stanza/pubsub/subscriptions.rb
 - lib/blather/stream.rb
 - lib/blather/stream/client.rb
 - lib/blather/stream/component.rb
@@ -99,33 +84,8 @@ files:
 - lib/blather/stream/stream_handler.rb
 - lib/blather/stream/tls.rb
 - lib/blather/xmpp_node.rb
-- spec/blather/core_ext/libxml_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/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/query_spec.rb
-- spec/blather/stanza/iq/roster_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/items_spec.rb
-- spec/blather/stanza/pubsub/subscriptions_spec.rb
-- spec/blather/stanza/pubsub_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/fixtures/pubsub.rb
-- spec/spec_helper.rb
+- LICENSE
+- README.rdoc
 has_rdoc: true
 homepage: http://github.com/sprsquish/blather
 licenses: []
@@ -163,8 +123,8 @@ test_files:
 - 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/discos/disco_info_spec.rb
+- spec/blather/stanza/iq/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
@@ -172,21 +132,12 @@ 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/affiliations_spec.rb
-- spec/blather/stanza/pubsub/items_spec.rb
-- spec/blather/stanza/pubsub/subscriptions_spec.rb
-- spec/blather/stanza/pubsub_spec.rb
+- spec/blather/stanza/pubsub/event_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/fixtures/pubsub.rb
+- spec/build_safe.rb
 - spec/spec_helper.rb
 - examples/drb_client.rb
 - examples/echo.rb
-- examples/pubsub/cli.rb
-- examples/pubsub/ping_pong.rb
-- examples/pubsub/pubsub_dsl.rb
-- examples/pubsub_client.rb
-- examples/rosterprint.rb
-- examples/xmpp4r/echo.rb

data/VERSION.yml

@@ -1,4 +0,0 @@
---- 
-:major: 0
-:minor: 2
-:patch: 2

data/examples/pubsub/cli.rb

@@ -1,64 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'blather/client'
-
-#ls
-#cd
-#cat
-#Blather::LOG.level = Logger::DEBUG
-module CliHandler
-  include EM::Protocols::LineText2
-
-  def ls(node)
-    pubsub.node(parse_dir(node)) do |result|
-      cur = node.split('/')
-      puts
-      puts result.items.map { |i| (i.node.split('/') - cur).join('/') }.join("\n")
-      start_line
-    end
-  end
-
-  def cd(node)
-    @node = parse_dir(node)
-    start_line
-  end
-
-  def cat(item)
-  end
-
-  def connect(who)
-    @who = who
-    puts "connected to '#{who}'"
-  end
-
-  def exit(_)
-    EM.stop
-  end
-
-  def initialize
-    $stdout.sync = true
-    @node = ''
-    @who = ''
-    start_line
-  end
-
-  def start_line
-    puts "\n/#{@node}> "
-  end
-
-  def receive_line(line)
-    return unless line =~ /(connect|exit|ls|cd|cat)\s?(.*)/i
-    __send__ $1, $2
-  end
-
-  def parse_dir(list)
-    return '' if list == '/'
-    cur = @node.split('/')
-    list.split('/').each { |dir| dir == '..' ? cur.pop : (cur << dir) }
-    cur * '/'
-  end
-end
-
-setup 'echo@jabber.local', 'echo'
-pubsub_host 'pubsub.jabber.local'
-when_ready { EM.open_keyboard CliHandler }

data/examples/pubsub/ping_pong.rb

@@ -1,18 +0,0 @@
-setup 'ping-pong@jabber.local', 'ping-pong'
-
-pubsub.host = 'pubsub.jabber.local'
-
-pubsub_event :node => 'ping' do |node|
-  pubsub.publish 'pong', node.payload
-end
-
-pubsub_event :node => 'pong' do |node|
-  x = node.payload.to_i
-  if x > 0
-    pubsub.publish 'ping', (x - 1)
-  else
-    shutdown
-  end
-end
-
-when_ready { pubsub.publish 'ping', 3 }

data/examples/pubsub/pubsub_dsl.rb

@@ -1,52 +0,0 @@
-# Get affiliations
-pubsub.affiliations do |aff|
-  aff == {
-    :member     => [],
-    :none       => [],
-    :outcast    => [],
-    :owner      => [],
-    :publisher  => []
-  }
-end
-
-# Get subscriptions
-pubsub.subscriptions do |sub|
-  sub == {
-    :none         => [],
-    :pending      => [],
-    :subscribed   => [],
-    :unconfigured => []
-  }
-end
-
-# Get nodes
-pubsub.nodes(path = nil) do |nodes|
-  nodes == [
-    DiscoItems::Item
-      .jid
-      .node
-      .name
-  ]
-end
-
-# Get node
-pubsub.node(path = nil) do |node|
-  node = Node
-    .attributes = {
-      [form data fields]
-    }
-    .type = '(leaf|collection)'
-    .feature = ''
-    .items(ids = [], :max => nil) { |list_of_items| }
-end
-
-# Get node items
-pubsub.items(path = '' | ids = [], max = nil) do |node_items|
-  node_items = [
-    Item
-      .jid
-      .id
-      .name
-      .payload
-  ]
-end

data/examples/pubsub_client.rb

@@ -1,39 +0,0 @@
-# For subscribers
-  pubsub.nodes [path]
-  pubsub.node('path')
-  pubsub.node('path').subscribe
-  pubsub.node('path').affiliation
-# For owners
-  pubsub.node('path').affiliations
-  pubsub.node('path').delete!
-  pubsub.node('path').purge!
-  pubsub.node('path').options
-  pubsub.node('path').defaults
-  pubsub.node('path').configure {}
-
-pubsub.affiliations
-
-pubsub.create 'node'
-
-pubsub.publish 'node', 'content'
-pubsub.delete 'node', 'item_id'
-
-pubsub.subscriptions
-pubsub.subscribe 'node'
-pubsub.unsubscribe 'node'
-
-# For subscribers
-  pubsub.subscriptions 'node'
-  pubsub.subscription 'node', [sub_id]
-  pubsub.subscription('node', [sub_id]).unsubscribe!
-  pubsub.subscription('node', [sub_id]).options
-  pubsub.subscription('node', [sub_id]).configure 'node', {}
-# For owners
-  pubsub.subscriptions.pending
-  pubsub.subscription('sub_id').delete!
-  
-
-Node::Collection
-  nodes
-Node::Leaf
-  items