agent_xmpp 0.1.0 → 0.1.1

data/.rvmrc

@@ -0,0 +1 @@
+rvm use 1.9.2@agent_xmpp

data/README.rdoc

@@ -1,7 +1,7 @@
-= Agent XMPP
+= AgentXMPP
 
-Agent XMPP is a simple DSL for writing automated XMPP clients that support Messaging, Ad-Hoc Commands and Publish Subscribe 
-Events. An application that responds to an Ad-Hoc command can be written with few lines of code.
+AgentXMPP is an application framework for writing XMPP clients that support Messaging, Ad-Hoc Commands and Publish Subscribe 
+Events. An application that responds to an Ad-Hoc Command can be written with few lines of code.
 
     # myapp.rb
     require 'rubygems'
@@ -11,7 +11,7 @@ Events. An application that responds to an Ad-Hoc command can be written with fe
       'Hello World' 
     end
 
-Specify the application Jabber ID (JID), password and roster in <tt>agent_xmpp.yml</tt>.
+Specify the application Jabber ID (JID), password and contact roster in <tt>agent_xmpp.yml</tt>.
 
     jid: myapp@nowhere.com
     password: none
@@ -27,7 +27,7 @@ Be sure libxml2 headers are available and that libsqlite3-ruby1.9.1 is installed
 
 Install the gem,
 
-    sudo gem install troystribling-agent_xmpp --source=http://gems.github.com
+    sudo gem install agent_xmpp
 
 Install the Gajim XMPP Client version 0.12.3 or higher, http://www.gajim.org, and connect to <i>you@home.com</i>. 
 
@@ -35,10 +35,11 @@ Run the application,
 
     ruby myapp.rb
 
-When started for the first time <tt>myapp.rb</tt> will automatically send buddy requests to all contacts specified
-in <tt>agent_xmpp.yml</tt>. Accept the buddy request and _myapp_ will appear as a contact in the Gajim roster. Right click on _myapp_
-and select _execute_ _commands_ from the drop down menu. A list of Ad-Hoc Commands will be displayed containing _hello_. 
-Select it and click the _forward_ _button_ to execute.
+When started for the first time <tt>myapp.rb</tt> will automatically send contact requests to all contacts specified
+in the <tt>agent_xmpp.yml</tt> contact roster. If you accept the contact request _myapp_ will appear in the Gajim contact roster. 
+Right click on _myapp_ and select _execute_ _commands_ from the drop down menu. A list of Ad-Hoc Commands will be displayed containing _hello_. Select it and click the _forward_ _button_ to execute.
+
+See http://github.com/troystribling/agent_xmpp/blob/master/test/app/app.rb for many examples.
 
 == Supported Environment
 
@@ -50,10 +51,46 @@ The following Operating Systems are supported
     
     Ubuntu 10.4
     
+== Contact Groups
+
+Contact groups may be specified in <tt>agent_xmpp.yml</tt>.
+
+    jid: myapp@nowhere.com
+    password: none
+    roster:
+        - 
+            jid:you@home.com
+            groups: [good group, owners]
+
+        - 
+            jid: someone@somewhere.com
+            groups: [bad group]
+    
+== Agent Administrator Commands
+
+Any contact that is in the <tt>admin</tt> contact group can execute <em>Administrator Commands</em>. At least one administrator should be specified in <tt>agent_xmpp.yml</tt>. The following commands are available to agent administrators.
+
+* <b>contacts</b>: List the contact roster.
+
+* <b>online users</b>: List all online users.
+
+* <b>add contact</b>: Add a contact.
+
+* <b>delete contact</b>: Delete a contact.
+
+* <b>subscriptions</b>: List all subscriptions with statistics.
+
+* <b>publications</b>: List all publications with statistics.
+
+* <b>messages by type</b>: List message statistics by message type.
+
+* <b>messages by contact</b>: List message statistics by contact.
+
+* <b>messages by command</b>: List message statistics by command.
+    
 == Ad-Hoc Command Response Payload
 
-Agent XMPP will map native ruby scalars, arrays and hashes returned by <tt>execute</tt> blocks to jabber:x:data command 
-response payloads (see XEP-0004 http://xmpp.org/extensions/xep-0004.html for a description of jabber:x:data).
+<em>Ad-Hoc Commands</em> allow XMPP clients to send and receive structured parameterized commands. To process an <em>Ad-Hoc Command</em> request in an AgentXMPP application use <tt>command</tt> blocks. AgentXMPP will map native ruby scalars, arrays and hashes returned by <tt>command</tt> blocks to jabber:x:data command response payloads (see XEP-0004 http://xmpp.org/extensions/xep-0004.html for a description of jabber:x:data).
 
     command 'scalar' do
       'scalar' 
@@ -83,16 +120,136 @@ response payloads (see XEP-0004 http://xmpp.org/extensions/xep-0004.html for a d
        {:a1 => ['v31', 'v31'], :a2 => 'v32'}]
     end
 
-a <tt>params</tt> structure is available within the <tt>execute</tt> block containing routing information.
+== Ad-Hoc Command Data Forms
+
+XMPP provides a simple form specification for entry of <em>Ad-Hoc Command</em> parameters, http://xmpp.org/extensions/xep-0004.html#protocol-fieldtypes. AgentXMPP supports the following form controls.
+
+* <b>title</b>: The form title.
+    
+* <b>instructions</b>: Form usage instructions for the user.
+    
+* <b>fixed</b>: Static text.
+    
+* <b>text-single</b>: Single line text entry.
+    
+* <b>text-private</b>: Single line private text entry for passwords.
+    
+* <b>jid-single</b>: Single JID entry with syntax validation.
+    
+* <b>text-multi</b>: Muli-line text entry.
+    
+* <b>list-single</b>: Select a single item from a list items.
+    
+* <b>boolean</b>: Select a boolean value for an item.
+    
+Form controls are specified in an <tt>on</tt> bloc which takes the command <tt>action</tt> as an argument and <tt>yields</tt> the <tt>form</tt>. Valid values for the action are <tt>:execute</tt> and <tt>:submit</tt>. In a simple form the controls are specified in <tt>on(:execute)</tt>  and the response in <tt>on(:submit)</tt>.
+
+    command 'long_form' do
+      on(:execute) do |form|
+        form.add_title('The Long Form')
+        form.add_instructions('Make the correct choices and provide the required information.')
+        form.add_fixed("Your name is required.")
+        form.add_text_single('first_name', 'First Name')
+        form.add_text_single('last_name', 'Last Name')
+        form.add_fixed("Your address is required.")
+        form.add_text_single('street', 'Street')
+        form.add_text_single('city', 'City')
+        form.add_text_single('state', 'State')
+        form.add_text_single('zip', 'Zip Code')
+        form.add_fixed("Enter two friends.")
+        form.add_jid_single('contact_1', 'contact JID')
+        form.add_jid_single('contact_2', 'contact JID')
+        form.add_fixed("Your password is required.")
+        form.add_text_private('password', 'Password')
+        form.add_text_private('renter_password', 'Renter Password')
+        form.add_fixed("Choose your food.")
+        form.add_list_single('fruits', [:apple, :orange, :lemon, :lime, :kiwi_fruit], 'Select a Fruit')
+        form.add_list_single('nuts', [:peanut, :almond, :cashew, :pecan, :walnut], 'Select a Nut')
+        form.add_list_single('vegetables', [:broccoli, :carrot, :corn, :tomato, :onion], 'Select a Vegtable')
+        form.add_fixed("Answer the questions.")
+        form.add_boolean('yes_or_no', 'Yes or No please?')
+        form.add_boolean('flux_capcitors', 'Enable flux capacitors for superluminal transport')
+        form.add_fixed("A story of at least 250 characters is required")
+        form.add_text_multi('story', 'Your Story')
+      end
+      on(:submit) do
+        params[:data]
+      end
+    end
+    
+If command parameters have dependencies multi-step forms can be used. Multi-step forms are specified by a sequence of <tt>on(:submit)</tt> blocks that are called in the order listed.
+
+    command 'multiple_steps' do
+      on(:execute) do |form|
+        form.add_title('Account Features')
+        form.add_instructions('Enter and Account')
+        form.add_jid_single('jid', 'account JID')
+      end
+      on(:submit) do |form|
+        form.add_title("Account '#{params[:data]['jid']}'")
+        form.add_instructions('Enable/Disbale features')
+        form.add_boolean('idle_logout', 'On or Off please')
+        form.add_boolean('electrocution', 'Electrocute on login failure?')
+        form.add_text_multi('mod', 'Message of the day')
+        form.add_text_multi('warn', 'Warning message')
+      end
+      on(:submit) do
+        params_list.inject({}){|r,p| r.merge(p[:data])} 
+      end
+    end
+
+== Command Authorization
+
+AgentXMPP allows command authorization groups to be specified by XMPP contact groups.
+
+    command 'do_something', :access => 'good' do
+        Something.do_it(params[:data])
+    end
+
+    command 'do_something', :access => ['bad', 'good'] do
+        SomethingElse.do_it(params[:data])
+    end
+
+== Command Before Filters
+
+AgentXMPP supports specification of filters executed before command execution that must return a boolean value. If the filter returns <tt>true</tt> the command executes. If <tt>false</tt> is returned the command does not execute. 
+
+    before :command => :all do
+      jid = params[:from]
+      AgentXmpp::Roster.find_by_jid(jid) or AgentXmpp.is_account_jid?(jid)
+    end
 
-== Ad-Hoc Command Forms
+    before :command => 'do_something' do
+        Something.do_it?(params)
+    end
+
+    before :command => ['do_something', 'and_something_else'] do
+        Something.do_it?(params)
+    end
+
+== Deferred Command Execution
+
+By default AgentXMPP executes commands in the main event loop. If a command requires a lot of time for execution it can be deferred to a thread pool.
+
+    command 'starship_engine_configuration', :defer => true do
+      on(:execute) do |form|
+        form.add_title('Hyper Drive Configuration')
+        form.add_instructions('Choose the hyperdrive configuration which best suits your needs')
+        form.add_boolean('answer', 'On or Off please')
+        form.add_boolean('flux_capcitors', 'Enable flux capacitors for superluminal transport')
+        form.add_fixed('Enable SQUIDs for enhanced quantum decoherence')
+        form.add_boolean('squids')
+      end
+      on(:submit) do
+        StarshipEngineering.engage(params[:data])
+      end
+    end
 
-Agent XMPP supports 
 == Send Commands
 
 Commands may be sent with or without a response callback,
 
-    send_command(:to=>'thatapp@a-place.com/ahost', :node=> 'hello') do |status, data|
+    send_command(:to=>'thatapp@aplace.com/ahost', :node=> 'hello') do |status, data|
       puts "COMMAND RESPONSE: #{status}, #{data.inspect}"
     end
 
@@ -107,6 +264,77 @@ and within <tt>command</tt> blocks.
       {:a1 => 'v1', :a2 => 'v2'}
     end
 
+== Command Error Response
+
+Error responses to <em>Ad-Hoc Command</em> requests can be sent if an error is encountered during command execution.
+    
+    command 'do_something' do
+      if MyValidator.can_do_something?(params)
+        'I did it'
+      else
+        error(:bad_request, params, 'jid not specified')
+      end
+    end
+    
+In general the error response syntax has the form,
+
+    error(error_type, params, error_message)
+
+Valid <tt>error_types</tt> are,
+
+    :bad-request
+    :conflict
+    :feature-not-implemented
+    :forbidden
+    :gone
+    :internal-server-error
+    :item-not-found
+    :jid-malformed
+    :not-acceptable
+    :not-allowed
+    :not-authorized
+    :payment-required
+    :recipient-unavailable
+    :redirect
+    :registration-required
+    :remote-server-not-found
+    :remote-server-timeout
+    :resource-constraint
+    :service-unavailable
+    :subscription-required
+    :undefined-condition
+    :unexpected-request
+
+== Command Response Delegation
+
+Command responses may be delegated to one or more <em>Message Processing Callbacks</em> (see the last section <em>Message Processing Callbacks</em> for a list). <em>Message Processing Callbacks</em> give applications the ability to interface with the framework message processing workflow. <em>Command Response Delegation</em> is useful when a command must send another message and the response of this secondary message is processed by the framework. The command then delegates its response to the secondary message response. In the example below of the <tt>add_contact</tt> administration message the command sends a command to the server to add a roster item and does not respond to the original request until the response of the add roster item request is received from the server. 
+
+    command 'admin/add_contact', :access => 'admin' do
+      on(:execute) do |form|
+        form.add_title('Add Contact')
+        form.add_jid_single('jid', 'contact JID')
+        form.add_text_single('groups', 'groups comma seperated')
+      end
+      on(:submit) do
+        contact = params[:data]
+        if contact["jid"]
+          AgentXmpp::Contact.update(contact)
+          xmpp_msg(AgentXmpp::Xmpp::IqRoster.update(pipe, contact["jid"], contact["groups"].split(/,/))) 
+          xmpp_msg(AgentXmpp::Xmpp::Presence.subscribe(contact["jid"]))
+          delegate_to(
+            :on_update_roster_item_result => lambda do |pipe, item_jid|     
+              command_completed if item_jid.eql?(contact["jid"])
+            end,
+            :on_update_roster_item_error  => lambda do |pipe, item_jid|
+              error(:bad_request, params, 'roster updated failed') if item_jid.eql?(contact["jid"])
+            end
+          )
+        else
+          error(:bad_request, params, 'jid not specified')
+        end
+      end
+    end
+
 == Publish
 
 Publish nodes are configured in <tt>agent_xmpp.yml</tt>.
@@ -162,7 +390,7 @@ Declare <tt>event</tt> blocks in <tt>myapp.rb</tt> to subscribe to published eve
       message(:to=>'someone@somewhere.com', :body=>"Got the event at: " + Time.now.to_s)
     end
 
-Agent XMPP will verify subscription to the event and subscribe if required. Subscriptions
+AgentXMPP will verify subscription to the event and subscribe if required. Subscriptions
 discovered that are not declared by an event block will be deleted.
 
 == Receive Chat Messages
@@ -183,23 +411,6 @@ If the <tt>chat</tt> block returns a <tt>String</tt> a response will be sent to
 
     send_chat(:to=>'thatapp@a-place.com/onahost', :body=>"Hello from #{AgentXmpp.jid.to_s} at " + Time.now.to_s)
     
-== Roster
-
-Roster groups may be specified in <tt>agent_xmpp.yml</tt>.
-
-    jid: myapp@nowhere.com
-    password: none
-    roster:
-        - 
-            jid:you@home.com
-            groups: [good group, owners]
-        
-        - 
-            jid: someone@somewhere.com
-            groups: [bad group]
-     
-Agent XMPP will update the roster maintained on the XMPP server to be consistent with to the roster specified in <tt>agent_xmpp.yml</tt>. 
-
 == Routing Priority
 
 The routing priority may be configured in <tt>agent_xmpp.yml</tt>. The default value is 1. Valid values are between -127 and 128. 
@@ -213,9 +424,15 @@ See http://xmpp.org/rfcs/rfc3921.html for a details.
             jid:you@home.com
             groups: [good group, owners]
         
+== Message Processing Context Extension
+
+You can add methods to the <tt>command</tt> and <tt>chat</tt> context by adding your methods to a module and calling,
+    
+    include_module MyExtensions
+            
 == Major Event Callbacks
 
-Agent XMPP provides callbacks for applications to respond to major events that occur during execution.
+AgentXMPP provides callbacks for applications to respond to major events that occur during execution.
  
     # application starting
     before_start{}
@@ -242,10 +459,7 @@ Agent XMPP provides callbacks for applications to respond to major events that o
 == Development with XMPP Clients
 
 Ad-Hoc Commands, jabber:x:data Forms nor Service Discovery are widely supported by XMPP clients and I have not found
-a client that supports Publish-Subscribe. Gajim http://www.gajim.org provides support for Ad-Hoc Commands and jabber:x:data Forms. Service Discovery,
-which is useful for Publish-Subscibe development, is supported by Gajim, but Psi http://psi-im.org provides a much better
-implementation. Both Gajim and Psi provide an interface for manual entry of XML messages. Since Publish-Subscribe is not supported on
-the user interface manual entry of messages is required for development. Example messages can be found at http://gist.github.com/160344
+a client that adequately supports Publish-Subscribe. Gajim http://www.gajim.org provides support for Ad-Hoc Commands and jabber:x:data Forms. Service Discovery, which is useful for Publish-Subscibe development, is supported by Gajim, but Psi http://psi-im.org provides a much better implementation. Both Gajim and Psi provide an interface for manual entry of XML messages. Since Publish-Subscribe is not supported on the user interface manual entry of messages is required for development. Example messages can be found at http://gist.github.com/160344
 
 == Logging
 
@@ -265,15 +479,15 @@ More examples can be found at http://gist.github.com/160338
 
 == Supported XEPs
 
-    XEP-0004 jabber:x:data Forms    http://xmpp.org/extensions/xep-0004.html
-    XEP-0030 Service Discovery      http://xmpp.org/extensions/xep-0030.html
-    XEP-0050 Ad-Hoc Commands        http://xmpp.org/extensions/xep-0050.html
-    XEP-0060 Publish Subscribe      http://xmpp.org/extensions/xep-0060.html
-    XEP-0092 Software Version       http://xmpp.org/extensions/xep-0092.html
+* XEP-0004 jabber:x:data Forms    http://xmpp.org/extensions/xep-0004.html
+* XEP-0030 Service Discovery      http://xmpp.org/extensions/xep-0030.html
+* XEP-0050 Ad-Hoc Commands        http://xmpp.org/extensions/xep-0050.html
+* XEP-0060 Publish Subscribe      http://xmpp.org/extensions/xep-0060.html
+* XEP-0092 Software Version       http://xmpp.org/extensions/xep-0092.html
 
 == Message Processing Callbacks
 
-Message processing callbacks are available to applications to extend the message processing work flow. To receive
+<em>Message Processing Callbacks</em> are available to applications to extend the agent message processing work flow. To receive
 callbacks a delegate object must be provided that implements the callbacks of interest.   
 
     after_connected do |connection|

data/Rakefile

@@ -12,15 +12,16 @@ begin
 require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "agent_xmpp"
-    gem.summary = %Q{Agent XMPP is a ruby XMPP bot framework inspired by MVC web frameworks.}
+    gem.summary = %Q{Agent XMPP is a ruby XMPP bot framework inspired by web frameworks.}
     gem.email = "troy.stribling@gmail.com"
     gem.homepage = "http://github.com/troystribling/agent_xmpp"
     gem.authors = ["Troy Stribling"]
     gem.files.include %w(lib/jeweler/templates/.gitignore VERSION)
-    gem.add_dependency('rake',                              '>= 0.8.3')
-    gem.add_dependency('eventmachine',                      '>= 0.12.6')
-    gem.add_dependency('sequel',                            '>= 3.9.0')
-    gem.add_dependency('evma_xmlpushparser',                '>= 0.0.1')
+    gem.add_dependency('rake',                   '>= 0.8.3')
+    gem.add_dependency('eventmachine',           '>= 0.12.6')
+    gem.add_dependency('sequel',                 '>= 3.9.0')
+    gem.add_dependency('evma_xmlpushparser',     '>= 0.0.1')
+    gem.add_dependency('sqlite3',                '>= 1.3.3')
   end
 rescue LoadError
   abort "jeweler is not available. In order to run test, you must: sudo gem install technicalpickles-jeweler --source=http://gems.github.com"

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/agent_xmpp.gemspec

@@ -1,144 +1,122 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{agent_xmpp}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Troy Stribling"]
-  s.date = %q{2010-08-21}
+  s.authors = [%q{Troy Stribling}]
+  s.date = %q{2011-06-12}
   s.email = %q{troy.stribling@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "agent_xmpp.gemspec",
-     "lib/agent_xmpp.rb",
-     "lib/agent_xmpp/admin.rb",
-     "lib/agent_xmpp/client.rb",
-     "lib/agent_xmpp/client/boot.rb",
-     "lib/agent_xmpp/client/client.rb",
-     "lib/agent_xmpp/client/connection.rb",
-     "lib/agent_xmpp/client/controller.rb",
-     "lib/agent_xmpp/client/message_delegate.rb",
-     "lib/agent_xmpp/client/message_pipe.rb",
-     "lib/agent_xmpp/client/response.rb",
-     "lib/agent_xmpp/config.rb",
-     "lib/agent_xmpp/main.rb",
-     "lib/agent_xmpp/models.rb",
-     "lib/agent_xmpp/models/contact.rb",
-     "lib/agent_xmpp/models/message.rb",
-     "lib/agent_xmpp/models/publication.rb",
-     "lib/agent_xmpp/models/roster.rb",
-     "lib/agent_xmpp/models/service.rb",
-     "lib/agent_xmpp/models/subscription.rb",
-     "lib/agent_xmpp/models/table_definitions.rb",
-     "lib/agent_xmpp/patches.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/entry.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"
-  ]
-  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.5}
-  s.summary = %q{Agent XMPP is a ruby XMPP bot framework inspired by MVC web frameworks.}
-  s.test_files = [
+    ".rvmrc",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "agent_xmpp.gemspec",
+    "default.gems",
+    "lib/agent_xmpp.rb",
+    "lib/agent_xmpp/admin.rb",
+    "lib/agent_xmpp/client.rb",
+    "lib/agent_xmpp/client/boot.rb",
+    "lib/agent_xmpp/client/client.rb",
+    "lib/agent_xmpp/client/connection.rb",
+    "lib/agent_xmpp/client/controller.rb",
+    "lib/agent_xmpp/client/message_delegate.rb",
+    "lib/agent_xmpp/client/message_pipe.rb",
+    "lib/agent_xmpp/client/response.rb",
+    "lib/agent_xmpp/config.rb",
+    "lib/agent_xmpp/main.rb",
+    "lib/agent_xmpp/models.rb",
+    "lib/agent_xmpp/models/contact.rb",
+    "lib/agent_xmpp/models/message.rb",
+    "lib/agent_xmpp/models/publication.rb",
+    "lib/agent_xmpp/models/roster.rb",
+    "lib/agent_xmpp/models/service.rb",
+    "lib/agent_xmpp/models/subscription.rb",
+    "lib/agent_xmpp/models/table_definitions.rb",
+    "lib/agent_xmpp/patches.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/entry.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/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"
   ]
+  s.homepage = %q{http://github.com/troystribling/agent_xmpp}
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.4}
+  s.summary = %q{Agent XMPP is a ruby XMPP bot framework inspired by web frameworks.}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rake>, [">= 0.8.3"])
       s.add_runtime_dependency(%q<eventmachine>, [">= 0.12.6"])
       s.add_runtime_dependency(%q<sequel>, [">= 3.9.0"])
       s.add_runtime_dependency(%q<evma_xmlpushparser>, [">= 0.0.1"])
+      s.add_runtime_dependency(%q<sqlite3>, [">= 1.3.3"])
     else
       s.add_dependency(%q<rake>, [">= 0.8.3"])
       s.add_dependency(%q<eventmachine>, [">= 0.12.6"])
       s.add_dependency(%q<sequel>, [">= 3.9.0"])
       s.add_dependency(%q<evma_xmlpushparser>, [">= 0.0.1"])
+      s.add_dependency(%q<sqlite3>, [">= 1.3.3"])
     end
   else
     s.add_dependency(%q<rake>, [">= 0.8.3"])
     s.add_dependency(%q<eventmachine>, [">= 0.12.6"])
     s.add_dependency(%q<sequel>, [">= 3.9.0"])
     s.add_dependency(%q<evma_xmlpushparser>, [">= 0.0.1"])
+    s.add_dependency(%q<sqlite3>, [">= 1.3.3"])
   end
 end
 

data/default.gems

@@ -0,0 +1,9 @@
+# default.gems generated gem export file. Note that any env variable settings will be missing. Append these after using a ';' field separator
+agent_xmpp -v0.1.0
+bundler -v1.0.15
+eventmachine -v0.12.10
+evma_xmlpushparser -v0.0.1
+git -v1.2.5
+jeweler -v1.6.2
+rake -v0.8.7
+sequel -v3.24.1

data/lib/agent_xmpp.rb

@@ -7,6 +7,7 @@ require 'socket'
 require 'optparse'
 require 'rexml/document'
 require 'base64'
+require 'yaml'
 
 require 'eventmachine'
 require 'evma_xmlpushparser'

data/lib/agent_xmpp/admin.rb

@@ -20,7 +20,7 @@ command 'admin/contacts', :access => 'admin' do
 end
 
 #.........................................................................................................
-command 'admin/on_line_users', :access => 'admin' do
+command 'admin/online_users', :access => 'admin' do
   AgentXmpp.logger.info "ACTION: admin/on_line_users"
   AgentXmpp::Roster.find_all_by_status(:available).map do |r| 
     jid = AgentXmpp::Xmpp::Jid.new(r[:jid]) 

data/lib/agent_xmpp/client/message_delegate.rb

@@ -464,6 +464,8 @@ module AgentXmpp
         req = [Xmpp::IqPubSub.subscriptions(pipe, jid.to_s)]
         if /#{AgentXmpp.jid.domain}/.match(jid.to_s)
           add_publish_methods(pipe, jid)
+          add_publish_method(pipe, jid)
+          add_create_pubsub_node(pipe, jid)
           @pubsub_service = jid
            req += [Xmpp::IqDiscoItems.get(pipe, jid.to_s)] + init_remote_services(pipe)
         end; req
@@ -646,7 +648,29 @@ module AgentXmpp
           end
         end
       end
-          
+ 
+      #.........................................................................................................
+      def add_publish_method(pipe, pubsub)
+        unless AgentXmpp.respond_to?(:publish)
+          AgentXmpp.define_meta_class_method(:publish) do |node, payload| 
+            pipe.send_resp(Xmpp::IqPublish.set(pipe, :node => node, :to => pubsub, :payload => payload.to_x_data))
+          end
+          AgentXmpp.logger.info "ADDED PUBLISH METHOD FOR: #{pubsub}"
+          Delegator.delegate(AgentXmpp, :publish)
+        end
+      end
+
+      #.........................................................................................................
+      def add_create_pubsub_node(pipe, pubsub)
+        unless AgentXmpp.respond_to?(:create_pubsub_node)
+          AgentXmpp.define_meta_class_method(:create_pubsub_node) do |node| 
+            pipe.send_resp(Xmpp::IqPubSub.create_node(pipe, pubsub, node))
+          end
+          AgentXmpp.logger.info "ADDED CREATE_PUBSUB_NODE FOR: #{pubsub}"
+          Delegator.delegate(AgentXmpp, :create_pubsub_node)
+        end
+      end
+                   
       #.........................................................................................................
       def add_send_command_request_method(pipe)
         AgentXmpp.define_meta_class_method(:send_command_request) do |args, &blk| 
@@ -707,7 +731,7 @@ module AgentXmpp
 
       #.........................................................................................................
       private :init_remote_services, :update_publish_nodes, :create_user_pubsub_root, :add_send_chat_method, 
-              :add_send_command_request_method, :add_publish_methods, :process_roster_items, :process_pubsub_discoinfo,
+              :add_send_command_request_method, :add_publish_methods, :add_publish_method, :add_create_pubsub_node, :process_roster_items, :process_pubsub_discoinfo,
               :check_roster_item_group
           
     #### self

data/lib/agent_xmpp/config.rb

@@ -1,7 +1,7 @@
 module AgentXmpp
 
   #.........................................................................................................
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
   AGENT_XMPP_NAME = 'AgentXMPP'
   OS_VERSION = IO.popen('uname -sr').readlines.first.to_s.strip
   SUBSCRIBE_RETRY_PERIOD = 60

data/lib/agent_xmpp/main.rb

@@ -15,14 +15,22 @@ end
 module AgentXmpp
   
   #...........................................................................................................
+  @settings = {}
   @config = {}
 
   #####-------------------------------------------------------------------------------------------------------
   class << self
 
     #.........................................................................................................
-    attr_accessor :config
+    attr_accessor :config, :settings
     
+    #####.....................................................................................................
+    # settings
+    #.........................................................................................................
+    def set(key, value)
+      @settings[key] = value
+    end
+
     #####.....................................................................................................
     # database
     #.........................................................................................................
@@ -32,7 +40,11 @@ module AgentXmpp
 
     #.........................................................................................................
     def agent_xmpp_db
-      @agent_xmpp_db ||= Sequel.sqlite("#{AgentXmpp.app_path}/agent_xmpp.db")
+      @agent_xmpp_db ||= if settings[:agent_xmpp_db_adapter] 
+                           settings[:agent_xmpp_db_adapter].call
+                         else 
+                           Sequel.sqlite("#{AgentXmpp.app_path}/agent_xmpp.db") 
+                         end
     end
 
     #.........................................................................................................
@@ -156,6 +168,7 @@ module AgentXmpp
     #### self
     end
 
+    delegate AgentXmpp, :set
     delegate AgentXmpp::BaseController, :command, :chat, :event, :before, :include_module
     delegate AgentXmpp::Boot, :before_start, :after_connected, :restarting_client, :discovered_pubsub_node, 
                               :discovered_command_nodes, :received_presence

metadata

@@ -1,74 +1,87 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: agent_xmpp
-version: !ruby/object:Gem::Version 
-  version: 0.1.0
+version: !ruby/object:Gem::Version
+  version: 0.1.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Troy Stribling
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-08-21 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-06-12 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  requirement: &2152765720 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.8.3
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: eventmachine
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  prerelease: false
+  version_requirements: *2152765720
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: &2152765240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.12.6
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: sequel
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  prerelease: false
+  version_requirements: *2152765240
+- !ruby/object:Gem::Dependency
+  name: sequel
+  requirement: &2152764760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.9.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: evma_xmlpushparser
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  prerelease: false
+  version_requirements: *2152764760
+- !ruby/object:Gem::Dependency
+  name: evma_xmlpushparser
+  requirement: &2152764280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.0.1
-    version: 
+  type: :runtime
+  prerelease: false
+  version_requirements: *2152764280
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &2152763800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.3
+  type: :runtime
+  prerelease: false
+  version_requirements: *2152763800
 description: 
 email: troy.stribling@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .document
-- .gitignore
+- .rvmrc
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
 - agent_xmpp.gemspec
+- default.gems
 - lib/agent_xmpp.rb
 - lib/agent_xmpp/admin.rb
 - lib/agent_xmpp/client.rb
@@ -134,54 +147,28 @@ files:
 - test/messages/session_messages.rb
 - test/messages/version_discovery_messages.rb
 - test/peer/peer.rb
-has_rdoc: true
 homepage: http://github.com/troystribling/agent_xmpp
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
-summary: Agent XMPP is a ruby XMPP bot framework inspired by MVC web frameworks.
-test_files: 
-- 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
+summary: Agent XMPP is a ruby XMPP bot framework inspired by web frameworks.
+test_files: []

data/.gitignore

@@ -1,11 +0,0 @@
-*.sw?
-.DS_Store
-coverage/*
-rdoc/*
-*.gem
-*.tmproj
-*.yml
-*.db
-log/*
-*.log
-test/xml_messages.txt