soar_sr 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0077fd59cbff3bbb191c5d96f48b253762c3b698
-  data.tar.gz: 141c6020e926b819ca19e79e80d8c77d2ce9b4b8
+  metadata.gz: 5d7140ecb1b8db4257124c2f57ad2e51620dde90
+  data.tar.gz: 2d2848a6d26079e2cfe5c7e941216573a265e0f6
 SHA512:
-  metadata.gz: 9375fa921ac20013b1921a921eedf71f50d17c6bad03b704cc8c012fd6142929d45bfe6d66efe6fca8583b8c856d1a6336a9716dbe320dc228d5b425184bd45a
-  data.tar.gz: 743cd848c2a403f91b6ce5a085736db1087df2487f5d700d95df42701e9890cd9025ed7586343f6a0dee7f1059e45d14764ad7592b933255f91a7d83c9b6c6a6
+  metadata.gz: e1eb991f60690270e2b563a633e165675ba47960ff019eb9f612fa25e143fc71c083b68189599e0c1e7e6556c0ca14fcc79246759fa7ae934b6f47a3d22ffb5b
+  data.tar.gz: da250ea11a467afdc03609d186eecfee9a4ff2ec05ecbb6c0affeb225ff7655f17a84cf87fe86c6cecd03c3787b8c064a1218bb1d7f52086bdc02615ac3d3086

data/lib/soar_sr/associations.rb

@@ -28,9 +28,9 @@ module SoarSr
 
     def domain_perspective_associations(domain_perspective)_{
       # byebug
-      provided?(domain_perspective, 'domain perspective')
-      meta = @registry.domain_perspectives.meta_for_domain_perspective('domains', domain_perspective)
-      meta = @registry.domain_perspectives.meta_for_domain_perspective('teams', domain_perspective) if no_meta?(meta)
+      provided?(domain_perspective, 'domain perspective') and any_registered?(domain_perspective)
+      meta = @registry.domain_perspectives.meta_for_domain_perspective('domains', domain_perspective) if type_registered?(domain_perspective, 'domains')
+      meta = @registry.domain_perspectives.meta_for_domain_perspective('teams', domain_perspective) if type_registered?(domain_perspective, 'teams')
       success_data(meta)
     }end
 
@@ -40,8 +40,8 @@ module SoarSr
     end
 
     def associate_service_component_with_domain_perspective(service_component, domain_perspective)_{
-      provided?(domain_perspective, 'domain perspective') and registered?(domain_perspective, 'domain perspective')
-      provided?(service_component, 'service component') and registered?(service_component, 'service component')
+      provided?(domain_perspective, 'domain perspective') and registered?(domain_perspective, 'domains')
+      provided?(service_component, 'service component') and registered?(service_component, 'service components')
 
       service_component_id = compile_domain_id('service-components', service_component)
       meta = @registry.domain_perspectives.meta_for_domain_perspective('domains', domain_perspective)
@@ -55,8 +55,8 @@ module SoarSr
     }end
 
     def associate_service_with_domain_perspective(service, domain_perspective)_{
-      provided?(domain_perspective, 'domain perspective') and registered?(domain_perspective, 'domain perspective')
-      provided?(service, 'service') and registered?(service, 'service')
+      provided?(domain_perspective, 'domain perspective') and registered?(domain_perspective, 'domains')
+      provided?(service, 'service') and registered?(service, 'services')
 
       service_id = compile_domain_id('services', service)
       meta = @registry.domain_perspectives.meta_for_domain_perspective('domains', domain_perspective)
@@ -71,8 +71,8 @@ module SoarSr
 
     def disassociate_service_component_from_domain_perspective(domain_perspective, service_component)_{
       # byebug
-      provided?(domain_perspective, 'domain perspective') and registered?(domain_perspective, 'domain perspective')
-      provided?(service_component, 'service component') and registered?(service_component, 'service component')
+      provided?(domain_perspective, 'domain perspective') and registered?(domain_perspective, 'domains')
+      provided?(service_component, 'service component') and registered?(service_component, 'service components')
 
       service_component_id = compile_domain_id('service-components', service_component)
       meta = @registry.domain_perspectives.meta_for_domain_perspective('domains', domain_perspective)
@@ -87,8 +87,8 @@ module SoarSr
 
     def disassociate_service_from_domain_perspective(domain_perspective, service)_{
       # byebug
-      provided?(domain_perspective, 'domain perspective') and registered?(domain_perspective, 'domain perspective')
-      provided?(service, 'service') and registered?(service, 'service')
+      provided?(domain_perspective, 'domain perspective') and registered?(domain_perspective, 'domains')
+      provided?(service, 'service') and registered?(service, 'services')
 
       service_id = compile_domain_id('services', service)
       meta = @registry.domain_perspectives.meta_for_domain_perspective('domains', domain_perspective)

data/lib/soar_sr/domain_perspectives.rb

@@ -18,7 +18,7 @@ module SoarSr
     }end
 
     def domain_perspective_by_name(type, domain_perspective)
-      provided?(domain_perspective, 'domain perspective')
+      provided?(domain_perspective, one_of(type))
       @uddi.get_business(compile_domain_id(type, domain_perspective))
     end
 
@@ -53,7 +53,7 @@ module SoarSr
 
     def configure_meta_for_domain_perspective(type, domain_perspective, meta)_{
         authorize
-        provided?(domain_perspective, 'domain perspective') and registered?(domain_perspective, 'domain perspective')
+        provided?(domain_perspective, one_of(type)) and registered?(domain_perspective, type)
         provided?(type, 'element type') and type?(type)
         provided?(meta, 'meta') and meta?(meta)
         
@@ -63,12 +63,12 @@ module SoarSr
         detail['description'] = compile_meta_into_descriptions(descriptions, meta)
 
         result = @uddi.save_business(detail['id'], detail['name'], detail['description'])
-        authorized?(result) and identifier?(result, 'domain perspective')
+        authorized?(result) and identifier?(result, type)
         success('meta updated', result['data'])
     }end
 
     def meta_for_domain_perspective(type, domain_perspective)_{
-      provided?(domain_perspective, 'domain perspective') and registered?(domain_perspective, 'domain perspective')
+      provided?(domain_perspective, one_of(type)) and registered?(domain_perspective, type)
       provided?(type, 'element type') and type?(type)
       
       meta = extract_meta_for_domain_perspective(extract_detail_for_domain_perspective(type, domain_perspective))
@@ -81,7 +81,7 @@ module SoarSr
     protected
 
     def domain_registered?(type, domain_perspective)
-      provided?(domain_perspective, 'domain perspective')
+      provided?(domain_perspective, one_of(type))
       result = @uddi.find_businesses(domain_perspective)
       registered = false
       id = nil
@@ -98,19 +98,19 @@ module SoarSr
 
     def register_domain(type, domain_perspective)_{
       authorize
-      provided?(domain_perspective, 'domain perspective') and not_registered?(domain_perspective, 'domain perspective')
+      provided?(domain_perspective, one_of(type)) and not_registered?(domain_perspective, type)
       id = compile_domain_id(type, domain_perspective)
       result = @uddi.save_business(id, domain_perspective)
-      authorized?(result) and identifier?(result, 'domain perspective')
+      authorized?(result) and identifier?(result, type)
       success('domain perspective registered')
     }end
 
     def deregister_domain(type, domain_perspective)_{
       authorize
-      provided?(domain_perspective, 'domain perspective') and registered?(domain_perspective, 'domain perspective')
+      provided?(domain_perspective, one_of(type)) and registered?(domain_perspective, type)
       raise ValidationError, 'domain perspective has associations' if @registry.associations.domain_perspective_has_associations?(domain_perspective)
       result = @uddi.delete_business(compile_domain_id(type, domain_perspective))
-      authorized?(result) and identifier?(result, 'domain perspective')
+      authorized?(result) and identifier?(result, type)
       success('domain perspective deregistered')
     }end    
 
@@ -126,7 +126,7 @@ module SoarSr
     end
 
     def extract_detail_for_domain_perspective(type, domain_perspective)
-      provided?(domain_perspective, 'domain perspective') and provided?(type, 'domain type')
+      provided?(domain_perspective, one_of(type)) and provided?(type, 'domain type')
       id = compile_domain_id(type, domain_perspective)
       detail = @uddi.get_business(id)['data'][domain_perspective]      
       detail ||= {}

data/lib/soar_sr/search.rb

@@ -70,7 +70,7 @@ module SoarSr
     }end
 
     def search_domain_perspective(domain_perspective, pattern)_{
-      provided?(domain_perspective, 'domain perspective') and registered?(domain_perspective, 'domain perspective')
+      provided?(domain_perspective, 'domain perspective') and registered?(domain_perspective, 'domains')
 
       found = {}
       data = @registry.associations.domain_perspective_associations(domain_perspective)['data']['associations']

data/lib/soar_sr/service_components.rb

@@ -55,7 +55,7 @@ module SoarSr
 
     def register_service_component(service_component)_{
         authorize
-        provided?(service_component, 'service component') and not_registered?(service_component, 'service component')
+        provided?(service_component, 'service component') and not_registered?(service_component, 'service components')
 
         result = @uddi.save_service_component(service_component)
         authorized?(result) and identifier?(result, 'service component')
@@ -65,7 +65,7 @@ module SoarSr
     def deregister_service_component(service_component)_{
       # byebug
       authorize
-      provided?(service_component, 'service component') and registered?(service_component, 'service component')
+      provided?(service_component, 'service component') and registered?(service_component, 'service components')
       raise ValidationError, 'service component has domain perspective associations' if @registry.associations.service_component_has_domain_perspective_associations?(service_component)
       result = @uddi.delete_service_component(service_component)
       authorized?(result) and identifier?(result, 'service component')
@@ -74,14 +74,14 @@ module SoarSr
 
     def configure_service_component_uri(service_component, uri)_{
       authorize
-      provided?(service_component, 'service component') and provided?(uri, 'URI') and uri?(uri) and registered?(service_component, 'service component')
+      provided?(service_component, 'service component') and provided?(uri, 'URI') and uri?(uri) and registered?(service_component, 'service components')
       result = @uddi.save_service_component_uri(service_component, uri)
       authorized?(result) and identifier?(result, 'service component')
       success
     }end
 
     def service_component_uri(service_component)_{
-      provided?(service_component, 'service component') and registered?(service_component, 'service component')
+      provided?(service_component, 'service component') and registered?(service_component, 'service components')
       result = @uddi.find_service_component_uri(service_component)
       identifier?(result, 'service component')
       uri = (has_data?(result, 'bindings') and (result['data']['bindings'].size > 0)) ? result['data']['bindings'].first[1]['access_point'] : nil

data/lib/soar_sr/service_definitions.rb

@@ -7,7 +7,7 @@ module SoarSr
     
     def register_service_definition(service, definition)_{
       authorize 
-      provided?(service, 'service') and registered?(service, 'service') and provided?(definition, 'service definition') and wadl?(definition)
+      provided?(service, 'service') and registered?(service, 'services') and provided?(definition, 'service definition') and wadl?(definition)
       result = @uddi.get_service(service)
       service = result['data']
       service['definition'] = definition
@@ -18,7 +18,7 @@ module SoarSr
 
     def service_definition_for_service(service)_{
       # byebug
-      provided?(service, 'service') and registered?(service, 'service')
+      provided?(service, 'service') and registered?(service, 'services')
       result = @uddi.get_service(service)['data']
       identifier?(result, 'service')
       return fail('service has no definition') if (result['definition'].nil?) or (result['definition'] == "")
@@ -27,7 +27,7 @@ module SoarSr
 
     def deregister_service_definition(service)_{
       authorize
-      provided?(service, 'service') and registered?(service, 'service')
+      provided?(service, 'service') and registered?(service, 'services')
       result = @uddi.get_service(service)
       service = result['data']
       service['definition'] = ""

data/lib/soar_sr/services.rb

@@ -9,7 +9,7 @@ module SoarSr
 
     def register_service(service, description = nil)_{
       authorize
-      key_provided?(service, 'name', 'service') and not_registered?(service['name'], 'service')
+      key_provided?(service, 'name', 'service') and not_registered?(service['name'], 'services')
       result = @uddi.save_service(service['name'], extract_description_and_meta(service, description), service['definition'])
       authorized?(result) and identifier?(result, 'service')
       success('service registered')
@@ -17,7 +17,7 @@ module SoarSr
 
     def deregister_service(service)_{
       authorize
-      provided?(service, 'service') and registered?(service, 'service')
+      provided?(service, 'service') and registered?(service, 'services')
       result = @uddi.delete_service(service)
       authorized?(result) and identifier?(result, 'service')
       success('service deregistered')
@@ -34,7 +34,7 @@ module SoarSr
 
     def add_service_uri(service, uri)_{
       authorize
-      provided?(service, 'service') and provided?(uri, 'URI') and uri?(uri) and registered?(service, 'service')
+      provided?(service, 'service') and provided?(uri, 'URI') and uri?(uri) and registered?(service, 'services')
       result = @uddi.add_service_uri(service, uri)
       authorized?(result) and identifier?(result, 'service')
       success
@@ -42,7 +42,7 @@ module SoarSr
 
     def service_uris(service)_{
       authorize
-      provided?(service, 'service') and registered?(service, 'service')
+      provided?(service, 'service') and registered?(service, 'services')
       result = @uddi.service_uris(service)
       authorized?(result) and identifier?(result, 'service')
       success_data(result['data'])
@@ -50,7 +50,7 @@ module SoarSr
 
     def remove_uri_from_service(service, uri)_{
       authorize
-      provided?(service, 'service') and provided?(uri, 'URI') and uri?(uri) and registered?(service, 'service')
+      provided?(service, 'service') and provided?(uri, 'URI') and uri?(uri) and registered?(service, 'services')
       result = @uddi.remove_service_uri(service, uri)
       authorized?(result) and identifier?(result, 'service')
       success
@@ -58,7 +58,7 @@ module SoarSr
 
     def configure_meta_for_service(service, meta)_{
       authorize
-      provided?(service, 'service') and provided?(meta, 'meta') and meta?(meta) and registered?(service, 'service')
+      provided?(service, 'service') and provided?(meta, 'meta') and meta?(meta) and registered?(service, 'services')
 
       descriptions = merge_meta_with_service_descriptions(service, meta)
       result = update_service_descriptions(service, descriptions)
@@ -68,7 +68,7 @@ module SoarSr
     }end
 
     def meta_for_service(service)
-      provided?(service, "service") and registered?(service, 'service')
+      provided?(service, "service") and registered?(service, 'services')
         detail = @uddi.get_service(service)['data']
         if detail['description']
           detail['description'].each do |desc|

data/lib/soar_sr/teams.rb

@@ -1,5 +1,6 @@
 require 'jsender'
 require 'soap4juddi'
+require 'byebug'
 
 module SoarSr
   class Teams < SoarSr::DomainPerspectives
@@ -17,4 +18,4 @@ module SoarSr
         deregister_domain('teams', domain_perspective)
       }end      
   end
-end
+end

data/lib/soar_sr/validator.rb

@@ -73,25 +73,31 @@ module SoarSr
     end
 
     def type_registered?(element, type)
-      return is_registered?(@registry.domain_perspectives.domain_perspective_registered?(element)) if (type == 'domain perspective')
-      return is_registered?(@registry.service_components.service_component_registered?(element)) if (type == 'service component')
-      return is_registered?(@registry.services.service_registered?(element)) if (type == 'service')
-      return is_registered?(@registry.teams.team_registered?(element)) if (type == 'team')
+      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, "#{type} already exists" if type_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, 'domain perspective')) and (not type_registered?(domain_perspective, 'team'))
+      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 #{type} provided" if not type_registered?(element, type)
+      raise ValidationError, "unknown #{one_of(type)} provided" if not type_registered?(element, type)
       true
-    end        
+    end   
+
+    def one_of(type)
+      result = type[0..-2]
+      result = 'domain perspective' if result == 'domain'
+      result
+    end     
   end
 end

data/lib/soar_sr/version.rb

@@ -1,3 +1,3 @@
 module SoarSr
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: soar_sr
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Ernst van Graan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: persistent-cache
   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: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   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: 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'
 - !ruby/object:Gem::Dependency
   name: soap4juddi
   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: Implementation of the Hetzner Service Registry specification, backed
@@ -116,9 +116,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -153,19 +153,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Implementation of the Hetzner Service Registry specification, backed by jUDDI
 test_files: []
-has_rdoc: