active_fulfillment 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bda8d728697d83cf15dff17825ae52a3754eeda5
-  data.tar.gz: 82e16d1630948fabdd08859705db6c601731ef9d
+  metadata.gz: a0d0b3d3561c71bebf34017db4db327fdfbec098
+  data.tar.gz: 0bb2385aa1976f87e88c32ec50c7fcaaf44fa3f9
 SHA512:
-  metadata.gz: 44aec13c8d6aa16caea7e1e4e8d112ecb84d1388adf6639e1c619a4d02f1c422174f2a388c7e1877c45c955aa4e1e61da9df16b164968a3f75cc12e6b0a39c94
-  data.tar.gz: 41c1be9bfebe0986ae4a42e8f246dfe20a6a3ff8e4f58d535b38e643b67aacb5278ea4d89288cfcc4695dfd1ef3284f52799cf0199ed98e80bf64720b264c589
+  metadata.gz: 919bf80d6f8ce53cd56d6b51b2b5bf608394b1df0fc43071b66a2c0925309c1a201f148f0f8e378bf9cf38075950e27b19412ddd02722779a51472ea319dcd24
+  data.tar.gz: 12d457a214c0be1c8db06bf90810fe497ba849ac76260fcdb001a78ca09f803b15027a716ccd6895002bec7475d4e535a0e8b0a676fef07b10e48353e655704a

data/lib/active_fulfillment/services/shopify_api.rb

@@ -71,7 +71,8 @@ module ActiveFulfillment
     def send_app_request(action, headers, data)
       uri = request_uri(action, data)
 
-      logger.info "[#{@name.upcase} APP] Post #{uri}"
+      log :info, "GET action=#{action}"
+      log :debug, "GET url=#{uri}"
 
       response = nil
       realtime = Benchmark.realtime do
@@ -80,13 +81,11 @@ module ActiveFulfillment
             response = ssl_get(uri, headers)
           end
         rescue *(RESCUABLE_CONNECTION_ERRORS) => e
-          logger.warn "[#{self}] Error while contacting fulfillment service error =\"#{e.message}\""
+          log :warn, "Error contacting fulfillment service exception=\"#{e.class}\" message=\"#{e.message}\""
         end
       end
 
-      line = "[#{@name.upcase} APP] Response from #{uri} --> "
-      line << "#{response} #{"%.4fs" % realtime}"
-      logger.info line
+      log :info, "GET response action=#{action} in #{"%.4fs" % realtime} #{response}"
 
       response
     end
@@ -95,11 +94,10 @@ module ActiveFulfillment
       response_data = ActiveSupport::JSON.decode(json_data)
       return {} unless response_data.is_a?(Hash)
       response_data[root.underscore] || response_data
-      rescue ActiveSupport::JSON.parse_error
-        {}
+    rescue ActiveSupport::JSON.parse_error
+      {}
     end
 
-
     def parse_xml(xml_data, type, key, value)
       Parsing.with_xml_document(xml_data) do |document, response|
         # Extract All elements of type and map them!
@@ -127,5 +125,9 @@ module ActiveFulfillment
         payload.to_xml(:root => root)
       end
     end
+
+    def log(level, message)
+      logger.public_send(level, "[ActiveFulfillment::ShopifyAPIService][#{@name.upcase} app] #{message}")
+    end
   end
 end

data/lib/active_fulfillment/version.rb

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

data/test/test_helper.rb

@@ -5,6 +5,7 @@ require 'active_fulfillment'
 require 'minitest/autorun'
 require 'mocha/setup'
 require 'timecop'
+require 'pry'
 
 require 'logger'
 ActiveFulfillment::Service.logger = Logger.new(nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_fulfillment
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Cody Fauser
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-07 00:00:00.000000000 Z
+date: 2016-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -129,6 +129,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: cody@shopify.com
 executables: []
@@ -179,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Framework and tools for dealing with shipping, tracking and order fulfillment