appydays 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f235dd9ffc485d78888e9cc325dc090dba1f40b8cf4a2cb9e24df2074149520
-  data.tar.gz: a34bed5f98cf79bad2401c94b254a41deb28f7165fb86e5378ec96bec8913b9d
+  metadata.gz: fa853f6dccbb995b590e7a13204f7e02f7c8bb992630fa19344a15e751149bcf
+  data.tar.gz: 235896b58a7e3a1fac6fa742cf01dfd8d129a54182d09ae1dfb65ad31b60448c
 SHA512:
-  metadata.gz: 4e62429beede3533e76c7f245ca3b653c5b702f5fbd64571f7381a49c6975043e8d1c8a37f60a47c3aed7422ec83a8408da66852a47ca3c28840852b2e3feac0
-  data.tar.gz: edb5ebdb0c6b073e8b6c8d4fdbd14d548592fbea901a6e6c0cfc7ef785231158ce94ff8bbbd5496637414c17239e47dd633e65db325c5316e8889d95d07fd564
+  metadata.gz: 931e7d037f44b697864b519f3efe6577a02f9923e814c2201f4c1ab1aea9430416f3cfc6dd63b26f116916b32ba08d608b03919cb7be52f173b11514e73d860a
+  data.tar.gz: 161d5c8a250623e558426ee6be2dae1135717c6599de90d4ff38e2276f2d5b2b65de729eaf16443ae18e92f6bb923771762d9c92ab8c2bec33731c7ed154645d

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/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,12 +19,15 @@ module Appydays::SpecHelpers
   #
 
   class HaveALineMatching
+    include RSpec::Matchers::Composable
+
     def initialize(regexp)
       @regexp = regexp
     end
 
     def matches?(target)
       @target = target
+      @target = @target.lines if @target.is_a?(String)
       return @target.find do |obj|
         obj.to_s.match(@regexp)
       end
@@ -43,9 +46,9 @@ module Appydays::SpecHelpers
     alias failure_message_for_should_not failure_message_when_negated
   end
 
-  ### RSpec matcher -- set up the expectation that the lefthand side
-  ### is Enumerable, and that at least one of the objects yielded
-  ### while iterating matches +regexp+ when converted to a String.
+  # RSpec matcher -- set up the expectation that the lefthand side
+  # is Enumerable, and that at least one of the objects yielded
+  # while iterating matches +regexp+ when converted to a String.
   module_function def have_a_line_matching(regexp)
     return HaveALineMatching.new(regexp)
   end
@@ -54,39 +57,73 @@ module Appydays::SpecHelpers
     return RSpec::Matchers::BuiltIn::HaveAttributes.new(length: x)
   end
 
-  # Matcher that will compare a string or time expected against a string or time actual,
-  # within a tolerance (default to 1 millisecond).
-  #
-  #   expect(last_response).to have_json_body.that_includes(
-  #       closes_at: match_time('2025-12-01T00:00:00.000+00:00').within(1.second))
-  #
-  RSpec::Matchers.define(:match_time) do |expected|
-    match do |actual|
-      @tolerance ||= 0.001
-      RSpec::Matchers::BuiltIn::BeWithin.new(@tolerance).of(self.time(expected)).matches?(self.time(actual))
+  class MatchTime
+    include RSpec::Matchers::Composable
+
+    def initialize(expected)
+      @expected = expected
+      if expected == :now
+        @expected_t = Time.now
+        @tolerance = 5
+      else
+        @expected_t = self.time(expected)
+        @tolerance = 0.001
+      end
     end
 
-    failure_message do |actual|
-      "expected ids %s to be within %s of %s" % [self.time(actual), @tolerance, self.time(expected)]
+    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
+
+    def matches?(actual)
+      @actual_t = self.time(actual)
+      @actual_t = self.change_tz(@actual_t, @expected_t.zone) if @actual_t
+      return RSpec::Matchers::BuiltIn::BeWithin.new(@tolerance).of(@expected_t).matches?(@actual_t)
+    end
+
+    protected def change_tz(t, zone)
+      return t.change(zone: zone) if t.respond_to?(:change)
+      prev_tz = ENV.fetch("TZ", nil)
+      begin
+        ENV["TZ"] = zone
+        return Time.at(t.to_f)
+      ensure
+        ENV["TZ"] = prev_tz
+      end
     end
 
-    chain :within do |tolerance|
+    def within(tolerance)
       @tolerance = tolerance
+      return self
     end
 
-    def time(s)
-      return Time.parse(s) if s.is_a?(String)
-      return s.to_time
+    def failure_message
+      return "expected %s to be within %s of %s" % [@actual_t, @tolerance, @expected_t]
     end
   end
 
+  # Matcher that will compare a string or time expected against a string or time actual,
+  # within a tolerance (default to 1 millisecond).
+  #
+  # Use match_time(:now) to automatically `match_time(Time.now).within(5.seconds)`.
+  #
+  #   expect(last_response).to have_json_body.that_includes(
+  #       closes_at: match_time('2025-12-01T00:00:00.000+00:00').within(1.second))
+  #
+  def match_time(expected)
+    return MatchTime.new(expected)
+  end
+
   # Matcher that will compare a string or Money expected against a string or Money actual.
   #
   #   expect(order.total).to cost('$25')
   #
-  RSpec::Matchers.define(:cost) do |expected|
+  RSpec::Matchers.define(:cost) do |expected, currency|
     match do |actual|
-      @base = RSpec::Matchers::BuiltIn::Eq.new(self.money(expected))
+      @base = RSpec::Matchers::BuiltIn::Eq.new(self.money(expected, currency))
       @base.matches?(self.money(actual))
     end
 
@@ -94,12 +131,37 @@ module Appydays::SpecHelpers
       @base.failure_message
     end
 
-    def money(s)
-      return Monetize.parse(s) if s.is_a?(String)
+    def money(s, currency=nil)
+      if (m = self.tryparse(s, currency))
+        return m
+      end
       return s if s.is_a?(Money)
-      return Money.new(s) if s.is_a?(Integer)
+      return Money.new(s, currency) if s.is_a?(Integer)
       return Money.new(s[:cents], s[:currency]) if s.respond_to?(:key?) && s.key?(:cents) && s.key?(:currency)
       raise "#{s} type #{s.class.name} not convertable to Money (add support or use supported type)"
     end
+
+    def tryparse(s, currency)
+      # We need to capture some global settings while we parse, and set them back after.
+      orig_default = Money.instance_variable_get(:@default_currency)
+      orig_assume = Monetize.assume_from_symbol
+      return nil unless s.is_a?(String)
+      # See https://github.com/RubyMoney/monetize/issues/161
+      # To get around this, need to use a valid custom currency
+      begin
+        Money::Currency.new("APPYDAYS")
+      rescue Money::Currency::UnknownCurrency
+        Money::Currency.register(iso_code: "APPYDAYS", subunit_to_unit: 1)
+      end
+      Money.default_currency = currency || orig_default || "APPYDAYS"
+      Monetize.assume_from_symbol = true
+      m = Monetize.parse!(s)
+      return m unless m.currency == "APPYDAYS"
+      raise Money::Currency::UnknownCurrency,
+            "Could not parse currency from '#{s}'. It needs a symbol, or set default_currency."
+    ensure
+      Money.default_currency = orig_default
+      Monetize.assume_from_symbol = orig_assume
+    end
   end
 end

data/lib/appydays/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appydays
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Lithic Tech
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-29 00:00:00.000000000 Z
+date: 2022-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -38,6 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.6'
+- !ruby/object:Gem::Dependency
+  name: monetize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: money
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement