mojodna-switchboard 0.0.3 → 0.0.4

data/Rakefile

@@ -0,0 +1,28 @@
+require 'switchboard'
+
+task :gemspec do
+  gemspec =<<-EOF
+Gem::Specification.new do |s|
+  s.name = "switchboard"
+  s.version = "#{Switchboard::VERSION * "."}"
+  s.summary = "XMPP toolkit."
+  s.description = "A toolkit for assembling XMPP clients and interacting with XMPP servers."
+  s.authors = ["Seth Fitzsimmons"]
+  s.email = ["seth@mojodna.net"]
+
+  s.files = #{Dir.glob("**/*").select { |f| File.file?(f) }.inspect}
+  s.executables = ["switchboard"]
+  s.require_paths = ["lib"]
+
+  s.add_dependency("xmpp4r")
+end
+  EOF
+
+  open("switchboard.gemspec", "w") do |f|
+    f << gemspec
+  end
+
+  puts "gemspec successfully created."
+end
+
+task :default => :gemspec

data/bin/switchboard

@@ -2,7 +2,7 @@
 require 'switchboard'
 require 'optparse'
 
-command = ARGV.clone.options do |opts|
+ARGV.clone.options do |opts|
   # opts.banner = "Usage: example.rb [options]"
 
   command = Switchboard::Commands::Default
@@ -30,6 +30,4 @@ command = ARGV.clone.options do |opts|
   ARGV.reject! { |v| !argv.include?(v) }
 
   command
-end
-
-command.run!
+end.run!

data/lib/switchboard/commands/default.rb

@@ -19,6 +19,7 @@ module Switchboard
 
         # opts.on("-d", "--daemon", "Make server run as a daemon.") { OPTIONS[:detach] = true }
         opts.on("-j", "--jid=jid", String, "Specifies the JID to use.") { |v| OPTIONS["jid"] = v }
+        opts.on("-r", "--resource=resource", String, "Specifies the resource to use.") { |v| OPTIONS["resource"] = v }
         opts.on("-p", "--password=password", String, "Specifies the password to use.") { |v| OPTIONS["password"] = v }
         # opts.on("-p", "--pidfile=path", String,
         #         "Specifies a pidfile to use.") { |v| OPTIONS[:pidfile] = v }

data/lib/switchboard/commands/pubsub/affiliations.rb

@@ -0,0 +1,38 @@
+module Switchboard
+  module Commands
+    class PubSub
+      class Affiliations < Switchboard::Command
+        description "Lists pubsub affiliations"
+
+        def self.run!
+          switchboard = Switchboard::Core.new do
+            defer :affiliations_received do
+              begin
+                pubsub.get_affiliations(OPTIONS["pubsub.node"])
+              rescue Jabber::ServerError => e
+                puts e
+              end
+            end
+
+            def affiliations_received(affiliations)
+              if affiliations
+                affiliations.each do |node, affiliation|
+                  puts [node, affiliation] * " => "
+                end
+              else
+                puts "No affiliations."
+              end
+            end
+          end
+
+          if OPTIONS["oauth"]
+            switchboard.plug!(OAuthPubSubJack)
+          else
+            switchboard.plug!(PubSubJack)
+          end
+          switchboard.run!
+        end
+      end
+    end
+  end
+end

data/lib/switchboard/commands/pubsub/config.rb

@@ -0,0 +1,46 @@
+module Switchboard
+  module Commands
+    class PubSub
+      class Config < Switchboard::Command
+        description "Gets the configuration for a pubsub node"
+
+        def self.run!
+          switchboard = Switchboard::Core.new do
+            defer :configuration_retrieved do
+              begin
+                if ARGV.length == 2
+                  key, value = ARGV
+                  puts "Setting '#{key}' to '#{value}'"
+                  config = Jabber::PubSub::NodeConfig.new(OPTIONS["pubsub.node"], key => value)
+                  set_config_for(OPTIONS["pubsub.node"], config)
+                end
+
+                get_config_from(OPTIONS["pubsub.node"])
+              rescue Jabber::ServerError => e
+                puts e
+              end
+            end
+
+            def configuration_retrieved(config)
+              if config
+                puts "Configuration for node '#{config.node}':"
+                config.options.each do |k,v|
+                  puts "  " + [k, v] * ": "
+                end
+              else
+                puts "Could not load configuration for node '#{OPTIONS["pubsub.node"]}'."
+              end
+            end
+          end
+
+          if OPTIONS["oauth"]
+            switchboard.plug!(OAuthPubSubJack)
+          else
+            switchboard.plug!(PubSubJack)
+          end
+          switchboard.run!
+        end
+      end
+    end
+  end
+end

data/lib/switchboard/commands/pubsub/create.rb

@@ -0,0 +1,45 @@
+module Switchboard
+  module Commands
+    class PubSub
+      class Create < Switchboard::Command
+        description "Creates a pubsub node"
+
+        def self.options(opts)
+          super(opts)
+          opts.on("--collection", "Specifies that a 'collection' node should be created.") { |v| OPTIONS["pubsub.create.node_type"] = "collection" }
+        end
+
+        def self.run!
+          switchboard = Switchboard::Core.new do
+            defer :node_created do
+              begin
+                if OPTIONS["pubsub.create.node_type"] == "collection"
+                  create_collection_node(OPTIONS["pubsub.node"])
+                else
+                  create_node(OPTIONS["pubsub.node"])
+                end
+              rescue Jabber::ServerError => e
+                puts e
+              end
+            end
+
+            def node_created(name)
+              if name
+                puts "Node '#{name}' was created."
+              else
+                puts "An auto-named node was created."
+              end
+            end
+          end
+
+          if OPTIONS["oauth"]
+            switchboard.plug!(OAuthPubSubJack)
+          else
+            switchboard.plug!(PubSubJack)
+          end
+          switchboard.run!
+        end
+      end
+    end
+  end
+end

data/lib/switchboard/commands/pubsub/delete.rb

@@ -0,0 +1,36 @@
+module Switchboard
+  module Commands
+    class PubSub
+      class Delete < Switchboard::Command
+        description "Deletes a pubsub node"
+
+        def self.run!
+          switchboard = Switchboard::Core.new do
+            defer :node_deleted do
+              begin
+                delete_node(OPTIONS["pubsub.node"])
+              rescue Jabber::ServerError => e
+                puts e
+              end
+            end
+
+            def node_deleted(success)
+              if success
+                puts "Node '#{OPTIONS["pubsub.node"]}' was deleted."
+              else
+                puts "Node '#{OPTIONS["pubsub.node"]}' could not be deleted."
+              end
+            end
+          end
+
+          if OPTIONS["oauth"]
+            switchboard.plug!(OAuthPubSubJack)
+          else
+            switchboard.plug!(PubSubJack)
+          end
+          switchboard.run!
+        end
+      end
+    end
+  end
+end

data/lib/switchboard/commands/pubsub/info.rb

@@ -0,0 +1,52 @@
+module Switchboard
+  module Commands
+    class PubSub
+      class Info < Switchboard::Command
+        hide! # Jabber::PubSub::NodeBrowser is broken in xmpp4r-0.4.0
+        description "Gets information about a pubsub resource"
+
+        def self.run!
+          switchboard = Switchboard::Core.new do
+            defer :info_retrieved do
+              begin
+                browser = Jabber::PubSub::NodeBrowser.new(client)
+                browser.get_info(OPTIONS["pubsub.server"], OPTIONS["pubsub.node"])
+              rescue Jabber::ServerError => e
+                puts e
+              end
+            end
+
+            def info_retrieved(info)
+              if info
+                if OPTIONS["pubsub.node"]
+                  puts "Info for '#{OPTIONS["pubsub.node"]}' on '#{OPTIONS["pubsub.server"]}'"
+                else
+                  puts "Info for '#{OPTIONS["pubsub.server"]}'"
+                end
+                info.each do |k,v|
+                  if v.is_a?(Array)
+                    puts "  #{k}:"
+                    v.each do |v2|
+                      puts "    #{v2}"
+                    end
+                  else
+                    puts "  #{k}: #{v}"
+                  end
+                end
+              else
+                puts "Info could not be loaded for '#{OPTIONS["pubsub.server"]}'"
+              end
+            end
+          end
+
+          if OPTIONS["oauth"]
+            switchboard.plug!(OAuthPubSubJack)
+          else
+            switchboard.plug!(PubSubJack)
+          end
+          switchboard.run!
+        end
+      end
+    end
+  end
+end

data/lib/switchboard/commands/pubsub/items.rb

@@ -0,0 +1,44 @@
+module Switchboard
+  module Commands
+    class PubSub
+      class Items < Switchboard::Command
+        description "Get items from a pubsub node"
+
+        def self.options(opts)
+          super(opts)
+          opts.on("--item-count=count", Integer, "Specifies the number of items to retrieve.") { |v| OPTIONS["pubsub.items.count"] = v }
+        end
+
+        def self.run!
+          switchboard = Switchboard::Core.new do
+            defer :items_retrieved do
+              begin
+                get_items_from(OPTIONS["pubsub.node"], OPTIONS["pubsub.items.count"])
+              rescue Jabber::ServerError => e
+                puts e
+              end
+            end
+
+            def items_retrieved(items)
+              if items && items.any?
+                puts "Items:"
+                items.each do |id, item|
+                  puts [id, item] * ": "
+                end
+              else
+                puts "No items available for node '#{OPTIONS["pubsub.node"]}'."
+              end
+            end
+          end
+
+          if OPTIONS["oauth"]
+            switchboard.plug!(OAuthPubSubJack)
+          else
+            switchboard.plug!(PubSubJack)
+          end
+          switchboard.run!
+        end
+      end
+    end
+  end
+end

data/lib/switchboard/commands/pubsub/listen.rb

@@ -0,0 +1,20 @@
+module Switchboard
+  module Commands
+    class PubSub
+      class Listen < Switchboard::Command
+        description "Listens for pubsub events"
+
+        def self.run!
+          switchboard = Switchboard::Core.new
+          switchboard.plug!(PubSubJack)
+
+          switchboard.on_pubsub_event do |event|
+            puts event.to_s
+          end
+
+          switchboard.run!
+        end
+      end
+    end
+  end
+end

data/lib/switchboard/commands/pubsub/nodes.rb

@@ -0,0 +1,41 @@
+module Switchboard
+  module Commands
+    class PubSub
+      class Nodes < Switchboard::Command
+        hide! # Jabber::PubSub::NodeBrowser is broken in xmpp4r-0.4.0
+        description "Lists available pubsub nodes (maybe use pubsub.<server>)"
+
+        def self.run!
+          switchboard = Switchboard::Core.new do
+            defer :nodes_retrieved do
+              begin
+                browser = Jabber::PubSub::NodeBrowser.new(client)
+                browser.nodes(OPTIONS["pubsub.server"])
+              rescue Jabber::ServerError => e
+                puts e
+              end
+            end
+
+            def nodes_retrieved(nodes)
+              if nodes && nodes.compact! && nodes.any?
+                puts "Nodes available on '#{OPTIONS["pubsub.server"]}':"
+                nodes.each do |node|
+                  puts "  #{node.to_s}"
+                end
+              else
+                puts "No nodes are available on '#{OPTIONS["pubsub.server"]}'."
+              end
+            end
+          end
+
+          if OPTIONS["oauth"]
+            switchboard.plug!(OAuthPubSubJack)
+          else
+            switchboard.plug!(PubSubJack)
+          end
+          switchboard.run!
+        end
+      end
+    end
+  end
+end

data/lib/switchboard/commands/pubsub/options.rb

@@ -0,0 +1,44 @@
+module Switchboard
+  module Commands
+    class PubSub
+      class Options < Switchboard::Command
+        description "Gets subscription options for a pubsub node"
+
+        def self.options(opts)
+          super(opts)
+          opts.on("--subscriber=jid", String, "Specifies the subscriber to retrieve options for.") { |v| OPTIONS["pubsub.subscriber"] = v }
+        end
+
+        def self.run!
+          switchboard = Switchboard::Core.new do
+            defer :options_retrieved do
+              begin
+                get_options_from(OPTIONS["pubsub.node"], OPTIONS["pubsub.subscriber"] || OPTIONS["jid"])
+              rescue Jabber::ServerError => e
+                puts e
+              end
+            end
+
+            def options_retrieved(options)
+              if options
+                puts "Options for subscription by '#{OPTIONS["pubsub.subscriber"] || OPTIONS["jid"]}' to node '#{options.node}':"
+                options.options.each do |k,v|
+                  puts "  " + [k, v] * ": "
+                end
+              else
+                puts "Could not load options for subscription by '#{OPTIONS["pubsub.subscriber"] || OPTIONS["jid"]}' to node '#{OPTIONS["pubsub.node"]}'."
+              end
+            end
+          end
+
+          if OPTIONS["oauth"]
+            switchboard.plug!(OAuthPubSubJack)
+          else
+            switchboard.plug!(PubSubJack)
+          end
+          switchboard.run!
+        end
+      end
+    end
+  end
+end

data/lib/switchboard/commands/pubsub/publish.rb

@@ -0,0 +1,47 @@
+module Switchboard
+  module Commands
+    class PubSub
+      class Publish < Switchboard::Command
+        description "Publish to a pubsub node"
+
+        def self.options(opts)
+          super(opts)
+          opts.on("--item-id=id", String, "Specifies the item id to use.") { |v| OPTIONS["pubsub.publish.id"] = v }
+        end
+
+        def self.run!
+          switchboard = Switchboard::Core.new do
+            defer :item_published do
+              begin
+                item = Jabber::PubSub::Item.new
+                item.text = STDIN.read
+                if OPTIONS["pubsub.publish.id"]
+                  publish_item_with_id_to(OPTIONS["pubsub.node"], item, OPTIONS["pubsub.publish.id"])
+                else
+                  publish_item_to(OPTIONS["pubsub.node"], item)
+                end
+              rescue Jabber::ServerError => e
+                puts e
+              end
+            end
+
+            def item_published(success)
+              if success
+                puts "Item was published."
+              else
+                puts "Item could not be published."
+              end
+            end
+          end
+
+          if OPTIONS["oauth"]
+            switchboard.plug!(OAuthPubSubJack)
+          else
+            switchboard.plug!(PubSubJack)
+          end
+          switchboard.run!
+        end
+      end
+    end
+  end
+end

data/lib/switchboard/commands/pubsub/pubsub.rb

@@ -10,13 +10,12 @@ module Switchboard
       def self.options(opts)
         super(opts)
         opts.on("--node=node", String, "Specifies the PubSub node to use.") { |v| OPTIONS["pubsub.node"] = v }
-        opts.on("--oauth", "Sign requests using OAuth.") { OPTIONS["oauth"] = true }
-        opts.on("--oauth-consumer-key=consumer-key", String, "Specifies the OAuth consumer key to use.") { |v| OPTIONS["oauth.consumer_key"] = v }
-        opts.on("--oauth-consumer-secret=consumer-secret", String, "Specifies the OAuth consumer secret to use.") { |v| OPTIONS["oauth.consumer_secret"] = v }
-        opts.on("--oauth-token=token", String, "Specifies the OAuth token to use.") { |v| OPTIONS["oauth.token"] = v }
-        opts.on("--oauth-token-secret=token-secret", String, "Specifies the OAuth token secret to use.") { |v| OPTIONS["oauth.token_secret"] = v }
-        opts.on("--node=node", String, "Specifies the PubSub node to use.") { |v| OPTIONS["pubsub.node"] = v }
         opts.on("--server=server", String, "Specifies the PubSub server to use.") { |v| OPTIONS["pubsub.server"] = v }
+        opts.on("--oauth", "Sign requests using OAuth.") { OPTIONS["oauth"] = true }
+        opts.on("--oauth-consumer-key=key", String, "Specifies the OAuth consumer key to use.") { |v| OPTIONS["oauth.consumer_key"] = v }
+        opts.on("--oauth-consumer-secret=secret", String, "Specifies the OAuth consumer secret to use.") { |v| OPTIONS["oauth.consumer_secret"] = v }
+        opts.on("--oauth-token =oken", String, "Specifies the OAuth token to use.") { |v| OPTIONS["oauth.token"] = v }
+        opts.on("--oauth-token-secret=secret", String, "Specifies the OAuth token secret to use.") { |v| OPTIONS["oauth.token_secret"] = v }
       end
     end
   end

data/lib/switchboard/commands/pubsub/purge.rb

@@ -0,0 +1,36 @@
+module Switchboard
+  module Commands
+    class PubSub
+      class Purge < Switchboard::Command
+        description "Purges a pubsub node"
+
+        def self.run!
+          switchboard = Switchboard::Core.new do
+            defer :node_purged do
+              begin
+                purge_items_from(OPTIONS["pubsub.node"])
+              rescue Jabber::ServerError => e
+                puts e
+              end
+            end
+
+            def node_purged(success)
+              if success
+                puts "Node '#{OPTIONS["pubsub.node"]}' was successfully purged."
+              else
+                puts "Could not purge node '#{OPTIONS["pubsub.node"]}'."
+              end
+            end
+          end
+
+          if OPTIONS["oauth"]
+            switchboard.plug!(OAuthPubSubJack)
+          else
+            switchboard.plug!(PubSubJack)
+          end
+          switchboard.run!
+        end
+      end
+    end
+  end
+end

data/lib/switchboard/commands/pubsub/subscribe.rb

@@ -17,10 +17,10 @@ module Switchboard
 
             # define here or as hydrant.subscriptions_received
             def subscribed(subscription)
-              if subscription.subscription == :subscribed
+              if subscription && subscription.subscription == :subscribed
                 puts "Subscribe successful."
               else
-                puts "Subscribe failed!".red
+                puts "Subscribe failed!"
               end
             end
           end

data/lib/switchboard/commands/pubsub/subscriptions.rb

@@ -9,7 +9,7 @@ module Switchboard
             # this executes in the main loop, so it doesn't really matter that this runs in a different thread
             defer :subscriptions_received do
               begin
-                subscriptions
+                subscriptions(settings["pubsub.node"])
               rescue Jabber::ServerError => e
                 puts e
               end
@@ -19,7 +19,7 @@ module Switchboard
             def subscriptions_received(subscriptions)
               if subscriptions && subscriptions.any?
                 puts "Subscriptions:"
-                puts subscriptions.collect { |subscription| "#{subscription.jid} => #{subscription.node}" } * "\n"
+                puts subscriptions.collect { |subscription| [subscription.subid, "#{subscription.jid || settings["jid"]} => #{subscription.node} (#{subscription.state})"].compact * ": " } * "\n"
               else
                 puts "No subscriptions."
               end

data/lib/switchboard/commands/pubsub.rb

@@ -1,4 +1,15 @@
 require 'switchboard/commands/pubsub/pubsub'
+require 'switchboard/commands/pubsub/affiliations'
+require 'switchboard/commands/pubsub/config'
+require 'switchboard/commands/pubsub/create'
+require 'switchboard/commands/pubsub/delete'
+require 'switchboard/commands/pubsub/info'
+require 'switchboard/commands/pubsub/items'
+require 'switchboard/commands/pubsub/listen'
+require 'switchboard/commands/pubsub/nodes'
+require 'switchboard/commands/pubsub/options'
+require 'switchboard/commands/pubsub/publish'
+require 'switchboard/commands/pubsub/purge'
 require 'switchboard/commands/pubsub/subscribe'
 require 'switchboard/commands/pubsub/subscriptions'
 require 'switchboard/commands/pubsub/unsubscribe'

data/lib/switchboard/commands/register.rb

@@ -4,6 +4,10 @@ module Switchboard
       description "Register a JID"
 
       class Registration < Switchboard::Core
+        def initialize(settings = Switchboard::Settings.new, spin = false)
+          super(settings, false)
+        end
+
       protected
 
         def auth!
@@ -16,7 +20,7 @@ module Switchboard
           # TODO consider using client.register_info.inspect
           begin
             puts "Registering #{settings["jid"]} with password '#{settings["password"]}'."
-            puts client.register(settings["password"])
+            iq = client.register(settings["password"])
           rescue Jabber::ServerError => e
             puts "Could not register: #{e}"
             shutdown(false)

data/lib/switchboard/core.rb

@@ -9,7 +9,8 @@ end
 # allow local library modifications/additions to be loaded
 $: << File.join(File.dirname(__FILE__))
 
-require 'switchboard/instance_exec'
+require 'switchboard/ext/delegate'
+require 'switchboard/ext/instance_exec'
 require 'xmpp4r/roster'
 
 

data/lib/switchboard/ext/delegate.rb

@@ -0,0 +1,21 @@
+class Module
+  # Modified version from ActiveSupport to support :with (for additional arguments)
+  def delegate(*methods)
+    options = methods.pop
+    unless options.is_a?(Hash) && to = options[:to]
+      raise ArgumentError, "Delegation needs a target. Supply an options hash with a :to key as the last argument (e.g. delegate :hello, :to => :greeter)."
+    end
+
+    prefix = options[:prefix] && "#{options[:prefix] == true ? to : options[:prefix]}_"
+    with = options[:with] || []
+
+    methods.each do |method|
+      module_eval(<<-EOS, "(__DELEGATION__)", 1)
+        def #{prefix}#{method}(*args, &block)
+          args += [#{with * ", "}]
+          #{to}.__send__(#{method.inspect}, *args, &block)
+        end
+      EOS
+    end
+  end
+end

data/lib/switchboard/helpers/oauth_pubsub.rb

@@ -0,0 +1,39 @@
+require 'rubygems'
+begin
+  require 'oauth'
+rescue LoadError => e
+  gem = e.message.split("--").last.strip
+  puts "The #{gem} gem is required."
+end
+
+require 'switchboard/helpers/pubsub'
+require 'oauth/consumer'
+require 'oauth/request_proxy/mock_request'
+require 'xmpp4r/pubsub'
+require 'xmpp4r/pubsub/helper/oauth_service_helper'
+
+module Switchboard
+  module Helpers
+    module OAuthPubSubHelper
+      include PubSubHelper
+
+      attr_reader :oauth_consumer, :oauth_token
+
+      # TODO most/all of these need to be implemented in OAuthServiceHelper
+      delegate :create_node, :create_collection_node, :delete_node,
+        :get_config_from, :get_options_from, :get_items_from, :publish_item_to,
+        :publish_item_with_id_to, :purge_items_from, :set_config_for,
+        :subscribe_to, :unsubscribe_from, :to => :pubsub,
+        :with => [:oauth_consumer, :oauth_token]
+
+      def subscriptions(node = nil)
+        if node
+          # TODO this needs to be implemented in OAuthServiceHelper
+          pubsub.get_subscriptions_from(node, oauth_consumer, oauth_token)
+        else
+          pubsub.get_subscriptions_from_all_nodes(oauth_consumer, oauth_token)
+        end
+      end
+    end
+  end
+end

data/lib/switchboard/helpers/pubsub.rb

@@ -0,0 +1,25 @@
+require 'xmpp4r/pubsub'
+# TODO this is broken in XMPP4R 0.4.0
+# require 'xmpp4r/pubsub/helper/nodebrowser'
+
+module PubSubHelper
+  attr_reader :pubsub
+
+  delegate :create_node, :create_collection_node, :delete_node,
+    :get_config_from, :get_options_from, :get_items_from, :publish_item_to,
+    :publish_item_with_id_to, :purge_items_from, :set_config_for,
+    :subscribe_to, :unsubscribe_from, :to => :pubsub
+
+  def on_pubsub_event(&block)
+    register_hook(:pubsub_event, &block)
+  end
+
+  def subscriptions(node = nil)
+    # NOTE: node-specific subscriptions do not appear to work in ejabberd 2.0.2
+    if node
+      pubsub.get_subscriptions_from(node)
+    else
+      pubsub.get_subscriptions_from_all_nodes
+    end
+  end
+end

data/lib/switchboard/jacks/oauth_pubsub.rb

@@ -1,15 +1,4 @@
-require 'rubygems'
-begin
-  require 'oauth'
-rescue LoadError => e
-  gem = e.message.split("--").last.strip
-  puts "The #{gem} gem is required."
-end
-
-require 'oauth/consumer'
-require 'oauth/request_proxy/mock_request'
-require 'xmpp4r/pubsub'
-require 'xmpp4r/pubsub/helper/oauth_service_helper'
+require 'switchboard/helpers/oauth_pubsub'
 
 # TODO subclass PubSubJack
 class OAuthPubSubJack
@@ -20,6 +9,8 @@ class OAuthPubSubJack
       return false
     end
 
+    switchboard.extend(Switchboard::Helpers::OAuthPubSubHelper)
+
     switchboard.on_startup do
       @pubsub = Jabber::PubSub::OAuthServiceHelper.new(client, settings["pubsub.server"])
 
@@ -30,38 +21,5 @@ class OAuthPubSubJack
         on(:pubsub_event, event)
       end
     end
-
-    def switchboard.subscribe_to(node)
-      pubsub.subscribe_to(node, oauth_consumer, oauth_token)
-    end
-
-    def switchboard.subscriptions
-      pubsub.get_subscriptions_from_all_nodes(oauth_consumer, oauth_token)
-    end
-
-    def switchboard.unsubscribe_from(node)
-      pubsub.unsubscribe_from(node, oauth_consumer, oauth_token)
-    end
-
-    # TODO add the ability to define accessors
-    def switchboard.general_token
-      @general_token
-    end
-
-    def switchboard.oauth_consumer
-      @oauth_consumer
-    end
-
-    def switchboard.oauth_token
-      @oauth_token
-    end
-
-    def switchboard.pubsub
-      @pubsub
-    end
-
-    def switchboard.on_pubsub_event(&block)
-      register_hook(:pubsub_event, &block)
-    end
   end
 end

data/lib/switchboard/jacks/pubsub.rb

@@ -1,4 +1,4 @@
-require 'xmpp4r/pubsub'
+require 'switchboard/helpers/pubsub'
 
 class PubSubJack
   def self.connect(switchboard, settings)
@@ -8,6 +8,8 @@ class PubSubJack
       return false
     end
 
+    switchboard.extend(Switchboard::Helpers::PubSubHelper)
+
     switchboard.on_startup do
       @pubsub = Jabber::PubSub::ServiceHelper.new(client, settings["pubsub.server"])
 
@@ -15,38 +17,5 @@ class PubSubJack
         on(:pubsub_event, event)
       end
     end
-
-    def switchboard.subscribe_to(node)
-      pubsub.subscribe_to(node)
-    end
-
-    def switchboard.subscriptions
-      pubsub.get_subscriptions_from_all_nodes
-    end
-
-    def switchboard.unsubscribe_from(node)
-      pubsub.unsubscribe_from(node)
-    end
-
-    # TODO add the ability to define accessors
-    def switchboard.general_token
-      @general_token
-    end
-
-    def switchboard.oauth_consumer
-      @oauth_consumer
-    end
-
-    def switchboard.oauth_token
-      @oauth_token
-    end
-
-    def switchboard.pubsub
-      @pubsub
-    end
-
-    def switchboard.on_pubsub_event(&block)
-      register_hook(:pubsub_event, &block)
-    end
   end
 end

data/lib/switchboard/version.rb

@@ -1,3 +1,3 @@
 module Switchboard
-  VERSION = [0, 0, 3]
+  VERSION = [0, 0, 4]
 end

data/switchboard.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name = "switchboard"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
   s.summary = "XMPP toolkit."
   s.description = "A toolkit for assembling XMPP clients and interacting with XMPP servers."
   s.authors = ["Seth Fitzsimmons"]
   s.email = ["seth@mojodna.net"]
 
-  s.files = ["bin/switchboard", "examples/election_results.rb", "lib/switchboard/colors.rb", "lib/switchboard/commands/command.rb", "lib/switchboard/commands/config/config.rb", "lib/switchboard/commands/config.rb", "lib/switchboard/commands/default.rb", "lib/switchboard/commands/help/help.rb", "lib/switchboard/commands/help.rb", "lib/switchboard/commands/pubsub/pubsub.rb", "lib/switchboard/commands/pubsub/subscribe.rb", "lib/switchboard/commands/pubsub/subscriptions.rb", "lib/switchboard/commands/pubsub/unsubscribe.rb", "lib/switchboard/commands/pubsub.rb", "lib/switchboard/commands/register.rb", "lib/switchboard/commands/roster/add.rb", "lib/switchboard/commands/roster/list.rb", "lib/switchboard/commands/roster/remove.rb", "lib/switchboard/commands/roster/roster.rb", "lib/switchboard/commands/roster.rb", "lib/switchboard/commands/unregister.rb", "lib/switchboard/commands.rb", "lib/switchboard/core.rb", "lib/switchboard/instance_exec.rb", "lib/switchboard/jacks/auto_accept.rb", "lib/switchboard/jacks/debug.rb", "lib/switchboard/jacks/notify.rb", "lib/switchboard/jacks/oauth_pubsub.rb", "lib/switchboard/jacks/pubsub.rb", "lib/switchboard/jacks/roster_debug.rb", "lib/switchboard/jacks.rb", "lib/switchboard/oauth/request_proxy/mock_request.rb", "lib/switchboard/settings.rb", "lib/switchboard/switchboard.rb", "lib/switchboard/version.rb", "lib/switchboard/xmpp4r/pubsub/helper/oauth_service_helper.rb", "lib/switchboard.rb", "README.markdown", "switchboard.gemspec"]
+  s.files = ["bin/switchboard", "examples/election_results.rb", "lib/switchboard/colors.rb", "lib/switchboard/commands/command.rb", "lib/switchboard/commands/config/config.rb", "lib/switchboard/commands/config.rb", "lib/switchboard/commands/default.rb", "lib/switchboard/commands/help/help.rb", "lib/switchboard/commands/help.rb", "lib/switchboard/commands/pubsub/affiliations.rb", "lib/switchboard/commands/pubsub/config.rb", "lib/switchboard/commands/pubsub/create.rb", "lib/switchboard/commands/pubsub/delete.rb", "lib/switchboard/commands/pubsub/info.rb", "lib/switchboard/commands/pubsub/items.rb", "lib/switchboard/commands/pubsub/listen.rb", "lib/switchboard/commands/pubsub/nodes.rb", "lib/switchboard/commands/pubsub/options.rb", "lib/switchboard/commands/pubsub/publish.rb", "lib/switchboard/commands/pubsub/pubsub.rb", "lib/switchboard/commands/pubsub/purge.rb", "lib/switchboard/commands/pubsub/subscribe.rb", "lib/switchboard/commands/pubsub/subscriptions.rb", "lib/switchboard/commands/pubsub/unsubscribe.rb", "lib/switchboard/commands/pubsub.rb", "lib/switchboard/commands/register.rb", "lib/switchboard/commands/roster/add.rb", "lib/switchboard/commands/roster/list.rb", "lib/switchboard/commands/roster/remove.rb", "lib/switchboard/commands/roster/roster.rb", "lib/switchboard/commands/roster.rb", "lib/switchboard/commands/unregister.rb", "lib/switchboard/commands.rb", "lib/switchboard/core.rb", "lib/switchboard/ext/delegate.rb", "lib/switchboard/ext/instance_exec.rb", "lib/switchboard/helpers/oauth_pubsub.rb", "lib/switchboard/helpers/pubsub.rb", "lib/switchboard/jacks/auto_accept.rb", "lib/switchboard/jacks/debug.rb", "lib/switchboard/jacks/notify.rb", "lib/switchboard/jacks/oauth_pubsub.rb", "lib/switchboard/jacks/pubsub.rb", "lib/switchboard/jacks/roster_debug.rb", "lib/switchboard/jacks.rb", "lib/switchboard/oauth/request_proxy/mock_request.rb", "lib/switchboard/settings.rb", "lib/switchboard/switchboard.rb", "lib/switchboard/version.rb", "lib/switchboard/xmpp4r/pubsub/helper/oauth_service_helper.rb", "lib/switchboard.rb", "Rakefile", "README.markdown", "switchboard.gemspec"]
   s.executables = ["switchboard"]
   s.require_paths = ["lib"]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mojodna-switchboard
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Seth Fitzsimmons
@@ -40,7 +40,18 @@ files:
 - lib/switchboard/commands/default.rb
 - lib/switchboard/commands/help/help.rb
 - lib/switchboard/commands/help.rb
+- lib/switchboard/commands/pubsub/affiliations.rb
+- lib/switchboard/commands/pubsub/config.rb
+- lib/switchboard/commands/pubsub/create.rb
+- lib/switchboard/commands/pubsub/delete.rb
+- lib/switchboard/commands/pubsub/info.rb
+- lib/switchboard/commands/pubsub/items.rb
+- lib/switchboard/commands/pubsub/listen.rb
+- lib/switchboard/commands/pubsub/nodes.rb
+- lib/switchboard/commands/pubsub/options.rb
+- lib/switchboard/commands/pubsub/publish.rb
 - lib/switchboard/commands/pubsub/pubsub.rb
+- lib/switchboard/commands/pubsub/purge.rb
 - lib/switchboard/commands/pubsub/subscribe.rb
 - lib/switchboard/commands/pubsub/subscriptions.rb
 - lib/switchboard/commands/pubsub/unsubscribe.rb
@@ -54,7 +65,10 @@ files:
 - lib/switchboard/commands/unregister.rb
 - lib/switchboard/commands.rb
 - lib/switchboard/core.rb
-- lib/switchboard/instance_exec.rb
+- lib/switchboard/ext/delegate.rb
+- lib/switchboard/ext/instance_exec.rb
+- lib/switchboard/helpers/oauth_pubsub.rb
+- lib/switchboard/helpers/pubsub.rb
 - lib/switchboard/jacks/auto_accept.rb
 - lib/switchboard/jacks/debug.rb
 - lib/switchboard/jacks/notify.rb
@@ -68,6 +82,7 @@ files:
 - lib/switchboard/version.rb
 - lib/switchboard/xmpp4r/pubsub/helper/oauth_service_helper.rb
 - lib/switchboard.rb
+- Rakefile
 - README.markdown
 - switchboard.gemspec
 has_rdoc: false