omf_common 6.0.0.pre.4 → 6.0.0.pre.6

data/lib/omf_common.rb

@@ -1,4 +1,5 @@
 require 'logging'
+require 'active_support/inflector'
 
 require "omf_common/version"
 require "omf_common/message"

data/lib/omf_common/comm.rb

@@ -1,10 +1,10 @@
-require 'omf_common/dsl/xmpp_blather'
+require 'omf_common/dsl/xmpp'
 
 module OmfCommon
   # PubSub communication class, can be extended with different implementations
   class Comm
     def initialize(pubsub_implementation)
-      self.extend("OmfCommon::DSL::#{pubsub_implementation.to_s.camelcase}".constant)
+      self.extend("OmfCommon::DSL::#{pubsub_implementation.to_s.camelize}".constantize)
     end
   end
 end

data/lib/omf_common/core_ext/string.rb

@@ -2,12 +2,4 @@ class String
   def ducktype
     Integer(self) rescue Float(self) rescue self
   end
-
-  def camelcase
-    self.split('_').map(&:capitalize).join('')
-  end
-
-  def constant
-    self.split('::').inject(Object) { |obj, name| obj = obj.const_get(name); obj }
-  end
 end

data/lib/omf_common/dsl/{xmpp_blather.rb → xmpp.rb}

@@ -1,13 +1,12 @@
 require 'blather/client/dsl'
-require 'omf_common/core_ext/blather/dsl/pubsub'
-require 'omf_common/core_ext/blather/stream/features'
-require 'omf_common/core_ext/blather/stream/features/register'
 
 module OmfCommon
   module DSL
-    module XmppBlather
+    module Xmpp
       include Blather::DSL
 
+      HOST_PREFIX = 'pubsub'
+
       PUBSUB_CONFIGURE = Blather::Stanza::X.new({
         :type => :submit,
         :fields => [
@@ -27,59 +26,61 @@ module OmfCommon
       end
 
       # Shut down XMPP connection
-      #
-      # @param [String] host Host represents the pubsub address, e.g. pubsub.norbit.npc.nicta.com.au
-      def disconnect(host)
+      def disconnect
         shutdown
       end
 
-      # Create a new pubsub node with additional configuration
+      # Create a new pubsub topic with additional configuration
       #
-      # @param [String] node Pubsub node name
+      # @param [String] topic Pubsub topic name
       # @param [String] host Pubsub host address
-      def create_node(node, host, &block)
-        pubsub.create_with_configuration(node, PUBSUB_CONFIGURE, host, &callback_logging(__method__, node, &block))
+      def create_topic(topic, host, &block)
+        pubsub.create(topic, prefix_host(host), PUBSUB_CONFIGURE, &callback_logging(__method__, topic, &block))
       end
 
-      # Delete a pubsub node
+      # Delete a pubsub topic
       #
-      # @param [String] node Pubsub node name
+      # @param [String] topic Pubsub topic name
       # @param [String] host Pubsub host address
-      def delete_node(node, host, &block)
-        pubsub.delete(node, host, &callback_logging(__method__, node, &block))
+      def delete_topic(topic, host, &block)
+        pubsub.delete(topic, prefix_host(host), &callback_logging(__method__, topic, &block))
       end
 
-      # Subscribe to a pubsub node
+      # Subscribe to a pubsub topic
       #
-      # @param [String] node Pubsub node name
+      # @param [String] topic Pubsub topic name
       # @param [String] host Pubsub host address
-      def subscribe(node, host, &block)
-        pubsub.subscribe(node, nil, host, &callback_logging(__method__, node, &block))
+      def subscribe(topic, host, &block)
+        pubsub.subscribe(topic, nil, prefix_host(host), &callback_logging(__method__, topic, &block))
       end
 
-      # Un-subscribe all existing subscriptions from all pubsub nodes.
+      # Un-subscribe all existing subscriptions from all pubsub topics.
       #
       # @param [String] host Pubsub host address
       def unsubscribe(host)
-        pubsub.subscriptions(host) do |m|
+        pubsub.subscriptions(prefix_host(host)) do |m|
           m[:subscribed] && m[:subscribed].each do |s|
-            pubsub.unsubscribe(s[:node], nil, s[:subid], host, &callback_logging(__method__, s[:node], s[:subid]))
+            pubsub.unsubscribe(s[:node], nil, s[:subid], prefix_host(host), &callback_logging(__method__, s[:node], s[:subid]))
           end
         end
       end
 
-      # Publish to a pubsub node
+      def affiliations(host, &block)
+        pubsub.affiliations(prefix_host(host), &callback_logging(__method__, &block))
+      end
+
+      # Publish to a pubsub topic
       #
-      # @param [String] node Pubsub node name
+      # @param [String] topic Pubsub topic name
       # @param [String] message Any XML fragment to be sent as payload
       # @param [String] host Pubsub host address
-      def publish(node, message, host, &block)
-        pubsub.publish(node, message, host, &callback_logging(__method__, node, message.operation, &block))
+      def publish(topic, message, host, &block)
+        pubsub.publish(topic, message, prefix_host(host), &callback_logging(__method__, topic, message.operation, &block))
       end
 
-      # Event callback for pubsub node event(item published)
+      # Event callback for pubsub topic event(item published)
       #
-      def node_event(*args, &block)
+      def topic_event(*args, &block)
         pubsub_event(:items?, *args, &callback_logging(__method__, &block))
       end
 
@@ -94,6 +95,10 @@ module OmfCommon
           block.call(callback) if block
         end
       end
+
+      def prefix_host(host)
+        "#{HOST_PREFIX}.#{host}"
+      end
     end
   end
 end

data/lib/omf_common/message.rb

@@ -38,7 +38,7 @@ module OmfCommon
       end
     end
 
-    # Construct a property node
+    # Construct a property xml node
     #
     def property(key, value = nil, &block)
       key_node = Message.new('property')

data/lib/omf_common/version.rb

@@ -1,4 +1,4 @@
 module OmfCommon
-  VERSION = "6.0.0.pre.4"
+  VERSION = "6.0.0.pre.6"
   PROTOCOL_VERSION = "6.0"
 end

data/omf_common.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   # specify any dependencies here; for example:
   s.add_development_dependency "minitest", "~> 2.11.3"
-  s.add_runtime_dependency "blather", "~> 0.7"
+  s.add_runtime_dependency "blather", "~> 0.8.0"
   s.add_runtime_dependency "logging", "~> 1.7.1"
   s.add_runtime_dependency "hashie", "~> 1.2.0"
 end

data/test/omf_common/comm_spec.rb

@@ -3,8 +3,8 @@ require 'test_helper'
 describe OmfCommon::Comm do
   describe 'when initialised with a pubsub implementation' do
     it 'must return a instance with all methods defined in corresponding module loaded' do
-      @comm = OmfCommon::Comm.new(:xmpp_blather)
-      %w(connect disconnect create_node delete_node subscribe unsubscribe publish).each do |m|
+      @comm = OmfCommon::Comm.new(:xmpp)
+      %w(connect disconnect create_topic delete_topic subscribe unsubscribe publish affiliations).each do |m|
         @comm.must_respond_to m
       end
 

data/test/omf_common/core_ext/string_spec.rb

@@ -2,14 +2,10 @@ require 'test_helper'
 
 describe String do
   describe "when given a string" do
-    it "must response to to_n, camelcase, constant" do
+    it "must response to ducktype" do
+      "100".ducktype.must_equal 100
       "100.0".ducktype.must_equal 100.0
       "i_am_a_string".ducktype.must_equal "i_am_a_string"
-      "i_am_a_string".camelcase.must_equal "IAmAString"
-      module IAmAString; end
-      "i_am_a_string".camelcase.constant.must_equal IAmAString
-      module IAmAString::Test; end
-      "IAmAString::Test".constant.must_equal IAmAString::Test
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_common
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre.4
+  version: 6.0.0.pre.6
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-04 00:00:00.000000000 Z
+date: 2012-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: logging
   requirement: !ruby/object:Gem::Requirement
@@ -89,11 +89,8 @@ files:
 - lib/omf_common.rb
 - lib/omf_common/comm.rb
 - lib/omf_common/command.rb
-- lib/omf_common/core_ext/blather/dsl/pubsub.rb
-- lib/omf_common/core_ext/blather/stream/features.rb
-- lib/omf_common/core_ext/blather/stream/features/register.rb
 - lib/omf_common/core_ext/string.rb
-- lib/omf_common/dsl/xmpp_blather.rb
+- lib/omf_common/dsl/xmpp.rb
 - lib/omf_common/message.rb
 - lib/omf_common/protocol.rnc
 - lib/omf_common/protocol.rng
@@ -124,9 +121,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: omf_common
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Common library of OMF
 test_files: []
-has_rdoc: 

data/lib/omf_common/core_ext/blather/dsl/pubsub.rb

@@ -1,11 +0,0 @@
-module Blather
-  module DSL
-    class PubSub
-      def create_with_configuration(node, configuration, host = nil)
-        stanza = Stanza::PubSub::Create.new(:set, send_to(host), node)
-        stanza.configure_node << configuration
-        request(stanza) { |n| yield n if block_given? }
-      end
-    end
-  end
-end

data/lib/omf_common/core_ext/blather/stream/features.rb

@@ -1,34 +0,0 @@
-module Blather
-  class Stream
-    # @private
-    class Features
-      def next!
-        @idx = @idx ? @idx+1 : 0
-        if stanza = @features.children[@idx]
-          if stanza.namespaces['xmlns'] && (klass = self.class.from_namespace(stanza.namespaces['xmlns']))
-            @feature = klass.new(
-              @stream,
-              proc {
-              if (klass == Blather::Stream::Register && @features && !@features.children.find { |v| v.element_name == "mechanisms" }.nil?)
-                stanza = @features.children.find { |v| v.element_name == "mechanisms" }
-                @idx = @features.children.index(stanza)
-                klass = self.class.from_namespace(stanza.namespaces['xmlns'])
-                @feature = klass.new @stream, proc { next! }, @fail
-                @feature.receive_data stanza
-              else
-                next!
-              end
-            },
-              (klass == Blather::Stream::SASL && @features && !@features.children.find { |v| v.element_name == "register" }.nil?) ? proc { next! } : @fail
-            )
-            @feature.receive_data stanza
-          else
-            next!
-          end
-        else
-          succeed!
-        end
-      end
-    end
-  end #Stream
-end #Blather

data/lib/omf_common/core_ext/blather/stream/features/register.rb

@@ -1,40 +0,0 @@
-module Blather
-  class Stream
-    class Register < Features
-      REGISTER_NS = "http://jabber.org/features/iq-register".freeze
-
-      register REGISTER_NS
-
-      def initialize(stream, succeed, fail)
-        super
-        @jid = @stream.jid
-        @pass = @stream.password
-      end
-
-      def receive_data(stanza)
-        error_node = stanza.xpath('//error').first
-
-        if error_node
-          fail!(error_node)
-        elsif stanza['type'] == 'result' && (stanza.content.empty? || !stanza.children.find { |v| v.element_name == "query" }.nil?)
-          succeed!
-        else
-          @stream.send register_node
-        end
-      end
-
-      def register_node
-        node = Blather::Stanza::Iq::Query.new(:set)
-        query_node = node.xpath('//query').first
-        query_node['xmlns'] = 'jabber:iq:register'
-        username_node = Nokogiri::XML::Node.new('username', node)
-        username_node.content = @jid.node
-        password_node = Nokogiri::XML::Node.new('password', node)
-        password_node.content = @pass
-        query_node.add_child(username_node)
-        query_node.add_child(password_node)
-        node
-      end
-    end
-  end
-end