has_configuration 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40f44c4cea757f02eefd7f88c4ebe57191f7fd66
-  data.tar.gz: 8f43c0b7f09647f1b64a81bb087bb137340973ac
+  metadata.gz: 4e711006bd79831f88942f6a8f00c73adda21e06
+  data.tar.gz: cae116f13df37c98c094537f77528acb37f0c5bb
 SHA512:
-  metadata.gz: 702a7f3bb8b1c8f8f369a66a07d1f2ae9979282fd8aa501a8885dfa58a377dd8169bc726e96151a953feb69a37b91d196edcd68adfa7ff09bc23122c9ad192b6
-  data.tar.gz: 7e565b1b17efaa841c5fa15fa9f2377807df8b1b67a1c6ca1dadf94333fcbf73684234d56af5b3fe34fff860dd431c5005b72c9c9e68996ea69a964b1682cc5d
+  metadata.gz: f431a7d22c52c614fad01600be733548ec56bc5fdb21c7dcf6ec43ef6a9f89799d53936287529cab904666defff2abc6ab75ccdf94272087a206246a7287b75f
+  data.tar.gz: aba4ca638e262bf0c625e56ad9f49386d8c269de18e77d94b8717147c00633a2e236e093e98820d39caf0b0d6707993acc2dc863dc2f3fb1a5e7d6af3641ca50

data/lib/has_configuration/configuration.rb

@@ -20,19 +20,28 @@ module HasConfiguration #:nodoc:
       end
     end
 
-  private
+    private
 
     def method_missing(sym, *args, &block)
-      configuration.send(sym, *args, &block)
+      configuration.send(sym, *args, &block) || super
+    end
+
+    def respond_to_missing?(sym, include_private = false)
+      configuration.respond_to?(sym, include_private)
     end
 
     def load_file
-      @raw = YAML.load(ERB.new(raw_file(filename)).result)
+      @raw = YAML.safe_load(
+        ERB.new(raw_file(filename)).result,
+        [],  # whitelist_classes
+        [],  # whitelist_symbols
+        true # allow aliases
+      )
     end
 
     def init_hash
       @hash = (@raw || {}).with_indifferent_access
-      @hash = @hash[environment]        if environment
+      @hash = @hash[environment] if environment
     end
 
     def raw_file(filename)
@@ -50,23 +59,19 @@ module HasConfiguration #:nodoc:
         filename = "#{@class_name.downcase}.yml"
         defined?(Rails) ? Rails.root.join('config', filename).to_s : filename
       else
-        fail ArgumentError,
-             'Unable to resolve filename, please add :file parameter to has_configuration'
+        raise ArgumentError,
+              'Unable to resolve filename, please add :file parameter to has_configuration'
       end
     end
 
     def environment
-      case
-      when @options.keys.include?(:env)   then @options[:env]
-      when defined?(Rails)                then Rails.env.to_s
-      end
+      return @options[:env] if @options.keys.include?(:env)
+      return Rails.env.to_s if defined?(Rails)
     end
 
     def deep_structify(hash)
-      result = {}
-      hash.each do |key, value|
-        result[key] = value.is_a?(Hash) ? deep_structify(value) : value
-      end if hash
+      hash ||= {}
+      result = Hash[hash.map { |k, v| [k, v.is_a?(Hash) ? deep_structify(v) : v] }]
       OpenStruct.new(result)
     end
 
@@ -77,15 +82,17 @@ module HasConfiguration #:nodoc:
     end
 
     def deep_stringified_hash
-      @deep_stringified_hash ||= deep_transform_keys(@hash) { |key| key.to_s }
+      @deep_stringified_hash ||= deep_transform_keys(@hash, &:to_s)
     end
 
     # from Rails 4.0 (/active_support/core_ext/hash/keys.rb)
     def deep_transform_keys(hash, &block)
       result = {}
-      hash.each do |key, value|
-        result[yield(key)] = value.is_a?(Hash) ? deep_transform_keys(value, &block) : value
-      end if hash
+      if hash
+        hash.each do |key, value|
+          result[yield(key)] = value.is_a?(Hash) ? deep_transform_keys(value, &block) : value
+        end
+      end
       result
     end
   end

data/lib/version.rb

@@ -1,6 +1,6 @@
 module HasConfiguration #:nodoc:
   module VERSION #:nodoc:
-    MAJOR = 1
+    MAJOR = 2
     MINOR = 0
     BUILD = 0
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has_configuration
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Martin Spickermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2017-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -113,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Simple configuration handling