soar_sr 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 994cbaba1fd332b69c03daf1978eae61e468b8d2
-  data.tar.gz: 798996ba2a81adb302d0f70ead4438660a235dab
+  metadata.gz: dd1964b9894c246621ad8453e60938dad184a442
+  data.tar.gz: a5c3ed9361bdaaa663ae97353cd474d38ef333f9
 SHA512:
-  metadata.gz: 1cb204c69e50a3626f1d7006f59dfdf283559416d0a97fd9b93aa90e53d3e99aec441bf515d978b9e8e57dc192868e9ad66e22f32e2be8ade6765b63a34ab686
-  data.tar.gz: 483073f2c989f8b30d630adf58835594c46705f561c95949eb640a0ddd00ece0c663a6dc0fb2434a0dfb63c4baa6379edbf21cae352ba43d12561d42708091ee
+  metadata.gz: ddcbd82018a7c8e3aa176d91c544a831b4fe81768c9db10bcea1d4c594c8b147fec74582ecd77659533ad6cf3b6059e7dedccce32c0729fdf1c35756f219bd76
+  data.tar.gz: 35321dd2867f2ab7a7a3281e230bced87fef406f5a082c4cf62e06ac5e2ee8c80e1f1b6dc6895f48aa24fba409a47332a525d2a3eeac67ad5dc6e363128ffc03

data/lib/soar_sr/associations.rb

@@ -49,7 +49,6 @@ module SoarSr
       domain_perspective = standardize(domain_perspective)            
       provided?(domain_perspective, 'domain perspective') and any_registered?(domain_perspective)
       provided?(service_component, 'service component') and registered?(service_component, 'service-components')
-
       service_component_id = compile_domain_id('service-components', service_component)
       type_registered =  which_type_registered?(domain_perspective)
 

data/lib/soar_sr/domain_perspectives.rb

@@ -74,7 +74,6 @@ module SoarSr
       domain_perspective = standardize(domain_perspective)            
       provided?(domain_perspective, one_of(type)) and registered?(domain_perspective, type)
       provided?(type, 'element type') and type?(type)
-      
       meta = extract_meta_for_domain_perspective(extract_detail_for_domain_perspective(type, domain_perspective))
       meta['associations'] ||= {}
       meta['associations']['service_components'] ||= {}
@@ -145,7 +144,7 @@ module SoarSr
       meta = {}
       if detail['description']
         detail['description'].each do |desc|
-          meta.merge!(JSON.parse(CGI.unescape(desc))) if (description_is_meta?(desc))
+          meta = Hash::deep_merge(meta, JSON.parse(CGI.unescape(desc))) if (description_is_meta?(desc))
         end
       end
       meta

data/lib/soar_sr/version.rb

@@ -1,3 +1,3 @@
 module SoarSr
-  VERSION = "1.1.5"
+  VERSION = "1.1.6"
 end

data/lib/soar_sr.rb

@@ -17,3 +17,32 @@ require 'jsender'
 module SoarSr
 	DOMAIN_TYPES = ['domains', 'services', 'service-components', 'teams'] unless defined? DOMAIN_TYPES; DOMAIN_TYPES.freeze
 end
+
+class ::Hash
+  def self.deep_merge(first, second)
+    result = first.merge(second)
+    first.each do |first_key, first_value|
+      second.each do |second_key, second_value|
+        if (first_key == second_key)
+          if first_value.is_a?(Hash) and (second_value.is_a?(Hash))
+            result[first_key] = Hash::deep_merge(first_value, second_value)
+          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
+          end        
+        end
+      end
+    end     
+    result
+  end
+
+  def self.value_has_hash?(value)
+    return nil if not value.is_a?(Hash)
+    keys = []
+    value.each do |k, v|
+      keys << k if v.is_a?(Hash)
+    end
+    keys
+  end
+end

data/soar_sr.gemspec

@@ -26,6 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "byebug"
   spec.add_dependency "jsender"
-  spec.add_dependency "soap4juddi", "~> 1.0.1"
+  spec.add_dependency "soap4juddi", "~> 1.0.3"
   spec.add_dependency "connection_pool"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soar_sr
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Ernst van Graan
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement