active_fulfillment 3.0.0.pre4 → 3.0.0.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff356b4c8f350a78ca0475c4415257fa803f83a9
-  data.tar.gz: 971bb598f5bd8ff27cb73eb0e0c5810453586714
+  metadata.gz: ec1ce2a917a90a5c9fcd77faa2cf28603fae713a
+  data.tar.gz: 4b4cfa6be54fe07ec5d3bcd87b7c3b6057260103
 SHA512:
-  metadata.gz: 2d7ce7cbb4a2dd194df82e42f7677678e92ccecfa5b01b7f9990622252bfaac22cb2b8542fdb3f55c5c6a553ff35e4e460cf223087ccb1f070fc71ef136a451f
-  data.tar.gz: d1632004e3c03275a02bd0f1c2eabdef9cede7ca047fa75523d34a581d3ebc87466194d8701d2aa2c162fa092d1240b3a3c5f2e3be69aa782df284b85ebaf9c4
+  metadata.gz: a1baba64efc3e9a507a41a8c14853684366ecb1076e4588756758f6d3fdca89b725614c012a15d15b60c453d9b7cceecde03585bfea28957437db8ee2411a8cf
+  data.tar.gz: 3c17fc456c50f3a887ac3a16c008c80d3983021eba2e877b2f848c69e7f0363d6f3343f156fd04340d927dd9c97bb101dac8be4db1d1c079f340fce49fc4bf6d

data/lib/active_fulfillment/services/amazon_mws.rb

@@ -184,11 +184,13 @@ module ActiveFulfillment
       uri = URI.parse("https://#{endpoint}/#{ACTIONS[service]}/#{VERSION}")
       query = build_full_query(verb, uri, params)
       headers = build_headers(query)
+      log_query = query
+      [@options[:login], @options[:app_id], @mws_auth_token].each { |key| log_query.gsub!(/#{key}/, '[filtered]') if key.present? }
 
+      logger.info "[#{self.class}][#{op.to_s}] query=#{log_query}"
       data = ssl_post(uri.to_s, query, headers)
-      if service == :inventory
-        logger.info "[#{self.class}][inventory] query=#{build_full_query(verb, uri, params.except('AWSAccessKeyId', 'MWSAuthToken'))} response=#{data}"
-      end
+      logger.info "[#{self.class}][#{op.to_s}] response=#{data}"
+
       response = parse_response(service, op, data)
       Response.new(success?(response), message_from(response), response)
     rescue ActiveUtils::ResponseError => e
@@ -196,6 +198,7 @@ module ActiveFulfillment
     end
 
     def handle_error(e)
+      logger.info "[#{self.class}][ResponseError] response=#{e.response.try(:body)}, message=#{e.message}"
       response = parse_error(e.response)
       if response.fetch(:faultstring, "").match(/^Requested order \'.+\' not found$/)
         Response.new(true, nil, {:status => SUCCESS, :tracking_numbers => {}, :tracking_companies => {}, :tracking_urls => {}})

data/lib/active_fulfillment/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module ActiveFulfillment
-  VERSION = "3.0.0.pre4"
+  VERSION = "3.0.0.pre5"
 end

data/test/unit/services/amazon_mws_test.rb

@@ -5,8 +5,8 @@ class AmazonMarketplaceWebServiceTest < Minitest::Test
 
   def setup
     @service = ActiveFulfillment::AmazonMarketplaceWebService.new(
-                                               :login => 'l',
-                                               :password => 'p'
+                                               :login => 'login',
+                                               :password => 'password'
                                                )
 
     @options = {
@@ -87,7 +87,7 @@ class AmazonMarketplaceWebServiceTest < Minitest::Test
     expected_keys = ["AWSAccessKeyId", "Action", "FeedType", "Merchant", "SignatureMethod", "SignatureVersion", "Timestamp", "Version"]
     opts = @service.build_basic_api_query(options)
     assert_equal expected_keys.sort, opts.keys.map(&:to_s).sort
-    assert_equal "l", opts["AWSAccessKeyId"]
+    assert_equal "login", opts["AWSAccessKeyId"]
     assert_equal ActiveFulfillment::AmazonMarketplaceWebService::SIGNATURE_VERSION, opts["SignatureVersion"]
     assert_equal "Hmac#{ActiveFulfillment::AmazonMarketplaceWebService::SIGNATURE_METHOD}", opts["SignatureMethod"]
     assert_equal ActiveFulfillment::AmazonMarketplaceWebService::VERSION, opts["Version"]
@@ -279,10 +279,10 @@ class AmazonMarketplaceWebServiceTest < Minitest::Test
     @service.expects(:ssl_post).returns(xml_fixture('amazon_mws/inventory_list_inventory_supply'))
 
     @service.class.logger.expects(:info).with do |message|
-      assert_match /ListInventorySupplyResult/, message
-      assert /MWSAuthToken/ !~ message
-      assert /AWSAccessKeyId/ !~ message
-    end
+      assert_match /ListInventorySupply/, message unless message.include?('ListInventorySupplyResult')
+      assert /@service[:login]/ !~ message
+      assert /@service[:password]/ !~ message
+    end.twice
 
     response = @service.fetch_stock_levels
     assert response.success?
@@ -412,6 +412,25 @@ class AmazonMarketplaceWebServiceTest < Minitest::Test
     assert_equal 'Something has gone terribly wrong!', response.faultstring
   end
 
+  def test_fetch_tracking_numbers_400
+    response = mock('response')
+    response.stubs(:code).returns(400)
+    response.stubs(:message).returns("Error fetching tracking")
+    response.stubs(:body).returns(xml_fixture('amazon_mws/tracking_response_error'))
+
+    @service.expects(:ssl_post).raises(ActiveUtils::ResponseError.new(response))
+
+    @service.class.logger.expects(:info).with do |message|
+      assert_match /Something has gone terribly wrong/, message unless message.include?('GetFulfillmentOrder')
+      assert /@service[:login]/ !~ message
+      assert /@service[:password]/ !~ message
+    end.twice
+
+    response = @service.fetch_tracking_data(['extern_id_1154539615776'])
+    assert !response.success?
+    assert_equal 'Something has gone terribly wrong!', response.faultstring
+  end
+
   def test_404_error
     http_response = build_mock_response(response_from_404, "Not Found", "404")
     @service.expects(:ssl_post).raises(ActiveUtils::ResponseError.new(http_response))
@@ -440,7 +459,7 @@ class AmazonMarketplaceWebServiceTest < Minitest::Test
 
   private
   def build_mock_response(response, message, code = "200")
-    http_response = mock(:code => code, :message => message)
+    http_response = stub(:code => code, :message => message)
     http_response.stubs(:body).returns(response)
     http_response
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_fulfillment
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre4
+  version: 3.0.0.pre5
 platform: ruby
 authors:
 - Cody Fauser
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-16 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport