fittings 0.2.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb552f67b4eefc231c0224a7e5ed90ce9fcc4e3847239120d01fab7f9bf1b8c5
-  data.tar.gz: 4752bf8ddeb6f27ce2a72c54eec183683b1591075b06ea8221a0fd8ea76131f8
+  metadata.gz: b679fb549952c6427c53415d90f4e0c2d4acd07483062ff3b7b78fa0c4fec455
+  data.tar.gz: 1718401ee1f52d5da4a52add3fdb1a002ffeb68b469e318604dd3971040dd667
 SHA512:
-  metadata.gz: dca71a88cd6861c792307c0e903c17a97247f8c2d0b49cb5a04d423174e3c9d8817bfb56be52f3ab7b50c3ee724046fd26ea0e7d691e3616556a1dce53380163
-  data.tar.gz: 0bfac3cb8d6db784f6b9ebd685b0944aea36170f9fb30da664e8abf4c90154df766943fbc981e7f730a9082c83922cb2aa1d261af36c0073d93e8f0df685cbee
+  metadata.gz: 94f30339ca45d20fa0ce9cf9c5aa7bef61c5af8e1e679f057be084f0bb1f36771461f4601366efacbbfca7fe414c9d670dc83af8c9d15d8440312021e461b39b
+  data.tar.gz: 34d94ac4bdd9d6b462423620b0e321b3cfc4ed18380611c99355e81c78c2ffc2b2b68a1a7c50cc24854411d3ea504b80c0faa5cdf3bfa7636e9bedb84dc8e414

data/.circleci/config.yml

@@ -5,7 +5,7 @@ version: 2
 jobs:
   generate-and-push-docs:
     docker:
-    - image: cimg/ruby:3.0.3
+    - image: cimg/ruby:3.1.2
       auth:
         username: "$DOCKERHUB_USERNAME"
         password: "$DOCKERHUB_PASSWORD"
@@ -26,7 +26,7 @@ jobs:
           docs:push; fi
   release:
     docker:
-    - image: cimg/ruby:3.0.3
+    - image: cimg/ruby:3.1.2
       auth:
         username: "$DOCKERHUB_USERNAME"
         password: "$DOCKERHUB_PASSWORD"
@@ -41,9 +41,9 @@ jobs:
     - run:
         name: Build/release gem to artifactory
         command: bundle exec rake push_artifactory
-  ruby-3.0.3:
+  ruby-3.1.2:
     docker:
-    - image: cimg/ruby:3.0.3
+    - image: cimg/ruby:3.1.2
       auth:
         username: "$DOCKERHUB_USERNAME"
         password: "$DOCKERHUB_PASSWORD"
@@ -69,9 +69,9 @@ jobs:
         when: on_fail
     - store_test_results:
         path: "/tmp/test-results"
-  ruby-2.7.5:
+  ruby-3.0.4:
     docker:
-    - image: cimg/ruby:2.7.5
+    - image: cimg/ruby:3.0.4
       auth:
         username: "$DOCKERHUB_USERNAME"
         password: "$DOCKERHUB_PASSWORD"
@@ -104,11 +104,11 @@ workflows:
     - release:
         context: org-global
         requires:
-        - ruby-3.0.3
-        - ruby-2.7.5
+        - ruby-3.1.2
+        - ruby-3.0.4
         filters:
           tags:
-            only: /^[0-9]+\.[0-9]+\.[0-9]+(\.?(RC|rc)[-\.]?\w*)?$/
+            only: /^[0-9]+\.[0-9]+\.[0-9]+((-|\.)?(RC|rc)[-\.]?\w*)?$/
           branches:
             ignore: /.*/
     - generate-and-push-docs:
@@ -117,15 +117,15 @@ workflows:
         - release
         filters:
           tags:
-            only: /^[0-9]+\.[0-9]+\.[0-9]+(\.?(RC|rc)[-\.]?\w*)?$/
+            only: /^[0-9]+\.[0-9]+\.[0-9]+((-|\.)?(RC|rc)[-\.]?\w*)?$/
           branches:
             ignore: /.*/
-    - ruby-3.0.3:
+    - ruby-3.1.2:
         context: org-global
         filters:
           tags:
             only: &1 /.*/
-    - ruby-2.7.5:
+    - ruby-3.0.4:
         context: org-global
         filters:
           tags:
@@ -139,7 +139,7 @@ workflows:
             only:
             - main
     jobs:
-    - ruby-3.0.3:
+    - ruby-3.1.2:
         context: org-global
-    - ruby-2.7.5:
+    - ruby-3.0.4:
         context: org-global

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [1.0.0]
+
+### Added
+
+- Switched to using `Hashie::Mash` for YAML parsing. This provides behavior that is more consistent, while remaining similar. It did not cause any tests to fail, but may be a breaking change depending on how you are using the gem.

data/fittings.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "fittings"
-  s.version = "0.2.3"
+  s.version = "1.0.0"
 
   s.authors = ["Edwin Cruz", "Colin Shield"]
   s.date = %q{2011-09-06}
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.executables   = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.add_dependency "hashie"
   s.add_development_dependency "rspec"
   s.add_development_dependency "rake"
   s.add_development_dependency "rdoc"

data/lib/setting.rb

@@ -1,21 +1,7 @@
 require 'singleton'
 require 'yaml'
 require 'erb'
-
-class Hash
-  def recursive_merge!(other)
-    other.keys.each do |k|
-      if self[k].is_a?(Array) && other[k].is_a?(Array)
-        self[k] = other[k]
-      elsif self[k].is_a?(Hash) && other[k].is_a?(Hash)
-        self[k].recursive_merge!(other[k])
-      else
-        self[k] = other[k]
-      end
-    end
-    self
-  end
-end
+require 'hashie'
 
 class Setting
   class NotFound < RuntimeError; end
@@ -101,7 +87,7 @@ class Setting
   #=================================================================
 
   def initialize
-    @available_settings ||= {}
+    @available_settings ||= Hashie::Mash.new
   end
 
   def has_key?(key)
@@ -133,7 +119,7 @@ class Setting
 
   # This method performs collapsing of the Hash settings values if the Hash
   # contains 'default' value, or just 1 element.
-  
+
   def collapse_hashes(v, args)
     out = if v.is_a?(Hash)
       if args.empty?
@@ -158,14 +144,14 @@ class Setting
       out
     end
   end
-  
+
   def loaded?
     @loaded
   end
 
   def load(params)
     # reset settings hash
-    @available_settings = {}
+    @available_settings = Hashie::Mash.new
     @loaded = false
 
     files = []
@@ -180,7 +166,14 @@ class Setting
 
     files.flatten.each do |file|
       begin
-        @available_settings.recursive_merge!(YAML::unsafe_load(ERB.new(IO.read(file)).result) || {}) if File.exists?(file)
+        # Ruby versions before 3.0.3 include Psych < 3.3.2, which does not include `unsafe_load`. In those versions,
+        # `load` is the behavior we want (in later versions, `load` uses `safe_load`, which doesn't support aliases and
+        # requires allowlisting classes used in files.
+        if Psych::VERSION < '3.3.2'
+          @available_settings.deep_merge!(YAML::load(ERB.new(IO.read(file)).result) || {}) if File.exists?(file)
+        else
+          @available_settings.deep_merge!(YAML::unsafe_load(ERB.new(IO.read(file)).result) || {}) if File.exists?(file)
+        end
       rescue Exception => e
         raise FileError.new("Error parsing file #{file}, with: #{e.message}")
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fittings
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Edwin Cruz
@@ -11,6 +11,20 @@ bindir: exe
 cert_chain: []
 date: 2011-09-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  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
@@ -82,6 +96,7 @@ files:
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -114,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.7
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Manage settings per environment