soap4juddi 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5d6ed10a454d01edbdc896dac4cf139f7fad13f
-  data.tar.gz: 3951fb5e9c27d94921b19cf087f4ee259a5a8def
+  metadata.gz: 45d54feebdd6c0c2ef331e7b62cbe266bcda4516
+  data.tar.gz: 71e0654c9f9bcc857c863f8e17a1a8fa5a289f8c
 SHA512:
-  metadata.gz: 383d9a1f87566cee0ad1fd587e4c519e8b6ff993e93942dea663dfbd3d400e8227cb8426a5809f704d944a0bfdd926e194e66940da7eb921ef7552bec4255cb7
-  data.tar.gz: e5a599a184d25c84129ee6210a8dbcd8b8f7d09a8a04fc72d48c342b5f8a920ed963692eb3244da5942e2f7ebec22230ee745239993055fedb89f31e1f727f79
+  metadata.gz: e3966c3d7617914a4d48cf862ee88fa9ea259b61bbd8badfbebc3fe1682e2c350ed193d6b85ae758a4b792410e482510cfd2154a53fb372ddbfef581050eba08
+  data.tar.gz: ff3fbbfc8a6d5155884ab5eb8e10f5c716236058a8474b8c89207d182779693c22e73bece3d98abe4241a6209df19a9df5cb748acb4de9c2c057cd7e6c267854

data/lib/soap4juddi/broker.rb

@@ -14,23 +14,10 @@ module Soap4juddi
       @soap_xml = Soap4juddi::XML.new
     end
 
-    def auth_body
-      @soap_xml.element_with_key_value("authInfo", "authtoken", @auth_token)
-    end
-
     def save_element_bindings(service, bindings, urn, description)
+      validate_bindings(bindings)
       body = auth_body
-      if (not bindings.nil?) and (not (bindings.size == 0))
-        bindings.each do |binding|
-          access_point = @soap_xml.element_with_value('accessPoint', binding, {'URLType' => extract_binding_url_type(binding)})
-          description = @soap_xml.element_with_value('description', description)
-          model_instance_details = @soap_xml.element_with_value('tModelInstanceDetails', '')
-          bindingTemplate = @soap_xml.element_with_value("bindingTemplate",
-                                                     "#{description}#{access_point}#{model_instance_details}",
-                                                    {'bindingKey' => '', 'serviceKey' => "#{urn}#{service}"})
-          body = body + bindingTemplate
-        end
-      end
+      body = add_bindings(body, service, bindings, urn, description)
       @soap_connector.request_soap(@base_uri, 'publishv2', 'save_binding', body) do | res|
         res.body
       end
@@ -187,12 +174,6 @@ module Soap4juddi
       { 'services' => entries }
     end
 
-    def extract_business(soap)
-      entries = {}
-      entries[@soap_xml.extract_value(soap, 'businessKey').gsub(@urns['domains'], "").gsub(@urns['teams'], "")] = { 'name' => extract_name(soap), 'description' => extract_descriptions(soap), 'contacts' => extract_contacts(soap) }
-      entries
-    end
-
     def extract_business_entries(soap)
       entries = {}
       entry = soap[/<ns2:businessList (.*?)<\/ns2:businessList>/, 1]
@@ -210,10 +191,6 @@ module Soap4juddi
       { 'businesses' => entries }
     end
 
-    def extract_errno(soap)
-      soap[/<ns2:result errno="(.*?)"\/>/, 1]
-    end
-
     def authenticate(auth_user, auth_password)
       @soap_connector.authenticate(auth_user, auth_password)
     end
@@ -224,6 +201,45 @@ module Soap4juddi
 
     private
 
+    def add_bindings(body, service, bindings, urn, description)
+      if (not bindings.nil?) and (not (bindings.size == 0))
+        bindings.each do |binding|
+          body = add_binding(body, service, binding, urn, description)
+        end
+      end
+      body
+    end
+
+    def add_binding(body, service, binding, urn, description)
+      access_point = @soap_xml.element_with_value('accessPoint', binding, {'URLType' => extract_binding_url_type(binding)})
+      description_data = @soap_xml.element_with_value('description', description)
+      model_instance_details = @soap_xml.element_with_value('tModelInstanceDetails', '')
+      bindingTemplate = @soap_xml.element_with_value(
+        "bindingTemplate",
+        "#{description_data}#{access_point}#{model_instance_details}",
+        {'bindingKey' => '', 'serviceKey' => "#{urn}#{service}"})
+      body + bindingTemplate
+    end
+
+    def validate_bindings(bindings)
+      raise Soap4juddi::InvalidElementError.new('invalid bindings') if not bindings.is_a?(Array)
+      true
+    end
+
+    def extract_business(soap)
+      entries = {}
+      entries[@soap_xml.extract_value(soap, 'businessKey').gsub(@urns['domains'], "").gsub(@urns['teams'], "")] = { 'name' => extract_name(soap), 'description' => extract_descriptions(soap), 'contacts' => extract_contacts(soap) }
+      entries
+    end
+
+    def extract_errno(soap)
+      soap[/<ns2:result errno="(.*?)"\/>/, 1]
+    end
+
+    def auth_body
+      @soap_xml.element_with_key_value("authInfo", "authtoken", @auth_token)
+    end
+
     def find_element_bindings_access_points(name, urn)
       @soap_connector.request_soap(@base_uri, 'inquiryv2', 'get_serviceDetail', @soap_xml.element_with_value('serviceKey', "#{urn}#{name}")) do |res|
         extract_bindings_access_points(res.body)

data/lib/soap4juddi/version.rb

@@ -1,3 +1,3 @@
 module Soap4juddi
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

metadata

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