ravioli 0.1.5 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7531708baaf2764477fc99c00343d6ccb10873695ccd6d20c56cb38a21f6520d
-  data.tar.gz: 13b46317a8d6b9fa5f167cab39c3cef998889951fb99b44d0177612798c087e8
+  metadata.gz: bdb5c361547c4d60716b512dc80eb81fb0ba897c898416eb6a70dbbca33200fa
+  data.tar.gz: c62de7b31a55d07c27ca894bce1698ac12477a7f12f4501260682d184bf7b25b
 SHA512:
-  metadata.gz: 79ba9026307074c13efb196b3fd3213ac76668def0064bb4c13a1abf0244c74be128bd259ec472aa09ef36b0bd26f4f5097f097206e42def11b59e04e9f01d25
-  data.tar.gz: ea102e1c1ad70d0fe6b6cfa9460804cf726a8bde10c404dc7eb03e598f6d6e03f7c9d4aca848c5f1f8b9642f906155af7feed4cde336d0328b4f137d1839bc4e
+  metadata.gz: 41fb4047b0d97c117e7714d9e8d8e5e2a01f85628d4828d0ddf5e590c3d66d02813d919e9d7f8290d949a0277dfbabc6acf02c9b0029060bce802ab16ae14416
+  data.tar.gz: 9736ba87ea128c55ac03dcda8f6f6a9172fdf549356b7642c14a02136092c262086468cd905d5d592407995e216264ebaed7c7fc2a82603c115c137e0f8d8e64

data/lib/ravioli.rb

@@ -40,4 +40,4 @@ module Ravioli
   end
 end
 
-require_relative "ravioli/engine" if defined?(Rails)
+require_relative "ravioli/railtie" if defined?(Rails)

data/lib/ravioli/builder.rb

@@ -99,6 +99,7 @@ module Ravioli
       load_credentials(
         key_path: "config/master.key",
         env_names: %w[master root],
+        quiet: true,
       )
 
       # Load any environment-specific configuration on top of it. Since Rails will try
@@ -107,6 +108,7 @@ module Ravioli
         "config/credentials/#{Rails.env}",
         key_path: "config/credentials/#{Rails.env}.key",
         env_names: ["master"],
+        quiet: true,
       )
 
       # Apply staging configuration on top of THAT, if need be
@@ -115,6 +117,7 @@ module Ravioli
           "config/credentials/staging",
           env_names: %w[staging master],
           key_path: "config/credentials/staging.key",
+          quiet: true,
         )
       end
     end
@@ -145,11 +148,11 @@ module Ravioli
     end
 
     # Load secure credentials using a key either from a file or the ENV
-    def load_credentials(path = "credentials", key_path: path, env_names: path.split("/").last)
+    def load_credentials(path = "credentials", key_path: path, env_names: path.split("/").last, quiet: false)
       error = nil
       env_names = Array(env_names).map { |env_name| parse_env_name(env_name) }
       env_names.each do |env_name|
-        credentials = parse_credentials(path, env_name: env_name, key_path: key_path)
+        credentials = parse_credentials(path, env_name: env_name, key_path: key_path, quiet: quiet)
         if credentials.present?
           configuration.append(credentials)
           return credentials
@@ -262,14 +265,14 @@ module Ravioli
       env_name.match?(/^RAILS_/) ? env_name : "RAILS_#{env_name.upcase}_KEY"
     end
 
-    def parse_credentials(path, key_path: path, env_name: path.split("/").last)
+    def parse_credentials(path, key_path: path, env_name: path.split("/").last, quiet: false)
       @current_credentials = path
       env_name = parse_env_name(env_name)
       key_path = path_to_config_file_path(key_path, extnames: "key", quiet: true)
       options = {key_path: key_path.to_s}
       options[:env_key] = ENV[env_name].present? ? env_name : "__RAVIOLI__#{SecureRandom.hex(6)}"
 
-      path = path_to_config_file_path(path, extnames: "yml.enc")
+      path = path_to_config_file_path(path, extnames: "yml.enc", quiet: quiet)
       (Rails.application.encrypted(path, **options)&.config || {}).tap do
         @current_credentials = nil
       end

data/lib/ravioli/configuration.rb

@@ -92,9 +92,13 @@ module Ravioli
     # rubocop:disable Style/MethodMissingSuper
     # rubocop:disable Style/MissingRespondToMissing
     def method_missing(method, *args, &block)
+      return super unless args.empty?
+
       # Return proper booleans from query methods
-      return send(method.to_s.chomp("?")).present? if args.empty? && method.to_s.ends_with?("?")
-      super
+      return send(method.to_s.chomp("?")).present? if method.to_s.ends_with?("?")
+
+      # Try to find a matching ENV key
+      fetch_env_key_for(method) { super(method, *args, &block) }
     end
     # rubocop:enable Style/MissingRespondToMissing
     # rubocop:enable Style/MethodMissingSuper

data/lib/ravioli/{engine.rb → railtie.rb}

@@ -1,18 +1,8 @@
 # frozen_string_literal: true
 
 require_relative "./staging_inquirer"
-Rails.env.class.prepend Ravioli::StagingInquirer
 
 module Ravioli
-  class Engine < ::Rails::Engine
-    # Bootstrap Ravioli onto the Rails app
-    initializer "ravioli", before: :load_environment_config do |app|
-      Rails.extend Ravioli::RailsConfig unless Rails.respond_to?(:config)
-    end
-  end
-
-  private
-
   module RailsConfig
     def config
       Ravioli.default || Ravioli.build(namespace: Rails.application&.class&.module_parent, strict: Rails.env.production?) do |config|
@@ -22,4 +12,10 @@ module Ravioli
       end
     end
   end
+
+  class Railtie < ::Rails::Railtie
+    # Bootstrap Ravioli onto the Rails app
+    Rails.env.class.prepend Ravioli::StagingInquirer
+    Rails.extend Ravioli::RailsConfig unless Rails.respond_to?(:config)
+  end
 end

data/lib/ravioli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ravioli
-  VERSION = "0.1.5"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ravioli
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.9
 platform: ruby
 authors:
 - Flip Sasser
@@ -270,7 +270,7 @@ files:
 - lib/ravioli.rb
 - lib/ravioli/builder.rb
 - lib/ravioli/configuration.rb
-- lib/ravioli/engine.rb
+- lib/ravioli/railtie.rb
 - lib/ravioli/staging_inquirer.rb
 - lib/ravioli/version.rb
 homepage: https://github.com/flipsasser/ravioli