soar-registry-staff 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d667963b213a8c1f8bfac707cd214818eb33e591
-  data.tar.gz: 3ce77a63e9ec45a7e84ecbef40891526c2557d3d
+  metadata.gz: f544b6dad6e1d457e519a2224be548670b5246ac
+  data.tar.gz: c2d23d9e7ca7d1054494eaa8a1f7592cad6fe4e9
 SHA512:
-  metadata.gz: 40202401ddea924599085587392e84cdfb10263a640e3980ddd6347cd4729d9bffac46013c9a5bbd502a405eacd9f07c5f7a388708a8a0a18aa42876c8f26643
-  data.tar.gz: b345267177081bba7e8b69d3b7cf1c79b3ee5ec9853617e9b62bf94b84f6c0a8a6a5f5cf18fe05f1ffa378af30cf08ba0ff13ba320a913b00d7ec48a573dfa1b
+  metadata.gz: 07dc861ee7813b76348ec62e22303bed71f0e3b6b4cd6bdf9662f2b333b61eb9dd72645c656a2325d4353dc9d333d0c652307e47d9bd6811d1ed0bbda8aa0fd2
+  data.tar.gz: 5e5845c4717996db03667913cab21840ceabde5dc338b906eacaf78784b56faa19a35de10307dbb77aaa08563ecd4932d4ebcdfc0ad5a70640d420b5b5f06e04

data/lib/soar/registry/staff/directory/dynamo_db/base.rb

@@ -65,7 +65,11 @@ module Soar
 
             def ready?
               begin
-                return @client.list_tables.table_names.class.name == 'Array'
+                #return @client.list_tables.table_names.class.name == 'Array'
+                resp = @client.describe_table({
+                  table_name: @table_name
+                })
+                return resp.table.table_name == @table_name
               rescue Seahorse::Client::NetworkingError
                 return false
               end

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

@@ -30,8 +30,8 @@ module Soar
         ##
         # @param [String] identity_id
         # @return [Array] list of roles
-        def calculate_roles(identity_id)
-          entry = @directory.fetch_identity(identity_id)
+        def calculate_roles(identity)
+          entry = @directory.fetch_identity(identity['identity_id'])
           return nil if not entry
           identity = @translator.get_identity(entry)
           roles = []
@@ -45,9 +45,9 @@ module Soar
         # @param [String] identity_id
         # @return [Array] list of identifiers
         ##
-        def calculate_identifiers(identity_id)
+        def calculate_identifiers(identity)
           indexes = @directory.indexed_attributes
-          entry = @directory.fetch_identity(identity_id)
+          entry = @directory.fetch_identity(identity['identity_id'])
           identity = @translator.get_identity(entry)
           identifiers = []
           indexes.each { |index| 
@@ -60,8 +60,8 @@ module Soar
         # @param [String] identity_id
         # @param [String] role
         # @return [Hash] A hash of attributes 
-        def calculate_attributes(identity_id, role)
-          entry = @directory.fetch_identity(identity_id)
+        def calculate_attributes(identity, role)
+          entry = @directory.fetch_identity(identity['identity_id'])
           return nil if not entry
           identity = @translator.get_identity(entry)
           { role => identity['roles'][role] }
@@ -70,18 +70,21 @@ module Soar
         ##
         # @param [String] identity_id
         # @return [Hash] Hash of attributes keyed by role
-        def calculate_all_attributes(identity_id)
-          entry = @directory.fetch_identity(identity_id)
+        def calculate_all_attributes(identity)
+          entry = @directory.fetch_identity(identity['identity_id'])
           @translator.get_identity(entry)
         end
 
         ##
-        # @param [Hash] identifier containing attribute name and attribute value
+        # @param [String|Hash] identity_id or identifier (a hash containing attribute name and attribute value)
         # @return [Array]
         def calculate_identities(identifier)
-          identifier = @translator.get_identifier(identifier)
-          entries = @directory.search_identities(identifier.keys[0], identifier[identifier.keys[0]] )
-          [@translator.get_identity(entries)[0]['identity_id']]
+          if @translator.is_json?(identifier)
+            identifier = @translator.get_identifier(identifier)
+            entries = @directory.search_identities(identifier.keys[0], identifier[identifier.keys[0]] )
+            return [@translator.get_identity(entries)[0]]
+          end
+          return [@translator.get_identity(@directory.fetch_identity(identifier))]
         end
 
       end

data/lib/soar/registry/staff/translator/dynamo_db.rb

@@ -12,6 +12,15 @@ module Soar
             return entry
           end
 
+          def is_json?(json)
+            begin
+              JSON.parse(json)
+              return true
+            rescue JSON::ParserError => e
+              return false
+            end
+          end
+
           ##
           # @param [Array] entries a list of entries from data source
           # @return [Array] identities a list of identities

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soar-registry-staff
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Charles Mulder