blather 0.4.7 → 0.4.8

data/spec/blather/stanza/presence/status_spec.rb

@@ -116,7 +116,7 @@ describe Blather::Stanza::Presence::Status do
     lambda { status1 <=> status2 }.must_raise(Blather::ArgumentError)
   end
 
-  Blather::Stanza::Presence::Status::VALID_STATES.each do |valid_state|
+  ([:available] + Blather::Stanza::Presence::Status::VALID_STATES).each do |valid_state|
     it "provides a helper (#{valid_state}?) for state #{valid_state}" do
       Blather::Stanza::Presence::Status.new.must_respond_to :"#{valid_state}?"
     end

data/spec/blather/stanza_spec.rb

@@ -7,7 +7,7 @@ describe Blather::Stanza do
 
   it 'provides a handler registration mechanism' do
     class Registration < Blather::Stanza; register :handler_test, :handler, 'test:namespace'; end
-    Registration.handler_heirarchy.must_include :handler_test
+    Registration.handler_hierarchy.must_include :handler_test
     Blather::Stanza.handler_list.must_include :handler_test
   end
 
@@ -24,8 +24,8 @@ describe Blather::Stanza do
   it 'can register subclass handlers' do
     class SuperClassRegister < Blather::Stanza; register :super_class; end
     class SubClassRegister < SuperClassRegister; register :sub_class; end
-    SuperClassRegister.handler_heirarchy.wont_include :sub_class
-    SubClassRegister.handler_heirarchy.must_include :super_class
+    SuperClassRegister.handler_hierarchy.wont_include :sub_class
+    SubClassRegister.handler_hierarchy.must_include :super_class
   end
 
   it 'can import a node' do

data/spec/blather/xmpp_node_spec.rb

@@ -51,110 +51,55 @@ describe Blather::XMPPNode do
     Blather::XMPPNode.import(n).must_be_kind_of ImportSubClass
   end
 
-  it 'provides an attribute_reader' do
-    foo = Class.new(Blather::XMPPNode) { attribute_reader :bar }.new
-    foo.must_respond_to :bar
-    foo.bar.must_be_nil
+  it 'provides an attribute reader' do
+    foo = Blather::XMPPNode.new
+    foo.read_attr(:bar).must_be_nil
     foo[:bar] = 'baz'
-    foo.bar.must_equal 'baz'
+    foo.read_attr(:bar).must_equal 'baz'
   end
 
-  it 'provides an attribute_reader with converstion' do
-    foo = Class.new(Blather::XMPPNode) { attribute_reader :bar, :call => :to_sym }.new
-    foo.must_respond_to :bar
-    foo.bar.must_be_nil
+  it 'provides an attribute reader with converstion' do
+    foo = Blather::XMPPNode.new
+    foo.read_attr(:bar, :to_sym).must_be_nil
     foo[:bar] = 'baz'
-    foo.bar.must_equal :baz
+    foo.read_attr(:bar, :to_sym).must_equal :baz
   end
 
-  it 'provides an attribute_writer' do
-    foo = Class.new(Blather::XMPPNode) { attribute_writer :bar }.new
+  it 'provides an attribute writer' do
+    foo = Blather::XMPPNode.new
     foo[:bar].must_be_nil
-    foo.bar = 'baz'
+    foo.write_attr(:bar, 'baz')
     foo[:bar].must_equal 'baz'
   end
 
-  it 'provides an attribute_accessor' do
-    foo = Class.new(Blather::XMPPNode) do
-      attribute_accessor :bar, :call => :to_sym
-      attribute_accessor :baz
-    end.new
-    foo.must_respond_to :bar
-    foo.bar.must_be_nil
-    foo.bar = 'fiz'
-    foo.bar.must_equal :fiz
-
-    foo.must_respond_to :baz
-    foo.baz.must_be_nil
-    foo.baz = 'buz'
-    foo.baz.must_equal 'buz'
-  end
-
   it 'provides a content reader' do
-    foo = Class.new(Blather::XMPPNode) { content_attr_reader :bar }.new('foo')
+    foo = Blather::XMPPNode.new('foo')
     foo << (bar = Blather::XMPPNode.new('bar', foo.document))
     bar.content = 'baz'
-    foo.must_respond_to :bar
-    foo.bar.must_equal 'baz'
+    foo.read_content(:bar).must_equal 'baz'
   end
 
   it 'provides a content reader that converts the value' do
-    foo = Class.new(Blather::XMPPNode) { content_attr_reader :bar, :to_sym }.new('foo')
+    foo = Blather::XMPPNode.new('foo')
     foo << (bar = Blather::XMPPNode.new('bar', foo.document))
     bar.content = 'baz'
-    foo.must_respond_to :bar
-    foo.bar.must_equal :baz
-  end
-
-  it 'provides a content reader with a different node' do
-    foo = Class.new(Blather::XMPPNode) { content_attr_reader :bar, nil, :fiz }.new('foo')
-    foo << (fiz = Blather::XMPPNode.new('fiz', foo.document))
-    fiz.content = 'baz'
-    foo.must_respond_to :bar
-    foo.bar.must_equal 'baz'
+    foo.read_content(:bar, :to_sym).must_equal :baz
   end
 
   it 'provides a content writer' do
-    foo = Class.new(Blather::XMPPNode) { content_attr_writer :bar }.new('foo')
-    foo.must_respond_to :bar=
-    foo.bar = 'baz'
+    foo = Blather::XMPPNode.new('foo')
+    foo.set_content_for :bar, 'baz'
     foo.content_from(:bar).must_equal 'baz'
   end
 
-  it 'provides a content writer with a different node' do
-    foo = Class.new(Blather::XMPPNode) { content_attr_writer :bar, :fiz }.new('foo')
-    foo.must_respond_to :bar=
-    foo.bar = 'baz'
-    foo.content_from(:fiz).must_equal 'baz'
-  end
-
-  it 'provides a content accessor' do
-    foo = Class.new(Blather::XMPPNode) { content_attr_accessor :bar }.new('foo')
-    foo << (bar = Blather::XMPPNode.new('bar', foo.document))
-    foo.must_respond_to :bar=
-    foo.must_respond_to :bar
-    foo.bar = 'baz'
-    foo.bar.must_equal 'baz'
-  end
-
-  it 'provides a content accessor with conversion' do
-    foo = Class.new(Blather::XMPPNode) { content_attr_accessor :bar, :to_sym }.new('foo')
-    foo << (bar = Blather::XMPPNode.new('bar', foo.document))
-    foo.must_respond_to :bar=
-    foo.must_respond_to :bar
-    foo.bar = 'baz'
-    foo.bar.must_equal :baz
-  end
-
   it 'provides a content writer that removes a child when set to nil' do
-    foo = Class.new(Blather::XMPPNode) { content_attr_writer :bar }.new('foo')
+    foo = Blather::XMPPNode.new('foo')
     foo << (bar = Blather::XMPPNode.new('bar', foo.document))
     bar.content = 'baz'
     foo.content_from(:bar).must_equal 'baz'
     foo.xpath('bar').wont_be_empty
 
-    foo.must_respond_to :bar=
-    foo.bar = nil
+    foo.set_content_for :bar, nil
     foo.content_from(:bar).must_be_nil
     foo.xpath('bar').must_be_empty
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: blather
 version: !ruby/object:Gem::Version 
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors: 
 - Jeff Smick
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-10 00:00:00 -08:00
+date: 2010-01-17 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,18 +40,14 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
-- README.rdoc
+- README.md
 files: 
-- examples/drb_client.rb
 - examples/echo.rb
 - examples/execute.rb
-- examples/ping.rb
 - examples/ping_pong.rb
-- examples/pong.rb
-- examples/print_heirarchy.rb
-- examples/pubsub/cli.rb
-- examples/pubsub/ping_pong.rb
+- examples/print_hierarchy.rb
 - examples/rosterprint.rb
+- examples/stream_only.rb
 - examples/xmpp4r/echo.rb
 - lib/blather.rb
 - lib/blather/client.rb
@@ -105,7 +101,7 @@ files:
 - lib/blather/stream/parser.rb
 - lib/blather/xmpp_node.rb
 - LICENSE
-- README.rdoc
+- README.md
 has_rdoc: true
 homepage: http://github.com/sprsquish/blather
 licenses: []

data/README.rdoc

@@ -1,185 +0,0 @@
-= Blather
-
-XMPP DSL (and more) for Ruby written on EventMachine and Nokogiri.
-
-== Features
-
-* evented architecture
-* uses Nokogiri
-* simplified starting point
-
-== Project Pages
-
-Blather:: https://sprsquish.github.com/blather
-
-GitHub:: https://github.com/sprsquish/blather
-
-GitHub Docs:: http://docs.github.com/sprsquish/blather
-
-RubyForge:: http://rubyforge.org/projects/squishtech
-
-RDocs:: http://squishtech.rubyforge.org/blather
-
-Google Group:: http://groups.google.com/group/xmpp-blather
-
-= Usage
-
-== Installation
-
-  sudo gem install blather
-
-== Example
-
-See the examples directory for more advanced examples.
-
-This will auto-accept any subscription requests and echo back any chat messages.
-
-  require 'rubygems'
-  require 'blather/client'
-
-  setup 'echo@jabber.local', 'echo'
-
-  # Auto approve subscription requests
-  subscription :request? do |s|
-    write_to_stream s.approve!
-  end
-
-  # Echo back what was said
-  message :chat?, :body do |m|
-    write_to_stream m.reply
-  end
-
-== Handlers
-
-Setup handlers by calling their names as methods.
-
-  # Will only be called for messages where #chat? responds positively
-  # and #body == 'exit'
-  message :chat?, :body => 'exit'
-
-=== Non-Stanza Handlers
-
-So far there are two non-stanza related handlers.
-
-  when_ready (or handle(:ready) {})
-    Called after the connection has been connected. It's good for initializing your system.
-
-  disconnected (or handle(:disconnected) {})
-    Called after the connection has been terminated. Good for teardown or automatic reconnection.
-    The following will reconnect every time the connection is lost:
-    disconnected { client.connect }
-
-=== Handler Guards
-
-Guards act like AND statements. Each condition must be met if the handler is to be used.
-
-  # Equivalent to saying (stanza.chat? && stanza.body)
-  message :chat?, :body
-
-The different types of guards are:
-
-  # Symbol
-  #   Checks for a non-false reply to calling the symbol on the stanza
-  #   Equivalent to stanza.chat?
-  message :chat?
-
-  # Hash with any value (:body => 'exit')
-  #   Calls the key on the stanza and checks for equality
-  #   Equivalent to stanza.body == 'exit'
-  message :body => 'exit'
-
-  # Hash with regular expression (:body => /exit/)
-  #   Calls the key on the stanza and checks for a match
-  #   Equivalent to stanza.body.match /exit/
-  message :body => /exit/
-
-  # Hash with array (:name => [:gone, :forbidden])
-  #   Calls the key on the stanza and check for inclusion in the array
-  #   Equivalent to [:gone, :forbidden].include?(stanza.name)
-  stanza_error :name => [:gone, :fobidden]
-
-  # Proc
-  #   Calls the proc passing in the stanza
-  #   Checks that the ID is modulo 3
-  message proc { |m| m.id % 3 == 0 }
-
-  # Array
-  #   Use arrays with the previous types effectively turns the guard into
-  #   an OR statement.
-  #   Equivalent to stanza.body == 'foo' || stanza.body == 'baz'
-  message [{:body => 'foo'}, {:body => 'baz'}]
-
-  # XPath
-  #   Runs the xpath query on the stanza and checks for results
-  #   This guard type cannot be combined with other guards
-  #   Equivalent to !stanza.find('/iq/ns:pubsub', :ns => 'pubsub:namespace').empty?
-  iq '/iq/ns:pubsub', :ns => 'pubsub:namespace'
-
-=== Filters
-
-Blather provides before and after filters that work much the way regular handlers work. Filters come in a before and after
-flavor. They're called in order of definition and can be guarded like handlers.
-
-  before { |s| "I'm run before any handler" }
-  before { |s| "I'm run next" }
-
-  before(:message) { |s| "I'm only run in front of message stanzas" }
-  before(nil, :id => 1) { |s| "I'll only be run when the stanza's ID == 1" }
-
-  # ... handlers
-
-  after { |s| "I'm run after everything" }
-
-== On the Command Line:
-
-Default usage is:
-
-  [blather_script] [options] node@domain.com/resource password [host] [port]
-
-Command line options:
-
-  -D, --debug                      Run in debug mode (you will see all XMPP communication)
-  -d, --daemonize                  Daemonize the process
-      --pid=[PID]                  Write the PID to this file
-      --log=[LOG]                  Write to the [LOG] file instead of stdout/stderr
-  -h, --help                       Show this message
-  -v, --version                    Show version
-
-
-= TODO
-
-* Add Disco the the DSL
-* More examples (Re-write XMPP4R examples into Blather)
-
-= Author
-
-Jeff Smick <sprsquish@gmail.com>
-
-=== Contributors
-
-Nolan Darilek <nolan@thewordnerd.info>
-
-= License
-
-Blather
-
-Copyright (c) 2009 Jeff Smick
- 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
- 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
- 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/examples/drb_client.rb

@@ -1,5 +0,0 @@
-%w[rubygems lib/blather/client drb/drb].each { |r| require r }
-
-setup 'drb_client@jabber.local', 'drb_client'
-
-when_ready { DRb.start_service 'druby://localhost:99843', self }

data/examples/ping.rb

@@ -1,11 +0,0 @@
-require 'blather/client'
-
-setup 'echo@jabber.local/ping', 'echo'
-
-status :from => Blather::JID.new('echo@jabber.local/pong') do |s|
-  say s.from, 'ping'
-end
-
-message :chat?, :body => 'pong' do |m|
-  say m.from, 'ping'
-end

data/examples/pong.rb

@@ -1,6 +0,0 @@
-require 'blather/client'
-
-setup 'echo@jabber.local/pong', 'echo'
-message :chat?, :body => 'ping' do |m|
-  say m.from, 'pong'
-end

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 }