appydays 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfd157bff00c9a41a678f4f8877660e90f9bb094b367ea0bedf153d7ea30d528
-  data.tar.gz: 4da1794259b8f5a2ad0d43544092487b91b56f840439404567ca26467264c8d8
+  metadata.gz: 191701f151a4b25333ee5f6cc1262e70c4d62dc063350bbebd4d00798cb2128e
+  data.tar.gz: 05d188d89e2db3047837f59784773284aa194f9435c2d6f83a8d8bc84b7c06d3
 SHA512:
-  metadata.gz: 85e0c276cb7978298f3a14fadfa71e767b216b2fd419beecda09fe6855eea3de8cf58e9651869eae45a1317a47df659ff0db69de8daf29533040f190eaac07b2
-  data.tar.gz: 0d07c35465caebd19c9cb86a3d2113cdd1bacebe80cfedd2251da076fdaadec46d0fa47c5e147e9c3fee78ec7b1afff39291ea30057b20e562c28010af4710dc
+  metadata.gz: dd5f3a2c5ebfc6d172992e98ed34d6eb33a581b5ef3c55cb0744491cdb22274c9e519af561aba1014dedd68606be9b714e8c7bf5aa9d6deb4b849cbd7115ec1c
+  data.tar.gz: fd5c9afa41fa2d9ededce48760d147339029c29c21e9679e3d58cbf43f544419a95201634c8626413718da52eac91262fead6515361e2fd7017901e355ed5171

data/lib/appydays/dotenviable.rb

@@ -24,6 +24,13 @@ require "appydays/version"
 # it won't get used, because .env files don't stomp what is already in the environment
 # (we don't want to use `overload`).
 # So we have some trickery to overwrite only PORT.
+#
+# @param rack_env [nil,String] Value like 'development' or 'production' to use to load .env files.
+#   If not given, use +env['RACK_ENV']+ or +default_rack_env+.
+# @param default_rack_env [String] If +env['RACK_ENV']+ is not set, use this value.
+# @param env [Hash] Hash to read and mutate.
+#   Pass in a different hash to load environment variables into it instead of ENV.
+#   Useful for testing, or to get the config for another environment.
 module Appydays::Dotenviable
   def self.load(rack_env: nil, default_rack_env: "development", env: ENV)
     original_port = env.delete("PORT")
@@ -33,7 +40,17 @@ module Appydays::Dotenviable
       ".env.#{rack_env}",
       ".env",
     ]
+    orig_env = nil
+    if env.object_id != ENV.object_id
+      orig_env = ENV.to_h
+      ENV.replace(env)
+    end
     Dotenv.load(*paths)
+    if orig_env
+      env.merge!(ENV)
+      ENV.replace(orig_env)
+    end
+
     env["PORT"] ||= original_port
     env["RACK_ENV"] ||= rack_env
   end

data/lib/appydays/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Appydays
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appydays
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Lithic Tech
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-27 00:00:00.000000000 Z
+date: 2024-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv