peddler 1.6.7 → 2.0.0

data/test/integration/test_recommendations.rb

@@ -6,7 +6,7 @@ require 'mws/recommendations'
 class TestRecommendations < IntegrationTest
   def test_lists_recommendations
     clients.each do |client|
-      res = client.list_recommendations
+      res = client.list_recommendations(client.marketplace.id)
       refute_empty res.parse
     end
   end

data/test/integration/test_subscriptions.rb

@@ -6,14 +6,14 @@ require 'mws/subscriptions'
 class TestSubscriptions < IntegrationTest
   def test_lists_registered_destinations
     clients.each do |client|
-      res = client.list_registered_destinations
+      res = client.list_registered_destinations(client.marketplace.id)
       refute_empty res.parse
     end
   end
 
   def test_lists_subscriptions
     clients.each do |client|
-      res = client.list_subscriptions
+      res = client.list_subscriptions(client.marketplace.id)
       refute_empty res.parse
     end
   end

data/test/integration_helper.rb

@@ -24,7 +24,7 @@ class IntegrationTest < MiniTest::Test
     end
 
     def current_endpoint
-      @current_endpoint || name.sub('Test', '')
+      @current_endpoint ||= name.sub('Test', '')
     end
   end
 

data/test/mws.yml

@@ -0,0 +1,36 @@
+- marketplace: CA
+  merchant_id: A2A7WNXBU01UJW
+  aws_access_key_id: AKIAILJW7BWJ6YBK4JUQ
+  aws_secret_access_key: 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
+- marketplace: ES
+  merchant_id: A2NEU7G6RGUKF
+  aws_access_key_id: AKIAJAMAR367FRSYNOPA
+  aws_secret_access_key: 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
+- marketplace: MX
+  merchant_id: A1PCFAUFK3U94S
+  aws_access_key_id: AKIAIHE4A3HDKICFHP4A
+  aws_secret_access_key: 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
+- marketplace: JP
+  merchant_id: A7BU5WGNVGQ1I
+  aws_access_key_id: AKIAJZ6EOLNDLSOEOLBA
+  aws_secret_access_key: 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
+- marketplace: IT
+  merchant_id: A2APQUVDBVWV7E
+  aws_access_key_id: AKIAIHE4YSF4UF7CDR6Q
+  aws_secret_access_key: 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
+- marketplace: FR
+  merchant_id: A2DP6GIDYN6OTH
+  aws_access_key_id: AKIAIOYKJRT4WIH3P72A
+  aws_secret_access_key: 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
+- marketplace: US
+  merchant_id: A2H6NH4SQYFZ4M
+  aws_access_key_id: AKIAJ25X7BKNXKVCYJXA
+  aws_secret_access_key: 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
+- marketplace: GB
+  merchant_id: A2D9DZ30GEWP6N
+  aws_access_key_id: AKIAJCJNB4MASX5JUMUA
+  aws_secret_access_key: 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
+- marketplace: DE
+  merchant_id: A7ZXDJZD3UIRG
+  aws_access_key_id: AKIAIORT7554FEBW7UBQ
+  aws_secret_access_key: P2ocOVChe/dQUpxRfA1n3TmP+wHrF6GaSzXslvEG

data/test/mws.yml.example

@@ -1,36 +1,32 @@
-- primary_marketplace_id: A1AM78C64UM0Y8
+- marketplace: US
   aws_access_key_id: AWS_ACCESS_KEY_ID
   aws_secret_access_key: AWS_SECRET_ACCESS_KEY
   merchant_id: MERCHANT_ID
-- primary_marketplace_id: A13V1IB3VIYZZH
+- marketplace: GB
   aws_access_key_id: AWS_ACCESS_KEY_ID
   aws_secret_access_key: AWS_SECRET_ACCESS_KEY
   merchant_id: MERCHANT_ID
-- primary_marketplace_id: A1RKKUPIHCS9HS
+- marketplace: DE
   aws_access_key_id: AWS_ACCESS_KEY_ID
   aws_secret_access_key: AWS_SECRET_ACCESS_KEY
   merchant_id: MERCHANT_ID
-- primary_marketplace_id: A2EUQ1WTGCTBG2
+- marketplace: CA
   aws_access_key_id: AWS_ACCESS_KEY_ID
   aws_secret_access_key: AWS_SECRET_ACCESS_KEY
   merchant_id: MERCHANT_ID
-- primary_marketplace_id: APJ6JRA9NG5V4
+- marketplace: FR
   aws_access_key_id: AWS_ACCESS_KEY_ID
   aws_secret_access_key: AWS_SECRET_ACCESS_KEY
   merchant_id: MERCHANT_ID
-- primary_marketplace_id: A1VC38T7YXB528
+- marketplace: JP
   aws_access_key_id: AWS_ACCESS_KEY_ID
   aws_secret_access_key: AWS_SECRET_ACCESS_KEY
   merchant_id: MERCHANT_ID
-- primary_marketplace_id: A1F83G8C2ARO7P
+- marketplace: ES
   aws_access_key_id: AWS_ACCESS_KEY_ID
   aws_secret_access_key: AWS_SECRET_ACCESS_KEY
   merchant_id: MERCHANT_ID
-- primary_marketplace_id: A1PA6795UKMFR9
-  aws_access_key_id: AWS_ACCESS_KEY_ID
-  aws_secret_access_key: AWS_SECRET_ACCESS_KEY
-  merchant_id: MERCHANT_ID
-- primary_marketplace_id: ATVPDKIKX0DER
+- marketplace: IT
   aws_access_key_id: AWS_ACCESS_KEY_ID
   aws_secret_access_key: AWS_SECRET_ACCESS_KEY
   merchant_id: MERCHANT_ID

data/test/null_client.rb

@@ -4,20 +4,22 @@ require 'peddler/client'
 require 'securerandom'
 
 module Null
+  module Parser
+    def self.new(res, *)
+      res
+    end
+  end
+
   class Client < ::Peddler::Client
+    self.path = '/'
+
     def configure_with_mock_data!
       self.aws_access_key_id = SecureRandom.hex
       self.aws_secret_access_key = SecureRandom.hex
       self.merchant_id = SecureRandom.hex
-      self.primary_marketplace_id = 'ATVPDKIKX0DER'
+      self.marketplace = 'US'
     end
-  end
 
-  module Parser
-    def self.new(res, *)
-      res
-    end
+    self.parser = Parser
   end
-
-  Client.parser = Parser
 end

data/test/unit/mws/test_feeds_client.rb

@@ -5,7 +5,7 @@ require 'mws/feeds/client'
 
 class TestMWSFeedsClient < MiniTest::Test
   def setup
-    @client = MWS::Feeds::Client.new
+    @client = MWS::Feeds::Client.new(marketplace: 'GB')
   end
 
   def test_submits_feed
@@ -16,7 +16,6 @@ class TestMWSFeedsClient < MiniTest::Test
     }
 
     @client.stub(:run, nil) do
-      @client.primary_marketplace_id = 'A1F83G8C2ARO7P'
       @client.submit_feed('content', 'type', marketplace_id_list: '1')
     end
 

data/test/unit/mws/test_fulfillment_outbound_shipment_client.rb

@@ -97,7 +97,7 @@ class TestMWSFulfillmentOutboundShipmentClient < MiniTest::Test
     }
 
     @client.stub(:run, nil) do
-      @client.list_all_fulfillment_orders(started_at)
+      @client.list_all_fulfillment_orders(query_start_date_time: started_at)
     end
 
     assert_equal operation, @client.operation

data/test/unit/mws/test_off_amazon_payments_client.rb

@@ -9,7 +9,7 @@ class TestMWSOffAmazonPaymentsClient < MiniTest::Test
   end
 
   def test_sandboxes
-    @client.primary_marketplace_id = 'A1F83G8C2ARO7P'
+    @client.marketplace = 'GB'
     refute_includes @client.aws_endpoint, 'Sandbox'
     assert_includes @client.sandbox.aws_endpoint, 'Sandbox'
   end

data/test/unit/mws/test_orders_client.rb

@@ -13,7 +13,7 @@ class TestMWSOrdersClient < MiniTest::Test
       'Action' => 'ListOrders',
       'CreatedAfter' => '2016-01-01',
       'OrderStatus.Status.1' => '1',
-      'MarketplaceId.Id.1' => '1',
+      'MarketplaceId.Id.1' => '123',
       'PaymentMethod.1' => '1',
       'TFMShipmentStatus.Status.1' => '1',
       'FulfillmentChannel.Channel.1' => 'MFN'
@@ -21,7 +21,7 @@ class TestMWSOrdersClient < MiniTest::Test
 
     @client.stub(:run, nil) do
       @client.list_orders(
-        marketplace_id: '1',
+        '123',
         created_after: '2016-01-01',
         order_status: '1',
         tfm_shipment_status: '1',
@@ -35,11 +35,12 @@ class TestMWSOrdersClient < MiniTest::Test
 
   def test_requires_start_time_keyword_when_listing_orders
     @client.stub(:run, nil) do
-      assert_raises(ArgumentError) do
-        @client.list_orders
+      error = assert_raises ArgumentError do
+        @client.list_orders('123')
       end
-      @client.list_orders(created_after: '2016-01-01')
-      @client.list_orders(last_updated_after: '2016-01-01')
+      assert_equal 'specify created_after or last_updated_after', error.message
+      @client.list_orders('123', created_after: '2016-01-01')
+      @client.list_orders('123', last_updated_after: '2016-01-01')
     end
   end
 

data/test/unit/mws/test_products_client.rb

@@ -6,7 +6,6 @@ require 'mws/products/client'
 class TestMWSProductsClient < MiniTest::Test
   def setup
     @client = MWS::Products::Client.new
-    @client.primary_marketplace_id = '123'
   end
 
   def test_lists_matching_products
@@ -17,7 +16,7 @@ class TestMWSProductsClient < MiniTest::Test
     }
 
     @client.stub(:run, nil) do
-      @client.list_matching_products('foo')
+      @client.list_matching_products('123', 'foo')
     end
 
     assert_equal operation, @client.operation
@@ -32,7 +31,7 @@ class TestMWSProductsClient < MiniTest::Test
     }
 
     @client.stub(:run, nil) do
-      @client.get_matching_product_for_id('foo', '1')
+      @client.get_matching_product_for_id('123', 'foo', '1')
     end
 
     assert_equal operation, @client.operation
@@ -46,7 +45,7 @@ class TestMWSProductsClient < MiniTest::Test
     }
 
     @client.stub(:run, nil) do
-      @client.get_matching_product('1')
+      @client.get_matching_product('123', '1')
     end
 
     assert_equal operation, @client.operation
@@ -60,7 +59,7 @@ class TestMWSProductsClient < MiniTest::Test
     }
 
     @client.stub(:run, nil) do
-      @client.get_competitive_pricing_for_sku('1')
+      @client.get_competitive_pricing_for_sku('123', '1')
     end
 
     assert_equal operation, @client.operation
@@ -74,7 +73,7 @@ class TestMWSProductsClient < MiniTest::Test
     }
 
     @client.stub(:run, nil) do
-      @client.get_competitive_pricing_for_asin('1')
+      @client.get_competitive_pricing_for_asin('123', '1')
     end
 
     assert_equal operation, @client.operation
@@ -88,7 +87,7 @@ class TestMWSProductsClient < MiniTest::Test
     }
 
     @client.stub(:run, nil) do
-      @client.get_lowest_offer_listings_for_sku('1')
+      @client.get_lowest_offer_listings_for_sku('123', '1')
     end
 
     assert_equal operation, @client.operation
@@ -103,7 +102,7 @@ class TestMWSProductsClient < MiniTest::Test
     }
 
     @client.stub(:run, nil) do
-      @client.get_lowest_priced_offers_for_sku('1', 'New')
+      @client.get_lowest_priced_offers_for_sku('123', '1', 'New')
     end
 
     assert_equal operation, @client.operation
@@ -118,7 +117,7 @@ class TestMWSProductsClient < MiniTest::Test
     }
 
     @client.stub(:run, nil) do
-      @client.get_lowest_priced_offers_for_asin('1', 'New')
+      @client.get_lowest_priced_offers_for_asin('123', '1', 'New')
     end
 
     assert_equal operation, @client.operation
@@ -132,7 +131,7 @@ class TestMWSProductsClient < MiniTest::Test
     }
 
     @client.stub(:run, nil) do
-      @client.get_lowest_offer_listings_for_asin('1')
+      @client.get_lowest_offer_listings_for_asin('123', '1')
     end
 
     assert_equal operation, @client.operation
@@ -187,7 +186,7 @@ class TestMWSProductsClient < MiniTest::Test
     }
 
     @client.stub(:run, nil) do
-      @client.get_my_price_for_sku('1')
+      @client.get_my_price_for_sku('123', '1')
     end
 
     assert_equal operation, @client.operation
@@ -201,7 +200,7 @@ class TestMWSProductsClient < MiniTest::Test
     }
 
     @client.stub(:run, nil) do
-      @client.get_my_price_for_asin('1')
+      @client.get_my_price_for_asin('123', '1')
     end
 
     assert_equal operation, @client.operation
@@ -215,7 +214,7 @@ class TestMWSProductsClient < MiniTest::Test
     }
 
     @client.stub(:run, nil) do
-      @client.get_product_categories_for_sku('1')
+      @client.get_product_categories_for_sku('123', '1')
     end
 
     assert_equal operation, @client.operation
@@ -229,21 +228,7 @@ class TestMWSProductsClient < MiniTest::Test
     }
 
     @client.stub(:run, nil) do
-      @client.get_product_categories_for_asin('1')
-    end
-
-    assert_equal operation, @client.operation
-  end
-
-  def test_queries_nonprimary_marketplaces
-    operation = {
-      'Action' => 'GetProductCategoriesForASIN',
-      'MarketplaceId' => '321',
-      'ASIN' => '1'
-    }
-
-    @client.stub(:run, nil) do
-      @client.get_product_categories_for_asin('1', marketplace_id: '321')
+      @client.get_product_categories_for_asin('123', '1')
     end
 
     assert_equal operation, @client.operation

data/test/unit/mws/test_recommendations_client.rb

@@ -28,9 +28,8 @@ class TestMWSRecommendationsClient < MiniTest::Test
       'MarketplaceId' => '123'
     }
 
-    @client.primary_marketplace_id = '123'
     @client.stub(:run, nil) do
-      @client.list_recommendations(category_query_list: [{ 'Foo' => '1' }])
+      @client.list_recommendations('123', category_query_list: [{ 'Foo' => '1' }])
     end
 
     assert_equal operation, @client.operation

data/test/unit/mws/test_reports_client.rb

@@ -175,7 +175,7 @@ class TestMWSReportsClient < MiniTest::Test
   end
 
   def test_gets_report_schedule_list_by_next_token
-    assert_raises(NotImplementedError) do
+    assert_raises NotImplementedError do
       @client.get_report_schedule_list_by_next_token
     end
   end

data/test/unit/mws/test_subscriptions_client.rb

@@ -6,26 +6,9 @@ require 'mws/subscriptions/client'
 class TestMWSSubscriptionsClient < MiniTest::Test
   def setup
     @client = MWS::Subscriptions::Client.new
-    @client.primary_marketplace_id = '123'
   end
 
   def test_registers_destination
-    operation = {
-      'Action' => 'RegisterDestination',
-      'MarketplaceId' => '123',
-      'Destination.DeliveryChannel' => 'SQS',
-      'Destination.AttributeList.member.1.Key' => 'sqsQueueUrl',
-      'Destination.AttributeList.member.1.Value' => 'foo'
-    }
-
-    @client.stub(:run, nil) do
-      @client.register_destination('foo')
-    end
-
-    assert_equal operation, @client.operation
-  end
-
-  def test_registers_destination_with_alternate_marketplace
     operation = {
       'Action' => 'RegisterDestination',
       'MarketplaceId' => '321',
@@ -51,7 +34,7 @@ class TestMWSSubscriptionsClient < MiniTest::Test
     }
 
     @client.stub(:run, nil) do
-      @client.deregister_destination('foo')
+      @client.deregister_destination('foo', '123')
     end
 
     assert_equal operation, @client.operation
@@ -74,19 +57,6 @@ class TestMWSSubscriptionsClient < MiniTest::Test
   end
 
   def test_lists_registered_destinations
-    operation = {
-      'Action' => 'ListRegisteredDestinations',
-      'MarketplaceId' => '123'
-    }
-
-    @client.stub(:run, nil) do
-      @client.list_registered_destinations
-    end
-
-    assert_equal operation, @client.operation
-  end
-
-  def test_lists_registered_destinations_with_alternate_marketplace
     operation = {
       'Action' => 'ListRegisteredDestinations',
       'MarketplaceId' => '321'
@@ -100,22 +70,6 @@ class TestMWSSubscriptionsClient < MiniTest::Test
   end
 
   def test_sends_test_notification_to_destination
-    operation = {
-      'Action' => 'SendTestNotificationToDestination',
-      'MarketplaceId' => '123',
-      'Destination.DeliveryChannel' => 'SQS',
-      'Destination.AttributeList.member.1.Key' => 'sqsQueueUrl',
-      'Destination.AttributeList.member.1.Value' => 'foo'
-    }
-
-    @client.stub(:run, nil) do
-      @client.send_test_notification_to_destination('foo')
-    end
-
-    assert_equal operation, @client.operation
-  end
-
-  def test_send_test_notification_to_destination_with_alternate_marketplace
     operation = {
       'Action' => 'SendTestNotificationToDestination',
       'MarketplaceId' => '321',
@@ -132,24 +86,6 @@ class TestMWSSubscriptionsClient < MiniTest::Test
   end
 
   def test_creates_subscription
-    operation = {
-      'Action' => 'CreateSubscription',
-      'MarketplaceId' => '123',
-      'Subscription.IsEnabled' => true,
-      'Subscription.NotificationType' => 'foo',
-      'Subscription.Destination.DeliveryChannel' => 'SQS',
-      'Subscription.Destination.AttributeList.member.1.Key' => 'sqsQueueUrl',
-      'Subscription.Destination.AttributeList.member.1.Value' => 'bar'
-    }
-
-    @client.stub(:run, nil) do
-      @client.create_subscription('foo', 'bar')
-    end
-
-    assert_equal operation, @client.operation
-  end
-
-  def test_creates_subscription_with_alternate_marketplace
     operation = {
       'Action' => 'CreateSubscription',
       'MarketplaceId' => '321',
@@ -168,23 +104,6 @@ class TestMWSSubscriptionsClient < MiniTest::Test
   end
 
   def test_gets_subscription
-    operation = {
-      'Action' => 'GetSubscription',
-      'MarketplaceId' => '123',
-      'NotificationType' => 'foo',
-      'Destination.DeliveryChannel' => 'SQS',
-      'Destination.AttributeList.member.1.Key' => 'sqsQueueUrl',
-      'Destination.AttributeList.member.1.Value' => 'bar'
-    }
-
-    @client.stub(:run, nil) do
-      @client.get_subscription('foo', 'bar')
-    end
-
-    assert_equal operation, @client.operation
-  end
-
-  def test_gets_subscription_with_alternate_marketplace
     operation = {
       'Action' => 'GetSubscription',
       'MarketplaceId' => '321',
@@ -202,23 +121,6 @@ class TestMWSSubscriptionsClient < MiniTest::Test
   end
 
   def test_deletes_subscription
-    operation = {
-      'Action' => 'DeleteSubscription',
-      'MarketplaceId' => '123',
-      'NotificationType' => 'foo',
-      'Destination.DeliveryChannel' => 'SQS',
-      'Destination.AttributeList.member.1.Key' => 'sqsQueueUrl',
-      'Destination.AttributeList.member.1.Value' => 'bar'
-    }
-
-    @client.stub(:run, nil) do
-      @client.delete_subscription('foo', 'bar')
-    end
-
-    assert_equal operation, @client.operation
-  end
-
-  def test_deletes_subscription_with_alternate_marketplace
     operation = {
       'Action' => 'DeleteSubscription',
       'MarketplaceId' => '321',
@@ -236,19 +138,6 @@ class TestMWSSubscriptionsClient < MiniTest::Test
   end
 
   def test_lists_subscriptions
-    operation = {
-      'Action' => 'ListSubscriptions',
-      'MarketplaceId' => '123'
-    }
-
-    @client.stub(:run, nil) do
-      @client.list_subscriptions
-    end
-
-    assert_equal operation, @client.operation
-  end
-
-  def test_lists_subscriptions_with_alternate_marketplace
     operation = {
       'Action' => 'ListSubscriptions',
       'MarketplaceId' => '321'
@@ -262,24 +151,6 @@ class TestMWSSubscriptionsClient < MiniTest::Test
   end
 
   def test_updates_subscription
-    operation = {
-      'Action' => 'UpdateSubscription',
-      'MarketplaceId' => '123',
-      'Subscription.IsEnabled' => true,
-      'Subscription.NotificationType' => 'foo',
-      'Subscription.Destination.DeliveryChannel' => 'SQS',
-      'Subscription.Destination.AttributeList.member.1.Key' => 'sqsQueueUrl',
-      'Subscription.Destination.AttributeList.member.1.Value' => 'bar'
-    }
-
-    @client.stub(:run, nil) do
-      @client.update_subscription('foo', 'bar', true)
-    end
-
-    assert_equal operation, @client.operation
-  end
-
-  def test_updates_subscription_with_alternate_marketplace
     operation = {
       'Action' => 'UpdateSubscription',
       'MarketplaceId' => '321',