has_configuration 5.0.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e42443c258397453654818b1b489594899b993f9353a0f5773929692a5e25eb8
-  data.tar.gz: 487e9fcd0fce895bde4e1647a8cc048c75ae231181b2d2ac9cd89f73f916717e
+  metadata.gz: 9ef13678ebcf0232c7c0b7535487a70b25d0e245686ca4acb7a8683cbee59d4a
+  data.tar.gz: '04568b62a1c1259c4e14dca63438e3ac60032f1ca78e103a0c09f0d8d816b14f'
 SHA512:
-  metadata.gz: 9305a55f4a488492d459b583e44ccf956e124a94e1b5a9daa58765ee0bf4b7e6b239770a76594eef0e3b5ee1ce648b4857c766ff9cdc9102f1486e7057cfeddd
-  data.tar.gz: 6045d9a8e991cc88829f7be6b816d3da307ea68928734bdf4cf43e7e41c8c048931233dba85cf24649e7d4618ed194dd0e9489cc3748e6a8473fbc3ba64a3e0a
+  metadata.gz: ad96fe37a596f768234729a99597a4429d1893b4765ba6196e3f904f038e021b4a5395927ae58a5f0d4a102568d0cbe663b4d85bd0d675563881e1bdb6b1cac6
+  data.tar.gz: 12f7267b2de11e3c0fe91b77e222281cf6dafc010f6d817358cd78ac936f5457612535a995b2bffde62efd65923bc105f4d7e33ad2a96d3347ee2e59d7a0710a

data/lib/has_configuration/configuration.rb

@@ -59,15 +59,18 @@ module HasConfiguration #:nodoc:
     end
 
     def filename
-      if @options[:file]
-        @options[:file]
-      elsif @class_name
-        filename = "#{@class_name.downcase}.yml"
-        defined?(Rails) ? Rails.root.join('config', filename).to_s : filename
-      else
-        raise ArgumentError,
-              'Unable to resolve filename, please add :file parameter to has_configuration'
-      end
+      @options[:file] || determine_filename_from_class ||
+        raise(
+          ArgumentError,
+          'Unable to resolve filename, please add :file parameter to has_configuration'
+        )
+    end
+
+    def determine_filename_from_class
+      return unless @class_name
+
+      filename = "#{@class_name.downcase}.yml"
+      defined?(Rails) ? Rails.root.join('config', filename).to_s : filename
     end
 
     def environment
@@ -91,13 +94,11 @@ module HasConfiguration #:nodoc:
       @deep_stringified_hash ||= deep_transform_keys(@hash, &:to_s)
     end
 
-    # from Rails 4.0 (/active_support/core_ext/hash/keys.rb)
+    # from Rails (/active_support/core_ext/hash/keys.rb)
     def deep_transform_keys(hash, &block)
-      result = {}
-      hash&.each do |key, value|
+      hash&.each_with_object({}) do |(key, value), result|
         result[yield(key)] = value.is_a?(Hash) ? deep_transform_keys(value, &block) : value
       end
-      result
     end
   end
 end

data/lib/version.rb

@@ -4,7 +4,7 @@ module HasConfiguration #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 5
     MINOR = 0
-    BUILD = 0
+    BUILD = 1
 
     STRING = [MAJOR, MINOR, BUILD].join('.')
   end

data/spec/lib/has_configuration_spec.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
+class Dummy
+  require 'has_configuration'
+  has_configuration file: 'spec/fixtures/class.yml'
+end
+
 RSpec.describe HasConfiguration do
   context 'when declared' do
-    Dummy = Class.new do
-      require 'has_configuration'
-      has_configuration file: 'spec/fixtures/class.yml'
-    end
-
     context 'with a class' do
       subject(:dummy) { Dummy }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has_configuration
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.1
 platform: ruby
 authors:
 - Martin Spickermann
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-12 00:00:00.000000000 Z
+date: 2020-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -133,7 +133,7 @@ homepage: https://github.com/spickermann/has_configuration
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -148,8 +148,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Simple configuration handling
 test_files: []