soap4juddi 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45d54feebdd6c0c2ef331e7b62cbe266bcda4516
-  data.tar.gz: 71e0654c9f9bcc857c863f8e17a1a8fa5a289f8c
+  metadata.gz: 9aa704713a3987adc9b8ad09abf4d15f9c7353d8
+  data.tar.gz: e27b11a2a99b6f10d04f5b5c1a0f76df3ec49986
 SHA512:
-  metadata.gz: e3966c3d7617914a4d48cf862ee88fa9ea259b61bbd8badfbebc3fe1682e2c350ed193d6b85ae758a4b792410e482510cfd2154a53fb372ddbfef581050eba08
-  data.tar.gz: ff3fbbfc8a6d5155884ab5eb8e10f5c716236058a8474b8c89207d182779693c22e73bece3d98abe4241a6209df19a9df5cb748acb4de9c2c057cd7e6c267854
+  metadata.gz: 17268df6f47e68f26ad3f85e629aaf956913d897459f09855b75cbc12206b98ef5f4405ff5f2f7cf82443d7b4e9906b941a7614cb75d9faf34d5bc7cfded3bd3
+  data.tar.gz: 5bab4343e05df97c8469b1cae7e23fcb7387f1f53d943a6be70fa5c8a2bd4ed3215d1406ca74f9917e28294e88249e1f9a15d20f7125aabb0b3ce4d09d595e53

data/lib/soap4juddi/broker.rb

@@ -15,7 +15,7 @@ module Soap4juddi
     end
 
     def save_element_bindings(service, bindings, urn, description)
-      validate_bindings(bindings)
+      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|
@@ -23,32 +23,13 @@ module Soap4juddi
       end
     end
 
-    def save_business(key, name, description, contacts)
-      body = @soap_xml.element_with_value("name", name)
-      if description
-        description.each do |desc|
-          xml = @soap_xml.element_with_value('description', desc, {'xml:lang' => 'en'})
-          body = "#{body}#{xml}" if desc and not (desc == "")
-        end
-      end
-      if (contacts) and (not contacts.empty?)
-        # byebug
-        contacts_xml = ""
-        contacts.each do |contact|
-          # contact_details = "<contact useType='(Job Title, Role)'> <description>Primary Contact</description> <personName>Ernst</personName> <phone useType='(Extension, Domestic, International, DSN)'>0217881441</phone> <email useType='Email'>ernst@b.com</email> </contact>"
-
-          contact_details = "<contact useType='(Job Title, Role)'> <description>#{contact['description']}</description> <personName>#{contact['name']}</personName> <phone useType='(Extension, Domestic, International, DSN)'>#{contact['phone']}</phone> <email useType='Email'>#{contact['email']}</email> </contact>"
-
-          contacts_xml = contacts_xml + contact_details
-        end
-        xml = @soap_xml.element_with_value("contacts", contacts_xml)
-        body = "#{body}#{xml}" if xml and not (xml == "")
-      end
-
-      businessEntity = @soap_xml.element_with_value('businessEntity', body, {'businessKey' => key})
+    def save_business(key, name, descriptions, contacts)
+      validate_elements(contacts, 'contacts')
+      validate_elements(descriptions, 'descriptions')
+      body = build_business_entity(key, name, descriptions, contacts)
       @soap_connector.request_soap(@base_uri,
                    'publishv2', 'save_business',
-                   "#{auth_body} #{businessEntity}") do | res|
+                   "#{auth_body} #{body}") do | res|
         extract_business(res.body)
       end
     end
@@ -200,6 +181,21 @@ module Soap4juddi
     end
 
     private
+   
+    def add_descriptions(body, descriptions)
+      if descriptions
+        descriptions.each do |desc|
+          body = add_description(body, desc)
+        end
+      end
+      body
+    end
+
+    def add_description(body, desc)
+      xml = @soap_xml.element_with_value('description', desc, {'xml:lang' => 'en'})
+      body = "#{body}#{xml}" if desc and not (desc == "")
+      body
+    end
 
     def add_bindings(body, service, bindings, urn, description)
       if (not bindings.nil?) and (not (bindings.size == 0))
@@ -210,6 +206,31 @@ module Soap4juddi
       body
     end
 
+    def add_contacts(body, contacts)
+      if (contacts) and (not contacts.empty?)
+        # byebug
+        contacts_xml = add_contacts_to_xml("", contacts)
+        xml = @soap_xml.element_with_value("contacts", contacts_xml)
+        body = "#{body}#{xml}" if xml and not (xml == "")
+      end
+      body
+    end
+
+    def add_contacts_to_xml(contacts_xml, contacts)
+      contacts.each do |contact|
+        contact_details = "<contact useType='(Job Title, Role)'> <description>#{contact['description']}</description> <personName>#{contact['name']}</personName> <phone useType='(Extension, Domestic, International, DSN)'>#{contact['phone']}</phone> <email useType='Email'>#{contact['email']}</email> </contact>"
+        contacts_xml = contacts_xml + contact_details
+      end 
+      contacts_xml
+    end
+
+    def build_business_entity(key, name, descriptions, contacts)
+      body = @soap_xml.element_with_value("name", name)
+      body = add_descriptions(body, descriptions)
+      body = add_contacts(body, contacts)
+      @soap_xml.element_with_value('businessEntity', body, {'businessKey' => key})
+    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)
@@ -221,8 +242,8 @@ module Soap4juddi
       body + bindingTemplate
     end
 
-    def validate_bindings(bindings)
-      raise Soap4juddi::InvalidElementError.new('invalid bindings') if not bindings.is_a?(Array)
+    def validate_elements(elements, label)
+      raise Soap4juddi::InvalidElementError.new("invalid #{label}") if not elements.is_a?(Array)
       true
     end
 

data/lib/soap4juddi/version.rb

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

metadata

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