soap4juddi 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4474b9d72abaa53ee40ccbb947994b31ffab0f0d
-  data.tar.gz: 6f5bd6a1720d6ed4b33e10415ac80fbf297fc683
+  metadata.gz: 63b7ba4fd1ca7454d882986406bec8d63a549c85
+  data.tar.gz: 18445ab17e4d243320447aa39783a463325db4a6
 SHA512:
-  metadata.gz: 753b5d349406e8f666527744ff756f5742281df49149070562aed44174fb4ce970b7736a68e4270a66976b912e708d8366059ded74acd6a5041ca6f56fcea680
-  data.tar.gz: 2ec97209e00b0bfa1722ad6cd502cd5c60f7abaa2c015c807f20639b08a5c89e1e636f61882511c61574cffb89367b08e992fab6648885b0ac774bb910109fc0
+  metadata.gz: 0497a9b0b8c9e9aa16f013e9af57bce2a59c08f55856e67b0bc331da13879a3fad1d9defee42412de494de28958d98c0317f7890adb7a90395ea41a079c9e11d
+  data.tar.gz: e6e4f2a83c1d3be863d5bf11857882e06735d00bfa2f56578ae8d600ec711399d8547266919699f4f2c6e22d40a53acdf3a2abbd50a027231e338a84cd06f4c6

data/lib/soap4juddi/broker.rb

@@ -16,9 +16,8 @@ module Soap4juddi
 
     def save_element_bindings(service, bindings, urn, description)
       validate_elements(bindings, 'bindings')
-      body = auth_body
-      body = add_bindings(body, service, bindings, urn, description)
-      @soap_connector.request_soap(@base_uri, 'publishv2', 'save_binding', body) do | res|
+      body = add_bindings("", service, bindings, urn, description)
+      @soap_connector.request_soap(@base_uri, 'publishv2', 'save_binding', add_auth_body(body)) do | res|
         res.body
       end
     end
@@ -29,7 +28,7 @@ module Soap4juddi
       body = build_business_entity(key, name, descriptions, contacts)
       @soap_connector.request_soap(@base_uri,
                    'publishv2', 'save_business',
-                   "#{auth_body} #{body}") do | res|
+                   add_auth_body(body)) do | res|
         extract_business(res.body)
       end
     end
@@ -50,8 +49,7 @@ module Soap4juddi
 
     def delete_business(key)
       xml = @soap_xml.element_with_value('businessKey', key)
-      @soap_connector.request_soap(@base_uri, 'publishv2', 'delete_business',
-      "#{auth_body} #{xml}") do |res|
+      @soap_connector.request_soap(@base_uri, 'publishv2', 'delete_business', add_auth_body(xml)) do |res|
         { 'errno' => extract_errno(res.body) }
       end
     end
@@ -78,7 +76,7 @@ module Soap4juddi
 
     def delete_binding(binding)
       xml = @soap_xml.element_with_value('bindingKey', binding)
-      @soap_connector.request_soap(@base_uri, 'publishv2', 'delete_binding', "#{auth_body} #{xml}") do |res|
+      @soap_connector.request_soap(@base_uri, 'publishv2', 'delete_binding', add_auth_body(xml)) do |res|
         { 'errno' => extract_errno(res.body) }
       end
     end
@@ -94,36 +92,15 @@ module Soap4juddi
     end
 
     def save_service_element(name, description, definition, urn, business_key)
-      # preserve bindings
       bindings = find_element_bindings_access_points(name, urn)['data']['result']
-
-      service_details = @soap_xml.element_with_value('name', name)
-      if description
-        description.each do |desc|
-          service_details = service_details + @soap_xml.element_with_value('description', desc, { 'xml:lang' => 'en' }) if desc and not (desc == "")
-        end
-      end
-      if definition and not (definition.strip == "")
-        keyedReference = @soap_xml.element_with_value('keyedReference', '', {'tModelKey' => 'uddi:uddi.org:wadl:types', 'keyName' => 'service-definition', 'keyValue' => definition})
-        service_details = service_details + @soap_xml.element_with_value('categoryBag', keyedReference)
-      end
-      xml = @soap_xml.element_with_value('businessService', service_details, {'businessKey' => business_key, 'serviceKey' => "#{urn}#{name}"})
-
-      body = "#{auth_body} #{xml}"
-
-      result = @soap_connector.request_soap(@base_uri, 'publishv2', 'save_service', body) do | res|
-        extract_service(res.body)
-      end
-
-      #restore bindings
+      result = save_service_element_with_side_effect_which_clears_bindings(name, description, definition, urn, business_key)
       save_element_bindings(name, bindings, urn, '')
-
       result
     end
 
     def delete_service_element(name, urn)
       service_key = @soap_xml.element_with_value('serviceKey', "#{urn}#{name}")
-      @soap_connector.request_soap(@base_uri, 'publishv2', 'delete_service', "#{auth_body} #{service_key}") do |res|
+      @soap_connector.request_soap(@base_uri, 'publishv2', 'delete_service', add_auth_body(service_key)) do |res|
         { 'errno' => extract_errno(res.body) }
       end
     end
@@ -144,6 +121,25 @@ module Soap4juddi
 
     private
 
+    def save_service_element_with_side_effect_which_clears_bindings(name, description, definition, urn, business_key)
+      xml = build_service_xml(name, description, definition, urn, business_key)
+      result = @soap_connector.request_soap(@base_uri, 'publishv2', 'save_service', add_auth_body(xml)) do | res|
+        extract_service(res.body)
+      end
+      result
+    end
+
+    def build_service_xml(name, description, definition, urn, business_key)
+      service_details = @soap_xml.element_with_value('name', name)
+      service_details = add_descriptions(service_details, description)
+      service_details = add_definition(service_details, definition)
+      @soap_xml.element_with_value('businessService', service_details, {'businessKey' => business_key, 'serviceKey' => "#{urn}#{name}"})
+    end
+
+    def add_auth_body(body)
+      body =  auth_body + body
+    end
+
     def extract_service_entries_elements(soap, urn)
       entries = {}
       entry = soap[/<ns2:serviceInfos>(.*?)<\/ns2:serviceInfos>/, 1]
@@ -175,6 +171,14 @@ module Soap4juddi
       end
       { 'businesses' => entries }
     end
+
+    def add_definition(body, definition)
+      if definition and not (definition.strip == "")
+        keyedReference = @soap_xml.element_with_value('keyedReference', '', {'tModelKey' => 'uddi:uddi.org:wadl:types', 'keyName' => 'service-definition', 'keyValue' => definition})
+        return body + @soap_xml.element_with_value('categoryBag', keyedReference)
+      end
+      body
+    end
    
     def add_descriptions(body, descriptions)
       if (descriptions) and (not descriptions.empty?)

data/lib/soap4juddi/version.rb

@@ -1,3 +1,3 @@
 module Soap4juddi
-  VERSION = "0.1.16"
+  VERSION = "0.1.17"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soap4juddi
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Ernst van Graan