soar_sr 1.1.11 → 1.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05a8b23810bacbbccacd773a77f60acaf884d0ef
-  data.tar.gz: e0050b40257e65c1c1e511fea9898099d732ebb7
+  metadata.gz: 1d5b2c72191fc412f47754413251335ad6e0c644
+  data.tar.gz: 983d459614f3e93c3177cd53629078687dcb1315
 SHA512:
-  metadata.gz: 6a3ab8b46470cbae1432234266b59c06a207029d11a1177ceb9596b48003421a635c91c2680f25efc01f75fe6bd8f7a59ad8bc15c56b37486823b08e764a1c44
-  data.tar.gz: 9d69aef2617b49b7e07902ca613b23231402c1fbdf2af09ee5770214358c40e421f29780ab4cd93a0977dc1845807063256e0506e704a4695e171aa9d5c9265a
+  metadata.gz: 2d939e304e12b51420f096616fb5ee3a2061d40c7721bc5dc9502b6106753052568f6b6aa9a12397c1b996f3c6c43108bc03dc66f7801485d68073149f8a23e6
+  data.tar.gz: e3bbcb139098f4ce9c0e148f2e9e14a4101113f4e8006a4c7659f05664008d9b6e39c8b7eb98d197a05d2c7a3b357efc2db857752d4b862d75b416464fa0ba3b

data/README.md

@@ -75,6 +75,7 @@ Or install it yourself as:
 	  sd.deregister_service_definition('my service')
 
 ### Teams
+    ts.list_teams
 	  ts.register_team('my team')
 	  ts.team_registered?('my team')
 	  ts.deregister_team('my team')

data/lib/soar_sr/domain_perspectives.rb

@@ -23,14 +23,14 @@ module SoarSr
       @uddi.get_business(compile_domain_id(type, domain_perspective))
     end
 
-    def list_domain_perspectives()_{
+    def list_domain_perspectives(domain_types = SoarSr::DOMAIN_TYPES)_{
       result = @uddi.find_businesses
       result['data']['domain_perspectives'] = {}
 
       if has_data?(result, 'businesses')
         result['data']['businesses'].each do |business, detail|
           hetz = false
-          SoarSr::DOMAIN_TYPES.each do |type|
+          domain_types.each do |type|
             hetz = true if detail['id'].include?(type)
           end
           result['data']['domain_perspectives'][business] = detail if hetz

data/lib/soar_sr/teams.rb

@@ -16,6 +16,10 @@ module SoarSr
 
       def deregister_team(domain_perspective)_{
         deregister_domain('teams', domain_perspective)
-      }end      
+      }end   
+
+      def list_teams
+        @registry.domain_perspectives.list_domain_perspectives(['teams'])
+      end   
   end
 end

data/lib/soar_sr/version.rb

@@ -1,3 +1,3 @@
 module SoarSr
-  VERSION = "1.1.11"
+  VERSION = "1.1.12"
 end

data/lib/soar_sr.rb

@@ -13,88 +13,9 @@ require "soar_sr/contacts"
 require "soar_sr/associations"
 require "soar_sr/juddi_provider"
 require "soar_sr/service_registry"
+require "soar_xt"
 require 'jsender'
 
 module SoarSr
 	DOMAIN_TYPES = ['domains', 'services', 'service-components', 'teams'] unless defined? DOMAIN_TYPES; DOMAIN_TYPES.freeze
-end
-
-class ::Hash
-  def self.deep_merge(first, second)
-    result = first
-    if first.is_a?(Hash) and (second.is_a?(Hash))
-      result = first.merge(second)
-    elsif first.is_a?(Array) and second.is_a?(Array)
-      return first + second
-    else
-      return second
-    end
-    first.each do |first_key, first_value|
-      second.each do |second_key, second_value|
-        if (first_key == second_key)
-          if first_value.is_a?(Hash) and (second_value.is_a?(Hash))
-            result[first_key] = Hash::deep_merge(first_value, second_value)
-          elsif first_value.is_a?(Array) and (second_value.is_a?(Array))
-            result[first_key] = first_value + second_value
-          else
-            result[first_key] = second_value
-          end        
-        end
-      end
-    end     
-    result
-  end
-
-  def self.value_has_hash?(value)
-    return nil if not value.is_a?(Hash)
-    keys = []
-    value.each do |k, v|
-      keys << k if v.is_a?(Hash)
-    end
-    keys
-  end
-end
-
-
-# a = {'key' => 'value'}
-#  => {"key"=>"value"} 
-# b = {'key2' => 'value2'}
-#  => {"key2"=>"value2"} 
-# a.merge b
-#  => {"key"=>"value", "key2"=>"value2"} 
-
-# a = {'key' => 'value'}
-#  => {"key"=>"value"} 
-# b = {'key' => 'value2'}
-#  => {"key"=>"value2"} 
-# a.merge b
-#  => {"key"=>"value2"}
-# Hash.deep_merge(a, b)
-#  => {"key"=>"valuevalue2"} 
-
-# a = {'key' => 'value', 'dictionary' => { '1' => 'one', '2' => 'two' }}
-#  => {"key"=>"value", "dictionary"=>{"1"=>"one", "2"=>"two"}} 
-# b = {'key2' => 'value2', 'dictionary' => { '3' => 'one', '4' => 'two' }}
-#  => {"key2"=>"value2", "dictionary"=>{"3"=>"one", "4"=>"two"}} 
-# a.merge b
-#  => {"key"=>"value", "dictionary"=>{"3"=>"one", "4"=>"two"}, "key2"=>"value2"} 
-# Hash.deep_merge(a, b)
-#  => {"key"=>"value", "dictionary"=>{"1"=>"one", "2"=>"two", "3"=>"one", "4"=>"two"}, "key2"=>"value2"} 
-
-# a = {'key' => 'value', 'dictionary' => [ '1', '2']}
-#  => {"key"=>"value", "dictionary"=>["1", "2"]} 
-# b = {'key2' => 'value2', 'dictionary' => ['3', '4']}
-#  => {"key2"=>"value2", "dictionary"=>["3", "4"]} 
-# a.merge b
-#  => {"key"=>"value", "dictionary"=>["3", "4"], "key2"=>"value2"} 
-# Hash.deep_merge(a, b)
-#  => {"key"=>"value", "dictionary"=>["1", "2", "3", "4"], "key2"=>"value2"} 
-
-# a = {'key' => 'value', 'dictionary' => { '1' => 'one', '2' => {'2.1' => 'twoone', '2.2' => 'twotwo' }}}
-#  => {"key"=>"value", "dictionary"=>{"1"=>"one", "2"=>{"2.1"=>"twoone", "2.2"=>"twotwo"}}} 
-# b = {'key2' => 'value2', 'dictionary' => { '3' => 'three', '2' => {'2.3' => 'twothree', '2.4' => 'twofour' }}}
-#  => {"key2"=>"value2", "dictionary"=>{"3"=>"three", "2"=>{"2.3"=>"twothree", "2.4"=>"twofour"}}} 
-# a.merge b
-#  => {"key"=>"value", "dictionary"=>{"3"=>"three", "2"=>{"2.3"=>"twothree", "2.4"=>"twofour"}}, "key2"=>"value2"} 
-# Hash::deep_merge(a, b)
-#  => {"key"=>"value", "dictionary"=>{"1"=>"one", "2"=>{"2.1"=>"twoone", "2.2"=>"twotwo", "2.3"=>"twothree", "2.4"=>"twofour"}, "3"=>"three"}, "key2"=>"value2"} 
+end

data/soar_sr.gemspec

@@ -26,5 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "byebug"
   spec.add_dependency "jsender"
+  spec.add_dependency "soar_xt"
   spec.add_dependency "soap4juddi", "~> 1.0.3"
 end

metadata

@@ -1,111 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: soar_sr
 version: !ruby/object:Gem::Version
-  version: 1.1.11
+  version: 1.1.12
 platform: ruby
 authors:
 - Ernst van Graan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-01-22 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: soar_xt
+  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.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.3
 description: Implementation of the Hetzner Service Registry specification, backed
@@ -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
@@ -154,17 +168,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