mojodna-switchboard 0.0.11 → 0.0.12

data/Rakefile

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.executables = ["switchboard"]
   s.require_paths = ["lib"]
 
-  s.add_dependency("mojodna-xmpp4r", ">=", "0.4.0.2")
+  s.add_dependency("mojodna-xmpp4r", ">=", "0.4.0.3")
 end
   EOF
 

data/bin/switchboard

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+require 'rubygems'
 require 'switchboard'
 require 'switchboard/commands'
 require 'optparse'

data/lib/switchboard/helpers/oauth_pubsub.rb

@@ -7,8 +7,8 @@ rescue LoadError => e
 end
 
 require 'oauth/version'
-if OAuth::VERSION < "0.3.1.1"
-  puts "The OAuth library must be at least version 0.3.1.1."
+if OAuth::VERSION < "0.3.1.4"
+  puts "The OAuth library must be at least version 0.3.1.4."
   exit 1
 end
 

data/lib/switchboard/switchboard.rb

@@ -1,6 +1,6 @@
 begin
   require 'oauth'
-rescue LoadError => e
+rescue LoadError
 end
 
 require 'switchboard/core'

data/lib/switchboard/version.rb

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

data/switchboard.gemspec

@@ -1,15 +1,15 @@
 # this file is automatically generated
 Gem::Specification.new do |s|
   s.name = "switchboard"
-  s.version = "0.0.11"
+  s.version = "0.0.12"
   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/client.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/disco/disco.rb", "lib/switchboard/commands/disco/info.rb", "lib/switchboard/commands/disco/items.rb", "lib/switchboard/commands/disco.rb", "lib/switchboard/commands/help/help.rb", "lib/switchboard/commands/help.rb", "lib/switchboard/commands/last/last.rb", "lib/switchboard/commands/last.rb", "lib/switchboard/commands/pep/location.rb", "lib/switchboard/commands/pep/pep.rb", "lib/switchboard/commands/pep/tune.rb", "lib/switchboard/commands/pep.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/retract.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/online.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/component.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/settings.rb", "lib/switchboard/switchboard.rb", "lib/switchboard/version.rb", "lib/switchboard/xmpp4r/location/helper/helper.rb", "lib/switchboard/xmpp4r/location/location.rb", "lib/switchboard/xmpp4r/location.rb", "lib/switchboard/xmpp4r/pubsub/helper/oauth_service_helper.rb", "lib/switchboard.rb", "Rakefile", "README.markdown", "switchboard.gemspec"]
+  s.files = ["bin/switchboard", "examples/election_results.rb", "lib/switchboard/client.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/disco/disco.rb", "lib/switchboard/commands/disco/info.rb", "lib/switchboard/commands/disco/items.rb", "lib/switchboard/commands/disco.rb", "lib/switchboard/commands/help/help.rb", "lib/switchboard/commands/help.rb", "lib/switchboard/commands/last/last.rb", "lib/switchboard/commands/last.rb", "lib/switchboard/commands/pep/location.rb", "lib/switchboard/commands/pep/pep.rb", "lib/switchboard/commands/pep/tune.rb", "lib/switchboard/commands/pep.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/retract.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/online.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/component.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/settings.rb", "lib/switchboard/switchboard.rb", "lib/switchboard/version.rb", "lib/switchboard.rb", "Rakefile", "README.markdown", "switchboard-0.0.11.gem", "switchboard.gemspec", "switchboard.gemspec.me"]
   s.executables = ["switchboard"]
   s.require_paths = ["lib"]
 
-  s.add_dependency("mojodna-xmpp4r", ">=", "0.4.0.2")
+  s.add_dependency("mojodna-xmpp4r", ">=", "0.4.0.3")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mojodna-switchboard
 version: !ruby/object:Gem::Version 
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors: 
 - Seth Fitzsimmons
@@ -22,7 +22,7 @@ dependencies:
         version: "0"
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.4.0.2
+        version: 0.4.0.3
     version: 
 description: A toolkit for assembling XMPP clients and interacting with XMPP servers.
 email: 
@@ -96,14 +96,12 @@ files:
 - lib/switchboard/settings.rb
 - lib/switchboard/switchboard.rb
 - lib/switchboard/version.rb
-- lib/switchboard/xmpp4r/location/helper/helper.rb
-- lib/switchboard/xmpp4r/location/location.rb
-- lib/switchboard/xmpp4r/location.rb
-- lib/switchboard/xmpp4r/pubsub/helper/oauth_service_helper.rb
 - lib/switchboard.rb
 - Rakefile
 - README.markdown
+- switchboard-0.0.11.gem
 - switchboard.gemspec
+- switchboard.gemspec.me
 has_rdoc: false
 homepage: 
 post_install_message: 

data/lib/switchboard/xmpp4r/location.rb

@@ -1,2 +0,0 @@
-require 'xmpp4r/location/location'
-require 'xmpp4r/location/helper/helper'

data/lib/switchboard/xmpp4r/location/helper/helper.rb

@@ -1,56 +0,0 @@
-# =XMPP4R - XMPP Library for Ruby
-# License:: Ruby's license (see the LICENSE file) or GNU GPL, at your option.
-# Website::http://home.gna.org/xmpp4r/
-
-require 'xmpp4r'
-require 'xmpp4r/pubsub'
-require 'xmpp4r/location/location'
-
-module Jabber
-  module UserLocation
-    ##
-    # A Helper for XEP-0080 User Location
-    #
-    # Use this helper to send a user's location, or receive them from a
-    # specified jid. Described at http://www.xmpp.org/extensions/xep-0080.html
-    #
-    # For example:
-    # <pre>
-    # h = UserLocation::Helper( @client, 'radio1@hug.hellomatty.com' )
-    # h.add_userlocation_callback do |location|
-    #   puts "Now in: #{location.locality}"
-    # end
-    # </pre>
-    class Helper < PubSub::ServiceHelper
-      ##
-      # Send out the current location.
-      #
-      # location:: [Jabber::UserLocation::Location] current_location
-      def current_location(location)
-        item = Jabber::PubSub::Item.new()
-        item.add(location)
-
-        publish_item_to(NS_USERLOCATION, item)
-      end
-
-      ##
-      # Use this method to indicate that you wish to stop publishing
-      # a location.
-      def stop_publishing
-        current_location(Jabber::UserLocation::Location.new())
-      end
-
-      ##
-      # Add a callback that will be invoked when a location is received
-      # from the jid specified when you constructed the Helper.
-      def add_userlocation_callback(prio = 200, ref = nil, &block)
-        add_event_callback(prio, ref) do |event|
-          location = event.first_element('items/item/location')
-          if location
-            block.call(location)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/switchboard/xmpp4r/location/location.rb

@@ -1,179 +0,0 @@
-# =XMPP4R - XMPP Library for Ruby
-# License:: Ruby's license (see the LICENSE file) or GNU GPL, at your option.
-# Website::http://home.gna.org/xmpp4r/
-
-require 'time'
-require 'xmpp4r/xmppelement'
-require 'rexml/element'
-
-module Jabber
-  module UserLocation
-    NS_USERLOCATION = 'http://jabber.org/protocol/geoloc'
-    ALLOWABLE_ATTRIBUTES = %w(accuracy alt area bearing building country
-      datum description floor lat locality lon postalcode region room
-      speed street text timestamp uri)
-
-    ##
-    # The <geoloc> XMPP element, as defined in XEP-0080 User Location
-    #
-    # See http://xmpp.org/extensions/xep-0080.html - this element
-    # encapsulates data about a user's current location. These are
-    # expressed as child elements such as <locality>, <lat>, etc.
-    # which are also managed by this class.
-    #
-    # If the element has no children then it indicates that the user
-    # has stopped publishing their location.
-    class Location < XMPPElement
-      name_xmlns 'geoloc', NS_USERLOCATION
-      force_xmlns true
-
-      ##
-      # Construct a new <location> element.
-      #
-      # Supply no arguments to make an empty element to indicate that
-      # location is no longer being published.
-      #
-      # attributes:: [Hash] location attributes
-      def initialize(attributes = {})
-        super()
-
-        # validate attributes
-        attributes = attributes.select do |k,v|
-          ALLOWABLE_ATTRIBUTES.include?(k) && !v.nil?
-        end
-
-        attributes.each do |k,v|
-          v = x.xmlschema if v.is_a?(Time)
-          add_element(REXML::Element.new(k)).text = v.to_s
-        end
-      end
-
-
-      ##
-      # Returns true if a location is currently being published, otherwise false.
-      def published?
-        (elements.size > 0)
-      end
-
-      ##
-      # Get the accuracy attribute of this location.
-      def accuracy
-        first_element('accuracy').text if first_element('accuracy')
-      end
-
-      ##
-      # Get the alt attribute of this location.
-      def alt
-        first_element('alt').text if first_element('alt')
-      end
-
-      ##
-      # Get the area attribute of this location.
-      def area
-        first_element('area').text if first_element('area')
-      end
-
-      ##
-      # Get the bearing attribute of this location.
-      def bearing
-        first_element('bearing').text if first_element('bearing')
-      end
-
-      ##
-      # Get the building attribute of this location.
-      def building
-        first_element('building').text if first_element('building')
-      end
-
-      ##
-      # Get the country attribute of this location.
-      def country
-        first_element('country').text if first_element('country')
-      end
-
-      ##
-      # Get the datum attribute of this location.
-      def datum
-        first_element('datum').text if first_element('datum')
-      end
-
-      ##
-      # Get the description attribute of this location.
-      def description
-        first_element('description').text if first_element('description')
-      end
-
-      ##
-      # Get the floor attribute of this location.
-      def floor
-        first_element('floor').text if first_element('floor')
-      end
-
-      ##
-      # Get the lat attribute of this location.
-      def lat
-        first_element('lat').text if first_element('lat')
-      end
-
-      ##
-      # Get the locality attribute of this location.
-      def locality
-        first_element('locality').text if first_element('locality')
-      end
-
-      ##
-      # Get the lon attribute of this location.
-      def lon
-        first_element('lon').text if first_element('lon')
-      end
-
-      ##
-      # Get the postalcode attribute of this location.
-      def postalcode
-        first_element('postalcode').text if first_element('postalcode')
-      end
-
-      ##
-      # Get the region attribute of this location.
-      def region
-        first_element('region').text if first_element('region')
-      end
-
-      ##
-      # Get the room attribute of this location.
-      def room
-        first_element('room').text if first_element('room')
-      end
-
-      ##
-      # Get the speed attribute of this location.
-      def speed
-        first_element('speed').text if first_element('speed')
-      end
-
-      ##
-      # Get the street attribute of this location.
-      def street
-        first_element('street').text if first_element('street')
-      end
-
-      ##
-      # Get the text attribute of this location.
-      def text
-        first_element('text').text if first_element('text')
-      end
-
-      ##
-      # Get the timestamp attribute of this location.
-      def timestamp
-        first_element('timestamp').text if first_element('timestamp')
-      end
-
-      ##
-      # Get the uri attribute of this location.
-      def uri
-        first_element('uri').text if first_element('uri')
-      end
-    end
-  end
-end

data/lib/switchboard/xmpp4r/pubsub/helper/oauth_service_helper.rb

@@ -1,107 +0,0 @@
-module Jabber
-  module PubSub
-    # PubSub service helper for use with OAuth-authenticated nodes
-    class OAuthServiceHelper < ServiceHelper
-      def initialize(stream, pubsubjid)
-        super(stream, pubsubjid)
-      end
-
-      # override #get_subscriptions_from_all_nodes to add an oauth element
-      def get_subscriptions_from_all_nodes(oauth_consumer, oauth_token)
-        iq = basic_pubsub_query(:get)
-
-        iq.pubsub.add(create_oauth_node(oauth_consumer, oauth_token))
-
-        entities = iq.pubsub.add(REXML::Element.new('subscriptions'))
-        res = nil
-        @stream.send_with_id(iq) { |reply|
-          if reply.pubsub.first_element('subscriptions')
-            res = []
-            reply.pubsub.first_element('subscriptions').each_element('subscription') { |subscription|
-              res << Jabber::PubSub::Subscription.import(subscription)
-            }
-          end
-        }
-
-        res
-      end
-
-      # override #subscribe_to to add an oauth element
-      def subscribe_to(node, oauth_consumer, oauth_token)
-        iq = basic_pubsub_query(:set)
-        sub = REXML::Element.new('subscribe')
-        sub.attributes['node'] = node
-        sub.attributes['jid'] = @stream.jid.strip.to_s
-
-        sub.add(create_oauth_node(oauth_consumer, oauth_token))
-
-        iq.pubsub.add(sub)
-        res = nil
-        @stream.send_with_id(iq) do |reply|
-          pubsubanswer = reply.pubsub
-          if pubsubanswer.first_element('subscription')
-            res = PubSub::Subscription.import(pubsubanswer.first_element('subscription'))
-          end
-        end # @stream.send_with_id(iq)
-        res
-      end
-
-      # override #unsubscribe_from to add an oauth element
-      def unsubscribe_from(node, oauth_consumer, oauth_token, subid=nil)
-        iq = basic_pubsub_query(:set)
-        unsub = PubSub::Unsubscribe.new
-        unsub.node = node
-        unsub.jid = @stream.jid.strip
-
-        unsub.add(create_oauth_node(oauth_consumer, oauth_token))
-
-        iq.pubsub.add(unsub)
-        ret = false
-        @stream.send_with_id(iq) { |reply|
-          ret = reply.kind_of?(Jabber::Iq) and reply.type == :result
-        } # @stream.send_with_id(iq)
-        ret
-      end
-
-    protected
-
-      # add the OAuth sauce (XEP-235)
-      def create_oauth_node(oauth_consumer, oauth_token)
-        require 'oauth/signature/hmac/sha1'
-        require 'cgi'
-
-        request = OAuth::RequestProxy.proxy \
-          "method" => "iq",
-          "uri"    => [@stream.jid.strip.to_s, @pubsubjid.strip.to_s] * "&",
-          "parameters" => {
-            "oauth_consumer_key"     => oauth_consumer.key,
-            "oauth_token"            => oauth_token.token,
-            "oauth_signature_method" => "HMAC-SHA1"
-          }
-
-        signature = OAuth::Signature.sign(request, :consumer => oauth_consumer, :token => oauth_token)
-
-        oauth = REXML::Element.new("oauth")
-        oauth.attributes['xmlns'] = 'urn:xmpp:oauth'
-
-        oauth_consumer_key = REXML::Element.new("oauth_consumer_key")
-        oauth_consumer_key.text = oauth_consumer.key
-        oauth.add(oauth_consumer_key)
-
-        oauth_token_node = REXML::Element.new("oauth_token")
-        oauth_token_node.text = oauth_token.token
-        oauth.add(oauth_token_node)
-
-        oauth_signature_method = REXML::Element.new("oauth_signature_method")
-        oauth_signature_method.text = "HMAC-SHA1"
-        oauth.add(oauth_signature_method)
-
-        oauth_signature = REXML::Element.new("oauth_signature")
-        oauth_signature.text = signature
-        oauth.add(oauth_signature)
-
-        oauth
-      end
-    end
-  end
-end