omf_common 6.2.0.pre.2 → 6.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmU3MzM4YzI4ZDI3MmQ0OTIwZTk2NjYxYTcyMTkzNjkwYTJjOGJmZg==
+    YjJhMzc2NmQ5MWVhMzVmODhmZjZhMmI2YzFjZmJlMDdmZGM3YzU3MQ==
   data.tar.gz: !binary |-
-    OTBjZDRlMzMxZGZhNDdlN2M4YzQ1ZDExNjZhODQxOWE3MWIxZDM5OA==
+    ZTQ0MGMyMjkwOWRmMDY5MjZlMjZlYjFkODQzZDkwMTlhMzE5ODVkNA==
 SHA512:
   metadata.gz: !binary |-
-    N2RmM2VjNmU5MWNlMjI0ZjYzNTU2MzhhMWI4NzI5N2JlNjg2MzcwOWMxNTVi
-    YzdiMjJlMDM5YzBhYWY0YWMxYWE4Mzc4NDFlMTc0YTEwY2M1MDMyNDc4OWMz
-    ZjQzZmE0MWRlYjJjYWU4NWY1MzhkMGRiMDJlYmRiMThkYTY2MTg=
+    MDIwYWY5YTIwYzdkNDNjNzNjNDM2NTM3NmY0NGUxNjMzYWZkYmIzMTM1ZGRi
+    OTI3NjE5ODdlNzE2ZTk2MDk0Y2EzMDBiNWY1NjdjMzVhMmM5ZDFjYTk5NGVi
+    NjUzOTU3ZGIyYTgyODY0ZmIzZWM3ODllM2ZkZWYzM2ViNWVmZGM=
   data.tar.gz: !binary |-
-    Nzg4NDc4NzdmMWE0YTkwM2RlYWY4MzRlOWMxMmM1YmQ4Mjg5NWNjY2E1ZTUy
-    NTM0YmIyNzMzN2Q0M2M2Mzc2MWRhNDZjYjcwZmMzZmYwZjhlMTQ0ODVlY2Qy
-    MzEyODA5ZDllNjZkMGI4NzdiMzExY2UxYTc4NTMwMmVmZWFlYTQ=
+    NWZmMDhhODE4OTRmYzExYWUwZWIwNmMwMjMwMTM1M2I4NzY1ZWYxZmVmNmU4
+    MTFjZGIwOTg3NGUzNGU3ZTY5ODk0NjllOTQ3NDJlOTYwMjc2NjA3MjVhOThl
+    ODU4NTU2ZDFjZDk2OGYxZDA0ZTFlMzU1Njk4NDFkYTNjZjk0MmE=

data/lib/omf_common/comm/amqp/amqp_topic.rb

@@ -37,6 +37,11 @@ module OmfCommon
           end
         end
 
+        def unsubscribe(key)
+          super
+          @exchange.delete
+        end
+
 
         private
 
@@ -49,32 +54,22 @@ module OmfCommon
           @lock = Monitor.new
           @subscribed = false
           @on_subscribed_handlers = []
-          @routing_key = opts[:routing_key]
+          # Monitor o.op & o.info by default
+          @routing_key = opts[:routing_key] || "o.*"
 
-          # @communicator.on_reconnect(self) do
-            # info "Resubscribe '#{self}'"
-            # _init_amqp
-          # end
           _init_amqp
         end
 
         def _init_amqp()
           channel = @communicator.channel
           @exchange = channel.topic(id, :auto_delete => true)
-          # @exchange.on_connection_interruption do |ex|
-            # warn "Exchange #{ex.name} detected connection interruption"
-            # @exchange = nil
-          # end
           channel.queue("", :exclusive => true, :auto_delete => true) do |queue|
-            #puts "QQ1(#{id}): #{queue}"
             queue.bind(@exchange, routing_key: @routing_key)
 
             queue.subscribe do |headers, payload|
-              #puts "===(#{id}) Incoming message '#{headers.content_type}'"
               debug "Received message on #{@address} | #{@routing_key}"
               MPReceived.inject(Time.now.to_f, @address, payload.to_s[/mid\":\"(.{36})/, 1]) if OmfCommon::Measure.enabled?
               Message.parse(payload, headers.content_type) do |msg|
-                #puts "---(#{id}) Parsed message '#{msg}'"
                 on_incoming_message(msg)
               end
             end

data/lib/omf_common/comm/xmpp/topic.rb

@@ -87,7 +87,7 @@ class XMPP
       OmfCommon.comm.topic_event(default_guard, &event_block)
     end
 
-    def _send_message(msg, block)
+    def _send_message(msg, opts = {}, block)
       super
       OmfCommon.comm.publish(self.id, msg, pubsub_domain_addr)
     end

data/lib/omf_common/exec_app.rb

@@ -46,10 +46,14 @@ class ExecApp
   # @param [String] id of the application to return
   def self.[](id)
     app = @@all_apps[id]
-    logger.info "Unknown application '#{id}/#{id.class}'" if app.nil?
+    warn "Unknown application '#{id}/#{id.class}'" if app.nil?
     return app
   end
 
+  def self.has?(id)
+    @@all_apps.has_key?(id)
+  end
+
   def self.signal_all(signal = 'KILL')
     @@all_apps.each_value { |app| app.signal(signal) }
   end

data/lib/omf_common/message.rb

@@ -168,6 +168,10 @@ module OmfCommon
       OmfCommon.comm.create_topic(name)
     end
 
+    def resource_address
+      _get_property(:res_id)
+    end
+
     def success?
       ! error?
     end

data/omf_common.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  s.add_development_dependency "minitest"
+  s.add_development_dependency "minitest", "~> 5.5.1"
   s.add_development_dependency "evented-spec", "~> 1.0.0.beta"
   s.add_development_dependency "simplecov"
   s.add_development_dependency "pry"

data/test/omf_common/comm/topic_spec.rb

@@ -4,6 +4,7 @@
 # By downloading or using this software you accept the terms and the liability disclaimer in the License.
 
 require 'test_helper'
+require 'omf_common/message/json/json_message'
 
 describe OmfCommon::Comm::Topic do
   describe "when using factory method to initialise" do

data/test/omf_common/comm/xmpp/communicator_spec.rb

@@ -28,6 +28,7 @@ describe "Using XMPP communicator" do
   end
 
   it "must allow you to connect" do
+    skip
     @xmpp_comm.on_connected do |c|
       assert_equal :xmpp, c.conn_info[:proto]
       assert_match /#{Socket.gethostname}/, c.conn_info[:user]
@@ -37,6 +38,7 @@ describe "Using XMPP communicator" do
   end
 
   it "must construct topic address string" do
+    skip
     @xmpp_comm.on_connected do |c|
       t_name = SecureRandom.uuid
       # TODO This format is different to AMQP
@@ -46,6 +48,7 @@ describe "Using XMPP communicator" do
   end
 
   it "must allow you to create a new pubsub topic" do
+    skip
     @xmpp_comm.on_connected do |c|
       t_name = SecureRandom.uuid.to_sym
       c.create_topic(t_name)

data/test/omf_common/comm/xmpp/topic_spec.rb

@@ -30,6 +30,7 @@ describe OmfCommon::Comm::XMPP::Topic do
   end
 
   it "must allow you to subscribe/unsubscribe to a new pubsub topic" do
+    skip
     @xmpp_comm.on_connected do |c|
       t_name = SecureRandom.uuid.to_sym
       c.subscribe(t_name) do |topic|
@@ -43,6 +44,7 @@ describe OmfCommon::Comm::XMPP::Topic do
   end
 
   it "must allow you to send and monitor messages" do
+    skip
     @xmpp_comm.on_connected do |c|
       t_name = SecureRandom.uuid.to_sym
       c.subscribe(t_name) do |topic|

data/test/omf_common/comm_spec.rb

@@ -38,12 +38,6 @@ describe OmfCommon::Comm do
       @topic.expects(:on_subscribed)
       @abstract_comm.subscribe(:bob) { 'do nothing' }
     end
-
-    it "must be able to publish message" do
-      @abstract_comm.stubs(:create_topic).returns(@topic)
-      @topic.expects(:publish)
-      @abstract_comm.publish(:bob, 'message')
-    end
   end
 
   describe 'when initialised with a pubsub implementation' do

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: omf_common
 version: !ruby/object:Gem::Version
-  version: 6.2.0.pre.2
+  version: 6.2.0
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.5.1
 - !ruby/object:Gem::Dependency
   name: evented-spec
   requirement: !ruby/object:Gem::Requirement
@@ -319,9 +319,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: omf_common
 rubygems_version: 2.4.2