appydays 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ad0f0fbdd3901ecfa8fb3e8b6f265b07262ab16a3a8485bbfe91daa5ed31324
-  data.tar.gz: 788207faccc15f95a4564aa23832b36a8ca3232169d741f7a3daf838fb1ecccd
+  metadata.gz: 03b299f65c7ee3543f139a2e705e1847144d49955dcab5fbe5c37a76fc9bb63a
+  data.tar.gz: 17179300f27c0f293a9ba7e1d106e87050c4ce1b73a99b69be572d51c07f982d
 SHA512:
-  metadata.gz: b9e0bde21c13ff9681234285c8c996ac63ce3fe1d3e806a13aae86bc22095bc9713ac00af2a8e99e46143f1277e23e714e573c53f94fd9856cd23d8742075db6
-  data.tar.gz: 2e2fb67636db8b42ab6cb1dc0cf3c01da77ebc82f1641b32ba03e9e047fb18017214569c9ed65872f2abdb25cf3f6f3a020ca092a0528e763e62a47dda2f4f6f
+  metadata.gz: 35fa1b0bc6933d9b76d509e0321e36a1281983694aa0f0362d17420ec7cab8878daf9e4676312948e70db58bc976d2c166f5e7b6191b7f1b357fffb41f763ede
+  data.tar.gz: b1efd166a9f7d28bc3c3a1bb4bcaa6703cb4fa2a1ae983aa57675c100a786354975ed8ee38a67b8a27f1374c068dd2ec08176d46e525f900b99e94d3e089bf1f

data/lib/appydays/loggable/sequel_logger.rb

@@ -17,7 +17,11 @@ class Sequel::Database
     log_each(
       :info,
       proc { args ? "#{message}; #{args.inspect}" : message },
-      proc { ["sequel_log", {message: message, args: args}] },
+      proc do
+        o = {message: message}
+        o[:args] = args unless args.nil?
+        ["sequel_log", o]
+      end,
     )
   end
 
@@ -28,7 +32,7 @@ class Sequel::Database
     log_each(
       lwd && (duration >= lwd) ? :warn : sql_log_level,
       proc { "(#{'%0.6fs' % duration}) #{message}" },
-      proc { ["sequel_query", {duration: duration, query: message}] },
+      proc { ["sequel_query", {duration: duration * 1000, query: message}] },
     )
   end
 

data/lib/appydays/loggable/sidekiq_job_logger.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require "sidekiq"
+require "sidekiq/version"
 require "sidekiq/job_logger"
-require "sidekiq/util"
 
 require "appydays/loggable"
 require "appydays/configurable"
@@ -10,7 +10,13 @@ require "appydays/configurable"
 class Appydays::Loggable::SidekiqJobLogger < Sidekiq::JobLogger
   include Appydays::Configurable
   include Appydays::Loggable
-  include Sidekiq::Util
+  begin
+    require "sidekiq/util"
+    include Sidekiq::Util
+  rescue LoadError
+    require "sidekiq/component"
+    include Sidekiq::Component
+  end
 
   Sidekiq.logger = self.logger
 
@@ -37,10 +43,10 @@ class Appydays::Loggable::SidekiqJobLogger < Sidekiq::JobLogger
     yield
     duration = self.elapsed(start)
     log_method = duration >= self.slow_job_seconds ? :warn : :info
-    self.logger.send(log_method, "job_done", duration: duration)
+    self.logger.send(log_method, "job_done", duration: duration * 1000)
   rescue StandardError
     # Do not log the error since it is probably a sidekiq retry error
-    self.logger.error("job_fail", duration: self.elapsed(start))
+    self.logger.error("job_fail", duration: self.elapsed(start) * 1000)
     raise
   end
 

data/lib/appydays/spec_helpers.rb

@@ -25,6 +25,7 @@ module Appydays::SpecHelpers
 
     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 +44,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 +55,70 @@ 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
+    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 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
 
-    chain :within do |tolerance|
+    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
+
+    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 +126,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.2.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appydays
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Lithic Tech
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-09 00:00:00.000000000 Z
+date: 2022-08-03 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
@@ -181,8 +209,8 @@ dependencies:
 description: 'appydays provides support for env-based configuration, and common structured
   logging capabilities
 
-  '
-email:
+'
+email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -199,8 +227,9 @@ files:
 homepage: https://github.com/lithictech/appydays
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -216,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Provides support for env-based configuration, and common structured logging
   capabilities