soar_sr 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f70f5737b75f2535a7eed5c47a97af944d14b01b
-  data.tar.gz: b9720f29b51743d365fc31f878da44e33438fce5
+  metadata.gz: 7a81f40d80e885c259c37c7634558069df0eea50
+  data.tar.gz: ca96964491c938cbb08ef2afb84cc70d0bb939aa
 SHA512:
-  metadata.gz: 08077201d88fccb5e45e8c83425f81755bfd224d6abd8f20d92832f1a7e2843fd3563b2207b83f45549469b0433e9ed26b44c56cb618be97e27d12c81511eddd
-  data.tar.gz: 02696cd744a6ffb140bbe1e09b53c942f78288d7172a398dfc8f4a6b144b7183567593dcec5dfdac49e9f59718791ea4a43a7467957f57b44ccb266f29a57c90
+  metadata.gz: f8a94c966ac25a99fbf580a5949279d8ec8c823e8aba206dad8364471d34a1dfa22cb3a10f43f0ef2b30a7fd77f133d606824d9d63ccea4312adc91593d7f44e
+  data.tar.gz: 24b7d84430cfa5b489079e53aa8f5d547e66b507ef8dd2771d051c7e3558d7cb7bc7d95b4178b4fe6ae0d91c8ae92d95885cc3db697d463a9fbb15d685b84ba6

data/lib/soar_sr/handler.rb

@@ -40,6 +40,28 @@ module SoarSr
       has_data?(result, 'registered') and result['data']['registered']
     end
 
+    def type_registered?(element, type)
+      return is_registered?(@registry.domain_perspectives.domain_perspective_registered?(element)) if (type == 'domains')
+      return is_registered?(@registry.service_components.service_component_registered?(element)) if (type == 'service-components')
+      return is_registered?(@registry.services.service_registered?(element)) if (type == 'services')
+      return is_registered?(@registry.teams.team_registered?(element)) if (type == 'teams')
+      false
+    end
+
+    def not_registered?(element, type)
+      raise ValidationError, "#{one_of(type)} already exists" if type_registered?(element, type)
+      true
+    end
+
+    def any_registered?(domain_perspective)
+      raise ValidationError, "unknown domain perspective provided" if (not type_registered?(domain_perspective, 'domains')) and (not type_registered?(domain_perspective, 'teams'))
+    end
+
+    def registered?(element, type)
+      raise ValidationError, "unknown #{one_of(type)} provided" if not type_registered?(element, type)
+      true
+    end   
+
     def validate
     	provided?(@urns, "urns") and provided?(@uddi, "UDDI provider") and credentials?(@credentials)
     end

data/lib/soar_sr/juddi_provider.rb

@@ -4,16 +4,16 @@ require 'persistent-cache'
 
 module SoarSr
   class JUDDIProvider
+    attr_reader :broker
+    attr_reader :urns
+    attr_reader :cache
+
     def initialize(urns, broker, cache_freshness)
       @urns = urns
       @broker = broker
       @cache = Persistent::Cache.new("uddi-broker", cache_freshness, Persistent::Cache::STORAGE_RAM)
     end
 
-    def broker
-      @broker
-    end
-
     def assign_service_to_business(name, business_key = @urns['company'])
       @broker.authorize
       result = get_service(name)
@@ -109,12 +109,6 @@ module SoarSr
       @broker.save_element_bindings(service_component, [uri], @urns['service-components'], "service component")
     end
 
-    def delete_existing_bindings(bindings)
-      bindings.each do |binding, detail|
-        @broker.delete_binding(binding)
-      end
-    end
-
     def find_service_component_uri(service_component)
       cached = @cache["find_service_component_uri:#{service_component}"]; return cached if cached
       value = @broker.find_element_bindings(service_component, @urns['service-components'])
@@ -147,12 +141,14 @@ module SoarSr
       @broker.delete_business(key)
     end
 
-    def business_eq?(business, comparison)
-      business == "#{@urns['domains']}#{comparison}"
-    end    
-
     private
 
+    def delete_existing_bindings(bindings)
+      bindings.each do |binding, detail|
+        @broker.delete_binding(binding)
+      end
+    end    
+
     def has_bindings?(result)
       result and result['data'] and result['data']['bindings'] and (result['data']['bindings'].size > 0)
     end

data/lib/soar_sr/service_registry.rb

@@ -14,6 +14,7 @@ module SoarSr
     attr_reader :contacts
 
     def initialize(uri, company, company_name, credentials, cache_freshness = 60)
+      validate(uri, company, company_name, credentials)
       @urns = initialize_urns(company, company_name)
       @uddi = initialize_uddi_provider(uri, @urns, credentials, cache_freshness)
       initialize_handlers(@urns, @uddi, credentials)
@@ -22,9 +23,7 @@ module SoarSr
     def check_dss(name)
     end
 
-    private
-
-    def initialize_urns(fqdn, company_name)
+    def self.build_urns(fqdn, company_name)
       base = "uddi:#{fqdn}"
       @urns = { 'base' => base,
                 'company' => "#{base}:#{company_name}",
@@ -35,6 +34,20 @@ module SoarSr
       @urns
     end
 
+    private
+
+    def validate(uri, company, company_name, credentials)
+      validator = SoarSr::Validator.new
+      validator.provided?(uri, 'URI') and validator.uri?(uri)
+      validator.provided?(company, 'company FQDN')
+      validator.provided?(company_name, 'company name')
+      validator.provided?(credentials, 'credentials') and validator.credentials?(credentials)
+    end
+
+    def initialize_urns(fqdn, company_name)
+      SoarSr::ServiceRegistry::build_urns(fqdn, company_name)
+    end
+
     def initialize_uddi_provider(uri, urns, credentials, cache_freshness)
       @broker = ::Soap4juddi::Broker.new(urns)
       @broker.set_uri(uri)

data/lib/soar_sr/validator.rb

@@ -32,7 +32,7 @@ module SoarSr
     end
 
     def credentials?(credentials)
-    	provided?(credentials['username'], 'username') and provided?(credentials['password'], 'password')
+    	provided?(credentials, 'credentials') and provided?(credentials['username'], 'username') and provided?(credentials['password'], 'password')
     end
 
     def authorized?(result)
@@ -74,31 +74,10 @@ module SoarSr
       true
     end
 
-    def type_registered?(element, type)
-      return is_registered?(@registry.domain_perspectives.domain_perspective_registered?(element)) if (type == 'domains')
-      return is_registered?(@registry.service_components.service_component_registered?(element)) if (type == 'service-components')
-      return is_registered?(@registry.services.service_registered?(element)) if (type == 'services')
-      return is_registered?(@registry.teams.team_registered?(element)) if (type == 'teams')
-      false
-    end
-
-    def not_registered?(element, type)
-      raise ValidationError, "#{one_of(type)} already exists" if type_registered?(element, type)
-      true
-    end
-
-    def any_registered?(domain_perspective)
-      raise ValidationError, "unknown domain perspective provided" if (not type_registered?(domain_perspective, 'domains')) and (not type_registered?(domain_perspective, 'teams'))
-    end
-
-    def registered?(element, type)
-      raise ValidationError, "unknown #{one_of(type)} provided" if not type_registered?(element, type)
-      true
-    end   
-
     def one_of(type)
       result = type[0..-2]
       result = 'domain perspective' if result == 'domain'
+      result = 'service component' if result == 'service-component'
       result
     end     
   end

data/lib/soar_sr/version.rb

@@ -1,3 +1,3 @@
 module SoarSr
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soar_sr
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Ernst van Graan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-16 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: persistent-cache