soar_sr 1.1.8 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f99a09060456c4c1e1c88811f6823ae8b177688
-  data.tar.gz: f672b0acf6180c45dda34efe7b7f29b27e88fb08
+  metadata.gz: 74ef5cd38ea67592ac85026463f7162449e11c06
+  data.tar.gz: a366c7a73d6e93fc659b61bd392e395d607e1138
 SHA512:
-  metadata.gz: c7ad55f733f1b38cb0a7c467e79b7b98d8f21bdda3d87aa41808f32253bd3626d8f0f67a1da12a8d5064287b279464aa7325e20b9aaed331a4a962f9cf16f4be
-  data.tar.gz: 317a418217543dd59dab48543c417c46db677409e1f3f579871a87e6baabcfa905ac269db144ad594fd1af3257e8aecd043b77c7c3987ee850313b2b82d550c0
+  metadata.gz: 7055ac00e8c02ea0cce619655f2b30b93a0a2cec87d9ae338892ff661b741977474fa827c43a109447f52abb0755e11623da823fb04fdd5e7c7c3e4bd61b541d
+  data.tar.gz: 4e37f159c663a79f511cbdc6e9c12cb0bfdbfebd34eb9da4be49b34bbb78fbf100237bea0dff38c969d35674fa8cfe452d303930bb3d16d8b3a647a90e273024

data/lib/soar_sr/associations.rb

@@ -3,7 +3,7 @@ require 'soap4juddi'
 require 'byebug'
 
 module SoarSr
-  class Associations < SoarSr::Handler
+  class Associations < SoarSr::ThreadedHandler
     include Jsender
 
     def service_component_has_domain_perspective_associations?(service_component)_{
@@ -44,6 +44,28 @@ module SoarSr
       (associations['service_components'].size > 0) or (associations['services'].size > 0)
     end
 
+    def service_associations(service)
+      service = standardize(service)            
+      provided?(service, 'service') and registered?(service, 'services')
+      result = @registry.services.service_uris(service)
+      service = {'id' => compile_domain_id('services', service), 'uris' => result['data']['bindings'], 'associations' => { 'domain_perspectives' => []}}
+      domain_perspectives = @registry.domain_perspectives.list_domain_perspectives['data']['domain_perspectives']
+
+      threads = []
+      services = []
+      domain_perspectives.each do |name, details|
+        threads, services = domain_perspective_associations_threaded(threads, name, service, services)
+      end
+      join_threads(threads)
+      services.each do |sv|
+        service['associations']['domain_perspectives'] = 
+          Hash::deep_merge(service['associations']['domain_perspectives'],
+                           sv['associations']['domain_perspectives'])
+        service['associations']['domain_perspectives'] = service['associations']['domain_perspectives'].uniq
+      end
+      service
+    end
+
     def associate_service_component_with_domain_perspective(service_component, domain_perspective)_{
       service_component = standardize(service_component)      
       domain_perspective = standardize(domain_perspective)            
@@ -154,6 +176,31 @@ module SoarSr
 
     private
 
+    def domain_perspective_associations_threaded(threads, domain_perspective, service, services)
+      thread = nil
+      threads = join_on_max_threads(threads)
+      threads << Thread.new do
+        result = map_domain_perspective_associations(domain_perspective, service)
+        @@mutex.synchronize do
+          services << result
+        end
+      end
+      return threads, services
+    end
+
+    def map_domain_perspective_associations(domain_perspective, service)
+      result = domain_perspective_associations(domain_perspective)
+      result['data']['associations']['services'].each do |id, associated|
+        `echo "#{id} -> #{associated} with #{service[id]} and #{id} and #{associated}}" >> /Users/ernstv/scratch/log` if (domain_perspective == 'testing')
+        if ((service['id'] == id) and (associated == true))
+          service['associations'] ||= {}
+          service['associations']['domain_perspectives'] ||= []
+          service['associations']['domain_perspectives'] << domain_perspective
+        end
+      end
+      service
+    end
+
     def no_meta?(meta)
       (meta['associations']['service_components'] == {}) and (meta['associations']['services'] == {})
     end

data/lib/soar_sr/services.rb

@@ -4,16 +4,9 @@ require 'json'
 require 'byebug'
 
 module SoarSr
-  class Services < SoarSr::Handler
+  class Services < SoarSr::ThreadedHandler
     include Jsender
     ALL_SERVICES = nil unless defined? ALL_SERVICES; ALL_SERVICES.freeze
-    attr_accessor :max_threads
-
-    def initialize(urns, uddi, credentials, registry, max_threads = 15)
-      super(urns, uddi, credentials, registry)
-      @@mutex = Mutex.new
-      @max_threads = max_threads
-    end
 
     def register_service(service, description = nil)_{
       service = standardize(service)            
@@ -177,20 +170,6 @@ module SoarSr
       services
     end
 
-    def join_threads(threads)
-      threads.each do |t|
-        t.join
-      end
-    end
-
-    def join_on_max_threads(threads)
-      if threads.count == @max_threads
-        join_threads(threads)
-        threads = []
-      end
-      threads
-    end
-
     def map_service_uri_threaded(threads, service)
       thread = nil
       threads = join_on_max_threads(threads)

data/lib/soar_sr/threaded_handler.rb

@@ -0,0 +1,28 @@
+module SoarSr
+  class ThreadedHandler < Handler
+    include Jsender
+    attr_accessor :max_threads
+
+    def initialize(urns, uddi, credentials, registry, max_threads = 15)
+      super(urns, uddi, credentials, registry)
+      @@mutex = Mutex.new
+      @max_threads = max_threads
+    end
+
+    protected
+
+    def join_threads(threads)
+      threads.each do |t|
+        t.join
+      end
+    end
+
+    def join_on_max_threads(threads)
+      if threads.count == @max_threads
+        join_threads(threads)
+        threads = []
+      end
+      threads
+    end    
+  end
+end

data/lib/soar_sr/version.rb

@@ -1,3 +1,3 @@
 module SoarSr
-  VERSION = "1.1.8"
+  VERSION = "1.1.9"
 end

data/lib/soar_sr.rb

@@ -2,6 +2,7 @@ require "soar_sr/version"
 require "soar_sr/validation_error"
 require "soar_sr/validator"
 require "soar_sr/handler"
+require "soar_sr/threaded_handler"
 require "soar_sr/services"
 require "soar_sr/service_components"
 require "soar_sr/service_definitions"
@@ -20,7 +21,12 @@ end
 
 class ::Hash
   def self.deep_merge(first, second)
-    result = first.merge(second)
+    result = first
+    if first.is_a?(Hash) and (second.is_a?(Hash))
+      result = first.merge(second)
+    else
+      return first + second
+    end
     first.each do |first_key, first_value|
       second.each do |second_key, second_value|
         if (first_key == second_key)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soar_sr
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.1.9
 platform: ruby
 authors:
 - Ernst van Graan
@@ -139,6 +139,7 @@ files:
 - lib/soar_sr/service_registry.rb
 - lib/soar_sr/services.rb
 - lib/soar_sr/teams.rb
+- lib/soar_sr/threaded_handler.rb
 - lib/soar_sr/validation_error.rb
 - lib/soar_sr/validator.rb
 - lib/soar_sr/version.rb