figjam 2.0.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 553e785849c51c3e893343d8ce74a05039f66b5629c1049a15430f183d7e03b5
-  data.tar.gz: 15daa5db7054cfa6a5e63829307c18725926ade03d7843a9f6c8a808d1020d5a
+  metadata.gz: eb55c0209ee029e45d1868e1eb32d159ac3b50b6bdbc8ba469a818c1058c4f00
+  data.tar.gz: 3c7febb9ba1368b82458221f2914348a344474cf50c5ef1bbbfd4247d853d18d
 SHA512:
-  metadata.gz: 928a8b0694bfd5511aaeeaed69780b7465550ce02f92df06df1db79f39811a76531950be14ba503f8bdc0c9c73871831ed85a1b2af25ab260c1c7d2566e4965e
-  data.tar.gz: 22d5358affb2da7fda4e02c080239fffe933aaff10d6c6bea8dc04aeedca9dbec6eeb2ae49892ae7bc1b3ddbc97875d1635a4de521db9e4703836246ee235684
+  metadata.gz: 1ba7fd124b00dcaa9f789a43556ab4725d1f7a8f0ed4b4112eafe6dfad72fefb583f4779df2a5a7fed1b8062764a149890ae952d16c7dcb03680a4531d13a390
+  data.tar.gz: b18b0f948baf4005b858cf38c162d66fd9620c62992f52a738c682be1b3abc7548529e03de36114123ebf89d060ccd3cba11877e11c8655bf33c461d342de79e

data/README.md

@@ -59,15 +59,26 @@ overrides.
 
 Figjam is perfect for Rails engines. They can have their own configuration file, and
 they can be loaded independently or in addition of the main application. To do this,
-you can create a `config/application.yml` file in your engine, and add this initializer:
+you can create a `config/application.yml` file in your engine, and add this to the `Rails::Engine`:
 
 ```ruby
-Figjam::Application.new(
-  environment: ::Rails.env,
-  path: File.expand_path("../application.yml", __dir__)
-).load
+module MyEngine
+  class Engine < ::Rails::Engine
+    Figjam::Rails::Engine.configure(self)
+  end
+end
+
+# Or if you wish to pass in a specific value for the environment:
+module MyEngine
+  class Engine < ::Rails::Engine
+    Figjam::Rails::Engine.configure(self, "my_engine_environment")
+  end
+end
 ```
 
+This will ensure that the engine's configuration is loaded when the Rails application starts, and
+before any other initializers run.
+
 ### Usage without Rails
 
 If you are not using Rails, you can load Figjam in your gem. Note, you can

data/lib/figjam/application.rb

@@ -69,7 +69,9 @@ module Figjam
     end
 
     private def parse(path)
-      (File.exist?(path) && load_yaml(ERB.new(File.read(path)).result)) || {} # nosemgrep
+      raise ArgumentError, "Figjam config path #{path} not found" unless File.exist?(path)
+
+      load_yaml(ERB.new(File.read(path)).result) # nosemgrep
     end
 
     # rubocop:disable Security/YAMLLoad
@@ -96,8 +98,8 @@ module Figjam
         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
+      ::ENV[key.to_s] = value&.to_s
+      ::ENV[FIGARO_ENV_PREFIX + key.to_s] = value&.to_s
     end
 
     private def skip?(key)

data/lib/figjam/env.rb

@@ -29,11 +29,11 @@ module Figjam
       method.to_s.downcase.match(/^(.+?)([!?=])?$/).captures
     end
 
-    # rubocop:disable Naming/PredicateName
+    # rubocop:disable Naming/PredicatePrefix
     private def has_key?(key)
       ::ENV.any? { |k, _| k.downcase == key }
     end
-    # rubocop:enable Naming/PredicateName
+    # rubocop:enable Naming/PredicatePrefix
 
     private def missing_key!(key)
       raise MissingKey, key

data/lib/figjam/rails/engine.rb

@@ -0,0 +1,16 @@
+module Figjam
+  module Rails
+    module Engine
+      class << self
+        def configure(engine_context, environment = ::Rails.env)
+          engine_context.config.before_configuration do
+            Figjam::Application.new(
+              environment: environment,
+              path: "#{engine_context.root}/config/application.yml"
+            ).load
+          end
+        end
+      end
+    end
+  end
+end

data/lib/figjam/rails.rb

@@ -6,6 +6,7 @@ rescue LoadError
   # Cater for no Rails
 else
   require "figjam/rails/application"
+  require "figjam/rails/engine"
 
   Figjam.adapter = Figjam::Rails::Application
   require "figjam/rails/railtie"

data/lib/figjam/version.rb

@@ -1,3 +1,3 @@
 module Figjam
-  VERSION = "2.0.1".freeze
+  VERSION = "2.2.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: figjam
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Harry Lascelles
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-03 00:00:00.000000000 Z
+date: 2025-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -212,6 +212,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-magic_numbers
+  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
@@ -227,7 +241,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rake
+  name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -240,8 +254,36 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 3.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 3.5.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-thread_safety
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -294,6 +336,7 @@ files:
 - lib/figjam/figaro_alias.rb
 - lib/figjam/rails.rb
 - lib/figjam/rails/application.rb
+- lib/figjam/rails/engine.rb
 - lib/figjam/rails/railtie.rb
 - lib/figjam/version.rb
 homepage: https://github.com/hlascelles/figjam