Ensure variable passthrough works end-to-end

Author: boardfish

lib/nvar.rb

@@ -5,11 +5,13 @@
 require "nvar/engine" if defined?(Rails)
 require "active_support/core_ext/module/attribute_accessors"
 require "active_support/core_ext/hash/reverse_merge"
+require "active_support/string_inquirer"
 
 # Centralized configuration for required environment variables in your Ruby app.
 module Nvar
   mattr_accessor :config_file_path, default: File.expand_path("config/environment_variables.yml")
   mattr_accessor :env_file_path, default: File.expand_path(".env")
+  mattr_accessor :env, default: :development
 
   # Comments in .env files must have a leading '#' symbol. This cannot be
   # followed by a space.
@@ -39,6 +41,10 @@ def message
   end
 
   class << self
+    def env
+      ActiveSupport::StringInquirer.new(@@env.to_s)
+    end
+
     def configure_for_rails(app)
       self.config_file_path = app.root.join("config/environment_variables.yml")
       self.env_file_path = app.root.join(".env")

lib/nvar/environment_variable.rb

@@ -16,7 +16,7 @@ def initialize(name:, type: "String", filter_from_requests: nil, **args)
       @type = type
       @required = args[:required].nil? ? true : args[:required]
       @filter_from_requests = filter_from_requests.yield_self { |f| [true, false].include?(f) ? f : f&.to_sym }
-      @value = fetch_value(**args.slice(:passthrough, :default_value).with_defaults(passthrough: ENV.fetch("NVAR_PASSTHROUGH", "").split(",").include?(name)))
+      @value = fetch_value(**args.slice(:passthrough, :default_value).with_defaults(passthrough: ENV.fetch("NVAR_PASSTHROUGH", "").split(",").include?(name.to_s)))
       @defined = true
     rescue KeyError
       @value = args[:default_value]
@@ -76,7 +76,7 @@ def typecast_value
     end
 
     def fetch_value(passthrough: false, default_value: nil)
-      return default_value || name if ENV["RAILS_ENV"] == "test" && !passthrough
+      return default_value || name.to_s.force_encoding("UTF-8") if Nvar.env.test? && !passthrough
 
       required ? ENV.fetch(name.to_s) : ENV[name.to_s]
     end