has_configuration 2.0.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4e711006bd79831f88942f6a8f00c73adda21e06
-  data.tar.gz: cae116f13df37c98c094537f77528acb37f0c5bb
+SHA256:
+  metadata.gz: 9ef13678ebcf0232c7c0b7535487a70b25d0e245686ca4acb7a8683cbee59d4a
+  data.tar.gz: '04568b62a1c1259c4e14dca63438e3ac60032f1ca78e103a0c09f0d8d816b14f'
 SHA512:
-  metadata.gz: f431a7d22c52c614fad01600be733548ec56bc5fdb21c7dcf6ec43ef6a9f89799d53936287529cab904666defff2abc6ab75ccdf94272087a206246a7287b75f
-  data.tar.gz: aba4ca638e262bf0c625e56ad9f49386d8c269de18e77d94b8717147c00633a2e236e093e98820d39caf0b0d6707993acc2dc863dc2f3fb1a5e7d6af3641ca50
+  metadata.gz: ad96fe37a596f768234729a99597a4429d1893b4765ba6196e3f904f038e021b4a5395927ae58a5f0d4a102568d0cbe663b4d85bd0d675563881e1bdb6b1cac6
+  data.tar.gz: 12f7267b2de11e3c0fe91b77e222281cf6dafc010f6d817358cd78ac936f5457612535a995b2bffde62efd65923bc105f4d7e33ad2a96d3347ee2e59d7a0710a

data/lib/has_configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'has_configuration/configuration'
 
 module HasConfiguration #:nodoc:

data/lib/has_configuration/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/hash/indifferent_access'
 require 'ostruct'
 require 'yaml'
@@ -31,12 +33,16 @@ module HasConfiguration #:nodoc:
     end
 
     def load_file
-      @raw = YAML.safe_load(
-        ERB.new(raw_file(filename)).result,
-        [],  # whitelist_classes
-        [],  # whitelist_symbols
-        true # allow aliases
-      )
+      @raw = if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.6.0')
+               YAML.safe_load(ERB.new(raw_file(filename)).result, aliases: true)
+             else
+               YAML.safe_load(
+                 ERB.new(raw_file(filename)).result,
+                 [],  # whitelist_classes
+                 [],  # whitelist_symbols
+                 true # allow aliases
+               )
+             end
     end
 
     def init_hash
@@ -53,25 +59,28 @@ 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
-      return @options[:env] if @options.keys.include?(:env)
+      return @options[:env] if @options.key?(:env)
       return Rails.env.to_s if defined?(Rails)
     end
 
     def deep_structify(hash)
       hash ||= {}
-      result = Hash[hash.map { |k, v| [k, v.is_a?(Hash) ? deep_structify(v) : v] }]
+      result = hash.transform_values { |v| v.is_a?(Hash) ? deep_structify(v) : v }
       OpenStruct.new(result)
     end
 
@@ -85,15 +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 = {}
-      if hash
-        hash.each do |key, value|
-          result[yield(key)] = value.is_a?(Hash) ? deep_transform_keys(value, &block) : value
-        end
+      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

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module HasConfiguration #:nodoc:
   module VERSION #:nodoc:
-    MAJOR = 2
+    MAJOR = 5
     MINOR = 0
-    BUILD = 0
+    BUILD = 1
 
     STRING = [MAJOR, MINOR, BUILD].join('.')
   end

data/spec/lib/has_configuration/configuration_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'has_configuration'
 
 require 'support/rails_mock'
@@ -6,7 +8,7 @@ RSpec.describe HasConfiguration::Configuration do
   let(:klass) { Class }
 
   before do
-    allow_any_instance_of(
+    allow_any_instance_of( # rubocop:disable RSpec/AnyInstance
       Configuration
     ).to receive(:raw_file).and_return(File.read(fixture))
   end
@@ -18,8 +20,8 @@ RSpec.describe HasConfiguration::Configuration do
       let(:file) { '/RAILS_ROOT/config/class.yml' }
 
       it 'loads default file' do
-        expect_any_instance_of(Configuration).to receive(:raw_file).with(file)
-        HasConfiguration::Configuration.new(klass)
+        configuration = described_class.new(klass)
+        expect(configuration).to have_received(:raw_file).with(file)
       end
     end
 
@@ -27,8 +29,8 @@ RSpec.describe HasConfiguration::Configuration do
       let(:file) { 'foo/bar.yml' }
 
       it 'loads provided file' do
-        expect_any_instance_of(Configuration).to receive(:raw_file).with(file)
-        HasConfiguration::Configuration.new(klass, file: file)
+        configuration = described_class.new(klass, file: file)
+        expect(configuration).to have_received(:raw_file).with(file)
       end
     end
   end
@@ -36,32 +38,31 @@ RSpec.describe HasConfiguration::Configuration do
   context 'when initialized' do
     let(:environment) { nil }
 
-    context 'environment' do
-      let(:fixture) { 'spec/fixtures/class.yml' }
+    context 'without env option' do
+      subject(:hash) { described_class.new(klass).to_h }
 
-      context 'without env option' do
-        subject(:hash) { HasConfiguration::Configuration.new(klass).to_h }
+      let(:fixture) { 'spec/fixtures/class.yml' }
 
-        it 'return the expected hash' do
-          expect(hash).to eq('env' => 'test')
-        end
+      it 'return the expected hash' do
+        expect(hash).to eq('env' => 'test')
       end
+    end
 
-      context 'with env option' do
-        let(:environment) { 'production' }
+    context 'with env option' do
+      subject(:hash) { described_class.new(klass, env: environment).to_h }
 
-        subject(:hash) { HasConfiguration::Configuration.new(klass, env: environment).to_h }
+      let(:environment) { 'production' }
+      let(:fixture) { 'spec/fixtures/class.yml' }
 
-        it 'return the expected hash' do
-          expect(hash).to eq('env' => environment)
-        end
+      it 'return the expected hash' do
+        expect(hash).to eq('env' => environment)
       end
     end
 
-    context 'yaml defaults' do
-      let(:fixture) { 'spec/fixtures/with_defaults.yml' }
+    context 'with yaml defaults' do
+      subject(:hash) { described_class.new(klass).to_h }
 
-      subject(:hash) { HasConfiguration::Configuration.new(klass).to_h }
+      let(:fixture) { 'spec/fixtures/with_defaults.yml' }
 
       it 'return the expected hash' do
         expect(hash).to eq('default' => 'default', 'env' => 'test')
@@ -69,9 +70,9 @@ RSpec.describe HasConfiguration::Configuration do
     end
 
     context 'with erb' do
-      let(:fixture) { 'spec/fixtures/with_erb.yml' }
+      subject(:hash) { described_class.new(klass).to_h }
 
-      subject(:hash) { HasConfiguration::Configuration.new(klass).to_h }
+      let(:fixture) { 'spec/fixtures/with_erb.yml' }
 
       it 'return the expected hash' do
         expect(hash).to eq('erb' => Rails.env)
@@ -82,27 +83,30 @@ RSpec.describe HasConfiguration::Configuration do
   describe '#to_h' do
     let(:fixture) { 'spec/fixtures/with_nested_attributes.yml' }
 
-    context '#to_h' do
-      subject { HasConfiguration::Configuration.new(klass).to_h }
-      it { should be_a(HashWithIndifferentAccess) }
+    context 'without arguments' do
+      subject { described_class.new(klass).to_h }
+
+      it { is_expected.to be_a(HashWithIndifferentAccess) }
     end
 
-    context '#to_h(:stringify)' do
-      subject { HasConfiguration::Configuration.new(klass).to_h(:stringify) }
-      it { should eq('env' => 'test', 'nested' => { 'foo' => 'bar', 'baz' => true }) }
+    context 'with :stringify' do
+      subject { described_class.new(klass).to_h(:stringify) }
+
+      it { is_expected.to eq('env' => 'test', 'nested' => { 'foo' => 'bar', 'baz' => true }) }
     end
 
-    context '#to_h(:symbolized)' do
-      subject { HasConfiguration::Configuration.new(klass).to_h(:symbolized) }
-      it { should eq(env: 'test', nested: { foo: 'bar', baz: true }) }
+    context 'with :symbolized' do
+      subject { described_class.new(klass).to_h(:symbolized) }
+
+      it { is_expected.to eq(env: 'test', nested: { foo: 'bar', baz: true }) }
     end
   end
 
   describe 'struct methods' do
-    let(:configuration) { HasConfiguration::Configuration.new(klass) }
+    let(:configuration) { described_class.new(klass) }
     let(:fixture) { 'spec/fixtures/with_nested_attributes.yml' }
 
-    it 'is structified' do
+    it 'supports multiple getter variants' do # rubocop:disable RSpec/MultipleExpectations
       expect(configuration.to_h[:env]).to eql('test')
       expect(configuration.env).to eql('test')
 

data/spec/lib/has_configuration_spec.rb

@@ -1,29 +1,29 @@
+# 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
-    before(:all) do
-      Dummy = Class.new do
-        require 'has_configuration'
-        has_configuration file: 'spec/fixtures/class.yml'
-      end
-    end
-
-    context 'the class' do
+    context 'with a class' do
       subject(:dummy) { Dummy }
 
-      it { should respond_to(:configuration) }
+      it { is_expected.to respond_to(:configuration) }
 
       it 'returns a configuration' do
-        expect(dummy.configuration).to be
+        expect(dummy.configuration).to be_present
       end
     end
 
-    context 'an instance' do
+    context 'with an instance' do
       subject(:dummy) { Dummy.new }
 
-      it { should respond_to(:configuration) }
+      it { is_expected.to respond_to(:configuration) }
 
       it 'returns a configuration' do
-        expect(dummy.configuration).to be
+        expect(dummy.configuration).to be_present
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'coveralls'
 Coveralls.wear!
 

data/spec/support/rails_mock.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Mocks Rails Environment
 Rails = Class.new do
   def self.root

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has_configuration
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 5.0.1
 platform: ruby
 authors:
 - Martin Spickermann
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-01-16 00:00:00.000000000 Z
+date: 2020-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.2
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +81,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -105,7 +133,7 @@ homepage: https://github.com/spickermann/has_configuration
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -113,16 +141,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Simple configuration handling
 test_files: []