confset 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8f29b83a1d3a103368e818adc5ab6ca2eaa3773d505bad3e54b01d8c876b3a0
-  data.tar.gz: '079bb9df829a8a899b7597500d418996b2eeb6bfd08db102b459f1cc4c7aa736'
+  metadata.gz: 8a370ca26c32a42b9eb9cd17d98e99a1450db5a73f2e53f11222f2757bfac588
+  data.tar.gz: '035569d155fb88697b03d4d4659b5e061540ef34585f25fad5455a5091211ac9'
 SHA512:
-  metadata.gz: e91cf5b4a235a67fc80b10004e4462bd24a4b19aeeab7faa2567d8565742c9cdec814c2596d074f071ca0b8943f7b03a024059462ababaabe27b9507631722d6
-  data.tar.gz: 3a2767e972218340d31d1b845322090741c6694e632ae13fe3c4f88c5812871ae460e816f190efc62b2f7175689200efbc70aa460ed35382b7ace65f00dfb44f
+  metadata.gz: 03c4a9c04f00ea925439156dd409c2f7e15c69c9861be8deeb9b9cb154a6e72b73059362ac839783d212c9f8cef4d8464c44bf256feae69971b9ae800be1984c
+  data.tar.gz: 7a503890c049a3f9fd44a57f97a95333ac72ea7c977266842145cbcd5f4cbf537454d7f142d4d334af6e7c55e717e594de4d9559b60971279dab54de23cce4a6

data/CHANGELOG.md

@@ -7,21 +7,47 @@ 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
+
+- Update project dependencies by @danilogco
+- Add `ruby v3.2.x` to the test matrix by @danilogco
+
+### Fixed
+
+- Fix indentation warning (rubyconfig#322) by @lygaret
+- Fix typo Padrino (rubyconfig#325) by @ytkg
+- Fix CI setting for Ruby 3.0 (rubyconfig#326) by @ytkg
+- Remove `Gemfile.lock` from the package by @danilogco
+
 ## [1.0.2] - 2022-06-06
 
-### Changes
+### 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
 
-### Fixes
+### 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
 
@@ -29,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/README.md

@@ -29,6 +29,7 @@ for the following interpreters and frameworks:
 
 * Interpreters
   * [Ruby](https://www.ruby-lang.org) `>= 2.7`
+  * Tested versions: 2.7.x, 3.0.x, 3.1.x and 3.2.x
 * Application frameworks
   * Rails `>= 6.0`
   * Padrino
@@ -39,14 +40,14 @@ for the following interpreters and frameworks:
 Add the gem to your `Gemfile` and run `bundle install` to install it:
 
 ```ruby
-gem "confset", "~> 1.0.0"
+gem "confset", "~> 1.0.3"
 ```
 
 You can also install by the GitHub packages server:
 
 ```ruby
 source "https://rubygems.pkg.github.com/dcotecnologia" do
-  gem "confset", "1.0.0"
+  gem "confset", "1.0.3"
 end
 ```
 

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/sources/yaml_source.rb

@@ -24,10 +24,10 @@ module Confset
 
         result || {}
 
-        rescue Psych::SyntaxError => e
-          raise "YAML syntax error occurred while parsing #{@path}. " \
-                "Please note that YAML must be consistently indented using spaces. Tabs are not allowed. " \
-                "Error: #{e.message}"
+      rescue Psych::SyntaxError => e
+        raise "YAML syntax error occurred while parsing #{@path}. " \
+              "Please note that YAML must be consistently indented using spaces. Tabs are not allowed. " \
+              "Error: #{e.message}"
       end
     end
   end

data/lib/confset/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Confset
-  VERSION = "1.0.2"
+  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.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Danilo Carolino
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-06 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
@@ -59,20 +59,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: 3.12.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: 3.12.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.12.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -93,84 +93,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: mdl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: 0.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: 0.14.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: 0.14.2
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.29'
+        version: 1.57.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.29'
+        version: 1.57.1
 - !ruby/object:Gem::Dependency
   name: rubocop-packaging
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
 description: 'Easiest way to manage multi-environment settings in any ruby project
   or framework: '
 email:
@@ -257,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:
   - - ">="
@@ -267,7 +267,7 @@ requirements: []
 rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
-summary: Effortless multi-environment settings in Rails, Sinatra, Pandrino and others
+summary: Effortless multi-environment settings in Rails, Sinatra, Padrino and others
 test_files:
 - spec/config_env_spec.rb
 - spec/config_spec.rb