blather 0.1 → 0.2

data/spec/blather/{core/xmpp_node_spec.rb → xmpp_node_spec.rb}

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[.. .. spec_helper])
+require File.join(File.dirname(__FILE__), *%w[.. spec_helper])
 
 describe 'Blather::XMPPNode' do
   it 'generates a new node' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: blather
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: "0.2"
 platform: ruby
 authors: 
 - Jeff Smick
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-27 00:00:00 -08:00
+date: 2008-12-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,14 +23,14 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: libxml
+  name: libxml-ruby
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.11
+        version: 0.9.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: echoe
@@ -52,81 +52,80 @@ 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/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
 files: 
 - 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
 - blather.gemspec
 has_rdoc: true
-homepage: ""
+homepage: http://github.com/sprsquish/blather/tree/master
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -164,9 +163,16 @@ signing_key:
 specification_version: 2
 summary: An evented XMPP library written on EventMachine and libxml-ruby
 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
+- 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

data/examples/shell_client.rb

@@ -1,28 +0,0 @@
-require 'lib/blather/client'
-include Blather
-
-class ShellClient < Client
-  def receive_roster(roster)
-    super
-    if roster.type == :result
-      start_highline
-    end
-  end
-
-  def receive_message(msg)
-    
-  end
-
-  def start_highline
-  end
-
-end
-
-EM.run {
-  shell = Shell.new
-
-  #shell
-  EM.spawn { shell.start }
-
-  Blather.run 'orthie@jabber.local/Blather', 'orthie', shell
-}

data/lib/blather/callback.rb

@@ -1,24 +0,0 @@
-module Blather
-
-  class Callback
-    include Comparable
-
-    attr_accessor :priority
-
-    def initialize(priority = 0, &callback)
-      @priority = priority
-      @callback = callback
-    end
-
-    def call(*args)
-      @callback.call(*args)
-    end
-
-    # Favor higher numbers
-    def <=>(o)
-      self.priority <=> o.priority
-    end
-
-  end #Callback
-
-end

data/lib/blather/client.rb

@@ -1,81 +0,0 @@
-require File.join(File.dirname(__FILE__), %w[.. blather])
-
-module Blather
-
-  class Client
-    @@callbacks = {}
-    @@status = nil
-
-    attr_accessor :jid,
-                  :roster
-
-    def send_data(data)
-      @stream.send data
-    end
-
-    def status
-      @@status
-    end
-
-    def set_status(state = nil, msg = nil, to = nil)
-      status = Presence::Status.new state, msg
-      status.to = to
-      @@status = status unless to
-
-      send_data status
-    end
-
-    def stream_started(stream)
-      @stream = stream
-      retreive_roster
-    end
-
-    def call(stanza)
-      stanza.callback_heirarchy.each { |type| break if callback(type, stanza) }
-    end
-
-    # Default response to an Iq 'get' or 'set' is 'service-unavailable'/'cancel'
-    def receive_iq(iq)
-      send_data(ErrorStanza.new_from(iq, 'service-unavailable', 'cancel').reply!) if [:set, :get].include?(iq.type)
-    end
-
-    def receive_roster(node)
-      if !@roster && node.type == :result
-        self.roster = Roster.new(@stream, node)
-        register_callback(:status, -128) { |_, status| roster[status.from].status = status if roster[status.from]; false }
-        set_status
-      elsif node.type == :set
-        roster.process node
-      end
-    end
-
-    def self.register_callback(type, priority = 0, &callback)
-      @@callbacks[type] ||= []
-      @@callbacks[type] << Callback.new(priority, &callback)
-      @@callbacks[type].sort!
-    end
-
-    def register_callback(type, priority = 0, &callback)
-      self.class.register_callback(type, priority = 0, &callback)
-    end
-
-    def self.status(state = nil, msg = nil)
-      @@status = Presence::Status.new state, msg
-    end
-
-    def callback(type, stanza)
-      complete = false
-      (@@callbacks[type] || []).each { |callback| break if complete = callback.call(self, stanza) }
-
-      method = "receive_#{type}"
-      complete = __send__(method, stanza) if !complete && respond_to?(method)
-      complete
-    end
-
-    def retreive_roster
-      send_data Iq::Roster.new
-    end
-
-  end #Client
-
-end

data/lib/blather/core/stanza/iq/query.rb

@@ -1,42 +0,0 @@
-module Blather
-class Stanza
-class Iq
-
-  class Query < Iq
-    register :query, :query
-
-    def self.new(type)
-      elem = super
-      elem.query.xmlns = self.xmlns
-      elem
-    end
-
-    def inherit(node)
-      query.remove!
-      @query = nil
-      super
-    end
-
-    def query
-      @query ||= if q = find_first('query')
-        q
-      else
-        self << q = XMPPNode.new('query')
-        q
-      end
-    end
-
-    def reply
-      elem = super
-      elem.type = :result
-    end
-
-    def reply!
-      self.type = :result
-      super
-    end
-  end #Query
-
-end #Iq
-end #Stanza
-end

data/lib/blather/extensions.rb

@@ -1,4 +0,0 @@
-%w[
-  last_activity
-  version
-].each { |r| require "extensions/#{r}" }

data/lib/blather/extensions/last_activity.rb

@@ -1,55 +0,0 @@
-module Blather
-  module Extensions #:nodoc:
-
-    module LastActivity #:nodoc:
-      def self.included(base)
-        base.class_eval do
-          @@last_activity = Time.now
-
-          alias_method :send_data_without_activity, :send_data
-          def send_data(data)
-            @@last_activity = Time.now
-            send_data_without_activity data
-          end
-        end
-      end
-
-      def last_activity
-        (Time.now - @@last_activity).to_i
-      end
-
-      def receive_last_activity(stanza)
-        send_data stanza.reply!(last_activity) if stanza.type == 'get'
-      end
-    end #LastActivity
-
-    class LastActivityStanza < Query #:nodoc:
-      register :last_activity, nil, 'jabber:iq:last'
-
-      def self.new(type = :get, seconds = nil)
-        elem = super type
-        elem.seconds = seconds
-        elem
-      end
-
-      def seconds=(seconds)
-        query.attributes.remove :seconds
-        query['seconds'] = seconds.to_i.to_s if seconds
-      end
-
-      def seconds
-        (query['seconds'] || 0).to_i
-      end
-
-      def reply(seconds)
-        elem = super()
-        elem.last_activity = seconds
-      end
-
-      def reply!(seconds)
-        self.last_activity = seconds
-        super()
-      end
-    end #LastActivityStanza
-  end
-end

data/lib/blather/extensions/version.rb

@@ -1,85 +0,0 @@
-module Blather
-  module Extensions #:nodoc:
-
-    module Version #:nodoc:
-      def self.included(base)
-        base.class_eval do
-          @@version = {}
-
-          def self.version(name, ver, os = nil)
-            @@version = {:name => name, :version => ver, :os => os}
-          end
-
-          add_callback(:iq, 100) do |c, s|
-            if s.detect { |n| n['xmlns'] == 'jabber:iq:version' }
-              ver = VersionStanza.new('result', c.version)
-              ver.id = s.id
-              ver.from = c.jid
-              ver.to = s.from
-              c.send_data ver
-            end
-          end
-        end
-      end
-
-      def version
-        @@version
-      end
-    end #Version
-
-    class VersionStanza < Iq #:nodoc:
-      def self.new(type = 'result', ver = {})
-        elem = super(type)
-
-        query = XML::Node.new('query')
-        query.xmlns = 'jabber:iq:version'
-        elem << query
-
-        elem.name = ver[:name] if ver[:name]
-        elem.version = ver[:version] if ver[:version]
-        elem.os = ver[:os] if ver[:os]
-
-        elem
-      end
-
-      def query
-        @query ||= self.detect { |n| n.name == 'query' }
-      end
-
-      def name=(name)
-        query.each { |n| n.remove! or break if n.name == 'name' }
-        query << XML::Node.new('name', name)
-      end
-
-      def name
-        if name = query.detect { |n| n.name == 'name' }
-          name.content
-        end
-      end
-
-      def version=(version)
-        query.each { |n| n.remove! or break if n.name == 'version' }
-        query << XML::Node.new('version', version)
-      end
-
-      def version
-        if version = query.detect { |n| n.version == 'version' }
-          version.content
-        end
-      end
-
-      def os=(os)
-        query.each { |n| n.remove! or break if n.name == 'os' }
-        query << XML::Node.new('os', os)
-      end
-
-      def os
-        if os = query.detect { |n| n.os == 'os' }
-          os.content
-        end
-      end
-    end #VersionStanza
-  end
-end
-
-Blather::Client.__send__ :include, Blather::Extensions::Version