active_fulfillment 3.2.7 → 3.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f065f33d0e6042c51a29f8dabbf5def0bd24e35156957c2ec96d6d605761fa9e
-  data.tar.gz: 16ea21edfae1a46c05307c77ad159409b4d8c4beaa217c4436c849321da89d59
+  metadata.gz: fa2427ef745737a0dfb2284df85693cec175294067469843760134665ef85415
+  data.tar.gz: 856771fc183ba05a3160eb6864256e6fa7393f6fc19327192e439581fdf12e70
 SHA512:
-  metadata.gz: 7be8875393fb0a922f2784b593e2ce551013a2f0d8570d25685388c05febbe6c65802e107bbfd6a96a8a76cacf7510357342e10e1da7c343ff07e6cd4f14f243
-  data.tar.gz: 6be7a305e19e7e20de11500c2ce669ec13c933329e488d2770417c0e8f7faa823e16e26198cb93904739dfee8e5c1f46ef78308980efeb1ae27ce658e8d3f5dd
+  metadata.gz: 4c3c4241f4623d7313772e6a8200fe13b6307edd73e3289e0549a5601d30304f31daae6ebb6246724f62e2f1e2b31d138c93c9f6fe1da9b5244fde553f656f93
+  data.tar.gz: cf6c27339ebe46e2afed84510de1f7cf9635e1facd208ad209644fe46cf4e3f053da4782ee19251d31bd9c2a5accf166123bf749ff9afaea0b83c1f6c8689cd0

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # ActiveFulfillment changelog
 
+### Version 3.2.8 (December 20, 2019)
+- Sending MarketplaceId for all Amazon requests
+
 ### Version 3.2.7 (November 30, 2018)
 - Fixing Amazon endpoint used for the CA and MX marketplaces
 

data/lib/active_fulfillment/services/amazon_mws.rb

@@ -356,6 +356,7 @@ module ActiveFulfillment
       opts["SignatureVersion"] = SIGNATURE_VERSION unless opts["SignatureVersion"]
       opts["SellerId"] = @seller_id unless opts["SellerId"] || !@seller_id
       opts["MWSAuthToken"] = @mws_auth_token unless opts["MWSAuthToken"] || !@mws_auth_token
+      opts["MarketplaceId"] = marketplace_id
       opts
     end
 
@@ -366,7 +367,6 @@ module ActiveFulfillment
         :DisplayableOrderId => order_id.to_s,
         :DisplayableOrderDateTime => options[:order_date].utc.iso8601,
         :ShippingSpeedCategory => options[:shipping_method],
-        :MarketplaceId => marketplace_id,
       }
       params[:DisplayableOrderComment] = options[:comment] if options[:comment]
 

data/lib/active_fulfillment/version.rb

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

data/test/unit/services/amazon_mws_test.rb

@@ -89,13 +89,14 @@ class AmazonMarketplaceWebServiceTest < Minitest::Test
       "FeedType" => "_POST_INVENTORY_AVAILABILITY_DATA_",
       "Merchant" => "SuperMerchant123"
     }
-    expected_keys = ["AWSAccessKeyId", "Action", "FeedType", "Merchant", "SignatureMethod", "SignatureVersion", "Timestamp", "Version"]
+    expected_keys = ["AWSAccessKeyId", "Action", "FeedType", "Merchant", "SignatureMethod", "SignatureVersion", "Timestamp", "Version", "MarketplaceId"]
     opts = @service.build_basic_api_query(options)
     assert_equal expected_keys.sort, opts.keys.map(&:to_s).sort
     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"]
+    assert_equal "ATVPDKIKX0DER", opts["MarketplaceId"]
   end
 
   def test_build_inventory_list_request
@@ -113,7 +114,7 @@ class AmazonMarketplaceWebServiceTest < Minitest::Test
 
   def test_create_signature
     service = ActiveFulfillment::AmazonMarketplaceWebService.new(:login => "0PExampleR2", :password => "sekrets")
-    expected_signature = "39XxH6iKLysjjDmWZSkyr2z8iSxfECHBYE1Pd0Qqpwo%3D"
+    expected_signature = "Zde8skcLEYlpbj27jSdTVGZ%2FWNcs4gDLXMdcQ8cvOrY%3D"
     options = {
       "AWSAccessKeyId" => "0PExampleR2",
       "Action" => "SubmitFeed",
@@ -123,7 +124,8 @@ class AmazonMarketplaceWebServiceTest < Minitest::Test
       "SignatureMethod" => "HmacSHA256",
       "SignatureVersion" => "2",
       "Timestamp" => "2009-08-20T01:10:27.607Z",
-      "Version" => "2009-01-01"
+      "Version" => "2009-01-01",
+      "MarketplaceId" => "ATVPDKIKX0DER"
     }
 
     uri = URI.parse("https://#{ActiveFulfillment::AmazonMarketplaceWebService::ENDPOINTS[:us]}")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_fulfillment
 version: !ruby/object:Gem::Version
-  version: 3.2.7
+  version: 3.2.8
 platform: ruby
 authors:
 - Cody Fauser
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-12 00:00:00.000000000 Z
+date: 2019-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -192,14 +192,14 @@ specification_version: 4
 summary: Framework and tools for dealing with shipping, tracking and order fulfillment
   services.
 test_files:
-- test/remote/james_and_james_test.rb
-- test/remote/amazon_mws_test.rb
-- test/remote/shipwire_test.rb
-- test/remote/webgistix_test.rb
-- test/test_helper.rb
 - test/unit/base_test.rb
-- test/unit/services/james_and_james_test.rb
 - test/unit/services/amazon_mws_test.rb
-- test/unit/services/shipwire_test.rb
-- test/unit/services/shopify_api_test.rb
 - test/unit/services/webgistix_test.rb
+- test/unit/services/shopify_api_test.rb
+- test/unit/services/shipwire_test.rb
+- test/unit/services/james_and_james_test.rb
+- test/test_helper.rb
+- test/remote/amazon_mws_test.rb
+- test/remote/webgistix_test.rb
+- test/remote/shipwire_test.rb
+- test/remote/james_and_james_test.rb