active_fulfillment 3.2.3 → 3.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c44a6365ceec8b87932cd38f60aa054cb454da7
-  data.tar.gz: 4ae3e1997771d41d0df24e710be64af80e28e01c
+  metadata.gz: c116080121697527325b266bda808c6acea1be1e
+  data.tar.gz: d49f7f6df9eeaaa9fad7d40a2cd2080f981be35f
 SHA512:
-  metadata.gz: db5d2187c183888f1e7aba008977cefcf73a34895cd56f1ab802018916a68abd3b9f548c2d0322fc9027a2e6e24b7a51d930c2a961c836a758b4436ac845eff8
-  data.tar.gz: d18c9ec1bb040afb698a4e6e243d447b60f4438590664b38774e3810345cab77ab724fdf4c247819e22b7a8c16d3d99b89c63efeb32c7ffa6df69dbe95be69c8
+  metadata.gz: 3fbcca254fb6aca6b40371c6ab89a3bc9f07873bcfa61df02c64cc433c3243489f365e6d8a33842576557de1bf8dddfbb573f06268f662751065ff011294801a
+  data.tar.gz: 3f71ad76b4776338811db3787c7e14f8864534662eb9bb2452f8d380fa427a8ad44eb2248328653f75a9acbd010c087b49fe97d19d4ac068c19103fb121d64f4

data/lib/active_fulfillment.rb

@@ -26,6 +26,7 @@ require 'active_support/core_ext/time/calculations'
 require 'active_support/core_ext/date/calculations'
 require 'active_support/core_ext/numeric/time'
 require 'active_support/core_ext/enumerable'
+require 'active_support/core_ext/string'
 begin
   require 'active_support/core_ext/time/acts_like'
 rescue LoadError

data/lib/active_fulfillment/services/shopify_api.rb

@@ -6,6 +6,8 @@ module ActiveFulfillment
 
     OrderIdCutoffDate = Date.iso8601('2015-03-01').freeze
 
+    MAX_LOGGED_RESPONSE_LENGTH = 70
+
     RESCUABLE_CONNECTION_ERRORS = [
       Net::ReadTimeout,
       Net::OpenTimeout,
@@ -86,11 +88,20 @@ module ActiveFulfillment
         end
       end
 
-      log :info, "GET response action=#{action} in #{"%.4fs" % realtime} #{response}"
-
+      log_response(action, realtime, response)
       response
     end
 
+    def log_response(action, realtime, response)
+      truncated = response.to_s.truncate(
+        MAX_LOGGED_RESPONSE_LENGTH,
+        omission: '[response truncated]'
+      )
+
+      log :info, "GET response action=#{action} in " \
+        "#{format('%.4fs', realtime)} #{truncated}"
+    end
+
     def parse_json(json_data, root)
       response_data = ActiveSupport::JSON.decode(json_data)
       return {} unless response_data.is_a?(Hash)

data/lib/active_fulfillment/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module ActiveFulfillment
-  VERSION = "3.2.3"
+  VERSION = "3.2.4"
 end

data/test/unit/services/shopify_api_test.rb

@@ -107,8 +107,46 @@ class ShopifyAPITest < Minitest::Test
     refute @service.fetch_stock_levels.success?
   end
 
+  def test_fetch_tracking_data_logs_the_response
+    response = 'some response'
+    @service.expects(:ssl_get).returns(response)
+
+    expected = ".* GET response action=fetch_tracking_numbers in .* #{response}"
+
+    assert_log(:info, expected) do
+      @service.fetch_tracking_data([1, 2])
+    end
+  end
+
+  def test_fetch_tracking_data_logs_the_truncated_response
+    response = 'some response. ' * 144
+    @service.expects(:ssl_get).returns(response)
+
+    expected = '.* GET response action=fetch_tracking_numbers in .* ' \
+      'some response. some response. some response. some ' \
+      '\[response truncated\]'
+
+    assert_log(:info, expected) do
+      @service.fetch_tracking_data([1, 2])
+    end
+  end
+
   private
 
+  def assert_log(level, expected)
+    r = Regexp.new(expected)
+
+    matches = false
+    @service.class.logger.expects(level).with do |message|
+      matches ||= r.match(message).present?
+      true
+    end.at_least_once
+
+    yield
+  ensure
+    assert matches, "Log didn't match #{r}"
+  end
+
   def mock_app_request(action, input, output)
     ActiveFulfillment::ShopifyAPIService.any_instance.expects(:send_app_request).with(action, nil, input).returns(output)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_fulfillment
 version: !ruby/object:Gem::Version
-  version: 3.2.3
+  version: 3.2.4
 platform: ruby
 authors:
 - Cody Fauser
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-05 00:00:00.000000000 Z
+date: 2018-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,7 +17,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
@@ -183,9 +183,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="