soar-registry-identity 6.0.1 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d74255d5ef004f45a6ff993c3e091fe0ce25642
-  data.tar.gz: 070ab8ac8d2dc8ac7661b4c4d362e3761b2a559e
+  metadata.gz: 10f0efeadba1d01ba72267399bc2b98a7f4ef13b
+  data.tar.gz: 65c52117a4e8e37067b89b465cf2d99f638c6ec7
 SHA512:
-  metadata.gz: ee3aca71e277683eff3f11aaddaabbbe084f23abcf8dbc891562a75053638a2048a27fab4364b4adf730518b4e4d049b368be8f23cd37e6353629706253abe3d
-  data.tar.gz: e966b1a027bedfeb919cf51e88d85e7495aec640e6d1d1fac3f1ff3f53a26f5e52fa5249c7b1e95088cd44828e0a74929b932a544d61c5ac2e569fd7418e1d79
+  metadata.gz: 7dc27e5c24f2d7c5b6148267aae94b49a752da2cf435b9016c7df26f2b35819487029c74bf373c4957b6458f814a344d0e35941137ed666de2a661df85bec8b0
+  data.tar.gz: c219b916b9fb7e90f5169fced8616f128bc02529e4b747014a9a5723157111b5498eccecceee148bee6e704181b17175e6669fb576ceebb6da5c84fa541dc75b

data/lib/soar/registry/identity/directory.rb

@@ -0,0 +1,21 @@
+
+module Soar
+  module Registry
+    module Identity
+      class Directory
+
+        attr_reader :directory, :fetch_index, :search_index
+
+        # @param [Soar::Registry::Directory] directory
+        # @param [String, Array] fetch_index
+        # @param [String, Array] search_index
+        def initialize(directory:, fetch_index:, search_index:)
+          @directory = directory
+          @fetch_index = fetch_index
+          @search_index = search_index
+        end
+
+      end
+    end
+  end
+end

data/lib/soar/registry/identity/model.rb

@@ -4,6 +4,7 @@ require 'soar/registry/identity/provider/customer/client_number'
 require 'soar/registry/identity/provider/customer/email'
 require 'soar/registry/identity/provider/customer/uuid'
 require 'soar/registry/identity/provider/stub/uuid'
+require 'soar/registry/identity/directory'
 
 module Soar
   module Registry

data/lib/soar/registry/identity/provider/customer/uuid.rb

@@ -6,29 +6,15 @@ module Soar
       module Provider
         module Customer
 
-          ##
-          # Work in progress. Do not use.
-          ## 
           class Uuid < SoarIdm::IdmApi
 
             ##
-            # @param [Hash] identity
-            # @option identity [Soar::Registry::Directory] :directory
-            # @option identity [String] :fetch_index
-            # @option identity [String] :search_index
-            #
-            # @param [Hash] roles
-            # @option roles [Soar::Registry::Directory] :directory
-            # @option roles [String] :fetch_index
-            # @option roles [String] :search_index
-            #
-            # @raise [ArgumentError]
+            # @param [Soar::Registry::Identity::Directory] identity_directory
+            # @param [Soar::Registry::Identity::Directory] role_directory
             ##
-            def initialize(identity:, roles:)
-              raise ArgumentError if not identity.key?(:directory) or not identity.key?(:fetch_index) or not identity.key?(:search_index)
-              raise ArgumentError if not roles.key?(:directory) or not roles.key?(:fetch_index) or not roles.key?(:search_index)
-              @identity = identity
-              @roles = roles
+            def initialize(identity_directory:, role_directory:)
+              @identity_directory = identity_directory
+              @role_directory = role_directory
             end
 
             ##
@@ -36,10 +22,10 @@ module Soar
             # @return [Array<String>] list of roles
             ##
             def calculate_roles(identity_uuid)
-              entries = @roles[:directory].search(@roles[:search_index], identity_uuid)
+              entries = @role_directory.directory.search(@role_directory.search_index, identity_uuid)
               roles = []
               entries.each do |entry|
-                roles << entry[@roles[:fetch_index][1]]
+                roles << entry[@role_directory.fetch_index[1]]
               end
               return roles
             end
@@ -49,13 +35,13 @@ module Soar
             # @return [Array<String,Number>] list of identifiers
             ##
             def calculate_identifiers(identity_uuid)
-              indexes = @identity[:directory].index
-              #indexes.delete(@identity[:directory])
+              indexes = @identity_directory.directory.index
+              #indexes.delete(@identity_directory.directory)
               identifiers = []
               indexes.each { |index| 
                 identifiers << identity[index.to_s]
               }
-              identifiers << identity[@roles[:fetch_index][0]]
+              identifiers << identity[@role_directory.fetch_index[0]]
               return identifiers.reverse
             end
 
@@ -66,10 +52,10 @@ module Soar
             ##
             def calculate_attributes(identity_uuid, role)
               primary_key = {
-                @roles[:fetch_index][0] => identity_uuid,
-                @roles[:fetch_index][1] => role
+                @role_directory.fetch_index[0] => identity_uuid,
+                @role_directory.fetch_index[1] => role
               }
-              result = @roles[:directory].fetch(primary_key)
+              result = @role_directory.directory.fetch(primary_key)
               attributes = {
                 role => result.key?('identity_role_attributes') ? result['identity_role_attributes'] : {}
               }
@@ -81,7 +67,7 @@ module Soar
             # @return [Hash{String => String, Number, Hash, Array}] A hash of attributes 
             def calculate_all_attributes(identity_uuid)
               identity = {}
-              role_entries = @roles[:directory].search(@roles[:search_index], identity_uuid)
+              role_entries = @role_directory.directory.search(@role_directory.search_index, identity_uuid)
               roles = {}
               role_entries.each do |role_entry|
                 identity = calculate_identity(identity_uuid, role_entry['identity_source']) if role_entry.key?('identity_source') 
@@ -102,7 +88,7 @@ module Soar
               identity_id = get_identity_id(identity_source) if not identity_source.nil? 
               #raise SoarIdm::IdentityError if identity_id.nil?
               begin 
-                source_identity = @identity[:directory].fetch(identity_id)
+                source_identity = @identity_directory.directory.fetch(identity_id)
                 identity = {}
                 identity["identity_uuid"] = identity_uuid
                 identity["email"]  = source_identity['Notifyemail_Invoice'] if source_identity.key?('Notifyemail_Invoice')

data/lib/soar/registry/identity/provider/staff/uuid.rb

@@ -9,23 +9,12 @@ module Soar
           class Uuid < SoarIdm::IdmApi
 
             ##
-            # @param [Hash] identity
-            # @option identity [Soar::Registry::Directory] :directory
-            # @option identity [String] :fetch_index
-            # @option identity [String] :search_index
-            #
-            # @param [Hash] roles
-            # @option roles [Soar::Registry::Directory] :directory
-            # @option roles [String] :fetch_index
-            # @option roles [String] :search_index
-            #
-            # @raise [ArgumentError]
+            # @param [Soar::Registry::Directory] identity_directory
+            # @param [Soar::Registry::Directory] role_directory
             ##
-            def initialize(identity:, roles:)
-              raise ArgumentError if not identity.key?(:directory) or not identity.key?(:fetch_index) or not identity.key?(:search_index)
-              raise ArgumentError if not roles.key?(:directory) or not roles.key?(:fetch_index) or not roles.key?(:search_index)
-              @identity = identity
-              @roles = roles
+            def initialize(identity_directory:, role_directory:)
+              @identity_directory = identity_directory
+              @role_directory = role_directory
             end
 
             ##
@@ -33,11 +22,11 @@ module Soar
             # @return [Array<String>] list of roles
             ##
             def calculate_roles(identity_uuid)
-              entries = @roles[:directory].search(@roles[:search_index], identity_uuid)
+              entries = @role_directory.directory.search(@role_directory.search_index, identity_uuid)
               roles = []
               entries.each do |entry|
                 identity_source = entry['identity_source'] if entry.key?('identity_source') 
-                roles << entry[@roles[:fetch_index][1]]
+                roles << entry[@role_directory.fetch_index[1]]
               end
               return roles
             end
@@ -47,7 +36,7 @@ module Soar
             # @return [Array<String,Number>] list of identifiers
             ##
             def calculate_identifiers(identity)
-              indexes = @identity[:directory].index
+              indexes = @identity_directory.directory.index
               identifiers = []
               indexes.each { |index| 
                 identifiers << identity[index.to_s]
@@ -62,10 +51,10 @@ module Soar
             ##
             def calculate_attributes(identity_uuid, role)
               primary_key = {
-                @roles[:fetch_index][0] => identity_uuid,
-                @roles[:fetch_index][1] => role
+                @role_directory.fetch_index[0] => identity_uuid,
+                @role_directory.fetch_index[1] => role
               }
-              result = @roles[:directory].fetch(primary_key)
+              result = @role_directory.directory.fetch(primary_key)
               attributes = {
                 role => result.key?('identity_role_attributes') ? result['identity_role_attributes'] : {}
               }
@@ -78,12 +67,12 @@ module Soar
             ##
             def calculate_all_attributes(identity_uuid)
               begin
-                role_entries = @roles[:directory].search(@roles[:search_index], identity_uuid)
+                role_entries = @role_directory.directory.search(@role_directory.search_index, identity_uuid)
                 roles = {}
                 role_entries.each { |role_entry|
                   roles[role_entry['identity_role']] = role_entry.key?('identity_role_attributes') ? role_entry['identity_role_attributes'] : {}
                 }
-                identity = @identity[:directory].fetch(identity_uuid)
+                identity = @identity_directory.directory.fetch(identity_uuid)
                 attributes = {}
                 attributes["identity_uuid"] = identity_uuid 
                 attributes["firstname"] = identity['givenName'] if identity.key?('givenName')

data/lib/soar/registry/identity/test/orchestration_provider/customer/uuid.rb

@@ -68,16 +68,16 @@ module Soar
 
               def given_identity_registry
                 identity_provider = Soar::Registry::Identity::Provider::Customer::Uuid.new({
-                  identity: {
+                  identity_directory: Soar::Registry::Identity::Directory.new({
                     directory: @identity_directory,
                     fetch_index: 'ID',
                     search_index: 'Notifyemail_Invoice'
-                  },
-                  roles: {
+                  }),
+                  role_directory: Soar::Registry::Identity::Directory.new({
                     directory: @roles_directory,
                     fetch_index: ['identity_uuid', 'identity_role'],
                     search_index: 'identity_uuid'
-                  }
+                  })
                 })
 
                 @idr = Soar::Registry::Identity.new(identity_provider)

data/lib/soar/registry/identity/test/orchestration_provider/staff/uuid.rb

@@ -75,16 +75,16 @@ module Soar
 
               def given_identity_registry
                 identity_provider = Soar::Registry::Identity::Provider::Staff::Uuid.new({
-                  identity: {
+                  identity_directory: Soar::Registry::Identity::Directory.new({
                     directory: @identity_directory,
                     fetch_index: 'entryuuid',
                     search_index: 'mail'
-                  },
-                  roles: {
+                  }),
+                  role_directory: Soar::Registry::Identity::Directory.new({
                     directory: @roles_directory,
                     fetch_index: ['identity_uuid', 'identity_role'],
                     search_index: 'identity_uuid'
-                  }
+                  })
                 })
 
                 @idr = Soar::Registry::Identity.new(identity_provider)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soar-registry-identity
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 7.0.0
 platform: ruby
 authors:
 - Charles Mulder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-30 00:00:00.000000000 Z
+date: 2017-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: soar_idm
@@ -66,6 +66,7 @@ files:
 - features/step_definitions/get_role_attributes_by_uuid.rb
 - features/step_definitions/get_roles_by_uuid_steps.rb
 - lib/soar/registry/identity.rb
+- lib/soar/registry/identity/directory.rb
 - lib/soar/registry/identity/error.rb
 - lib/soar/registry/identity/factory.rb
 - lib/soar/registry/identity/model.rb
@@ -101,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Identity Registry