appydays 0.3.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03b299f65c7ee3543f139a2e705e1847144d49955dcab5fbe5c37a76fc9bb63a
-  data.tar.gz: 17179300f27c0f293a9ba7e1d106e87050c4ce1b73a99b69be572d51c07f982d
+  metadata.gz: ab72febd501e6dada1c4738598be500f24b98ab57183a8674e93e6622a82aaf4
+  data.tar.gz: c906e8cc5af47912035269aada22d832dfcb338079ac210207c2cfa26ac3bc64
 SHA512:
-  metadata.gz: 35fa1b0bc6933d9b76d509e0321e36a1281983694aa0f0362d17420ec7cab8878daf9e4676312948e70db58bc976d2c166f5e7b6191b7f1b357fffb41f763ede
-  data.tar.gz: b1efd166a9f7d28bc3c3a1bb4bcaa6703cb4fa2a1ae983aa57675c100a786354975ed8ee38a67b8a27f1374c068dd2ec08176d46e525f900b99e94d3e089bf1f
+  metadata.gz: 65b183daf0a109fe1dc95f06a4bb1e842489541fd1fab7ec1c2794766a664334dd53e8b7adb8da5a80446fffe46bad7ff41c8e6076465d4fea05182c0956906b
+  data.tar.gz: 4608508c05777a02fa77983b9d91cb597e4f995cd1b78af7ea363a301d91ec31245357f97610f658e25a577d9a96778a6fd5b798af3f62ef9a81cd6a8a450187

data/lib/appydays/configurable.rb

@@ -86,6 +86,8 @@ module Appydays::Configurable
     #   If convert is passed, that is used as the converter so the default value can be any type.
     # key: The key to lookup the config value from the environment.
     #   If nil, use an auto-generated combo of the configuration key and method name.
+    #   If key is an array, look up each (string) value as a key.
+    #   The first non-nil (ie, `ENV.fetch(x, nil)`) value will be used.
     # convert: If provided, call it with the string value so it can be parsed.
     #   For example, you can parse a string JSON value here.
     #   Convert will not be called with the default value.
@@ -106,7 +108,8 @@ module Appydays::Configurable
       end
 
       key ||= "#{@group_key}_#{name}".upcase
-      env_value = ENV.fetch(key, nil)
+      keys = Array(key)
+      env_value = keys.filter_map { |k| ENV.fetch(k, nil) }.first
       converter = self._converter(default, convert)
       value = env_value.nil? ? default : converter[env_value]
       value = installer._set_value(name, value, side_effect)

data/lib/appydays/dotenviable.rb

@@ -9,8 +9,17 @@ require "appydays/version"
 # (by convention, .env.<env>.local, .env.<env>, and .env).
 #
 # It can be called multiple times for the same environment.
+# There are a couple special cases for RACK_ENV and PORT variables:
 #
-# NOTE: Foreman assigns the $PORT environment variable BEFORE we load config
+# RACK_ENV variable: Dotenviable defaults the $RACK_ENV variable to whatever
+# is used for dotfile loading (ie, the `rack_env` or `default_rack_env` value).
+# This avoids the surprising behavior where a caller does not have RACK_ENV set,
+# they call +Dotenviable.load+, and RACK_ENV is still not set,
+# though it had some implied usage within this method.
+# If for some reason you do not want +ENV['RACK_ENV']+ to be set,
+# you can store its value before calling `load` and set it back after.
+#
+# PORT variable: Foreman assigns the $PORT environment variable BEFORE we load config
 # (get to what is defined in worker, like puma.rb), so even if we have it in the .env files,
 # it won't get used, because .env files don't stomp what is already in the environment
 # (we don't want to use `overload`).
@@ -26,5 +35,6 @@ module Appydays::Dotenviable
     ]
     Dotenv.load(*paths)
     env["PORT"] ||= original_port
+    env["RACK_ENV"] ||= rack_env
   end
 end

data/lib/appydays/loggable/sequel_logger.rb

@@ -5,8 +5,9 @@ require "sequel/database/logging"
 
 class Sequel::Database
   def log_exception(exception, message)
+    level = message.match?(/^SELECT NULL AS "?nil"? FROM .* LIMIT 1$/i) ? :debug : :error
     log_each(
-      :error,
+      level,
       proc { "#{exception.class}: #{exception.message.strip if exception.message}: #{message}" },
       proc { ["sequel_exception", {sequel_message: message}, exception] },
     )

data/lib/appydays/spec_helpers.rb

@@ -19,6 +19,8 @@ module Appydays::SpecHelpers
   #
 
   class HaveALineMatching
+    include RSpec::Matchers::Composable
+
     def initialize(regexp)
       @regexp = regexp
     end
@@ -56,6 +58,8 @@ module Appydays::SpecHelpers
   end
 
   class MatchTime
+    include RSpec::Matchers::Composable
+
     def initialize(expected)
       @expected = expected
       if expected == :now
@@ -70,6 +74,7 @@ module Appydays::SpecHelpers
     def time(s)
       return nil if s.nil?
       return Time.parse(s) if s.is_a?(String)
+      return Time.at(s) if s.is_a?(Numeric)
       return s.to_time
     end
 

data/lib/appydays/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appydays
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Lithic Tech
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-03 00:00:00.000000000 Z
+date: 2022-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv