troystribling-agent_xmpp 0.0.0 → 0.0.1

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.0.1

data/agent_xmpp.gemspec

@@ -2,14 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{agent_xmpp}
-  s.version = "0.0.0"
+  s.version = "0.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Troy Stribling"]
-  s.date = %q{2009-06-02}
-  s.default_executable = %q{agent_xmpp}
+  s.date = %q{2009-08-03}
   s.email = %q{troy.stribling@gmail.com}
-  s.executables = ["agent_xmpp"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
@@ -21,48 +19,98 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
+     "VERSION",
      "agent_xmpp.gemspec",
-     "bin/agent_xmpp",
      "lib/agent_xmpp.rb",
      "lib/agent_xmpp/app.rb",
      "lib/agent_xmpp/app/boot.rb",
-     "lib/agent_xmpp/app/chat_message_body_controller.rb",
      "lib/agent_xmpp/app/controller.rb",
-     "lib/agent_xmpp/app/format.rb",
-     "lib/agent_xmpp/app/map.rb",
-     "lib/agent_xmpp/app/routes.rb",
-     "lib/agent_xmpp/app/view.rb",
      "lib/agent_xmpp/client.rb",
      "lib/agent_xmpp/client/client.rb",
      "lib/agent_xmpp/client/connection.rb",
-     "lib/agent_xmpp/client/parser.rb",
+     "lib/agent_xmpp/client/message_delegate.rb",
+     "lib/agent_xmpp/client/message_pipe.rb",
+     "lib/agent_xmpp/client/publish_model.rb",
+     "lib/agent_xmpp/client/response.rb",
+     "lib/agent_xmpp/client/roster_model.rb",
+     "lib/agent_xmpp/client/services_model.rb",
+     "lib/agent_xmpp/config.rb",
+     "lib/agent_xmpp/main.rb",
      "lib/agent_xmpp/patches.rb",
-     "lib/agent_xmpp/patches/standard_library_patches.rb",
-     "lib/agent_xmpp/patches/standard_library_patches/array.rb",
-     "lib/agent_xmpp/patches/standard_library_patches/float.rb",
-     "lib/agent_xmpp/patches/standard_library_patches/hash.rb",
-     "lib/agent_xmpp/patches/standard_library_patches/object.rb",
-     "lib/agent_xmpp/patches/standard_library_patches/string.rb",
-     "lib/agent_xmpp/patches/xmpp4r_patches.rb",
-     "lib/agent_xmpp/patches/xmpp4r_patches/command.rb",
-     "lib/agent_xmpp/patches/xmpp4r_patches/iq.rb",
-     "lib/agent_xmpp/patches/xmpp4r_patches/x_data.rb",
-     "lib/agent_xmpp/utils.rb",
-     "lib/agent_xmpp/utils/logger.rb",
-     "lib/agent_xmpp/utils/roster.rb",
-     "lib/agent_xmpp/version.rb",
-     "test/agent_xmpp_test.rb",
-     "test/test_helper.rb"
+     "lib/agent_xmpp/patches/array.rb",
+     "lib/agent_xmpp/patches/float.rb",
+     "lib/agent_xmpp/patches/hash.rb",
+     "lib/agent_xmpp/patches/object.rb",
+     "lib/agent_xmpp/patches/rexml.rb",
+     "lib/agent_xmpp/patches/string.rb",
+     "lib/agent_xmpp/xmpp.rb",
+     "lib/agent_xmpp/xmpp/element.rb",
+     "lib/agent_xmpp/xmpp/error_response.rb",
+     "lib/agent_xmpp/xmpp/iq.rb",
+     "lib/agent_xmpp/xmpp/iq_command.rb",
+     "lib/agent_xmpp/xmpp/iq_disco.rb",
+     "lib/agent_xmpp/xmpp/iq_pubsub.rb",
+     "lib/agent_xmpp/xmpp/iq_roster.rb",
+     "lib/agent_xmpp/xmpp/iq_version.rb",
+     "lib/agent_xmpp/xmpp/jid.rb",
+     "lib/agent_xmpp/xmpp/message.rb",
+     "lib/agent_xmpp/xmpp/presence.rb",
+     "lib/agent_xmpp/xmpp/sasl.rb",
+     "lib/agent_xmpp/xmpp/stanza.rb",
+     "lib/agent_xmpp/xmpp/x_data.rb",
+     "test/app/app.rb",
+     "test/cases/test_application_message_processing.rb",
+     "test/cases/test_errors.rb",
+     "test/cases/test_presence_management.rb",
+     "test/cases/test_roster_management.rb",
+     "test/cases/test_service_discovery.rb",
+     "test/cases/test_session_management.rb",
+     "test/cases/test_version_discovery.rb",
+     "test/helpers/matchers.rb",
+     "test/helpers/mocks.rb",
+     "test/helpers/test_case_extensions.rb",
+     "test/helpers/test_client.rb",
+     "test/helpers/test_delegate.rb",
+     "test/helpers/test_helper.rb",
+     "test/messages/application_messages.rb",
+     "test/messages/error_messages.rb",
+     "test/messages/presence_messages.rb",
+     "test/messages/roster_messages.rb",
+     "test/messages/service_discovery_messages.rb",
+     "test/messages/session_messages.rb",
+     "test/messages/version_discovery_messages.rb",
+     "test/peer/peer.rb",
+     "test/xml_messages.txt"
   ]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/troystribling/agent_xmpp}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.1}
-  s.summary = %q{TODO}
+  s.summary = %q{Agent XMPP is a ruby XMPP bot framework inspired by MVC web frameworks.}
   s.test_files = [
-    "test/agent_xmpp_test.rb",
-     "test/test_helper.rb"
+    "test/app/app.rb",
+     "test/cases/test_application_message_processing.rb",
+     "test/cases/test_errors.rb",
+     "test/cases/test_presence_management.rb",
+     "test/cases/test_roster_management.rb",
+     "test/cases/test_service_discovery.rb",
+     "test/cases/test_session_management.rb",
+     "test/cases/test_version_discovery.rb",
+     "test/helpers/matchers.rb",
+     "test/helpers/mocks.rb",
+     "test/helpers/test_case_extensions.rb",
+     "test/helpers/test_client.rb",
+     "test/helpers/test_delegate.rb",
+     "test/helpers/test_helper.rb",
+     "test/messages/application_messages.rb",
+     "test/messages/error_messages.rb",
+     "test/messages/presence_messages.rb",
+     "test/messages/roster_messages.rb",
+     "test/messages/service_discovery_messages.rb",
+     "test/messages/session_messages.rb",
+     "test/messages/version_discovery_messages.rb",
+     "test/peer/peer.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -73,17 +121,14 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rake>, [">= 0.8.3"])
       s.add_runtime_dependency(%q<eventmachine>, ["= 0.12.6"])
       s.add_runtime_dependency(%q<troystribling-evma_xmlpushparser>, ["= 0.0.1"])
-      s.add_runtime_dependency(%q<xmpp4r>, ["= 0.4"])
     else
       s.add_dependency(%q<rake>, [">= 0.8.3"])
       s.add_dependency(%q<eventmachine>, ["= 0.12.6"])
       s.add_dependency(%q<troystribling-evma_xmlpushparser>, ["= 0.0.1"])
-      s.add_dependency(%q<xmpp4r>, ["= 0.4"])
     end
   else
     s.add_dependency(%q<rake>, [">= 0.8.3"])
     s.add_dependency(%q<eventmachine>, ["= 0.12.6"])
     s.add_dependency(%q<troystribling-evma_xmlpushparser>, ["= 0.0.1"])
-    s.add_dependency(%q<xmpp4r>, ["= 0.4"])
   end
 end

data/lib/agent_xmpp.rb

@@ -1,16 +1,20 @@
+$:.unshift(File.dirname(__FILE__))
+
 require 'find'
 require 'ftools'
+require 'singleton'
+require 'logger'
+require 'socket'
+require 'optparse'
+require 'rexml/document'
+require 'base64'
 
 require 'eventmachine'
 require 'evma_xmlpushparser'
-require 'xmpp4r'
-require 'xmpp4r/roster'
-require 'xmpp4r/version'
-require 'xmpp4r/dataforms'
-require 'xmpp4r/command/iq/command'
 
-require 'agent_xmpp/version'
 require 'agent_xmpp/patches'
 require 'agent_xmpp/app'
 require 'agent_xmpp/client'
-require 'agent_xmpp/utils'
+require 'agent_xmpp/xmpp'
+require 'agent_xmpp/config'
+require 'agent_xmpp/main'

data/lib/agent_xmpp/app.rb

@@ -1,7 +1,2 @@
 require 'agent_xmpp/app/boot'
 require 'agent_xmpp/app/controller'
-require 'agent_xmpp/app/format'
-require 'agent_xmpp/app/map'
-require 'agent_xmpp/app/routes'
-require 'agent_xmpp/app/view'
-require 'agent_xmpp/app/chat_message_body_controller'

data/lib/agent_xmpp/app/boot.rb

@@ -6,7 +6,6 @@ module AgentXmpp
     
     #.......................................................................................................
     @config_load_order = []
-    @app_load_order = []
     
     ####......................................................................................................
     class << self
@@ -15,47 +14,62 @@ module AgentXmpp
       attr_accessor :config_load_order, :app_load_order
       
       #.......................................................................................................
-      def app_dir
-        Dir.pwd
-      end
-      
-      #.......................................................................................................
-      def before_config_load(&blk)
-         define_meta_class_method(:call_before_config_load, &blk)
-      end
+      def boot
+        
+        ####..............
+        AgentXmpp.log_file = add_path(AgentXmpp.log_file) if AgentXmpp.log_file.kind_of?(String)
+        AgentXmpp.config_file = add_path(AgentXmpp.config_file)
+        AgentXmpp.logger = Logger.new(AgentXmpp.log_file, 10, 1024000)
 
-      #.......................................................................................................
-      def after_connection_completed(&blk)
-         define_meta_class_method(:call_after_connection_completed, &blk)
-      end
+        ####..............
+        AgentXmpp.logger.info "STARTING AgentXmpp"
+        AgentXmpp.logger.info "APPLICATION PATH: #{AgentXmpp.app_path}"
+        AgentXmpp.logger.info "LOG FILE: #{AgentXmpp.log_file.kind_of?(String) ? AgentXmpp.log_file : "STDOUT"}"
+        AgentXmpp.logger.info "CONFIGURATION FILE: #{AgentXmpp.config_file}"
+        AgentXmpp.logger.level = Logger::WARN 
 
-      #.......................................................................................................
-      def before_app_load(&blk)
-         define_meta_class_method(:call_before_app_load, &blk)
-      end
+        ####..............
+        raise AgentXmppError, "Configuration file #{AgentXmpp.config_file} required." unless File.exist?(AgentXmpp.config_file) 
 
+        ####..............
+        AgentXmpp.config = File.open(AgentXmpp.config_file) {|yf| YAML::load(yf)}
+        call_if_implemented(:call_before_start)
+        AgentXmpp::Client.new().connect
+        
+      end
+      
+      ####....................................................................................................
+      # application deligate methods
       #.......................................................................................................
-      def after_app_load(&blk)
-         define_meta_class_method(:call_after_app_load, &blk)
+      def call_if_implemented(method, *args)
+        send(method, *args) if respond_to?(method)
       end
-    
-      ####------------------------------------------------------------------------------------------------------
-      def load(path, options = {})
-        exclude_files = options[:exclude] || []
-        ordered_files = options[:ordered_load] || []
-        ordered_files.each{|f| require f}
-        Find.find(path) do |file_path|
-          if file_match = /(.*)\.rb$/.match(file_path)
-            file = file_match.captures.last
-            unless exclude_files.include?(file) and ordered_files.include?(file)
-              require file 
+      
+      #.........................................................................................................
+      def callbacks(*args)
+        args.each do |meth| 
+          instance_eval <<-do_eval
+            def #{meth}(&blk)
+              define_meta_class_method(:call_#{meth}, &blk)
             end
-          end
+          do_eval
         end
+      end 
+                          
+    ####......................................................................................................
+    private
+
+      #.......................................................................................................
+      def add_path(dir)
+        File.join(AgentXmpp.app_path, dir)
       end
-    
+        
+    #### self
     end
-    ####......................................................................................................
+
+    #.........................................................................................................
+    callbacks(:before_start, :after_connected, :discovered_all_publish_nodes, :discovered_command_nodes, 
+              :discovered_pubsub_node, :received_presence, :restarting_client)
 
   #### Boot
   end

data/lib/agent_xmpp/app/controller.rb

@@ -2,40 +2,156 @@
 module AgentXmpp
   
   #####-------------------------------------------------------------------------------------------------------
-  class Controller
+  class BaseController
 
     #---------------------------------------------------------------------------------------------------------
-    attr_reader :format, :params, :connection
+    @routes = {}
+    
     #---------------------------------------------------------------------------------------------------------
+    class << self
+      
+      #.........................................................................................................
+      attr_reader :routes
 
-    #.........................................................................................................
-    def initialize
+      #.........................................................................................................
+      def execute(node, opts = {}, &blk) 
+        route(:execute, {:node => node, :opts => opts, :blk => blk}) 
+      end
+
+      #.........................................................................................................
+      def event(jid, node, opts = {}, &blk) 
+        j = Xmpp::Jid.new(jid)
+        route(:event, {:node => "/home/#{j.domain}/#{j.node}/#{node}", :domain => j.domain, :opts => opts, :blk => blk}) 
+      end
+
+      #.........................................................................................................
+      def chat(opts = {}, &blk) 
+        route(:chat, {:opts => opts, :blk => blk})
+      end
+
+      #.........................................................................................................
+      def route(action, nroute)
+        (routes[action] ||= []).push(nroute).last
+      end
+     
+      #.........................................................................................................
+      def command_nodes
+        (routes[:execute] ||= []).map{|r| r[:node]}
+      end
+
+      #.........................................................................................................
+      def subscriptions(service)
+        (routes[:event] ||= []).inject([]){|s,r| /#{r[:domain]}/.match(service) ? s << r[:node] : s}
+      end
+      
+      #.........................................................................................................
+      def event_domains
+        (routes[:event] ||= []).map{|r| r[:domain]}.uniq
+      end
+      
+    #### self
     end
- 
-    #---------------------------------------------------------------------------------------------------------
-    # handle request
+
     #.........................................................................................................
-    def handle_request(connection, action, params)
+    attr_reader :params, :pipe
+
+    #.........................................................................................................
+    def initialize(pipe, params)
       @params = params
-      @connection = connection
-      @format = Format.new(params[:xmlns])
-      send(action)
+      @pipe = pipe
     end
 
+    #.......................................................................................................
+     def invoke_execute
+       route = get_route(params[:action])
+       unless route.nil?
+         define_meta_class_method(:request, &route[:blk])
+         define_meta_class_method(:request_callback) do |*result|
+           result = result.first if result.length.eql?(1)  
+           add_payload_to_container(result.nil? ? nil : result.to_x_data)
+         end
+         handle_request
+       else
+         AgentXmpp.logger.error "ROUTING ERROR: no route for {:node => '#{params[:node]}', :action => '#{params[:action]}'}."
+         Xmpp::ErrorResponse.no_route(params)
+       end
+     end
+
+     #.......................................................................................................
+      def invoke_event
+        route = get_route(:event)
+        unless route.nil?
+          define_meta_class_method(:request, &route[:blk])
+          handle_request
+        else
+          AgentXmpp.logger.error "ROUTING ERROR: no route for {:node => '#{params[:node]}'}."
+        end
+      end
+
+     #.......................................................................................................
+     def invoke_chat
+       route = chat_route
+       unless route.nil?
+         define_meta_class_method(:request, &route[:blk])
+       else
+         define_meta_class_method(:request) do
+           "#{AgentXmpp::AGENT_XMPP_NAME} #{AgentXmpp::VERSION}, #{AgentXmpp::OS_VERSION}"
+         end
+       end
+       define_meta_class_method(:request_callback) do |result|
+         add_payload_to_container(result) if result.kind_of?(String)
+       end
+       handle_request
+     end
+
     #.........................................................................................................
-    def result_for(&blk)
-      @result_for_blk = blk
+    def handle_request
+      EventMachine.defer(method(:request).to_proc, respond_to?(:request_callback) ? method(:request_callback).to_proc : nil)
     end
 
     #.........................................................................................................
-    def respond_to(&blk)
-      View.send(:define_method, :respond_to, &blk)
-      View.send(:define_method, :result_callback) do |*result|
-        connection.send(add_payload_to_container(respond_to(result)))
-      end
-      EventMachine.defer(@result_for_blk, View.new(connection, format, params).method(:result_callback).to_proc)
+    # add payloads
+    #.........................................................................................................
+    def result_jabber_x_data(params, payload)
+      Xmpp::IqCommand.result(:to => params[:from], :id => params[:id], :node => params[:node], :payload => payload)
+    end
+
+    #.........................................................................................................
+    def result_message_chat(params, payload)
+      Xmpp::Message.chat(params[:from], payload)
     end
         
+  private
+    
+    #.........................................................................................................
+    def add_payload_to_container(payload)
+      meth = "result_#{params[:xmlns].gsub(/:/, "_")}".to_sym
+      if respond_to?(meth) 
+        pipe.send_resp(send(meth, params, payload))
+      else
+        AgentXmpp.logger.error "PAYLOAD ERROR: unsupported payload {:xmlns => '#{params[:xmlns]}', :node => '#{params[:node]}', :action => '#{params[:action]}'}."
+        Xmpp::ErrorResponse.unsupported_payload(params)
+      end
+    end
+    
+    #.........................................................................................................
+    # routes
+    #.........................................................................................................
+    def get_route(action) 
+      (BaseController.routes[action] || []).select{|r| r[:node].eql?(params[:node].to_s)}.first
+    end
+
+    #.........................................................................................................
+    def chat_route 
+      (BaseController.routes[:chat] ||= []).first
+    end
+    
+  #### BaseController
+  end
+
+  ##############################################################################################################
+  class Controller < BaseController
+
   #### Controller
   end