configuration_service 2.0.6 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d77ac4451fbc4e6b19276dddbba08a4d44240cb
-  data.tar.gz: d645e3e4b48494e7f8bbd84b73a194c45f257a0c
+  metadata.gz: a8a12bd4bf52fe773fde0b4306ba47c9d9f33d90
+  data.tar.gz: 64b84d7cf9c08401d56c0c8f4b7c9d9ac40c59c6
 SHA512:
-  metadata.gz: b3dbe5db6da2659032e7d15fb55ed98173e8cc7ff6cffa7af6610c64aa4f49dfa4949826b4984d1b1adb4598bf8dd9c76b6149c4aab8e0f34bb2311f88476e16
-  data.tar.gz: 8c89bd07e788933c053b369fd642ee8768d7faa9d42726afcaf2c779af8ab6f134d0815a81bda1f9057be8221861ed281761cef8423be2ebf51568097bea8dd1
+  metadata.gz: 374a86490e8e6d0c42d3c13058a60320f016efae154ba4d370ccf30547ea72df3ebd0cb347aa8f38c8602467c3f4f08f537f601fe8b99902e6fead53d387fe7b
+  data.tar.gz: beb9ea330992004c10fbb7782d808799c48534b9c79681ddb2abdcfce0697f9a30dc1c5c1af0ca30bc8e3d6d58f65d398ed7a1510c1114b9c6d462a146ad5b96

data/.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 11.1"
   spec.add_development_dependency "cucumber", "~> 2.0"
   spec.add_development_dependency "rspec", "~> 3.3"
   spec.add_development_dependency "rspec-expectations", "~> 3.3"

data/lib/configuration_service/factory/environment_context/env_dict.rb

@@ -6,8 +6,9 @@ module ConfigurationService
 
       class EnvDict < Hash
 
-        def initialize(env, *path)
-          @env = env
+        def initialize(sources, *path)
+          @sources = sources.is_a?(Array) ? sources : [ sources ]
+          @env = @sources.inject { |m, e| m.merge(e) }
           @path = build_path(*path)
 
           env_keys.each do |k|
@@ -58,8 +59,8 @@ module ConfigurationService
             raise KeyError, "missing environment variable #{envar}"
           end
 
-          def env_keys
-            @env.keys.select { |k| under_path?(k) }
+          def env_keys(env = @env)
+            env.keys.select { |k| under_path?(k) }
           end
 
           def under_path?(k)
@@ -96,8 +97,8 @@ module ConfigurationService
           end
 
           def scrub_env!
-            env_keys.each do |k|
-              @env.delete(k)
+            @sources.each do |env|
+              env_keys(env).each { |k| env.delete(k) }
             end
           end
 

data/lib/configuration_service/factory/environment_context.rb

@@ -46,8 +46,8 @@ module ConfigurationService
       ##
       # Returns a new factory
       #
-      # @param [Hash] env
-      #   the string-keyed environment
+      # @param [Hash, Array<Hash>] sources
+      #   one or a list of the string-keyed environments
       # @param [String] prefix
       #   the prefix for matching environment variable names
       #
@@ -55,8 +55,8 @@ module ConfigurationService
       # they can use {.create} which instantiates a factory with default +env+ and +prefix+
       # and uses that internally.
       #
-      def initialize(env = ENV, prefix = DEFAULT_PREFIX)
-        @env = EnvDict.new(env, prefix)
+      def initialize(sources = default_sources, prefix = DEFAULT_PREFIX)
+        @env = EnvDict.new(sources, prefix)
       end
 
       ##
@@ -73,6 +73,9 @@ module ConfigurationService
       # [PROVIDER_*] configuration options for the service provider
       #              (see service provider documentation)
       #
+      # On JRuby, system properties are also scanned. Where a system property and environment variable of the
+      # same name exist, the environment variable is preferred.
+      #
       # The service provider class is fetched from the {ConfigurationService::ProviderRegistry} using +PROVIDER+.
       # A service provider instance is then constructed with a dictionary of the +PROVIDER_*+ variables,
       # in which the keys are the name of the variable without +PROVIDER_+, downcased and intern'd.
@@ -80,7 +83,8 @@ module ConfigurationService
       # Then a service {ConfigurationService::Base} is constructed with the +IDENTIFIER+, +TOKEN+ and service provider instance.
       #
       # And finally, the environment is scrubbed of the variables used, to protect them from accidental exposure
-      # (e.g. in an exception handler that prints the environment).
+      # (e.g. in an exception handler that prints the environment). On JRuby, system properties are scrubbed of variables used as well,
+      # regardless of whether they were overridden by environment variables.
       #
       # @return [ConfigurationService::Base] the configuration service instance created
       # @raise [ProviderNotFoundError] if no service provider has been registered with the name given by +PROVIDER+
@@ -104,6 +108,10 @@ module ConfigurationService
 
       private
 
+        def default_sources
+          (RUBY_PLATFORM == "java" ? [java.lang.System.properties, ENV] : ENV)
+        end
+
         def provider
           provider_id = @env[:provider]
           provider_config = @env.subslice(:provider)

data/lib/configuration_service/version.rb

@@ -1,5 +1,5 @@
 module ConfigurationService
 
-  VERSION = "2.0.6"
+  VERSION = "2.1.0"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: configuration_service
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.1.0
 platform: ruby
 authors:
 - Sheldon Hearn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.1'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Configuration service