figjam 1.4.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63193ca4ccdc6bd4f2ef6176e38a4ffc60a9dbd3443f72f7115eafbea7d824e2
-  data.tar.gz: 79a43ae8ab92ebb0b96b87a774fd8960e773fa86d37b6e55b189135c1c4dd23d
+  metadata.gz: efb30c09f6e2c3d1b9dd649679dfba6dbabd5cbbc5e56c8e9f51fd18082cfa9c
+  data.tar.gz: b95972fc469e8bfdb651406925fc3af859c0639662fd4464c8b367de1fc23c87
 SHA512:
-  metadata.gz: f2f5091a1abcdf7907f0e4fd7afb02505d00fb250a59d3c340d02bf73e93375bd4b2e7d74c5d7b28f9eda7131496fdbf4f93c0a3da086225eda06cb5d5238215
-  data.tar.gz: be33071b27c9053afd3ace0d8d9767b140ee79bbe1e35ff742372a5965509ff809b266f5241d5278792f76d52cd126d10bde80c3ddd420b004fe8d070587e1b2
+  metadata.gz: ba4c3648b7ed4c8f1cdc0a8e7df2a8db996511301b626f02ca0921547a996e4d21fddfbe2aabcb4643df6b14277026efa2a00c148ec25d0db93746fb3d978865
+  data.tar.gz: 00c61bc16d26dc502a4948d986ab528994a00a2aab51f45f0b9150ed17d8be7037660cb4d5b9990d50215c9f50dd44f49c32097af188f590b0384fe3c8c0f3da

data/lib/figjam/application.rb

@@ -5,6 +5,10 @@ require "figjam/figaro_alias"
 module Figjam
   class Application
     FIGARO_ENV_PREFIX = "_FIGARO_"
+    SILENCE_STRING_WARNINGS_KEYS = %i[
+      FIGARO_SILENCE_STRING_WARNINGS
+      FIGJAM_SILENCE_STRING_WARNINGS
+    ]
 
     include Enumerable
 
@@ -58,7 +62,17 @@ module Figjam
     end
 
     def parse(path)
-      File.exist?(path) && YAML.load(ERB.new(File.read(path)).result) || {}
+      File.exist?(path) && load_yaml(ERB.new(File.read(path)).result) || {}
+    end
+
+    def load_yaml(source)
+      # https://bugs.ruby-lang.org/issues/17866
+      # https://github.com/rails/rails/commit/179d0a1f474ada02e0030ac3bd062fc653765dbe
+      begin
+        YAML.load(source, aliases: true) || {}
+      rescue ArgumentError
+        YAML.load(source) || {}
+      end
     end
 
     def global_configuration
@@ -70,8 +84,10 @@ module Figjam
     end
 
     def set(key, value)
-      non_string_configuration!(key) unless key.is_a?(String)
-      non_string_configuration!(value) unless value.is_a?(String) || value.nil?
+      unless non_string_warnings_silenced?
+        non_string_configuration!(key) unless key.is_a?(String)
+        non_string_configuration!(value) unless value.is_a?(String) || value.nil?
+      end
 
       ::ENV[key.to_s] = value.nil? ? nil : value.to_s
       ::ENV[FIGARO_ENV_PREFIX + key.to_s] = value.nil? ? nil: value.to_s
@@ -81,6 +97,13 @@ module Figjam
       ::ENV.key?(key.to_s) && !::ENV.key?(FIGARO_ENV_PREFIX + key.to_s)
     end
 
+    def non_string_warnings_silenced?
+      SILENCE_STRING_WARNINGS_KEYS.any? { |key|
+        # Allow the silence configuration itself to use non-string keys/values.
+        configuration.values_at(key.to_s, key).any? { |cv| cv.to_s == 'true' }
+      }
+    end
+
     def non_string_configuration!(value)
       warn "WARNING: Use strings for Figjam configuration. #{value.inspect} was converted to #{value.to_s.inspect}."
     end

data/lib/figjam/rails.rb

@@ -5,8 +5,8 @@ begin
 rescue LoadError
 else
   require "figjam/rails/application"
-  require "figjam/rails/railtie"
 
   Figjam.adapter = Figjam::Rails::Application
+  require "figjam/rails/railtie"
 end
 

data/lib/figjam/version.rb

@@ -1,3 +1,3 @@
 module Figjam
-  VERSION = "1.4.0"
+  VERSION = "1.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: figjam
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Harry Lascelles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-14 00:00:00.000000000 Z
+date: 2022-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -72,6 +72,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: combustion
+  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: fasterer
   requirement: !ruby/object:Gem::Requirement