soap4juddi 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65c3e4a81e6d6557654f1e4d469f826739e06d1d
-  data.tar.gz: 4302bb9540e057601d98bffc8d268dc004ca086d
+  metadata.gz: 6eeb72a738505c99d644f5129fa372a319a50c39
+  data.tar.gz: a16aab08c0e0a2f9ef4485977495a7c5e2e5b63f
 SHA512:
-  metadata.gz: aeaf8bf9ab5eab8a22516127130ee655ce72d5dea6bc85e4361a1a1093dfd303f1ded3f97fb742dfe63fc11ddf60dd53c82c58f3dd88c5f39ddc0a5377eb25c2
-  data.tar.gz: e9cc19b283eaa2baed7d1692f89583d05e103cce552e95eb735587dd967dacef9f6550cf748a82db355561307fd7777034838e2a6be9e7c7cd2e4ca2f76524c9
+  metadata.gz: 9ced6c86ef600c3d03935faf1a21c2435aad05d83b03f7b99afc5dfa18922e3e179695a2347868078161119be9381eaa24e4cfed6766c3beb23891776e35a765
+  data.tar.gz: 85e3575f83470add6ad307625f2d58edd14ea4cd5da0a2f2c6d7ca7899c895304ab7368e6d3619077fb1370a68a24379672522ff1f216037e798104fa718e877

data/.gitignore

@@ -1,3 +1,4 @@
+.byebug_history
 /.bundle/
 /.yardoc
 /Gemfile.lock

data/lib/soap4juddi/broker.rb

@@ -43,8 +43,7 @@ module Soap4juddi
           body = "#{body}#{xml}" if desc and not (desc == "")
         end
       end
-
-      if contacts
+      if (contacts) and (not contacts.empty?)
         # byebug
         contacts_xml = ""
         contacts.each do |contact|
@@ -168,7 +167,7 @@ module Soap4juddi
 
     def extract_service(soap)
       entries = {}
-      entries[@soap_xml.extract_id(soap, 'serviceKey')] = extract_name(soap)
+      entries[@soap_xml.extract_value(soap, 'serviceKey')] = extract_name(soap)
       entries
     end
 
@@ -178,7 +177,7 @@ module Soap4juddi
       while entry do
         service = entry[/<ns2:serviceInfo (.*?)<\/ns2:serviceInfo>/, 1]
         break if service.nil? or ((service.is_a? String) and (service.strip == ""))
-        id = @soap_xml.extract_id(service, 'serviceKey')
+        id = @soap_xml.extract_value(service, 'serviceKey')
         entries[id.gsub(urn, "")] = { 'id' => id, 'name' => extract_name(service) } if id.include?(urn)
         entry[/<ns2:serviceInfo (.*?)<\/ns2:serviceInfo>/, 1] = ""
         entry.gsub!("<ns2:serviceInfo </ns2:serviceInfo>", "")
@@ -189,7 +188,7 @@ module Soap4juddi
 
     def extract_business(soap)
       entries = {}
-      entries[@soap_xml.extract_id(soap, 'businessKey').gsub(@urns['domains'], "").gsub(@urns['teams'], "")] = { 'name' => extract_name(soap), 'description' => extract_descriptions(soap), 'contacts' => extract_contacts(soap) }
+      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
 
@@ -200,7 +199,7 @@ module Soap4juddi
         business = entry[/<ns2:businessInfo (.*?)<\/ns2:businessInfo>/, 1]
         break if business.nil? or ((business.is_a? String) and (business.strip == ""))
         business[/<ns2:serviceInfos(.*?)<\/ns2:serviceInfos>/, 1] = "" if business[/<ns2:serviceInfos(.*?)<\/ns2:serviceInfos>/, 1]
-        id = @soap_xml.extract_id(entry, 'businessKey')
+        id = @soap_xml.extract_value(entry, 'businessKey')
         key = id.gsub(@urns['domains'], "").gsub(@urns['teams'], "")
         entries[key] = { 'id' => id, 'name' => extract_name(business) }
         entry[/<ns2:businessInfo (.*?)<\/ns2:businessInfo>/, 1] = ""
@@ -214,11 +213,6 @@ module Soap4juddi
       soap[/<ns2:result errno="(.*?)"\/>/, 1]
     end
 
-    def check_availability
-      result = `curl -S #{@base_uri}/juddiv3 2>&1`
-      not(result.downcase.include?("fail"))
-    end   
-
     def authenticate(auth_user, auth_password)
       @soap_connector.authenticate(auth_user, auth_password)
     end
@@ -245,7 +239,7 @@ module Soap4juddi
       while entry do
         binding = entry[/<ns2:bindingTemplate (.*?)<\/ns2:bindingTemplate>/, 1]
         break if binding.nil? or ((binding.is_a? String) and (binding.strip == ""))
-        id = @soap_xml.extract_id(binding, 'bindingKey')
+        id = @soap_xml.extract_value(binding, 'bindingKey')
         entries[id] = {'access_point' => extract_access_point(binding), 'description' => extract_description(binding)}
         entry[/<ns2:bindingTemplate (.*?)<\/ns2:bindingTemplate>/, 1] = ""
         entry.gsub!("<ns2:bindingTemplate </ns2:bindingTemplate>", "")
@@ -277,7 +271,7 @@ module Soap4juddi
       while entry do
         binding = entry[/<ns2:bindingTemplate (.*?)<\/ns2:bindingTemplate>/, 1]
         break if binding.nil? or ((binding.is_a? String) and (binding.strip == ""))
-        id = @soap_xml.extract_id(binding, 'bindingKey')
+        id = @soap_xml.extract_value(binding, 'bindingKey')
         entries << extract_access_point(binding)
         entry[/<ns2:bindingTemplate (.*?)<\/ns2:bindingTemplate>/, 1] = ""
         entry.gsub!("<ns2:bindingTemplate </ns2:bindingTemplate>", "")

data/lib/soap4juddi/connector.rb

@@ -1,24 +1,32 @@
 require 'net/http'
+require 'jsender'
 
 module Soap4juddi
   class Connector
-    include Soap4juddi::JSender
+    include Jsender
+
+    attr_reader :uri
+    attr_reader :soap_xml
+    attr_accessor :auth_token
 
     def initialize
       @soap_xml = Soap4juddi::XML.new
     end
 
+    def has_credentials?
+      return true if @auth_user or @auth_password
+      false
+    end
+
     def authenticate(auth_user, auth_password)
-      @auth_user = auth_user
-      @auth_password =auth_password
+       @auth_user = auth_user
+       @auth_password =auth_password
     end
 
     def authorize(base_uri)
-      @auth_token = '' # clear any existing token
-      result = execute(build_authorization_request(base_uri)) do |res|
-        @auth_token = (res.body.split('authtoken:')[1]).split('<')[0]
-      end
-      @auth_token
+      validate_base_uri(base_uri)
+      @auth_token = '' #clear existing auth token
+      @auth_token = request_auth_token(base_uri)
     end
 
     def request_soap(base_uri, version, service, request, attr = nil, &block)
@@ -30,15 +38,31 @@ module Soap4juddi
     end  
 
     def execute(req, &block)
+      validate_destination(req)
       res = Net::HTTP.start(@uri.hostname, @uri.port) do |http|
         http.request(req)
       end
-
       jsend_result(res, block)
     end
 
+    def connection(base_uri, service, action)
+      validate_connection_parameters(base_uri, service, action)
+      build_post_request(base_uri, service, action)
+    end      
+
+    def extract_auth_token(body)
+      (body.split('authtoken:')[1]).split('<')[0]
+    end
+
     private
 
+    def request_auth_token(base_uri)
+      result = execute(build_authorization_request(base_uri)) do |res|
+         @auth_token = extract_auth_token(res.body)
+       end
+       @auth_token
+    end
+
     def build_authorization_request(base_uri)
       req = connection(base_uri, 'security', 'get_authToken')
       auth = @soap_xml.element_with_value('get_authToken', '', {'userID' => @auth_user, 'cred' => @auth_password})
@@ -46,14 +70,6 @@ module Soap4juddi
       req
     end
 
-    def connection(base_uri, service, action)
-      @uri = URI("#{base_uri}/juddiv3/services/#{service}")
-      req = Net::HTTP::Post.new(@uri)
-      req.content_type = @soap_xml.content_type
-      req['SOAPAction'] = action
-      req
-    end      
-
     def jsend_result(res, block)
       case res
         when Net::HTTPSuccess
@@ -68,5 +84,33 @@ module Soap4juddi
       return success_data(result) if result
       return success
     end  
+
+    def build_uri(base_uri, service)
+      @uri = URI("#{base_uri}/juddiv3/services/#{service}")
+    end
+
+    def validate_connection_parameters(base_uri, service, action)
+      validate_base_uri(base_uri)
+      raise Soap4juddi::InvalidDestinationError.new('no service provided') if service.nil?
+      raise Soap4juddi::InvalidDestinationError.new('no action provided') if action.nil?
+      true
+    end
+
+    def build_post_request(base_uri, service, action)
+      req = Net::HTTP::Post.new(build_uri(base_uri, service))
+      req.content_type = @soap_xml.content_type
+      req['SOAPAction'] = action
+      req
+    end
+
+    def validate_destination(req)
+      raise Soap4juddi::InvalidRequestError.new('no request provided') if req.nil?
+      true
+    end
+
+    def validate_base_uri(base_uri)
+      raise Soap4juddi::InvalidDestinationError.new('no base URI provided') if base_uri.nil?
+      true
+    end
   end
 end

data/lib/soap4juddi/invalid_destination_error.rb

@@ -0,0 +1,4 @@
+module Soap4juddi
+	class InvalidDestinationError < ArgumentError
+	end
+end

data/lib/soap4juddi/invalid_element_error.rb

@@ -0,0 +1,4 @@
+module Soap4juddi
+	class InvalidElementError < ArgumentError
+	end
+end

data/lib/soap4juddi/invalid_request_error.rb

@@ -0,0 +1,4 @@
+module Soap4juddi
+	class InvalidRequestError < ArgumentError
+	end
+end

data/lib/soap4juddi/invalid_text_error.rb

@@ -0,0 +1,4 @@
+module Soap4juddi
+	class InvalidTextError < ArgumentError
+	end
+end

data/lib/soap4juddi/version.rb

@@ -1,3 +1,3 @@
 module Soap4juddi
-  VERSION = "0.1.6"
+  VERSION = "0.1.8"
 end

data/lib/soap4juddi/xml.rb

@@ -1,43 +1,87 @@
 module Soap4juddi  
   class XML
     def element_with_key_value(element, key, value, attributes = nil)
-      element_with_value(element, "#{key}:#{value}")
+      element_with_value(element, "#{key}:#{value}", attributes)
     end
 
     def element_with_value(element, value, attributes = nil)
+      validate_element(element)
       xml = "<urn:#{element}"
       xml = append_key_value_attributes_to_xml(xml, attributes) if attributes
-      xml = "#{xml}>#{value}</urn:#{element}>"
+      xml += ">#{value}</urn:#{element}>"
     end   
       
-    def extract_id(soap, type)
-      soap[/#{type}="(.*?)"/, 1]
+    def extract_value(soap, key)
+      validate_text(soap, 'text') and validate_text(key, 'key')
+      extract_value_in_quotes_using_key(soap, key)
     end
 
     def envelope_header_body(text, version = 3)
-      "<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' xmlns:urn='urn:uddi-org:api_v#{version}'> <soapenv:Header/> <soapenv:Body> #{text} </soapenv:Body> </soapenv:Envelope>"      
+      "<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' xmlns:urn='urn:uddi-org:api_v#{version.to_s}'> <soapenv:Header/> <soapenv:Body>#{text.to_s}</soapenv:Body> </soapenv:Envelope>"
     end
 
-    def soap_envelope(message, urn = nil, attr = nil)
-      text = ""
-      text = text + "<urn:#{urn} generic='2.0' xmlns='urn:uddi-org:api_v2' " + (attr.nil? ? "" : attr) + ">" if urn
-      text = text + message
-      text = text + "</urn:#{urn}>" if urn
+    def soap_envelope(message, urn = nil, attributes = nil)
+      validate_text(urn, 'urn') if urn
+      validate_text(attributes, 'attributes') if attributes
+      text = inject_urn_and_attributes_into_message(message, urn, attributes)
       envelope_header_body(text, 2)
     end
-
+ 
     def content_type
       'text/xml;charset=UTF-8'
     end
 
     private
 
+    def validate_element(element)
+      raise Soap4juddi::InvalidElementError.new('invalid element provided') if element.nil?
+      raise Soap4juddi::InvalidElementError.new('invalid element provided') if not element.is_a?(String)
+      raise Soap4juddi::InvalidElementError.new('no element provided') if element.strip == ''
+    end
+
     def append_key_value_attributes_to_xml(xml, attributes)
-      attributes.each do |k, v|
-        v = "'#{v}'" if v.is_a?(String)
-        xml = "#{xml} #{k}=#{v}"
+      attributes.each do |a, v|
+        xml += " #{a}='#{v}'"
       end
       xml
-    end       
+    end    
+
+    def validate_text(text, label)
+      raise Soap4juddi::InvalidTextError.new("no #{label} provided") if text.nil?
+      raise Soap4juddi::InvalidTextError.new("invalid #{label} provided") if invalid_text?(text)
+      true
+    end
+
+    def invalid_text?(text)
+      ((not text.is_a?(String)) or (text.strip == ''))
+    end   
+
+    def extract_value_in_quotes_using_key(soap, key)
+      extract_value_in_arbitrary_quotes_following_key_and_equal_sign(
+        collapse_spaces_around_equal_sign(soap), key
+      )
+    rescue
+      nil
+    end
+
+    def collapse_spaces_around_equal_sign(soap)
+      data = soap
+      data[/\s*=\s*/] = '='
+      data
+    end
+
+    def extract_value_in_arbitrary_quotes_following_key_and_equal_sign(soap, key)
+      result = soap[/#{key}="(.*?)"/, 1]
+      result ||= soap[/#{key}='(.*?)'/, 1]
+      result
+    end
+
+    def inject_urn_and_attributes_into_message(message, urn, attributes)
+      text = ""
+      text += "<urn:#{urn} generic='2.0' xmlns='urn:uddi-org:api_v2' " + (attributes.nil? ? "" : attributes) + ">" if urn
+      text += message.to_s
+      text += "</urn:#{urn}>" if urn
+      text
+    end
   end
 end

data/lib/soap4juddi.rb

@@ -1,5 +1,8 @@
-require "soap4juddi/version"
-require 'soap4juddi/jsender'
+require 'soap4juddi/version'
+require 'soap4juddi/invalid_element_error'
+require 'soap4juddi/invalid_text_error'
+require 'soap4juddi/invalid_request_error'
+require 'soap4juddi/invalid_destination_error'
 require 'soap4juddi/xml'
 require 'soap4juddi/connector'
 require 'soap4juddi/broker'

data/soap4juddi.gemspec

@@ -23,4 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "byebug"
+  spec.add_dependency "jsender"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soap4juddi
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Ernst van Graan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2015-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jsender
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Provides connector, xml and brokerage facilities to a jUDDI consumer
 email:
 - ernst.van.graan@hetzner.co.za
@@ -71,7 +99,10 @@ files:
 - lib/soap4juddi.rb
 - lib/soap4juddi/broker.rb
 - lib/soap4juddi/connector.rb
-- lib/soap4juddi/jsender.rb
+- lib/soap4juddi/invalid_destination_error.rb
+- lib/soap4juddi/invalid_element_error.rb
+- lib/soap4juddi/invalid_request_error.rb
+- lib/soap4juddi/invalid_text_error.rb
 - lib/soap4juddi/version.rb
 - lib/soap4juddi/xml.rb
 - soap4juddi.gemspec

data/lib/soap4juddi/jsender.rb

@@ -1,50 +0,0 @@
-module Soap4juddi
-  module JSender
-    def report(status, message, result = nil)
-      data = compile_data(result)
-      data['notifications'] = message.is_a?(Array) ? message : [ message ] 
-      { 'status' => status, 'data' => data }
-    end
-
-    def fail(message = nil, data = nil)
-      message ||= 'fail'
-      report('fail', message, data)
-    end
-
-    def fail_data(data = nil)
-      fail(nil, data)
-    end
-
-    def success_data(data = nil)
-      success(nil, data)
-    end
-
-    def success(message = nil, data = nil)
-      message ||= 'success'
-      report('success', message, data)
-    end
-
-    def has_data?(result, key = nil)
-      return false if key.nil?
-      return false if (result.nil?) or (result['data'].nil?)
-      return false if (not key.nil?) and (result['data'][key].nil?)
-      true
-    end
-
-    def notifications_include?(result, pattern)
-      return false if not has_data?(result, 'notifications')
-      result['data']['notifications'].to_s.include?(pattern)
-    end
-
-    private
-
-    def compile_data(result)
-      data ||= {}
-      result = { 'result' => result} if not result.is_a? Hash
-      result.each do |key, value|
-        data[key] = value
-      end
-      data
-    end
-  end
-end