confset 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee921fe4009d09cc7bc14c73f8b8b92c34362519dc1f7c45d22ebfbdbbd672fc
-  data.tar.gz: 075edbaa190b9a44f9b0d772c73430bc19bf3cf6223d7849571d37d073fb19c6
+  metadata.gz: 8a370ca26c32a42b9eb9cd17d98e99a1450db5a73f2e53f11222f2757bfac588
+  data.tar.gz: '035569d155fb88697b03d4d4659b5e061540ef34585f25fad5455a5091211ac9'
 SHA512:
-  metadata.gz: 907c3c7a16e7c4b6c78295b7ecb61c01680a8b21978bbf5c20895b87628fbf3c5892884fccf29b2342851e4c6e758dcbaa1f6f99667442eacf949e4e0418c148
-  data.tar.gz: 1f048671f6c483c98f84ca081c699a019414110fa062f2d9a9ccf839585b824c84e6f41a3434d4e05e3a61c57641db49dd5056c17a45938b84de00ee78dd4085
+  metadata.gz: 03c4a9c04f00ea925439156dd409c2f7e15c69c9861be8deeb9b9cb154a6e72b73059362ac839783d212c9f8cef4d8464c44bf256feae69971b9ae800be1984c
+  data.tar.gz: 7a503890c049a3f9fd44a57f97a95333ac72ea7c977266842145cbcd5f4cbf537454d7f142d4d334af6e7c55e717e594de4d9559b60971279dab54de23cce4a6

data/CHANGELOG.md

@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.1.0] - 2023-10-13
+
+### Changed
+
+#### Breaking Changes
+
+- `config` no longer loads `deep_merge`'s monkey patch for `Hash#deep_merge` and Hash#deep_merge!`([#342](https://github.com/rubyconfig/config/pull/342)). If you rely on those methods and are not using Rails / Active Support, you can load the monkey patch via`require 'deep_merge/deep_merge_hash'` by @jonathanhefner
+
+### Fixed
+
+- Address edge case with table config param (#339) by @krasnoukhov
+
 ## [1.0.3] - 2023-02-17
 
 ### Changed
@@ -26,8 +38,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Only load Railtie integration if Rails::Railtie is defined
-[rubyconfig#31](https://github.com/rubyconfig/config/pull/319) - Thanks to Ufuk
-Kayserilioglu <ufuk.kayserilioglu@shopify.com>
+  [rubyconfig#31](https://github.com/rubyconfig/config/pull/319) - Thanks to Ufuk
+  Kayserilioglu <ufuk.kayserilioglu@shopify.com>
 - CHANGELOG.md pattern changed to the [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [1.0.1] - 2022-05-30
@@ -35,7 +47,7 @@ Kayserilioglu <ufuk.kayserilioglu@shopify.com>
 ### Fixed
 
 - Avoid to crash the Rails application when there is an error
-parsing a variable <https://github.com/dcotecnologia/confset/pull/5>
+  parsing a variable <https://github.com/dcotecnologia/confset/pull/5>
 
 ## [1.0.0] - 2022-05-27
 
@@ -43,9 +55,9 @@ parsing a variable <https://github.com/dcotecnologia/confset/pull/5>
 
 - Initial release
 - Refac the project focusing on the newer versions of the
-Ruby language and Ruby on Rails.
+  Ruby language and Ruby on Rails.
 
----------------------
+---
 
 You can find the full changelog of the original "config" gem at the link
 <https://github.com/rubyconfig/config/blob/master/CHANGELOG.md>.

data/lib/confset/options.rb

@@ -114,7 +114,7 @@ module Confset
     end
 
     # Some keywords that don't play nicely with OpenStruct
-    SETTINGS_RESERVED_NAMES = %w[select collect test count zip min max exit!].freeze
+    SETTINGS_RESERVED_NAMES = %w[select collect test count zip min max exit! table].freeze
 
     # An alternative mechanism for property access.
     # This let's you do foo['bar'] along with foo.bar.
@@ -134,11 +134,11 @@ module Confset
     end
 
     def key?(key)
-      table.key?(key)
+      @table.key?(key)
     end
 
     def has_key?(key)
-      table.has_key?(key)
+      @table.has_key?(key)
     end
 
     def method_missing(method_name, *args)

data/lib/confset/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Confset
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

data/lib/confset.rb

@@ -7,7 +7,7 @@ require "confset/sources/yaml_source"
 require "confset/sources/hash_source"
 require "confset/sources/env_source"
 require "confset/validation/schema"
-require "deep_merge"
+require "deep_merge/core"
 
 module Confset
   extend Confset::Validation::Schema

data/spec/fixtures/reserved_keywords.yml

@@ -5,3 +5,4 @@ zip: cherry
 max: kumquat
 min: fig
 exit!: taro
+table: strawberry

data/spec/options_spec.rb

@@ -20,6 +20,7 @@ describe Confset::Options do
       expect(config.max).to eq("kumquat")
       expect(config.min).to eq("fig")
       expect(config.exit!).to eq("taro")
+      expect(config.table).to eq("strawberry")
     end
 
     it "should allow to access them using [] operator" do
@@ -30,6 +31,7 @@ describe Confset::Options do
       expect(config["max"]).to eq("kumquat")
       expect(config["min"]).to eq("fig")
       expect(config["exit!"]).to eq("taro")
+      expect(config["table"]).to eq("strawberry")
 
       expect(config[:select]).to eq("apple")
       expect(config[:collect]).to eq("banana")
@@ -38,6 +40,26 @@ describe Confset::Options do
       expect(config[:max]).to eq("kumquat")
       expect(config[:min]).to eq("fig")
       expect(config[:exit!]).to eq("taro")
+      expect(config[:table]).to eq("strawberry")
+    end
+  end
+
+  context "when empty" do
+    let(:config) do
+      Confset.load_files("#{fixture_path}/empty1.yml")
+    end
+
+    it "should allow to access them via object member notation" do
+      expect(config.select).to be_nil
+      expect(config.table).to be_nil
+    end
+
+    it "should allow to access them using [] operator" do
+      expect(config["select"]).to be_nil
+      expect(config["table"]).to be_nil
+
+      expect(config[:select]).to be_nil
+      expect(config[:table]).to be_nil
     end
   end
 

data/spec/spec_helper.rb

@@ -10,6 +10,7 @@ Dir["./spec/support/**/*.rb"].each { |f| require f }
 RSpec.configure do |config|
   # Turn the deprecation warnings into errors, giving you the full backtrace
   config.raise_errors_for_deprecations!
+  config.include FixtureHelper
 
   config.before(:suite) do
     Confset.module_eval do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: confset
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Danilo Carolino
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-17 00:00:00.000000000 Z
+date: 2023-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -39,7 +39,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.10.0
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -49,7 +49,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.10.0
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -60,6 +60,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.12.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -67,20 +70,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.12.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.12.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.6
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.6
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -101,14 +107,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -129,14 +135,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.45.1
+        version: 1.57.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.45.1
+        version: 1.57.1
 - !ruby/object:Gem::Dependency
   name: rubocop-packaging
   requirement: !ruby/object:Gem::Requirement
@@ -251,7 +257,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="