appydays 0.2.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91b171c7afb39adf17de30701ad3047c6d5edb080e512e8a2a1596f88c1c8b2e
-  data.tar.gz: 2020c7ec844d50ef4cbdfeb9a25bde44ac5d85d5d780e6736e6320af17a4771b
+  metadata.gz: 28e26d2090ae5a2026a2e0be984ef8eb9e9d0e77064805fd54e50579477e6b76
+  data.tar.gz: c42cd9bf6a052604a1a61b5188aef8ed052ff9312f0c737eae07825fb9ec0a7c
 SHA512:
-  metadata.gz: f9f2f5dd7804b5a166451109432c253e8fd9c7fbaf2179a424b00d4448e0f0f3598029e0f5711d9c7cfed937e2f84f62e1850aae5c00866904b2acdd81be5c91
-  data.tar.gz: 17a99175b776829772f1744cd740fb6ed396d171e7c8735f7c380c323d2cfc0dbab3cdf1fed890daf9b3bf371bfc26f982ceb5b5194a2ecb0980ae0fa0dad46c
+  metadata.gz: 69bb8e1c9f07c649c9e0d16a0b82ff50fc4a06810d122a49d78a312244dd62d2c5296c158a2fc3317dee90c1ab1c7ff0f8f25bbad5b5e35ffdd0e4cc99d61269
+  data.tar.gz: 92bd69f37dfdd3b28b6626a5203b53c1dc353587a784d77cd32cb0a316272575403063adf2e6f0fbb47529a73c4cbae925018047c7354ebf69b278e2e4631cc3

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

@@ -43,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

@@ -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.2.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appydays
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Lithic Tech
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-01 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