blather 0.2.2 → 0.2.3

data/lib/blather.rb

@@ -26,17 +26,13 @@ $:.unshift File.join(File.dirname(__FILE__), '..')
   blather/stanza/iq
   blather/stanza/iq/query
   blather/stanza/iq/roster
-  blather/stanza/disco
-  blather/stanza/disco/disco_info
-  blather/stanza/disco/disco_items
+  blather/stanza/iq/disco
+  blather/stanza/iq/discos/disco_info
+  blather/stanza/iq/discos/disco_items
   blather/stanza/message
   blather/stanza/presence
   blather/stanza/presence/status
   blather/stanza/presence/subscription
-  blather/stanza/pubsub
-  blather/stanza/pubsub/affiliations
-  blather/stanza/pubsub/subscriptions
-  blather/stanza/pubsub/items
 
   blather/stream
   blather/stream/client

data/lib/blather/client.rb

@@ -1,13 +1,256 @@
-require File.join(File.dirname(__FILE__), *%w[client dsl])
+require File.join(File.dirname(__FILE__), *%w[.. blather])
+
+module Blather #:nodoc:
+
+  class Client #:nodoc:
+    attr_accessor :jid,
+                  :roster
+
+    def initialize
+      @state = :initializing
+
+      @status = Stanza::Presence::Status.new
+      @handlers = {}
+      @tmp_handlers = {}
+      @roster = Roster.new self
+
+      setup_initial_handlers
+    end
+
+    def setup(jid, password, host = nil, port = 5222)
+      @setup = [JID.new(jid), password, host, port]
+      self
+    end
+
+    def setup?
+      @setup.is_a?(Array) && !@setup.empty?
+    end
+
+    def run
+      raise 'Not setup!' unless @setup.is_a?(Array)
+      trap(:INT) { EM.stop }
+      EM.run {
+        klass = @setup[2].node ? Blather::Stream::Client : Blather::Stream::Component
+        klass.start Blather.client, *@setup
+      }
+
+    def temporary_handler(id, &handler)
+      @tmp_handlers[id] = handler
+    end
+
+    def register_handler(type, *guards, &handler)
+      @handlers[type] ||= []
+      @handlers[type] << [guards, handler]
+    end
+
+    def status
+      @status.state
+    end
+
+    def status=(state)
+      state, msg, to = state
+
+      status = Stanza::Presence::Status.new state, msg
+      status.to = to
+      @statustatus unless to
+
+      write status
+    end
+
+    def write(stanza)
+      stanza.from ||= jid if stanza.respond_to?(:from)
+      @stream.send(stanza) if @stream
+    end
+
+    def stream_started(stream)
+      @stream = stream
+
+      #retreive roster
+      if @stream.is_a?(Stream::Component)
+        @state = :ready
+        call_handler_for :ready, nil
+      else
+        write Stanza::Iq::Roster.new
+      end
+    end
+
+    def stop
+      @stream.close_connection_after_writing
+    end
+
+    def stopped
+      EM.stop
+    end
+
+    def call(stanza)
+      if handler = @tmp_handlers.delete(stanza.id)
+        handler.call stanza
+      else
+        stanza.handler_heirarchy.each do |type|
+          break if call_handler_for(type, stanza) && (stanza.is_a?(BlatherError) || stanza.type == :iq)
+        end
+      end
+    end
+
+    def call_handler_for(type, stanza)
+      if @handlers[type]
+        @handlers[type].find { |guards, handler| handler.call(stanza) unless guarded?(guards, stanza) }
+        true
+      end
+    end
+
+  protected
+    def setup_initial_handlers
+      register_handler :error do |err|
+        raise err
+      end
+
+      register_handler :iq do |iq|
+        write(StanzaError::ServiceUnavailable.new(iq, :cancel).to_node) 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
+
+    ##
+    # If any of the guards returns FALSE this returns true
+    def guarded?(guards, stanza)
+      guards.find do |guard|
+        case guard
+        when Symbol
+          !stanza.__send__(guard)
+        when Array
+          # return FALSE if any item is TRUE
+          !guard.detect { |condition| !guarded?([condition], stanza) }
+        when Hash
+          # return FALSE unless any inequality is found
+          guard.find do |method, value|
+            if value.is_a?(Regexp)
+              !stanza.__send__(method).to_s.match(value)
+            else
+              stanza.__send__(method) != value
+            end
+          end
+        when Proc
+          !guard.call(stanza)
+        else
+          raise "Bad guard: #{guard.inspect}"
+        end
+      end
+    end
+
+  end #Client
+
+  def client
+    @client ||= Client.new
+  end
+  module_function :client
+end #Blather
+
+##
+# Prepare server settings
+#   setup_client [node@domain/resource], [password], [host], [port]
+# host and port are optional defaulting to the domain in the JID and 5222 respectively
+def setup_client(jid, password, host = nil, port = 5222)
+  at_exit { Blather.client.setup_client(jid, password, host, port).run }
+end
+
+def setup_component(jid, secret, host, port)
+  at_exit { Blather.client.setup_component(jid, secret, host, port).run }
+end
+
+##
+# Shutdown the connection.
+# Flushes the write buffer then stops EventMachine
+def shutdown
+  Blather.client.stop
+end
+
+##
+# Set handler for a stanza type
+def handle(stanza_type, *guards, &block)
+  Blather.client.register_handler stanza_type, *guards, &block
+end
+
+##
+# Wrapper for "handle :ready" (just a bit of syntactic sugar)
+def when_ready(&block)
+  handle :ready, &block
+end
+
+##
+# Set current status
+def status(state = nil, msg = nil)
+  Blather.client.status = state, msg
+end
+
+##
+# Direct access to the roster
+def roster
+  Blather.client.roster
+end
+
+##
+# Write data to the stream
+# Anything that resonds to #to_s can be paseed to the stream
+def write(stanza)
+  Blather.client.write(stanza)
+end
+
+##
+# Helper method to make sending basic messages easier
+#   say [jid], [msg]
+def say(to, msg)
+  Blather.client.write Blather::Stanza::Message.new(to, msg)
+end
+
+##
+# Wrapper to grab the current JID
+def jid
+  Blather.client.jid
+end
+
+##
+#
+def discover(what, who, where, &callback)
+  stanza = Blather::Stanza.class_from_registration(:query, "http://jabber.org/protocol/disco##{what}").new
+  stanza.to = who
+  stanza.node = where
+
+  Blather.client.temporary_handler stanza.id, &callback
+  write stanza
+end
+
+##
+# Checks to see if the method is part of the handlers list.
+# If so it creates a handler, otherwise it'll pass it back
+# to Ruby's method_missing handler
+def method_missing(method, *args, &block)
+  if Blather::Stanza.handler_list.include?(method)
+    handle method, *args, &block
+  else
+    super
+  end
+end
 
-include Blather::DSL
 
 at_exit do
-  unless client.setup?
+  unless Blather.client.setup?
     if ARGV.length < 2
       puts "Run with #{$0} user@server/resource password [host] [port]"
     else
-      client.setup(*ARGV).run
+      Blather.client.setup(*ARGV).run
     end
   end
 end

data/lib/blather/roster.rb

@@ -71,15 +71,6 @@ module Blather
       @items.dup
     end
 
-    ##
-    # A hash of items keyed by group
-    def grouped
-      self.inject(Hash.new{|h,k|h[k]=[]}) do |hash, item|
-        item[1].groups.each { |group| hash[group] << item[1] }
-        hash
-      end
-    end
-
   private
     def self.key(jid)
       JID.new(jid).stripped.to_s

data/lib/blather/stanza/{disco.rb → iq/disco.rb}

@@ -1,9 +1,11 @@
 module Blather
 class Stanza
+class Iq
 
-  class Disco < Iq::Query
+  class Disco < Query
     attribute_accessor :node, :to_sym => false
   end
 
+end #Iq
 end #Stanza
 end #Blather

data/lib/blather/stanza/{disco → iq/discos}/disco_info.rb

@@ -1,5 +1,6 @@
 module Blather
 class Stanza
+class Iq
 
   ##
   # DiscoInfo object ()
@@ -7,11 +8,9 @@ class Stanza
   class DiscoInfo < Disco
     register :disco_info, nil, 'http://jabber.org/protocol/disco#info'
 
-    def initialize(type = nil, node = nil, identities = [], features = [])
+    def initialize(type = nil, identities = [], features = [], node = nil)
       super type
 
-      self.node = node
-
       [identities].flatten.each do |id|
         query << (id.is_a?(Identity) ? id : Identity.new(id[:name], id[:type], id[:category]))
       end
@@ -19,6 +18,8 @@ class Stanza
       [features].flatten.each do |feature|
         query << (feature.is_a?(Feature) ? feature : Feature.new(feature))
       end
+
+      self.node = node
     end
 
     ##
@@ -80,5 +81,6 @@ class Stanza
     end
   end
 
+end #Iq
 end #Stanza
 end #Blather

data/lib/blather/stanza/{disco → iq/discos}/disco_items.rb

@@ -1,5 +1,6 @@
 module Blather
 class Stanza
+class Iq
 
   class DiscoItems < Disco
     register :disco_items, nil, 'http://jabber.org/protocol/disco#items'
@@ -55,5 +56,6 @@ class Stanza
     end
   end
 
+end #Iq
 end #Stanza
 end #Blather

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

@@ -8,7 +8,7 @@ class Iq
     ##
     # Ensure the namespace is set to the query node
     def initialize(type = nil)
-      super
+      super()
       query.namespace = self.class.ns
     end
 

data/lib/blather/stanza/iq/roster.rb

@@ -27,8 +27,8 @@ class Iq
     ##
     # Roster items
     def items
-      items = query.find('//item', self.class.ns)
-      items = query.find('//query_ns:item', :query_ns => self.class.ns) if items.empty?
+      items = query.find('item')
+      items = query.find('query_ns:item', :query_ns => self.class.ns) if items.empty?
       items.map { |i| RosterItem.new(i) }
     end
 

data/lib/blather/xmpp_node.rb

@@ -129,7 +129,7 @@ module Blather
     def namespace=(ns)
       if ns
         ns = {nil => ns} unless ns.is_a?(Hash)
-        ns.each { |n| XML::Namespace.new self, *n }
+        ns.each { |p,n| XML::Namespace.new self, p, n }
       end
     end
 

data/spec/blather/stanza/{discos → iq/discos}/disco_info_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_info_xml
   <<-XML
@@ -24,7 +24,7 @@ describe 'Blather::Stanza::Iq::DiscoInfo' do
   end
 
   it 'has a node attribute' do
-    n = Blather::Stanza::Iq::DiscoInfo.new nil, 'music', [], []
+    n = Blather::Stanza::Iq::DiscoInfo.new nil, [], [], 'music'
     n.node.must_equal 'music'
     n.node = :foo
     n.node.must_equal 'foo'
@@ -55,7 +55,7 @@ describe 'Blather::Stanza::Iq::DiscoInfo identities' do
     control = [ Stanza::Iq::DiscoInfo::Identity.new(*%w[name type category]),
                 Stanza::Iq::DiscoInfo::Identity.new(*%w[name1 type1 category1])]
 
-    di = Stanza::Iq::DiscoInfo.new nil, nil, ids
+    di = Stanza::Iq::DiscoInfo.new nil, ids
     di.identities.size.must_equal 2
     di.identities.each { |i| control.include?(i).must_equal true }
   end
@@ -64,7 +64,7 @@ describe 'Blather::Stanza::Iq::DiscoInfo identities' do
     control = [ Stanza::Iq::DiscoInfo::Identity.new(*%w[name type category]),
                 Stanza::Iq::DiscoInfo::Identity.new(*%w[name1 type1 category1])]
 
-    di = Stanza::Iq::DiscoInfo.new nil, nil, control
+    di = Stanza::Iq::DiscoInfo.new nil, control
     di.identities.size.must_equal 2
     di.identities.each { |i| control.include?(i).must_equal true }
   end
@@ -72,7 +72,7 @@ describe 'Blather::Stanza::Iq::DiscoInfo identities' do
   it 'takes a single hash as identity' do
     control = [Stanza::Iq::DiscoInfo::Identity.new(*%w[name type category])]
 
-    di = Stanza::Iq::DiscoInfo.new nil, nil, {:name => 'name', :type => 'type', :category => 'category'}
+    di = Stanza::Iq::DiscoInfo.new nil, {:name => 'name', :type => 'type', :category => 'category'}
     di.identities.size.must_equal 1
     di.identities.each { |i| control.include?(i).must_equal true }
   end
@@ -80,7 +80,7 @@ describe 'Blather::Stanza::Iq::DiscoInfo identities' do
   it 'takes a single identity object as identity' do
     control = [Stanza::Iq::DiscoInfo::Identity.new(*%w[name type category])]
 
-    di = Stanza::Iq::DiscoInfo.new nil, nil, control.first
+    di = Stanza::Iq::DiscoInfo.new nil, control.first
     di.identities.size.must_equal 1
     di.identities.each { |i| control.include?(i).must_equal true }
   end
@@ -94,7 +94,7 @@ describe 'Blather::Stanza::Iq::DiscoInfo identities' do
     control = [ Stanza::Iq::DiscoInfo::Identity.new(*%w[name type category]),
                 Stanza::Iq::DiscoInfo::Identity.new(*%w[name1 type1 category1])]
 
-    di = Stanza::Iq::DiscoInfo.new nil, nil, ids
+    di = Stanza::Iq::DiscoInfo.new nil, ids
     di.identities.size.must_equal 2
     di.identities.each { |i| control.include?(i).must_equal true }
   end
@@ -105,7 +105,7 @@ describe 'Blather::Stanza::Iq::DiscoInfo features' do
     features = %w[feature1 feature2 feature3]
     control = features.map { |f| Stanza::Iq::DiscoInfo::Feature.new f }
 
-    di = Stanza::Iq::DiscoInfo.new nil, nil, [], features
+    di = Stanza::Iq::DiscoInfo.new nil, [], features
     di.features.size.must_equal 3
     di.features.each { |f| control.include?(f).must_equal true }
   end
@@ -114,7 +114,7 @@ describe 'Blather::Stanza::Iq::DiscoInfo features' do
     features = %w[feature1 feature2 feature3]
     control = features.map { |f| Stanza::Iq::DiscoInfo::Feature.new f }
 
-    di = Stanza::Iq::DiscoInfo.new nil, nil, [], control
+    di = Stanza::Iq::DiscoInfo.new nil, [], control
     di.features.size.must_equal 3
     di.features.each { |f| control.include?(f).must_equal true }
   end
@@ -122,7 +122,7 @@ describe 'Blather::Stanza::Iq::DiscoInfo features' do
   it 'takes a single string' do
     control = [Stanza::Iq::DiscoInfo::Feature.new('feature1')]
 
-    di = Stanza::Iq::DiscoInfo.new nil, nil, [], 'feature1'
+    di = Stanza::Iq::DiscoInfo.new nil, [], 'feature1'
     di.features.size.must_equal 1
     di.features.each { |f| control.include?(f).must_equal true }
   end
@@ -130,7 +130,7 @@ describe 'Blather::Stanza::Iq::DiscoInfo features' do
   it 'takes a single Feature object' do
     control = [Stanza::Iq::DiscoInfo::Feature.new('feature1')]
 
-    di = Stanza::Iq::DiscoInfo.new nil, nil, [], control.first
+    di = Stanza::Iq::DiscoInfo.new nil, [], control.first
     di.features.size.must_equal 1
     di.features.each { |f| control.include?(f).must_equal true }
   end
@@ -140,7 +140,7 @@ describe 'Blather::Stanza::Iq::DiscoInfo features' do
     control = features.map { |f| Stanza::Iq::DiscoInfo::Feature.new f }
     features[1] = control[1]
 
-    di = Stanza::Iq::DiscoInfo.new nil, nil, [], features
+    di = Stanza::Iq::DiscoInfo.new nil, [], features
     di.features.size.must_equal 3
     di.features.each { |f| control.include?(f).must_equal true }
   end