soar_sr 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d5e4239ec6dbf478aa8215b23131b4a16301a1b
-  data.tar.gz: e24020042cfd7bfa82a56ea9f1e40ca446a28184
+  metadata.gz: 994cbaba1fd332b69c03daf1978eae61e468b8d2
+  data.tar.gz: 798996ba2a81adb302d0f70ead4438660a235dab
 SHA512:
-  metadata.gz: 9aabd4bb7911c64bd4ff53384f7d6876ec3c1e4f4419668eba989e97652381d2b9efc038f606b98b9c9c84a6df15866c61824c4269f84d798ef9aea6d736b463
-  data.tar.gz: 83b6e08166f7029c510ffa91c55e22933c4ca4acf4419b28bb500bfa7681a0fb6dc5341521fabf8b0680b8b2ad78c44ff8c319f36afc61f2abac9d9b5128c908
+  metadata.gz: 1cb204c69e50a3626f1d7006f59dfdf283559416d0a97fd9b93aa90e53d3e99aec441bf515d978b9e8e57dc192868e9ad66e22f32e2be8ade6765b63a34ab686
+  data.tar.gz: 483073f2c989f8b30d630adf58835594c46705f561c95949eb640a0ddd00ece0c663a6dc0fb2434a0dfb63c4baa6379edbf21cae352ba43d12561d42708091ee

data/lib/soar_sr/services.rb

@@ -7,6 +7,13 @@ module SoarSr
   class Services < SoarSr::Handler
     include Jsender
     ALL_SERVICES = nil unless defined? ALL_SERVICES; ALL_SERVICES.freeze
+    attr_accessor :max_threads
+
+    def initialize(urns, uddi, credentials, registry, max_threads = 15)
+      super(urns, uddi, credentials, registry)
+      @@mutex = Mutex.new
+      @max_threads = max_threads
+    end
 
     def register_service(service, description = nil)_{
       service = standardize(service)            
@@ -134,13 +141,6 @@ module SoarSr
       success_data({'services' => found})
     end
 
-    def map_service_uris(services)
-      services_detailed = {}
-      services.each do |id, service|
-        service['uris'] = service_uris(service['name'])['data']['bindings']
-      end      
-    end
-
     def extract_service_by_name_from_services_list(result, name)
       result['data']['services'].each do |sname, service|
         compare_service = "#{@urns['services']}#{name}" == sname
@@ -168,5 +168,60 @@ module SoarSr
       found
     end
 
+    def map_service_uris(services)
+      90.times do
+        threads = []
+        services.each do |id, service|
+          threads = map_service_uri_threaded(threads, service)
+        end
+        join_threads(threads)
+      end
+      services
+    end
+
+    def join_threads(threads)
+      threads.each do |t|
+        t.join
+      end
+    end
+
+    def join_on_max_threads(threads)
+      if threads.count == @max_threads
+        join_threads(threads)
+        threads = []
+      end
+      threads
+    end
+
+    def map_service_uri_threaded(threads, service)
+      thread = nil
+      threads = join_on_max_threads(threads)
+      threads << Thread.new do
+        map_service_uri_thread_safe(service)
+      end
+      threads
+    end
+
+    def map_service_uri_thread_safe(service)
+      name = service_name_thread_safe(service)
+      result = service_uris(name)
+      uris = result['data'].nil? ? {} : result['data']['bindings']
+      service_uris_thread_safe(service, uris)
+    end
+
+    def service_name_thread_safe(service)
+      name = nil
+      @@mutex.synchronize do
+        name = service['name']
+      end
+      name
+    end
+
+    def service_uris_thread_safe(service, uris)
+      @@mutex.synchronize do
+        service['uris'] = uris
+      end      
+      service
+    end
   end
 end

data/lib/soar_sr/version.rb

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

data/soar_sr.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "byebug"
   spec.add_dependency "jsender"
   spec.add_dependency "soap4juddi", "~> 1.0.1"
+  spec.add_dependency "connection_pool"
 end

metadata

@@ -1,113 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: soar_sr
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Ernst van Graan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-01-18 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: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: connection_pool
+  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
   by jUDDI
 email:
@@ -116,9 +130,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -153,17 +167,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.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Implementation of the Hetzner Service Registry specification, backed by jUDDI