blather 0.1 → 0.2

data/CHANGELOG

@@ -1 +1,3 @@
+v0.2 Overhaul the DSL to look more like Sinatra
+
 v0.1 Initial release (birth!)

data/Manifest

@@ -1,43 +1,46 @@
 CHANGELOG
+examples/drb_client.rb
 examples/echo.rb
-examples/shell_client.rb
 lib/autotest/discover.rb
 lib/autotest/spec.rb
-lib/blather/callback.rb
-lib/blather/client.rb
-lib/blather/core/errors.rb
-lib/blather/core/jid.rb
-lib/blather/core/roster.rb
-lib/blather/core/roster_item.rb
-lib/blather/core/stanza/iq/query.rb
-lib/blather/core/stanza/iq/roster.rb
-lib/blather/core/stanza/iq.rb
-lib/blather/core/stanza/message.rb
-lib/blather/core/stanza/presence/status.rb
-lib/blather/core/stanza/presence/subscription.rb
-lib/blather/core/stanza/presence.rb
-lib/blather/core/stanza.rb
-lib/blather/core/stream/parser.rb
-lib/blather/core/stream/resource.rb
-lib/blather/core/stream/sasl.rb
-lib/blather/core/stream/session.rb
-lib/blather/core/stream/tls.rb
-lib/blather/core/stream.rb
-lib/blather/core/sugar.rb
-lib/blather/core/xmpp_node.rb
-lib/blather/extensions/last_activity.rb
-lib/blather/extensions/version.rb
-lib/blather/extensions.rb
+lib/blather/errors.rb
+lib/blather/jid.rb
+lib/blather/roster.rb
+lib/blather/roster_item.rb
+lib/blather/stanza/error.rb
+lib/blather/stanza/iq/query.rb
+lib/blather/stanza/iq/roster.rb
+lib/blather/stanza/iq.rb
+lib/blather/stanza/message.rb
+lib/blather/stanza/presence/status.rb
+lib/blather/stanza/presence/subscription.rb
+lib/blather/stanza/presence.rb
+lib/blather/stanza.rb
+lib/blather/stream/parser.rb
+lib/blather/stream/resource.rb
+lib/blather/stream/sasl.rb
+lib/blather/stream/session.rb
+lib/blather/stream/tls.rb
+lib/blather/stream.rb
+lib/blather/sugar.rb
+lib/blather/xmpp_node.rb
 lib/blather.rb
 LICENSE
+Manifest
 Rakefile
 README.rdoc
-spec/blather/core/jid_spec.rb
-spec/blather/core/roster_item_spec.rb
-spec/blather/core/roster_spec.rb
-spec/blather/core/stanza_spec.rb
-spec/blather/core/stream_spec.rb
-spec/blather/core/xmpp_node_spec.rb
+spec/blather/jid_spec.rb
+spec/blather/roster_item_spec.rb
+spec/blather/roster_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_spec.rb
+spec/blather/stream_spec.rb
+spec/blather/xmpp_node_spec.rb
 spec/build_safe.rb
 spec/spec_helper.rb
-Manifest

data/README.rdoc

@@ -30,28 +30,22 @@ Jeff Smick <sprsquish@gmail.com>
 
 See the /examples directory for more advanced examples.
 
-This will auto-accept any subscription requests and echo back any messages or presence notifications.
+This will auto-accept any subscription requests and echo back any chat messages.
 
-  require 'lib/blather/client'
+  %w[rubygems blather].each { |r| require r }
 
-  class Echo < Blather::Client
-    # Auto-approve subscription requests
-    def receive_subscription(s)
-      send_data(s.approve!) and true if s.request?
-    end
+  setup 'echo@jabber.local', 'echo'
 
-    # Echo presence
-    def receive_status(status)
-      set_status(status.state, status.message, status.from) if roster[status.from]
-    end
-
-    # Echo message
-    def receive_message(message)
-      send_data(message.reply) if message.type == :chat
-    end
+  # Auto approve subscription requests
+  handle :subscription do |s|
+    write(s.approve!) if s.request?
   end
 
-  Blather.run 'echo@jabber.local', 'echo', Echo.new
+  # Echo back what was said
+  handle :message do |m|
+    write(m.reply) if m.chat? && m.body
+  end
+  
   
 
 = License

data/Rakefile

@@ -1,16 +1,17 @@
 require 'echoe'
-require 'lib/blather'
 require 'hanna/rdoctask'
 
 Echoe.new('blather') do |p|
   p.author = 'Jeff Smick'
   p.email = 'sprsquish@gmail.com'
+  p.url = 'http://github.com/sprsquish/blather/tree/master'
 
   p.project = 'squishtech'
-  p.version = Blather::VERSION
   p.summary = 'An evented XMPP library written on EventMachine and libxml-ruby'
 
-  p.runtime_dependencies = ['eventmachine', 'libxml >=1.0.11']
+  p.runtime_dependencies = ['eventmachine', 'libxml-ruby >=0.9.2']
   p.rdoc_options += %w[-S -T hanna --main README.rdoc --exclude autotest]
+
   p.test_pattern = 'spec/**/*_spec.rb'
+  p.rcov_options = ['--exclude \/Library\/Ruby\/Gems,spec\/', '--xrefs']
 end

data/blather.gemspec

@@ -2,23 +2,23 @@
 
 Gem::Specification.new do |s|
   s.name = %q{blather}
-  s.version = "0.1"
+  s.version = "0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Smick"]
-  s.date = %q{2008-11-27}
+  s.date = %q{2008-12-19}
   s.description = %q{An evented XMPP library written on EventMachine and libxml-ruby}
   s.email = %q{sprsquish@gmail.com}
-  s.extra_rdoc_files = ["CHANGELOG", "lib/autotest/discover.rb", "lib/autotest/spec.rb", "lib/blather/callback.rb", "lib/blather/client.rb", "lib/blather/core/errors.rb", "lib/blather/core/jid.rb", "lib/blather/core/roster.rb", "lib/blather/core/roster_item.rb", "lib/blather/core/stanza/iq/query.rb", "lib/blather/core/stanza/iq/roster.rb", "lib/blather/core/stanza/iq.rb", "lib/blather/core/stanza/message.rb", "lib/blather/core/stanza/presence/status.rb", "lib/blather/core/stanza/presence/subscription.rb", "lib/blather/core/stanza/presence.rb", "lib/blather/core/stanza.rb", "lib/blather/core/stream/parser.rb", "lib/blather/core/stream/resource.rb", "lib/blather/core/stream/sasl.rb", "lib/blather/core/stream/session.rb", "lib/blather/core/stream/tls.rb", "lib/blather/core/stream.rb", "lib/blather/core/sugar.rb", "lib/blather/core/xmpp_node.rb", "lib/blather/extensions/last_activity.rb", "lib/blather/extensions/version.rb", "lib/blather/extensions.rb", "lib/blather.rb", "LICENSE", "README.rdoc"]
-  s.files = ["CHANGELOG", "examples/echo.rb", "examples/shell_client.rb", "lib/autotest/discover.rb", "lib/autotest/spec.rb", "lib/blather/callback.rb", "lib/blather/client.rb", "lib/blather/core/errors.rb", "lib/blather/core/jid.rb", "lib/blather/core/roster.rb", "lib/blather/core/roster_item.rb", "lib/blather/core/stanza/iq/query.rb", "lib/blather/core/stanza/iq/roster.rb", "lib/blather/core/stanza/iq.rb", "lib/blather/core/stanza/message.rb", "lib/blather/core/stanza/presence/status.rb", "lib/blather/core/stanza/presence/subscription.rb", "lib/blather/core/stanza/presence.rb", "lib/blather/core/stanza.rb", "lib/blather/core/stream/parser.rb", "lib/blather/core/stream/resource.rb", "lib/blather/core/stream/sasl.rb", "lib/blather/core/stream/session.rb", "lib/blather/core/stream/tls.rb", "lib/blather/core/stream.rb", "lib/blather/core/sugar.rb", "lib/blather/core/xmpp_node.rb", "lib/blather/extensions/last_activity.rb", "lib/blather/extensions/version.rb", "lib/blather/extensions.rb", "lib/blather.rb", "LICENSE", "Rakefile", "README.rdoc", "spec/blather/core/jid_spec.rb", "spec/blather/core/roster_item_spec.rb", "spec/blather/core/roster_spec.rb", "spec/blather/core/stanza_spec.rb", "spec/blather/core/stream_spec.rb", "spec/blather/core/xmpp_node_spec.rb", "spec/build_safe.rb", "spec/spec_helper.rb", "Manifest", "blather.gemspec"]
+  s.extra_rdoc_files = ["CHANGELOG", "lib/autotest/discover.rb", "lib/autotest/spec.rb", "lib/blather/errors.rb", "lib/blather/jid.rb", "lib/blather/roster.rb", "lib/blather/roster_item.rb", "lib/blather/stanza/error.rb", "lib/blather/stanza/iq/query.rb", "lib/blather/stanza/iq/roster.rb", "lib/blather/stanza/iq.rb", "lib/blather/stanza/message.rb", "lib/blather/stanza/presence/status.rb", "lib/blather/stanza/presence/subscription.rb", "lib/blather/stanza/presence.rb", "lib/blather/stanza.rb", "lib/blather/stream/parser.rb", "lib/blather/stream/resource.rb", "lib/blather/stream/sasl.rb", "lib/blather/stream/session.rb", "lib/blather/stream/tls.rb", "lib/blather/stream.rb", "lib/blather/sugar.rb", "lib/blather/xmpp_node.rb", "lib/blather.rb", "LICENSE", "README.rdoc"]
+  s.files = ["CHANGELOG", "examples/drb_client.rb", "examples/echo.rb", "lib/autotest/discover.rb", "lib/autotest/spec.rb", "lib/blather/errors.rb", "lib/blather/jid.rb", "lib/blather/roster.rb", "lib/blather/roster_item.rb", "lib/blather/stanza/error.rb", "lib/blather/stanza/iq/query.rb", "lib/blather/stanza/iq/roster.rb", "lib/blather/stanza/iq.rb", "lib/blather/stanza/message.rb", "lib/blather/stanza/presence/status.rb", "lib/blather/stanza/presence/subscription.rb", "lib/blather/stanza/presence.rb", "lib/blather/stanza.rb", "lib/blather/stream/parser.rb", "lib/blather/stream/resource.rb", "lib/blather/stream/sasl.rb", "lib/blather/stream/session.rb", "lib/blather/stream/tls.rb", "lib/blather/stream.rb", "lib/blather/sugar.rb", "lib/blather/xmpp_node.rb", "lib/blather.rb", "LICENSE", "Manifest", "Rakefile", "README.rdoc", "spec/blather/jid_spec.rb", "spec/blather/roster_item_spec.rb", "spec/blather/roster_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_spec.rb", "spec/blather/stream_spec.rb", "spec/blather/xmpp_node_spec.rb", "spec/build_safe.rb", "spec/spec_helper.rb", "blather.gemspec"]
   s.has_rdoc = true
-  s.homepage = %q{}
+  s.homepage = %q{http://github.com/sprsquish/blather/tree/master}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Blather", "--main", "README.rdoc", "-S", "-T", "hanna", "--main", "README.rdoc", "--exclude", "autotest"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{squishtech}
   s.rubygems_version = %q{1.3.1}
   s.summary = %q{An evented XMPP library written on EventMachine and libxml-ruby}
-  s.test_files = ["spec/blather/core/jid_spec.rb", "spec/blather/core/roster_item_spec.rb", "spec/blather/core/roster_spec.rb", "spec/blather/core/stanza_spec.rb", "spec/blather/core/stream_spec.rb", "spec/blather/core/xmpp_node_spec.rb"]
+  s.test_files = ["spec/blather/jid_spec.rb", "spec/blather/roster_item_spec.rb", "spec/blather/roster_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_spec.rb", "spec/blather/stream_spec.rb", "spec/blather/xmpp_node_spec.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
@@ -26,16 +26,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<eventmachine>, [">= 0"])
-      s.add_runtime_dependency(%q<libxml>, [">= 1.0.11"])
+      s.add_runtime_dependency(%q<libxml-ruby>, [">= 0.9.2"])
       s.add_development_dependency(%q<echoe>, [">= 0"])
     else
       s.add_dependency(%q<eventmachine>, [">= 0"])
-      s.add_dependency(%q<libxml>, [">= 1.0.11"])
+      s.add_dependency(%q<libxml-ruby>, [">= 0.9.2"])
       s.add_dependency(%q<echoe>, [">= 0"])
     end
   else
     s.add_dependency(%q<eventmachine>, [">= 0"])
-    s.add_dependency(%q<libxml>, [">= 1.0.11"])
+    s.add_dependency(%q<libxml-ruby>, [">= 0.9.2"])
     s.add_dependency(%q<echoe>, [">= 0"])
   end
 end

data/examples/drb_client.rb

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

data/examples/echo.rb

@@ -1,22 +1,13 @@
-require 'lib/blather/client'
-include Blather
+%w[rubygems lib/blather].each { |r| require r }
 
-class Echo < Client
-  # Auto-approve subscription requests
-  def receive_subscription(s)
-    send_data(s.approve!) and true if s.request?
-  end
+setup 'echo@jabber.local', 'echo'
 
-  # Echo presence
-  def receive_status(status)
-    set_status(status.state, status.message, status.from) if roster[status.from]
-  end
-
-  # Echo message
-  def receive_message(message)
-    send_data(message.reply) if message.type == :chat
-  end
+# Auto approve subscription requests
+handle :subscription do |s|
+  write(s.approve!) if s.request?
 end
 
-#handle :version do run Extensions::VersionHandler.new('Echo', '1.0'); end
-run 'sprsquish@jabber.local/Blather', 'iq150150', Echo.new
+# Echo back what was said
+handle :message do |m|
+  write(m.reply) if m.chat? && m.body
+end

data/lib/blather.rb

@@ -7,40 +7,149 @@ $:.unshift File.dirname(__FILE__)
   digest/md5
   logger
 
-  blather/callback
-
-  blather/core/errors
-  blather/core/jid
-  blather/core/roster
-  blather/core/roster_item
-  blather/core/sugar
-  blather/core/xmpp_node
-
-  blather/core/stanza
-  blather/core/stanza/iq
-  blather/core/stanza/iq/query
-  blather/core/stanza/iq/roster
-  blather/core/stanza/message
-  blather/core/stanza/presence
-  blather/core/stanza/presence/status
-  blather/core/stanza/presence/subscription
-
-  blather/core/stream
-  blather/core/stream/parser
-  blather/core/stream/resource
-  blather/core/stream/sasl
-  blather/core/stream/session
-  blather/core/stream/tls
+  blather/errors
+  blather/jid
+  blather/roster
+  blather/roster_item
+  blather/sugar
+  blather/xmpp_node
+
+  blather/stanza
+  blather/stanza/error
+  blather/stanza/iq
+  blather/stanza/iq/query
+  blather/stanza/iq/roster
+  blather/stanza/message
+  blather/stanza/presence
+  blather/stanza/presence/status
+  blather/stanza/presence/subscription
+
+  blather/stream
+  blather/stream/parser
+  blather/stream/resource
+  blather/stream/sasl
+  blather/stream/session
+  blather/stream/tls
 ].each { |r| require r }
 
-XML::Parser.indent_tree_output = false
+XML.indent_tree_output = false
 
 module Blather
-  VERSION = '0.1'
-  LOG = Logger.new STDOUT
+  LOG = Logger.new(STDOUT)
+
+  class Client
+    attr_accessor :jid,
+                  :roster
+
+    def initialize
+      @state = :initializing
+
+      @status = Stanza::Presence::Status.new
+      @handlers = Hash.new { |h,k| h[k] = [] }
+      @roster = Roster.new self
+
+      setup_initial_handlers
+    end
+
+    def register_handler(type, &handler)
+      @handlers[type] << handler
+    end
+
+    def status
+      @status.state
+    end
+
+    def status=(state)
+      state, msg, to = state
+
+      status = Stanza::Presence::Status.new state, msg
+      status.to = to
+      @status = status unless to
+
+      write status
+    end
+
+    def write(data)
+      @stream.send(data) if @stream
+    end
+
+    def stream_started(stream)
+      @stream = stream
+
+      #retreive roster
+      write Stanza::Iq::Roster.new
+    end
+
+    def call(stanza)
+      stanza.handler_heirarchy.each do |type|
+        break if call_handler_for(type, stanza) && stanza.type == :iq
+      end
+    end
+
+    def call_handler_for(type, stanza)
+      if @handlers[type]
+        @handlers[type].each { |handler| handler.call(stanza) }
+        true
+      end
+    end
+
+  protected
+    def setup_initial_handlers
+      register_handler :iq do |iq|
+        write(Stanza::Error.new_from(iq, 'service-unavailable', 'cancel').reply!) if [:set, :get].include?(iq.type)
+      end
+
+      register_handler :status do |status|
+        roster[status.from].status = status if roster[status.from]
+      end
+
+      register_handler :roster do |node|
+        roster.process node
+        if @state == :initializing
+          @state = :ready
+          write @status
+          call_handler_for :ready, nil
+        end
+      end
+    end
+
+  end #Client
+
+  module Application
+    @@client = Blather::Client.new
+
+    def setup(jid, password, host = nil, port = 5222)
+      at_exit do
+        trap(:INT) { EM.stop }
+        EM.run { Blather::Stream.start @@client, Blather::JID.new(jid), password, host, port }
+      end
+    end
+
+    def daemonize
+      @daemonize = true
+    end
+
+    def handle(stanza_type, &block)
+      @@client.register_handler stanza_type, &block
+    end
+
+    def status(state = nil, msg = nil)
+      @@client.status = state, msg
+    end
+
+    def roster
+      @@client.roster
+    end
+
+    def write(stanza)
+      @@client.write(stanza)
+    end
+
+    def say(to, msg)
+      @@client.write Blather::Stanza::Message.new(to, msg)
+    end
+  end #Application
 
-  def run(jid, password, client, host = nil, port = 5222)
-    EM.run { Stream.start client, JID.new(jid), password, host, port }
-  end
-  module_function :run
 end
+
+include Blather::Application

data/lib/blather/{core/stanza.rb → stanza.rb}

@@ -2,13 +2,7 @@ module Blather
   ##
   # Base XMPP Stanza
   class Stanza < XMPPNode
-    @@registered_callbacks = []
-
-    def self.registered_callbacks
-      @@registered_callbacks
-    end
-
-    class_inheritable_array :callback_heirarchy
+    class_inheritable_array :handler_heirarchy
 
     ##
     # Registers a callback onto the callback heirarchy stack
@@ -17,13 +11,11 @@ module Blather
     # that inherits Stanza can register a callback for itself
     # which is added to a list and iterated over when looking for
     # a callback to use
-    def self.register(callback_type, name = nil, xmlns = nil)
-      @@registered_callbacks << callback_type
-
-      self.callback_heirarchy ||= []
-      self.callback_heirarchy.unshift callback_type
+    def self.register(type, name = nil, xmlns = nil)
+      self.handler_heirarchy ||= []
+      self.handler_heirarchy.unshift type
 
-      name = name || self.name || callback_type
+      name = name || self.name || type
       super name, xmlns
     end
 
@@ -109,7 +101,7 @@ module Blather
     ##
     # returns:: a symbol of the type
     def type
-      self['type'].to_sym if self['type']
+      self['type'].to_sym unless self['type'].nil? || self['type'].empty?
     end
 
   end