soar_sr 1.1.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ccf4654048854b36afdecbde6605e09a690ab2f
-  data.tar.gz: 48a8cf071e5072e4e01cc469cd49a1341f7d15a4
+  metadata.gz: 7d5e4239ec6dbf478aa8215b23131b4a16301a1b
+  data.tar.gz: e24020042cfd7bfa82a56ea9f1e40ca446a28184
 SHA512:
-  metadata.gz: eeda8acf57ed23c9e9938e57e1a812cd190aa03f1d41a01e76cfcfc9ce4b5a318e20dca66d356b2a2353219e0ae8d63b019ef70803fc019d908c61a7c9bafb2b
-  data.tar.gz: 8a3008f85d969560fdcf5952f4102c276874554114d6f5f58edee34ab6065e5ec4f118d5939b2abc53ccd3b84fcddf6611e698dbafc5b5ce4d148ae8d9a6c301
+  metadata.gz: 9aabd4bb7911c64bd4ff53384f7d6876ec3c1e4f4419668eba989e97652381d2b9efc038f606b98b9c9c84a6df15866c61824c4269f84d798ef9aea6d736b463
+  data.tar.gz: 83b6e08166f7029c510ffa91c55e22933c4ca4acf4419b28bb500bfa7681a0fb6dc5341521fabf8b0680b8b2ad78c44ff8c319f36afc61f2abac9d9b5128c908

data/lib/soar_sr/search.rb

@@ -31,6 +31,13 @@ module SoarSr
       search_for_service(name, false, false)
     end
 
+    def search_services_for_uri(pattern)_{
+      provided?(pattern, 'pattern') and length_at_least?(pattern, 4, 'pattern')
+      result = @registry.services.list_services
+      found = extract_services_with_uris_that_match_from_data(result, pattern)
+      success_data({'services' => found})       
+    }end
+
     def search_for_service(pattern, include_service_components = true, full_text = true)_{
       provided?(pattern, 'pattern') and length_at_least?(pattern, 4, 'pattern')
 
@@ -69,6 +76,23 @@ module SoarSr
       success_data({'services' => found})
     }end
 
+    def search_access_points(pattern)
+      found = []
+      result = search_for_service(pattern, false, true)['data']['services']
+      result ||= {}
+      result.each do |service, detail|
+        uris = detail['uris']
+        uris ||= {}
+        uris.each do |id, access_details|
+          access_points = access_details['access_point']
+          access_points ||= ""
+          included = (not((access_point =~ /#{pattern}/i).nil?))
+          found << service if (included and (found[service].nil?))
+        end
+      end
+      success_data({'services' => found})
+    end    
+
     def search_domain_perspective(domain_perspective, pattern)_{
       domain_perspective = standardize(domain_perspective)            
       provided?(domain_perspective, 'domain perspective') and registered?(domain_perspective, 'domains')
@@ -101,5 +125,42 @@ module SoarSr
       end
       return false
     end
+
+    def extract_services_with_uris_that_match_from_data(result, pattern)
+      found = {}
+      if has_data?(result, 'services')
+        services = result['data']['services']
+        found = extract_services_with_uris_that_match(found, services, pattern)
+      end
+    end
+
+    def extract_services_with_uris_that_match(found, services, pattern)
+      services.each do |service, detail|
+        found = extract_matching_uris_for_services(found, service, detail, pattern)
+      end 
+      found     
+    end
+
+    def extract_matching_uris_for_services(found, service, detail, pattern)
+      uris = detail['uris']
+      uris ||= {}
+      append_matching_uris(found, service, uris, pattern)
+    end
+
+    def append_matching_uris(found, service, uris, pattern)
+      uris.each do |id, access_details|
+        extract_uris_from_access_details(found, access_details, service, pattern)
+      end
+      found      
+    end
+
+    def extract_uris_from_access_details(found, access_details, service, pattern)
+      uri = access_details['access_point']
+      if (not((uri =~ /#{pattern}/i).nil?))
+        found[service] ||= []
+        found[service] << uri
+      end
+      found
+    end    
   end
 end

data/lib/soar_sr/services.rb

@@ -104,7 +104,9 @@ module SoarSr
     end    
 
     def list_services
-      search_for_service_by_pattern(ALL_SERVICES)
+      found = search_for_service_by_pattern(ALL_SERVICES)
+
+      success_data({'services' => found})      
     end
 
     private

data/lib/soar_sr/version.rb

@@ -1,3 +1,3 @@
 module SoarSr
-  VERSION = "1.1.2"
+  VERSION = "1.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soar_sr
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.4
 platform: ruby
 authors:
 - Ernst van Graan
@@ -14,98 +14,98 @@ dependencies:
   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: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.1
 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,17 +153,17 @@ 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.4.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Implementation of the Hetzner Service Registry specification, backed by jUDDI