soar-registry-directory 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70a565fb09b0f4af26cfb869c32c41aa5809b27e
-  data.tar.gz: 2fb0d1201fce3c266bf570315b2524005a61776b
+  metadata.gz: f8fc37329cb604910b73547c7fca3ad7fe6f39ff
+  data.tar.gz: de37ddcb439fe8fbafb8a9395eb5bc32b69507d4
 SHA512:
-  metadata.gz: cfbebba8afea49661752f2fe56a23f57c3874c3595af6b23f90fee6a30697258733b83836254df42e9552f1d841de4c8025ee7b7359f7be5871bd428cb72a049
-  data.tar.gz: 12784a7f75d25c92dabdcd1f3fa88ec779bac1dfd5173507f0a29767ffc8ac60ef3e5816e52ac9ddb05b57f92bb92a32e69320dee5a1c0616f4b191c97b66181
+  metadata.gz: 77ddb080426ce0d95c55c489668303108ff57e872982cba993b2702b48a6ecb71d0778c608f89ca2cfbf41cbb607e7cd54e1cf7c261156cfc90c674b23907908
+  data.tar.gz: e047c942762f85c70aacb7d4702fe89a2f631f406fc326e2c618bbd6db12ee80b152e6bd3fd6b383570fb66c4f9d05af96079c4dfff8fa688c35ebf1367ea12b

data/README.md

@@ -47,7 +47,7 @@ Create an instance of the stub provider by passing in the name, primary key and
 ```ruby
 > provider = Soar::Registry::Directory::Provider::Ldap.new({
     base: 'dc=hetzner,dc=co,dc=za',
-    index: ['entryuuid', 'mail'],
+    index: [:entryuuid, :mail],
     config: {
       host: 'localhost',
       port: 389
@@ -59,6 +59,7 @@ Create an instance of the stub provider by passing in the name, primary key and
     }
 })
 ```
+Please note: Primary key is assumed to be the first element of index array. Index array elements need to be symbols for Ldap.
 
 ### The Model
 ```ruby

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

@@ -1,5 +1,6 @@
 require 'soar/registry/directory/error'
 require 'net/ldap'
+require 'hashie'
 
 module Soar
   module Registry

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

@@ -1,4 +1,5 @@
 require 'soar/registry/directory'
+require 'hashie'
 
 module Soar
   module Registry
@@ -9,16 +10,8 @@ module Soar
 
             def initialize
               @configuration = YAML.load_file("config/#{ENV['CONFIG_FILE']}")
-              @base = @configuration['provider']['base']
-              @config = {
-                host: @configuration['provider']['config']['host'],
-                port: @configuration['provider']['config']['port']
-              }
-              @credentials = {
-                username: @configuration['provider']['credentials']['username'],
-                password: @configuration['provider']['credentials']['password']
-              }
-              @index = @configuration['provider']['index']
+              @base = @configuration['provider']['config']['base']
+              @index = @configuration['provider']['config']['index']
               @entries = [{
                 dn: "cn=John Smith,#{@base}",
                 attributes: {
@@ -39,19 +32,8 @@ module Soar
             end
 
             def given_configured_directory
-              provider = Soar::Registry::Directory::Provider::Ldap.new({
-                base: @base,
-                index: @index,
-                config: {
-                  host: @config[:host],
-                  port: @config[:port]
-                },
-                attributes: ['entryuuid', 'cn', 'mail', 'sn'],
-                credentials: {
-                  username: @credentials[:username],
-                  password: @credentials[:password]
-                }
-              })
+              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])
@@ -66,14 +48,14 @@ module Soar
               @entries.each{ |entry| 
                 @directory.put(entry)
                 result = @directory.search("mail", entry[:attributes][:mail])
-                entry[:attributes][:entryuuid] = result[0][:entryuuid]
+                entry[:attributes][:entryuuid] = result[0][@index[0]]
               }
             end
 
             def put_entry
               @directory.put(@entries[0])
               result = @directory.search("mail", @entries[0][:attributes][:mail])
-              @entries[0][:attributes][:entryuuid] = result[0][:entryuuid]
+              @entries[0][:attributes][:entryuuid] = result[0][@index[0]]
             end
 
             def search_for_entry

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soar-registry-directory
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Charles Mulder