soar-registry-directory 5.0.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7534aad40030456e9a4b9fc88d8a58d52e2817a
-  data.tar.gz: 1afbcb2d7d1a1441eb2e0e5067399c237e3fb19f
+  metadata.gz: 25375792d34b3062277d3100e6e2dc99e404c75e
+  data.tar.gz: 5fad83bf254ed3fe03b12c3bde8398e25e77609b
 SHA512:
-  metadata.gz: 4ba850d7503dffb59cf24d74eff42a43acdb1b145d4920b7e2b053bfcbbf449d8c7ddc76986575b6b4725251b1fe867b3201c54275bd9729bfb9de6ff9337d7d
-  data.tar.gz: f567f1b47129a1a61997af5b08f29e19c12671dead9e6d8a38974847fa282d6701c4df17fe1709661c3d7f13f7e304953c9ad05a31513c8ab326f64fa017c1eb
+  metadata.gz: c056c7b6e8f10460b0984598c856a3a2035418f663cb4cce11a193c243a22620eb61390e9f5f17a8ae4292856de6efedea52f7614cb17a01d777d6bc3457bf80
+  data.tar.gz: 68d43c936a4b1c5e20b14b1303c2516ffc4b653d3f3f5a2dead51348d703c136c6d437c01343c7ae3104317e4abe1db6c0d503bc154435b2459018d0a1d7696b

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

@@ -24,11 +24,12 @@ module Soar
           # @option configuration [String] :region
           # @option configuration [String] :endpoint
           ##
-          def initialize(credentials: , table: , index: , configuration: )
-            @table_name = table
-            @partition_key = index['partition_key']
-            @sort_key = index['sort_key'] if index.key?('sort_key')
-            @global_secondary_indexes = index['global_secondary_index'] if index.key?('global_secondary_index')
+          def initialize(credentials: , table: , configuration: )
+            @table_name = table[:name]
+            index = table[:index]
+            @partition_key = index[:partition_key]
+            @sort_key = index[:sort_key] if index.key?(:sort_key)
+            @global_secondary_indexes = index[:global_secondary_index] if index.key?(:global_secondary_index)
             @credentials = Hashie.symbolize_keys(credentials)
             configuration[:credentials] = Aws::Credentials.new(@credentials[:username], @credentials[:password])
             @client = Aws::DynamoDB::Client.new(Hashie.symbolize_keys(configuration))
@@ -40,11 +41,17 @@ module Soar
           # @raise [Soar::Registry::Directory::Error::DuplicateEntryError]
           ##
           def put(entry)
+            condition_expression = "attribute_not_exists(#{@partition_key})"
+            condition_expression += " AND attribute_not_exists(#{@sort_key})" if @sort_key
+            #@global_secondary_indexes.each { |global_secondary_index|
+            #  condition_expression += " AND attribute_not_exists(#{global_secondary_index})"
+            #} if @global_secondary_indexes
+
             adapt_exceptions do
               @client.put_item({
                 table_name: @table_name,
                 item: entry,
-                condition_expression: "attribute_not_exists(#{@partition_key})"
+                condition_expression: condition_expression
               })
               return true
             end
@@ -64,7 +71,7 @@ module Soar
                 key: primary_key
               }
               identity = @client.get_item(options)
-              raise Soar::Registry::Directory::Error::NoEntriesFoundError, "No entries found for #{@primary_key} = #{primary_key}" if identity.item.nil?
+              raise Soar::Registry::Directory::Error::NoEntriesFoundError, "No entries found for primary_key = #{primary_key}" if identity.item.nil?
               identity.item
             end
           end
@@ -125,7 +132,6 @@ module Soar
           # @return [Boolean]
           ##
           def recreate_table(name: nil, structure: nil)
-
             adapt_exceptions do
               if @client.list_tables.table_names.include?(name) 
                 @client.delete_table({

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

@@ -104,7 +104,7 @@ module Soar
             adapt_exceptions do
               index = []
               @client.query("SHOW INDEX FROM Client").each_hash { |entry| 
-                index << entry['Column_name']
+                index << entry['Column_name'].to_sym
               }
               index
             end

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

@@ -13,21 +13,16 @@ module Soar
             def initialize
               @retries = 5
               @configuration = YAML.load_file("config/#{ENV['CONFIG_FILE']}")
-              @table = @configuration['provider']['table']['name']
-              @index = @configuration['provider']['table']['index'] 
+              @table = @configuration['provider']['config']['table']
+              @index = @table['index']
               @entries = JSON.parse(File.read("lib/soar/registry/directory/test/fixtures/entries.json"))
             end
 
             def given_configured_directory
-              provider = Soar::Registry::Directory::Provider::DynamoDb.new({
-                credentials: @configuration['provider']['credentials'], 
-                table: @table,
-                index: @index,
-                configuration: @configuration['provider']['config']
-              })
+              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: @table[:name], 
                 structure: JSON.parse(File.read("lib/soar/registry/directory/test/fixtures/table_structure.json"))
               })
             end
@@ -39,9 +34,8 @@ module Soar
             end
 
             def sabotage_network
-              @configuration['provider']['config'][:credentials] = Aws::Credentials.new(@configuration['provider']['credentials']['username'], @configuration['provider']['credentials']['password'])
-              @configuration['provider']['config']['endpoint'] = 'http://does-not-exist'
-              @directory.provider.client = Aws::DynamoDB::Client.new(Hashie.symbolize_keys(@configuration['provider']['config']))
+              @configuration['provider']['config']['configuration'][:endpoint] = 'http://does-not-exist'
+              @directory.provider.client = Aws::DynamoDB::Client.new(Hashie.symbolize_keys(@configuration['provider']['config']['configuration']))
             end
 
             def put_duplicate_entry
@@ -102,9 +96,9 @@ module Soar
 
             def index?
               @index == {
-                'partition_key' => @index['partition_key'],
-                'sort_key' => @index['sort_key'],
-                'global_secondary_index' => @index['global_secondary_index']
+                partition_key: @index[:partition_key],
+                sort_key: @index[:sort_key],
+                global_secondary_index: @index[:global_secondary_index]
               }
             end
 

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

@@ -13,14 +13,18 @@ module Soar
 
             def initialize
               @configuration = YAML.load_file("config/#{ENV['CONFIG_FILE']}")
-              @index = @configuration['provider']['config']['index']
+              @index = @configuration['provider']['config']['index'].map { |index| index.to_sym }
               @attributes = @configuration['provider']['config']['attributes']
               @entries = [{
                 ID: 1,
                 Client_Number: "C123456789",
-                Notifyemail_Invoice: "johnconner@example.com" 
+                Notifyemail_Invoice: "johnconner@example.com",
+                First_Name: 'John',
+                Surname: 'Connor'
               }, {
                 ID: 2,
+                First_Name: 'Sarah',
+                Surname: 'Connor',
                 Client_Number: "C101112134",
                 Notifyemail_Invoice: "sarahconnor@example.com" 
               }]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soar-registry-directory
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.1
 platform: ruby
 authors:
 - Charles Mulder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-16 00:00:00.000000000 Z
+date: 2017-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashy_db
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Soar Registry Directory