soar_sr 1.1.10 → 1.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af795a36412a5f505f72ed8632bd784765959946
-  data.tar.gz: efbcc633498efff786dbf357ca59ad03df25b4ca
+  metadata.gz: 05a8b23810bacbbccacd773a77f60acaf884d0ef
+  data.tar.gz: e0050b40257e65c1c1e511fea9898099d732ebb7
 SHA512:
-  metadata.gz: 02ea53afb5567e409a336a531d0abfbb86c3a6c2453ebb950ea76f194728890324ec51a131b89d6715a4e1e763ae5cb62e0dd04407759540717e65decb571401
-  data.tar.gz: 965917ad5e41d61bc18524782b7fec49bc6f09080bb034669bdae3ab591602e40cf2337552279d0a1c1a4602349015f07525e89d3519175fa7bfd8bd478197dc
+  metadata.gz: 6a3ab8b46470cbae1432234266b59c06a207029d11a1177ceb9596b48003421a635c91c2680f25efc01f75fe6bd8f7a59ad8bc15c56b37486823b08e764a1c44
+  data.tar.gz: 9d69aef2617b49b7e07902ca613b23231402c1fbdf2af09ee5770214358c40e421f29780ab4cd93a0977dc1845807063256e0506e704a4695e171aa9d5c9265a

data/lib/soar_sr/associations.rb

@@ -44,11 +44,19 @@ module SoarSr
       (associations['service_components'].size > 0) or (associations['services'].size > 0)
     end
 
-    def service_associations(service)
+    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' => []}}
+
+      bindings = result['data']['bindings']
+      bindings ||= {}
+      uris = {}
+      bindings.each do |id, detail|
+        uris[id] = detail['access_point']
+      end
+
+      service = {'id' => compile_domain_id('services', service), 'uris' => uris, 'associations' => { 'domain_perspectives' => {}}}
       domain_perspectives = @registry.domain_perspectives.list_domain_perspectives['data']['domain_perspectives']
 
       threads = []
@@ -61,10 +69,9 @@ module SoarSr
         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
+      success_data(service)
+    }end
 
     def associate_service_component_with_domain_perspective(service_component, domain_perspective)_{
       service_component = standardize(service_component)      
@@ -191,11 +198,10 @@ module SoarSr
     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
+          service['associations']['domain_perspectives'] ||= {}
+          service['associations']['domain_perspectives'][domain_perspective] = domain_perspective
         end
       end
       service

data/lib/soar_sr/version.rb

@@ -1,3 +1,3 @@
 module SoarSr
-  VERSION = "1.1.10"
+  VERSION = "1.1.11"
 end

data/lib/soar_sr.rb

@@ -24,8 +24,10 @@ class ::Hash
     result = first
     if first.is_a?(Hash) and (second.is_a?(Hash))
       result = first.merge(second)
-    else
+    elsif first.is_a?(Array) and second.is_a?(Array)
       return first + second
+    else
+      return second
     end
     first.each do |first_key, first_value|
       second.each do |second_key, second_value|
@@ -35,7 +37,7 @@ class ::Hash
           elsif first_value.is_a?(Array) and (second_value.is_a?(Array))
             result[first_key] = first_value + second_value
           else
-            result[first_key] = first_value + second_value
+            result[first_key] = second_value
           end        
         end
       end
@@ -52,3 +54,47 @@ class ::Hash
     keys
   end
 end
+
+
+# a = {'key' => 'value'}
+#  => {"key"=>"value"} 
+# b = {'key2' => 'value2'}
+#  => {"key2"=>"value2"} 
+# a.merge b
+#  => {"key"=>"value", "key2"=>"value2"} 
+
+# a = {'key' => 'value'}
+#  => {"key"=>"value"} 
+# b = {'key' => 'value2'}
+#  => {"key"=>"value2"} 
+# a.merge b
+#  => {"key"=>"value2"}
+# Hash.deep_merge(a, b)
+#  => {"key"=>"valuevalue2"} 
+
+# a = {'key' => 'value', 'dictionary' => { '1' => 'one', '2' => 'two' }}
+#  => {"key"=>"value", "dictionary"=>{"1"=>"one", "2"=>"two"}} 
+# b = {'key2' => 'value2', 'dictionary' => { '3' => 'one', '4' => 'two' }}
+#  => {"key2"=>"value2", "dictionary"=>{"3"=>"one", "4"=>"two"}} 
+# a.merge b
+#  => {"key"=>"value", "dictionary"=>{"3"=>"one", "4"=>"two"}, "key2"=>"value2"} 
+# Hash.deep_merge(a, b)
+#  => {"key"=>"value", "dictionary"=>{"1"=>"one", "2"=>"two", "3"=>"one", "4"=>"two"}, "key2"=>"value2"} 
+
+# a = {'key' => 'value', 'dictionary' => [ '1', '2']}
+#  => {"key"=>"value", "dictionary"=>["1", "2"]} 
+# b = {'key2' => 'value2', 'dictionary' => ['3', '4']}
+#  => {"key2"=>"value2", "dictionary"=>["3", "4"]} 
+# a.merge b
+#  => {"key"=>"value", "dictionary"=>["3", "4"], "key2"=>"value2"} 
+# Hash.deep_merge(a, b)
+#  => {"key"=>"value", "dictionary"=>["1", "2", "3", "4"], "key2"=>"value2"} 
+
+# a = {'key' => 'value', 'dictionary' => { '1' => 'one', '2' => {'2.1' => 'twoone', '2.2' => 'twotwo' }}}
+#  => {"key"=>"value", "dictionary"=>{"1"=>"one", "2"=>{"2.1"=>"twoone", "2.2"=>"twotwo"}}} 
+# b = {'key2' => 'value2', 'dictionary' => { '3' => 'three', '2' => {'2.3' => 'twothree', '2.4' => 'twofour' }}}
+#  => {"key2"=>"value2", "dictionary"=>{"3"=>"three", "2"=>{"2.3"=>"twothree", "2.4"=>"twofour"}}} 
+# a.merge b
+#  => {"key"=>"value", "dictionary"=>{"3"=>"three", "2"=>{"2.3"=>"twothree", "2.4"=>"twofour"}}, "key2"=>"value2"} 
+# Hash::deep_merge(a, b)
+#  => {"key"=>"value", "dictionary"=>{"1"=>"one", "2"=>{"2.1"=>"twoone", "2.2"=>"twotwo", "2.3"=>"twothree", "2.4"=>"twofour"}, "3"=>"three"}, "key2"=>"value2"} 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soar_sr
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.1.11
 platform: ruby
 authors:
 - Ernst van Graan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: persistent-cache