secvault 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18d7c81d380aa63a8092f4bd91a438ee3e02282695b6fcbe6841ffbb81a30a9b
-  data.tar.gz: 2dbe018b171e0840e9a6047027fcf8e60ef73ec60867e4f6f4f97240df74f126
+  metadata.gz: 7aa65a706270754c5654d4ddac89114d5c6f59f80c2bd1480d11dc0b350a57d9
+  data.tar.gz: 9ce9a4d9661505ba37a8c827d8f5811c8b9ff0b2fab8f8a8b89bb9f53fb62618
 SHA512:
-  metadata.gz: c864336bbb71f184bf09e9f3bc0c191cbd7f7d750ee5a9c541cc3711b0ddc0cc608103e574dffd940b64dc814b4d5b5f433940ef0adf6235e3d17caf9f5784ce
-  data.tar.gz: 6c62bb91d5a9a0ca1ac0a984f94c92d11c9815d8832e371b7b362d2d6142e1a5f6ea5b058ce8d7762708c271c4cfe848b753d8ea2c6c1dbf47ace950c6df16fd
+  metadata.gz: ebd99a7e5c479c1bf98f7180414bcf7b77b45f70a19d56b3b20d734da069ed5f4d18b6855356a89d47475c6955f8ce5a4edc161e2ee13c5d4ab1494a4be38855
+  data.tar.gz: 888b561a34ff6be3798accb339d812d0456e3e10df0f4725c2c522e080ccef70c6dc23e54cae76878b5e4a67a44b4b63527b5bd0386133907b3df9a6bbec3df5

data/README.md

@@ -86,32 +86,28 @@ production:
 
 ## Multi-File Configuration
 
-Organize secrets across multiple files for better maintainability:
+Organize secrets across multiple files with a **super clean API**:
 
 ```ruby
 # config/initializers/secvault.rb
 require "secvault"
-Secvault.setup_backward_compatibility_with_older_rails!
 
-Rails.application.config.after_initialize do
-  # Load multiple files in order (later files override earlier ones)
-  secrets_files = [
-    Rails.root.join('config', 'secrets.yml'),         # Base secrets
-    Rails.root.join('config', 'secrets.oauth.yml'),   # OAuth & APIs
-    Rails.root.join('config', 'secrets.local.yml')    # Local overrides
-  ]
-  
-  existing_files = secrets_files.select(&:exist?)
-  
-  if existing_files.any?
-    merged_secrets = Rails::Secrets.parse(existing_files, env: Rails.env)
-    secrets_object = ActiveSupport::OrderedOptions.new
-    secrets_object.merge!(merged_secrets)
-    Rails.application.define_singleton_method(:secrets) { secrets_object }
-  end
-end
+# That's it! Just pass your files array
+Secvault.setup_multi_file!([
+  'config/secrets.yml',         # Base secrets
+  'config/secrets.oauth.yml',   # OAuth & APIs
+  'config/secrets.local.yml'    # Local overrides
+])
 ```
 
+**What this does automatically:**
+- ✅ Sets up Rails 7.1 compatibility (calls `setup_backward_compatibility_with_older_rails!`)
+- ✅ Loads and merges all files in order (later files override earlier ones)
+- ✅ Handles missing files gracefully
+- ✅ Adds `reload_secrets!` method in development
+- ✅ Provides logging (except in production)
+- ✅ Creates Rails.application.secrets with merged configuration
+
 **File organization example:**
 ```
 config/
@@ -120,6 +116,18 @@ config/
 ├── secrets.local.yml     # Local development overrides (gitignored)
 ```
 
+**Advanced options:**
+```ruby
+# Disable reload helper or logging
+Secvault.setup_multi_file!(files, reload_method: false, logger: false)
+
+# Use Pathname objects if needed
+Secvault.setup_multi_file!([
+  Rails.root.join('config', 'secrets.yml'),
+  Rails.root.join('config', 'secrets.oauth.yml')
+])
+```
+
 ## Advanced Usage
 
 **Manual multi-file parsing:**
@@ -175,10 +183,14 @@ production:
 
 ## Development Tools
 
-**Hot-reload secrets (development only):**
+**Hot-reload secrets (automatically available in development):**
 ```ruby
-# In Rails console or code
-reload_secrets!  # Reloads all secrets files without server restart
+# In Rails console - automatically added by setup_multi_file!
+reload_secrets!  # Reloads all configured files without server restart
+# 🔄 Reloaded secrets from 3 files
+
+# Also available as:
+Rails.application.reload_secrets!
 ```
 
 **Check integration status:**

data/lib/secvault/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Secvault
-  VERSION = "2.4.0"
+  VERSION = "2.5.0"
 end

data/lib/secvault.rb

@@ -115,8 +115,87 @@ module Secvault
     end
   end
   
-  # Backward compatibility alias
+  # Set up multi-file secrets loading with a clean API
+  # Just pass an array of file paths and Secvault handles the rest
+  #
+  # Usage in an initializer:
+  #   Secvault.setup_multi_file!([
+  #     'config/secrets.yml',
+  #     'config/secrets.oauth.yml', 
+  #     'config/secrets.local.yml'
+  #   ])
+  #
+  # Options:
+  #   - files: Array of file paths (String or Pathname)
+  #   - reload_method: Add a reload helper method (default: true in development)
+  #   - logger: Enable/disable logging (default: true except in production)
+  def setup_multi_file!(files, reload_method: Rails.env.development?, logger: !Rails.env.production?)
+    # Ensure Secvault integration is active
+    setup_backward_compatibility_with_older_rails! unless active?
+    
+    # Convert strings to Pathname objects and resolve relative to Rails.root
+    file_paths = Array(files).map do |file|
+      file.is_a?(Pathname) ? file : Rails.root.join(file)
+    end
+    
+    # Set up the multi-file loading
+    Rails.application.config.after_initialize do
+      load_multi_file_secrets!(file_paths, logger: logger)
+    end
+    
+    # Add reload helper in development
+    if reload_method
+      add_reload_helper!(file_paths)
+    end
+  end
+  
+  # Load secrets from multiple files and merge them
+  def load_multi_file_secrets!(file_paths, logger: !Rails.env.production?)
+    existing_files = file_paths.select(&:exist?)
+    
+    if existing_files.any?
+      # Load and merge all secrets files
+      merged_secrets = Rails::Secrets.parse(existing_files, env: Rails.env)
+      
+      # Create ActiveSupport::OrderedOptions object for Rails compatibility
+      secrets_object = ActiveSupport::OrderedOptions.new
+      secrets_object.merge!(merged_secrets)
+      
+      # Replace Rails.application.secrets
+      Rails.application.define_singleton_method(:secrets) { secrets_object }
+      
+      # Log successful loading
+      if logger
+        file_names = existing_files.map(&:basename)
+        Rails.logger&.info "[Secvault Multi-File] Loaded #{existing_files.size} files: #{file_names.join(', ')}"
+        Rails.logger&.info "[Secvault Multi-File] Merged #{merged_secrets.keys.size} secret keys for #{Rails.env}"
+      end
+      
+      merged_secrets
+    else
+      Rails.logger&.warn "[Secvault Multi-File] No secrets files found" if logger
+      {}
+    end
+  end
+  
+  # Add reload helper method for development
+  def add_reload_helper!(file_paths)
+    # Define reload method on Rails.application
+    Rails.application.define_singleton_method(:reload_secrets!) do
+      Secvault.load_multi_file_secrets!(file_paths, logger: true)
+      puts "🔄 Reloaded secrets from #{file_paths.size} files"
+      true
+    end
+    
+    # Also make it available as a top-level method
+    Object.define_method(:reload_secrets!) do
+      Rails.application.reload_secrets!
+    end
+  end
+  
+  # Backward compatibility aliases
   alias_method :setup_rails_71_integration!, :setup_backward_compatibility_with_older_rails!
+  alias_method :setup_multi_files!, :setup_multi_file!  # Alternative name
 end
 
 Secvault.install! if defined?(Rails)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: secvault
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Unnikrishnan KP