configuration_service 4.1.1 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 799ae54df3cac75e5657db7dff7dbc102049524a
-  data.tar.gz: f1ca9d20a5cd027417b7775787b316680e7674c1
+  metadata.gz: a08e439b4b3ae82204b37d1220da1ad995d05724
+  data.tar.gz: d6cf937e29cf6f2d521eeecaf1b20a3096ebeafd
 SHA512:
-  metadata.gz: 9d9d8bda7a9a32f5bad1af44cd56bfa5385d77ddf1d9c35a879ef9fd7e7bc73edad3aa692b8c22cc3eaaa8a2ceb0a1417fc32bbfaac6dee6069923146edec48b
-  data.tar.gz: dcb67bfcd33459015d05b7f257b56ecf53add9f23de621b97f61c36500497513ac035b317946307e2b613c209b70483d2fc03ad2a097a3a30e35ff81c26b2209
+  metadata.gz: f330c463b9dd838d0f9702e29853df543070cb7b2f737274d2388d11371dc6de9f9d5233681b07118c8e5621f71b88676a2773b0f1ceb8c7c32838b24c9ebc9e
+  data.tar.gz: a73776f84e1b156bafbd6129b27eb8c10f29c8ec3bdeb39939a0ab71c2b1334f19fcf5493b748d4fd50066a7a8fe4a2ba936ba0d38ed0de2abc8a65f3ceb589e

data/lib/configuration_service/decorator/reference_resolver.rb

@@ -1,5 +1,6 @@
 require 'configuration_service/configuration'
 require 'configuration_service/decorator_registry'
+require 'configuration_service/errors'
 require 'delegate'
 
 module ConfigurationService
@@ -71,6 +72,12 @@ module ConfigurationService
     #
     class ReferenceResolver < SimpleDelegator
 
+      ##
+      #
+      # Configuration with a referenced identifier was not found
+      #
+      class MissingReferenceError < ConfigurationService::ConfigurationNotFoundError; end
+
       ##
       # The regular expression used to match configuration identifier references
       #
@@ -115,7 +122,7 @@ module ConfigurationService
       #
       def authorize_consumption(identifier, credentials)
         configuration = @provider.request_configuration(identifier, credentials)
-        identifiers = ReferenceResolver.find_configuration_identifiers(configuration.data)
+        identifiers = find_configuration_identifiers(configuration.data)
         identifiers.unshift(identifier)
         @provider.authorize_consumption(identifiers, credentials) 
       end
@@ -126,24 +133,56 @@ module ConfigurationService
       # @param [Hash] configuration_data
       #   the data dictionary whose String values to search for configuration identifier references
       # @return [Array] list of referenced configuration identifiers found
-      ##
-      def self.find_configuration_identifiers(configuration_data)
-        configuration_data.values.select { |value|
-          value.is_a? String
-        }.map { |value| 
-          match = value.match(PATTERN)
-          match[1] if not match.nil?
-        }.compact
-      end	
+      #
+      def find_configuration_identifiers(configuration_data)
+        enumerate_references(configuration_data).map { |_, _, reference| reference }
+      end
 
+      ##
+      # Provide resolved configuration data
+      #
+      # @param [Hash] configuration_data
+      #   the data dictionary whose configuration identifier references to resolve
+      #
+      # @return [Hash] a deep copy of +configuration_data+ in which references have been replaced
+      #   with the configuration data they reference.
+      #
       def resolve_configuration_data(configuration_data, credentials)
-        configuration_data.each { |key, value|
-          next if not value.is_a? String
-          match = value.match(PATTERN)
-          if not match.nil?
-            configuration_data[key] = @provider.request_configuration(match[1], credentials).data
+        deep_copy(configuration_data).tap do |resolved_data|
+          enumerate_references(resolved_data).each do |c, k, reference|
+            if resolved = @provider.request_configuration(reference, credentials)
+              c[k] = resolved.data
+            else
+              raise MissingReferenceError.new("unresolved reference %{#{reference}}")
+            end
           end
-        }
+        end
+      end
+
+      ##
+      # Enumerate all references in a configuration data dictionary
+      #
+      # @param [Hash] configuration_data
+      #   the data dictionary to walk
+      #
+      # @return [Enumerator] an enumerator over all (possibly nested) references.
+      #   The enumerator yields an array of the (sub)dictionary in which the reference
+      #   was found, the key that mapped to the reference, and the reference.
+      #
+      def enumerate_references(configuration_data)
+        Enumerator.new do |enum|
+          configuration_data.each do |key, value|
+            if value.is_a?(Hash)
+              enumerate_references(value).each { |m| enum << m }
+            elsif value.to_s =~ PATTERN
+              enum << [configuration_data, key, $1]
+            end
+          end
+        end
+      end
+
+      def deep_copy(h)
+        Marshal.load(Marshal.dump(h))
       end
 
     end

data/lib/configuration_service/provider/stub_store.rb

@@ -64,6 +64,13 @@ unless defined?(ConfigurationService::Provider::StubStore)
           nil
         end
 
+        ##
+        # Delete all configuration data and metadata
+        #
+        def clear
+          @configurations.clear
+        end
+
         # @private
         def initialize
           @configurations = {}

data/lib/configuration_service/version.rb

@@ -1,5 +1,5 @@
 module ConfigurationService
 
-  VERSION = "4.1.1"
+  VERSION = "4.2.0"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: configuration_service
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.2.0
 platform: ruby
 authors:
 - Sheldon Hearn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-13 00:00:00.000000000 Z
+date: 2017-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -160,3 +160,4 @@ signing_key:
 specification_version: 4
 summary: Configuration service
 test_files: []
+has_rdoc: