soar-registry-directory 5.0.1 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25375792d34b3062277d3100e6e2dc99e404c75e
-  data.tar.gz: 5fad83bf254ed3fe03b12c3bde8398e25e77609b
+  metadata.gz: 6dea4c5efb18d2280d073f6bce679b804f623360
+  data.tar.gz: 0ac2542962c087002260057a9f3e9defc87fc69d
 SHA512:
-  metadata.gz: c056c7b6e8f10460b0984598c856a3a2035418f663cb4cce11a193c243a22620eb61390e9f5f17a8ae4292856de6efedea52f7614cb17a01d777d6bc3457bf80
-  data.tar.gz: 68d43c936a4b1c5e20b14b1303c2516ffc4b653d3f3f5a2dead51348d703c136c6d437c01343c7ae3104317e4abe1db6c0d503bc154435b2459018d0a1d7696b
+  metadata.gz: 4e374679b5f7f74d35083bb4f6980af26559592c89922b1ca9360f940c156b681604dae1ddeab323058299f5c57e549bca2fc7636237a18b6f651bd5645db4c7
+  data.tar.gz: 5386f8ff844f3242fba8cd3c42e1f600ce1a885ca1455a50ff332dcd0e4b95437d57192dd6a97382c9bfc6e1551dad75c3c6a67729c92a8cb6baf9dd7b694301

data/README.md

@@ -29,17 +29,23 @@ Create an instance of the stub provider by passing in the name, primary key and
 ### DynamodDb Provider
 ```ruby
 > provider = Soar::Registry::Directory::Provider::DynamoDb.new({
-    credentials: {
-        username: "username",
-        password: "secret"
+    table: {
+        name: 'identity_roles'
+        index: {
+            partition_key: 'partition_key'
+            sort_key: 'sort_key'
+            global_secondary_index: ['global_secondary_index1']
+        }
     },
-    table: "mytable",
-    index: 
-      partition_key: 'uuid',
-      sort_key: 'role'
-    config: {
-        region: 'us-west-2'
-        endpoint: 'http://localhost:8000'
+    configuration: {
+      region: 'us-west-2'
+      endpoint: 'http://localhost:8000'
+      http_read_timeout: 1, 
+      retry_limit: 0
+    },
+    credentials: {
+        username: 'username'
+        password: 'secret'
     }
 })
 
@@ -54,7 +60,7 @@ $ sudo apt-get install libmysqlclient-dev
 
 ```ruby
 > provider = Soar::Registry::Directory::Provider::Mysql.new({
-    index: ['Client_Number', 'Notifyemail_Invoice', 'Login'],
+    index: ['ID', 'Client_Number', 'Notifyemail_Invoice', 'Login'],
     config: {
       database: 'konsoleh_genie'
       table: 'Client'

data/lib/soar/registry/directory/provider/dynamo_db.rb

@@ -94,7 +94,7 @@ module Soar
                 }
               }
 
-              options.merge!({index_name: "#{key}-index"}) if @global_secondary_indexes.include?(key)
+              options.merge!({index_name: "#{key}-index"}) if @global_secondary_indexes and @global_secondary_indexes.include?(key)
               identity = @client.query(options)
               identity.items.map { |item| 
                 Hashie.stringify_keys(item)

data/lib/soar/registry/directory/test/provider/dynamo_db.rb

@@ -16,15 +16,23 @@ module Soar
               @table = @configuration['provider']['config']['table']
               @index = @table['index']
               @entries = JSON.parse(File.read("lib/soar/registry/directory/test/fixtures/entries.json"))
+              @connection_retries = 6
             end
 
             def given_configured_directory
-              provider = Soar::Registry::Directory::Provider::DynamoDb.new(Hashie.symbolize_keys(@configuration['provider']['config']))
-              @directory = Soar::Registry::Directory.new(provider)
-              @directory.provider.recreate_table({
-                name: @table[:name], 
-                structure: JSON.parse(File.read("lib/soar/registry/directory/test/fixtures/table_structure.json"))
-              })
+              begin 
+                provider = Soar::Registry::Directory::Provider::DynamoDb.new(Hashie.symbolize_keys(@configuration['provider']['config']))
+                @directory = Soar::Registry::Directory.new(provider)
+                @directory.provider.recreate_table({
+                  name: @table[:name], 
+                  structure: JSON.parse(File.read("lib/soar/registry/directory/test/fixtures/table_structure.json"))
+                })
+              rescue Soar::Registry::Directory::Error::NetworkingError => e
+                raise if @connection_retries == 0
+                sleep 10
+                @connection_retries -= 1
+                given_configured_directory
+              end
             end
 
             def given_existing_data

data/lib/soar/registry/directory/test/provider/ldap.rb

@@ -30,15 +30,23 @@ module Soar
                   sn: "Cilliers"
                 }
               }]
+              @connection_retries = 6
             end
 
             def given_configured_directory
-              provider_class = Object.const_get(@configuration['provider']['class'])
-              provider = provider_class.new(Hashie.symbolize_keys(@configuration['provider']['config']))
-              @directory = Soar::Registry::Directory.new(provider)
-              @entries.each { |entry|
-                provider.delete(entry[:dn])
-              }
+              begin
+                provider_class = Object.const_get(@configuration['provider']['class'])
+                provider = provider_class.new(Hashie.symbolize_keys(@configuration['provider']['config']))
+                @directory = Soar::Registry::Directory.new(provider)
+                @entries.each { |entry|
+                  provider.delete(entry[:dn])
+                }
+              rescue Soar::Registry::Directory::Error::NetworkingError => e
+                raise if @connection_retries == 0
+                sleep 10
+                @connection_retries -= 1
+                given_configured_directory
+              end
             end
 
             ##

data/lib/soar/registry/directory/test/provider/mysql.rb

@@ -28,18 +28,22 @@ module Soar
                 Client_Number: "C101112134",
                 Notifyemail_Invoice: "sarahconnor@example.com" 
               }]
+              @connection_retries = 6
             end
 
             def given_configured_directory
-              recreate_table({
-                host: @configuration['provider']['config']['config']['host'],
-                username: @configuration['provider']['config']['credentials']['username'],
-                password: @configuration['provider']['config']['credentials']['password'],
-                filepath: PATH_TO_DATABASE_STRUCTURE_DUMP
-              })
-              provider_class = Object.const_get(@configuration['provider']['class'])
-              provider = provider_class.new(Hashie.symbolize_keys(@configuration['provider']['config']))
-              @directory = Soar::Registry::Directory.new(provider)
+              begin
+                provider_class = Object.const_get(@configuration['provider']['class'])
+                provider = provider_class.new(Hashie.symbolize_keys(@configuration['provider']['config']))
+                provider.client.query("DROP TABLE IF EXISTS `Client`")
+                provider.client.query("CREATE TABLE Client ( ID int(11) NOT NULL AUTO_INCREMENT, Client_Number varchar(15) NOT NULL DEFAULT '', First_Name varchar(70) DEFAULT NULL, Surname varchar(70) DEFAULT NULL, Notifyemail_Invoice text, PRIMARY KEY (ID), KEY Notifyemail_Invoice (Notifyemail_Invoice(20)), KEY Client_Number (Client_Number))")
+                @directory = Soar::Registry::Directory.new(provider)
+              rescue Soar::Registry::Directory::Error::NetworkingError => e
+                raise if @connection_retries == 0
+                sleep(10)
+                @connection_retries -= 1
+                given_configured_directory
+              end
             end
 
             ##
@@ -133,15 +137,6 @@ module Soar
               }
             end
 
-            private 
-
-            ##
-            # Execute command using mysql client on terminal 
-            ##
-            def recreate_table(host:, username:, password:, filepath:)
-              `mysql -h #{host} -u#{username} -p#{password} konsoleh_genie < '#{filepath}'`
-            end
-
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soar-registry-directory
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.2
 platform: ruby
 authors:
 - Charles Mulder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-21 00:00:00.000000000 Z
+date: 2017-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashy_db