has_configuration 5.0.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e42443c258397453654818b1b489594899b993f9353a0f5773929692a5e25eb8
-  data.tar.gz: 487e9fcd0fce895bde4e1647a8cc048c75ae231181b2d2ac9cd89f73f916717e
+  metadata.gz: 9900b392e98d9a9cea21c03c580ac9401b6967908a6daf653b338d0be95bbe5a
+  data.tar.gz: 75276e32b7167ff2097713cc8552705063dc8037034f5adb5b6dbbdf0152691c
 SHA512:
-  metadata.gz: 9305a55f4a488492d459b583e44ccf956e124a94e1b5a9daa58765ee0bf4b7e6b239770a76594eef0e3b5ee1ce648b4857c766ff9cdc9102f1486e7057cfeddd
-  data.tar.gz: 6045d9a8e991cc88829f7be6b816d3da307ea68928734bdf4cf43e7e41c8c048931233dba85cf24649e7d4618ed194dd0e9489cc3748e6a8473fbc3ba64a3e0a
+  metadata.gz: 2b5c225aaaacbfa20315db359c063c19866535538021e252e9737186cae252cee47352ba2893b9782aa002666aea856cbc21cbabc4bc61cadd31525820b5c64c
+  data.tar.gz: 37bb26491f37b7fc5d4f8d4053739d0cdf526fa3b73ffcc70a248d87b58104e25175acb71fea408a8a9c534f261dabfd11e22e5e1e1720bdc8f42ffb11585d33

data/lib/has_configuration/configuration.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/hash/indifferent_access'
-require 'ostruct'
-require 'yaml'
+require "active_support/core_ext/hash/indifferent_access"
+require "ostruct"
+require "yaml"
 
-module HasConfiguration #:nodoc:
-  class Configuration #:nodoc:
+module HasConfiguration # :nodoc:
+  class Configuration # :nodoc:
     def initialize(klass, options = {})
       @class_name = klass.name
-      @options    = options
+      @options = options
 
       load_file
       init_hash
@@ -16,16 +16,16 @@ module HasConfiguration #:nodoc:
 
     def to_h(type = nil)
       case type
-      when :symbolized  then  deep_symbolized_hash
-      when :stringify   then  deep_stringified_hash
-      else                    @hash
+      when :symbolized then deep_symbolized_hash
+      when :stringify then deep_stringified_hash
+      else @hash
       end
     end
 
     private
 
-    def method_missing(sym, *args, &block)
-      configuration.send(sym, *args, &block) || super
+    def method_missing(sym, ...)
+      configuration.send(sym, ...) || super
     end
 
     def respond_to_missing?(sym, include_private = false)
@@ -33,16 +33,7 @@ module HasConfiguration #:nodoc:
     end
 
     def load_file
-      @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
+      @raw = YAML.safe_load(ERB.new(raw_file(filename)).result, aliases: true)
     end
 
     def init_hash
@@ -59,20 +50,23 @@ 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.key?(:env)
-      return Rails.env.to_s if defined?(Rails)
+      Rails.env.to_s if defined?(Rails)
     end
 
     def deep_structify(hash)
@@ -91,13 +85,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/has_configuration.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'has_configuration/configuration'
+require "has_configuration/configuration"
 
-module HasConfiguration #:nodoc:
+module HasConfiguration # :nodoc:
   def self.included(base)
     base.extend(ClassMethods)
   end
 
-  module ClassMethods #:nodoc:
+  module ClassMethods # :nodoc:
     # Load configuration settings from a yaml file and adds a class and an instance
     # method +configuration+ to the object.
     #
@@ -82,7 +82,7 @@ module HasConfiguration #:nodoc:
         base.extend(ClassMethods)
       end
 
-      module ClassMethods #:nodoc:
+      module ClassMethods # :nodoc:
         attr_reader :configuration
       end
 
@@ -93,6 +93,6 @@ module HasConfiguration #:nodoc:
   end
 end
 
-class Object #:nodoc:
+class Object # :nodoc:
   include HasConfiguration
 end

data/lib/version.rb

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

data/spec/lib/has_configuration/configuration_spec.rb

@@ -1,117 +1,117 @@
 # frozen_string_literal: true
 
-require 'has_configuration'
+require "has_configuration"
 
-require 'support/rails_mock'
+require "support/rails_mock"
 
 RSpec.describe HasConfiguration::Configuration do
   let(:klass) { Class }
 
   before do
-    allow_any_instance_of( # rubocop:disable RSpec/AnyInstance
+    allow_any_instance_of( # standard:disable RSpec/AnyInstance
       Configuration
     ).to receive(:raw_file).and_return(File.read(fixture))
   end
 
-  describe '.new' do
-    let(:fixture) { 'spec/fixtures/class.yml' }
+  describe ".new" do
+    let(:fixture) { "spec/fixtures/class.yml" }
 
-    context 'when no filename provided' do
-      let(:file) { '/RAILS_ROOT/config/class.yml' }
+    context "when no filename provided" do
+      let(:file) { "/RAILS_ROOT/config/class.yml" }
 
-      it 'loads default file' do
+      it "loads default file" do
         configuration = described_class.new(klass)
         expect(configuration).to have_received(:raw_file).with(file)
       end
     end
 
-    context 'when filename provided' do
-      let(:file) { 'foo/bar.yml' }
+    context "when filename provided" do
+      let(:file) { "foo/bar.yml" }
 
-      it 'loads provided file' do
+      it "loads provided file" do
         configuration = described_class.new(klass, file: file)
         expect(configuration).to have_received(:raw_file).with(file)
       end
     end
   end
 
-  context 'when initialized' do
+  context "when initialized" do
     let(:environment) { nil }
 
-    context 'without env option' do
+    context "without env option" do
       subject(:hash) { described_class.new(klass).to_h }
 
-      let(:fixture) { 'spec/fixtures/class.yml' }
+      let(:fixture) { "spec/fixtures/class.yml" }
 
-      it 'return the expected hash' do
-        expect(hash).to eq('env' => 'test')
+      it "return the expected hash" do
+        expect(hash).to eq("env" => "test")
       end
     end
 
-    context 'with env option' do
+    context "with env option" do
       subject(:hash) { described_class.new(klass, env: environment).to_h }
 
-      let(:environment) { 'production' }
-      let(:fixture) { 'spec/fixtures/class.yml' }
+      let(:environment) { "production" }
+      let(:fixture) { "spec/fixtures/class.yml" }
 
-      it 'return the expected hash' do
-        expect(hash).to eq('env' => environment)
+      it "return the expected hash" do
+        expect(hash).to eq("env" => environment)
       end
     end
 
-    context 'with yaml defaults' do
+    context "with yaml defaults" do
       subject(:hash) { described_class.new(klass).to_h }
 
-      let(:fixture) { 'spec/fixtures/with_defaults.yml' }
+      let(:fixture) { "spec/fixtures/with_defaults.yml" }
 
-      it 'return the expected hash' do
-        expect(hash).to eq('default' => 'default', 'env' => 'test')
+      it "return the expected hash" do
+        expect(hash).to eq("default" => "default", "env" => "test")
       end
     end
 
-    context 'with erb' do
+    context "with erb" do
       subject(:hash) { described_class.new(klass).to_h }
 
-      let(:fixture) { 'spec/fixtures/with_erb.yml' }
+      let(:fixture) { "spec/fixtures/with_erb.yml" }
 
-      it 'return the expected hash' do
-        expect(hash).to eq('erb' => Rails.env)
+      it "return the expected hash" do
+        expect(hash).to eq("erb" => Rails.env)
       end
     end
   end
 
-  describe '#to_h' do
-    let(:fixture) { 'spec/fixtures/with_nested_attributes.yml' }
+  describe "#to_h" do
+    let(:fixture) { "spec/fixtures/with_nested_attributes.yml" }
 
-    context 'without arguments' do
+    context "without arguments" do
       subject { described_class.new(klass).to_h }
 
       it { is_expected.to be_a(HashWithIndifferentAccess) }
     end
 
-    context 'with :stringify' do
+    context "with :stringify" do
       subject { described_class.new(klass).to_h(:stringify) }
 
-      it { is_expected.to eq('env' => 'test', 'nested' => { 'foo' => 'bar', 'baz' => true }) }
+      it { is_expected.to eq("env" => "test", "nested" => {"foo" => "bar", "baz" => true}) }
     end
 
-    context 'with :symbolized' do
+    context "with :symbolized" do
       subject { described_class.new(klass).to_h(:symbolized) }
 
-      it { is_expected.to eq(env: 'test', nested: { foo: 'bar', baz: true }) }
+      it { is_expected.to eq(env: "test", nested: {foo: "bar", baz: true}) }
     end
   end
 
-  describe 'struct methods' do
+  describe "struct methods" do
     let(:configuration) { described_class.new(klass) }
-    let(:fixture) { 'spec/fixtures/with_nested_attributes.yml' }
+    let(:fixture) { "spec/fixtures/with_nested_attributes.yml" }
 
-    it 'supports multiple getter variants' do # rubocop:disable RSpec/MultipleExpectations
-      expect(configuration.to_h[:env]).to eql('test')
-      expect(configuration.env).to eql('test')
+    it "supports multiple getter variants" do # standard:disable RSpec/MultipleExpectations
+      expect(configuration.to_h[:env]).to eql("test")
+      expect(configuration.env).to eql("test")
 
-      expect(configuration.to_h[:nested]['foo']).to eql('bar')
-      expect(configuration.nested.foo).to eql('bar')
+      expect(configuration.to_h[:nested]["foo"]).to eql("bar")
+      expect(configuration.nested.foo).to eql("bar")
     end
   end
 end

data/spec/lib/has_configuration_spec.rb

@@ -1,29 +1,29 @@
 # frozen_string_literal: true
 
-RSpec.describe HasConfiguration do
-  context 'when declared' do
-    Dummy = Class.new do
-      require 'has_configuration'
-      has_configuration file: 'spec/fixtures/class.yml'
-    end
+class Dummy
+  require "has_configuration"
+  has_configuration file: "spec/fixtures/class.yml"
+end
 
-    context 'with a class' do
+RSpec.describe HasConfiguration do
+  context "when declared" do
+    context "with a class" do
       subject(:dummy) { Dummy }
 
       it { is_expected.to respond_to(:configuration) }
 
-      it 'returns a configuration' do
-        expect(dummy.configuration).to be_present
+      it "returns a configuration" do
+        expect(dummy.configuration).to be_a HasConfiguration::Configuration
       end
     end
 
-    context 'with an instance' do
+    context "with an instance" do
       subject(:dummy) { Dummy.new }
 
       it { is_expected.to respond_to(:configuration) }
 
-      it 'returns a configuration' do
-        expect(dummy.configuration).to be_present
+      it "returns a configuration" do
+        expect(dummy.configuration).to be_a HasConfiguration::Configuration
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,7 +1,24 @@
 # frozen_string_literal: true
 
-require 'coveralls'
-Coveralls.wear!
+require "simplecov"
+
+SimpleCov.start do
+  if ENV["CI"]
+    require "simplecov_json_formatter"
+    require "simplecov-lcov"
+
+    SimpleCov::Formatter::LcovFormatter.config do |c|
+      c.report_with_single_file = true
+      c.single_report_path = "coverage/lcov.info"
+    end
+
+    formatter SimpleCov::Formatter::MultiFormatter.new [
+      SimpleCov::Formatter::JSONFormatter, SimpleCov::Formatter::LcovFormatter
+    ]
+  end
+
+  add_filter %w[version.rb initializer.rb]
+end
 
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
@@ -83,7 +100,7 @@ RSpec.configure do |config|
     # Use the documentation formatter for detailed output,
     # unless a formatter has already been configured
     # (e.g. via a command-line flag).
-    config.default_formatter = 'doc'
+    config.default_formatter = "doc"
   end
 
   # Print the 10 slowest examples and example groups at the

data/spec/support/rails_mock.rb

@@ -3,10 +3,10 @@
 # Mocks Rails Environment
 Rails = Class.new do
   def self.root
-    Pathname.new('/RAILS_ROOT')
+    Pathname.new("/RAILS_ROOT")
   end
 
   def self.env
-    'test'
+    "test"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has_configuration
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 6.0.0
 platform: ruby
 authors:
 - Martin Spickermann
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-12 00:00:00.000000000 Z
+date: 2023-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,98 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.2
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        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
-    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: rspec
-  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
-  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-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:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.1.0
 description: |2
       Loads configuration setting from a yml file and adds a configuation method
       to class and instances
@@ -132,8 +48,9 @@ files:
 homepage: https://github.com/spickermann/has_configuration
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -141,15 +58,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: Simple configuration handling
 test_files: []