peddler 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04fe2f05cb29fdcfed397c2a449cee124e59e804
-  data.tar.gz: 703bbfa1b3586e6de667e9588c08160f16e44483
+  metadata.gz: a6f67b925cce300aac503662925a525c2a926db0
+  data.tar.gz: c50b916f201204efff20ad84142b890f87f18db8
 SHA512:
-  metadata.gz: f2bb404705d1ebf31383bfa2175f1f42319594a7b6bd1e1f0aa49959db89da39bc49a22a59ba4baa17d4fb8a288b480ecbf8ba3fb12f9b47e98259eef1c97641
-  data.tar.gz: 1998213239427a3ab9bbbd5d363e707827ef01ad973d8a891426775fbe1e1f4808d29d241638b81fbf0891aed1389ab22837e14b79633035bc4d4cce3fc293ff
+  metadata.gz: 7b7207770118f4af6786a4394bfd1138b0b89c311e9b20059b9818ae75a84c4ed25f2ea4fd102740e5f98ffa1847e78d8536509e6b73cddf5fc0f4b1fefa6394
+  data.tar.gz: 171a182338ae07f4e52ddbf846fd12e963ec2c4dce6c9c18b38e8fd8c95f8e3e3148a44b24d264a9b6165158b3a9908ad7531a63a5eacd836c3b569c42f4b31e

data/README.md

@@ -34,16 +34,12 @@ Each client requires valid MWS credentials. You can set some or all when or afte
 
 ```ruby
 client = MWS::Orders::Client.new(
-  marketplace_id:        "foo",
-  merchant_id:           "bar",
-  aws_access_key_id:     "baz",
+  primary_marketplace_id: "foo",
+  merchant_id: "bar",
+  aws_access_key_id: "baz",
   aws_secret_access_key: "qux"
 )
 
-# Swap marketplace
-client.marketplace_id = "quux"
-```
-
 Alternatively, you can set these globally in the shell.
 
 ```sh

data/lib/mws/fulfillment_inbound_shipment/client.rb

@@ -21,8 +21,8 @@ module MWS
       def create_inbound_shipment_plan(ship_from_address, inbound_shipment_plan_request_items, opts = {})
         operation('CreateInboundShipmentPlan')
           .add(opts.update(
-            'ShipFromAddress' => ship_from_address,
-            'InboundShipmentPlanRequestItems' => inbound_shipment_plan_request_items
+                 'ShipFromAddress' => ship_from_address,
+                 'InboundShipmentPlanRequestItems' => inbound_shipment_plan_request_items
           ))
           .structure!('InboundShipmentPlanRequestItems', 'member')
 
@@ -40,8 +40,8 @@ module MWS
       def create_inbound_shipment(shipment_id, inbound_shipment_header, opts = {})
         operation('CreateInboundShipment')
           .add(opts.update(
-            'ShipmentId' => shipment_id,
-            'InboundShipmentHeader' => inbound_shipment_header
+                 'ShipmentId' => shipment_id,
+                 'InboundShipmentHeader' => inbound_shipment_header
           ))
           .structure!('InboundShipmentItems', 'member')
 
@@ -59,8 +59,8 @@ module MWS
       def update_inbound_shipment(shipment_id, inbound_shipment_header, opts = {})
         operation('UpdateInboundShipment')
           .add(opts.update(
-            'ShipmentId' => shipment_id,
-            'InboundShipmentHeader' => inbound_shipment_header
+                 'ShipmentId' => shipment_id,
+                 'InboundShipmentHeader' => inbound_shipment_header
           ))
           .structure!('InboundShipmentItems', 'member')
 
@@ -142,8 +142,8 @@ module MWS
       def get_package_labels(shipment_id, page_type, opts = {})
         operation('GetPackageLabels')
           .add(opts.update(
-            'ShipmentId' => shipment_id,
-            'PageType' => page_type
+                 'ShipmentId' => shipment_id,
+                 'PageType' => page_type
           ))
 
         run

data/lib/mws/fulfillment_outbound_shipment/client.rb

@@ -55,6 +55,7 @@ module MWS
       # @option opts [Array<String>] :notification_email_list
       # @option opts [Struct, Hash] :cod_settings
       # @return [Peddler::XMLParser]
+      # rubocop:disable MethodLength, ParameterLists
       def create_fulfillment_order(seller_fulfillment_order_id, displayable_order_id, displayable_order_date_time, displayable_order_comment, shipping_speed_category, destination_address, items, opts = {})
         if opts.key?(:cod_settings)
           opts['CODSettings'] = opts.delete(:cod_settings)
@@ -71,7 +72,7 @@ module MWS
               'DestinationAddress' => destination_address,
               'Items' => items
             )
-          )
+              )
           .structure!('Items', 'member')
           .structure!('NotificationEmailList', 'member')
 
@@ -142,7 +143,7 @@ module MWS
       # Returns delivery tracking information for a package in an outbound
       # shipment for a Multi-Channel Fulfillment order
       def get_package_tracking_details
-        raise NotImplementedError
+        fail NotImplementedError
       end
 
       # Requests that Amazon stop attempting to fulfill an existing fulfillment

data/lib/mws/off_amazon_payments/client.rb

@@ -13,6 +13,8 @@ module MWS
     #   made through the Login and Pay with Amazon service offered by Amazon
     #   Payments. You cannot use this API section to process payments for Amazon
     #   Marketplace, Amazon Webstore, or Checkout by Amazon.
+    #
+    # rubocop:disable ClassLength
     class Client < ::Peddler::Client
       version "2013-01-01"
       path "/OffAmazonPayments/#{version}/"
@@ -38,8 +40,8 @@ module MWS
       def create_order_reference_for_id(id, id_type, opts = {})
         operation('CreateOrderReferenceForId')
           .add(opts.update(
-            'Id' => id,
-            'IdType' => id_type
+                 'Id' => id,
+                 'IdType' => id_type
           ))
 
         run
@@ -55,7 +57,7 @@ module MWS
       def get_billing_agreement_details(amazon_billing_agreement_id, opts = {})
         operation('GetBillingAgreementDetails')
           .add(opts.update(
-            'AmazonBillingAgreementId' => amazon_billing_agreement_id
+                 'AmazonBillingAgreementId' => amazon_billing_agreement_id
           ))
 
         run
@@ -128,9 +130,9 @@ module MWS
       def authorize_on_billing_agreement(amazon_billing_agreement_id, authorization_reference_id, authorization_amount, opts = {})
         operation('AuthorizeOnBillingAgreement')
           .add(opts.update(
-            'AmazonBillingAgreementId' => amazon_billing_agreement_id,
-            'AuthorizationReferenceId' => authorization_reference_id,
-            'AuthorizationAmount' => authorization_amount
+                 'AmazonBillingAgreementId' => amazon_billing_agreement_id,
+                 'AuthorizationReferenceId' => authorization_reference_id,
+                 'AuthorizationAmount' => authorization_amount
           ))
 
         run
@@ -148,7 +150,7 @@ module MWS
       def close_billing_agreement(amazon_billing_agreement_id, opts = {})
         operation('CloseBillingAgreement')
           .add(opts.update(
-            'AmazonBillingAgreementId' => amazon_billing_agreement_id
+                 'AmazonBillingAgreementId' => amazon_billing_agreement_id
           ))
 
         run
@@ -248,9 +250,9 @@ module MWS
       def authorize(amazon_order_reference_id, authorization_reference_id, authorization_amount, opts = {})
         operation('Authorize')
           .add(opts.update(
-            'AmazonOrderReferenceId' => amazon_order_reference_id,
-            'AuthorizationReferenceId' => authorization_reference_id,
-            'AuthorizationAmount' => authorization_amount
+                 'AmazonOrderReferenceId' => amazon_order_reference_id,
+                 'AuthorizationReferenceId' => authorization_reference_id,
+                 'AuthorizationAmount' => authorization_amount
           ))
 
         run
@@ -282,9 +284,9 @@ module MWS
       def capture(amazon_authorization_id, capture_reference_id, capture_amount, opts = {})
         operation('Capture')
           .add(opts.update(
-            'AmazonAuthorizationId' => amazon_authorization_id,
-            'CaptureReferenceId' => capture_reference_id,
-            'CaptureAmount' => capture_amount
+                 'AmazonAuthorizationId' => amazon_authorization_id,
+                 'CaptureReferenceId' => capture_reference_id,
+                 'CaptureAmount' => capture_amount
           ))
 
         run
@@ -330,9 +332,9 @@ module MWS
       def refund(amazon_capture_id, refund_reference_id, refund_amount, opts = {})
         operation('Refund')
           .add(opts.update(
-            'AmazonCaptureId' => amazon_capture_id,
-            'RefundReferenceId' => refund_reference_id,
-            'RefundAmount' => refund_amount
+                 'AmazonCaptureId' => amazon_capture_id,
+                 'RefundReferenceId' => refund_reference_id,
+                 'RefundAmount' => refund_amount
           ))
 
         run

data/lib/mws/orders/client.rb

@@ -25,8 +25,9 @@ module MWS
       # @option opts [String] :max_results_per_page
       # @option opts [String] :tfm_shipment_status
       # @return [Peddler::XMLParser]
+      # rubocop:disable MethodLength
       def list_orders(opts = {})
-        opts[:marketplace_id] ||= marketplace_id
+        opts[:marketplace_id] ||= primary_marketplace_id
         if opts.key?(:tfm_shipment_status)
           opts['TFMShipmentStatus'] = opts.delete(:tfm_shipment_status)
         end

data/lib/mws/products/client.rb

@@ -13,7 +13,7 @@ module MWS
       # Lists products and their attributes, based on a search query
       #
       # @see http://docs.developer.amazonservices.com/en_US/products/Products_ListMatchingProducts.html
-      # @overload list_matching_products(query, opts = { marketplace_id: marketplace_id })
+      # @overload list_matching_products(query, opts = { marketplace_id: primary_marketplace_id })
       #   @param query [String]
       #   @param opts [Hash]
       #   @option opts [String] :marketplace_id
@@ -30,7 +30,7 @@ module MWS
       #   SellerSKU, UPC, EAN, ISBN, and JAN values
       #
       # @see http://docs.developer.amazonservices.com/en_US/products/Products_GetMatchingProduct.html
-      # @overload get_matching_product_for_id(id_type, *id_list, opts = { marketplace_id: marketplace_id })
+      # @overload get_matching_product_for_id(id_type, *id_list, opts = { marketplace_id: primary_marketplace_id })
       #   @param id_type [String]
       #   @param id_list [Array<String>]
       #   @param opts [Hash]
@@ -49,7 +49,7 @@ module MWS
       # Lists products and their attributes, based on a list of ASIN values
       #
       # @see http://docs.developer.amazonservices.com/en_US/products/Products_GetMatchingProductForId.html
-      # @overload get_matching_product(*asin_list, opts = { marketplace_id: marketplace_id })
+      # @overload get_matching_product(*asin_list, opts = { marketplace_id: primary_marketplace_id })
       #   @param asin_list [Array<String>]
       #   @param opts [Hash]
       #   @option opts [String] :marketplace_id
@@ -67,7 +67,7 @@ module MWS
       # Gets the current competitive price of a product, based on Seller SKU
       #
       # @see http://docs.developer.amazonservices.com/en_US/products/Products_GetCompetitivePricingForSKU.html
-      # @overload get_competitive_pricing_for_sku(*seller_sku_list, opts = { marketplace_id: marketplace_id })
+      # @overload get_competitive_pricing_for_sku(*seller_sku_list, opts = { marketplace_id: primary_marketplace_id })
       #   @param seller_sku_list [Array<String>]
       #   @param opts [Hash]
       #   @option opts [String] :marketplace_id
@@ -85,7 +85,7 @@ module MWS
       # Gets the current competitive price of a product, identified by its ASIN
       #
       # @see http://docs.developer.amazonservices.com/en_US/products/Products_GetCompetitivePricingForASIN.html
-      # @overload get_competitive_pricing_for_asin(*asin_list, opts = { marketplace_id: marketplace_id })
+      # @overload get_competitive_pricing_for_asin(*asin_list, opts = { marketplace_id: primary_marketplace_id })
       #   @param asin_list [Array<String>]
       #   @param opts [Hash]
       #   @option opts [String] :marketplace_id
@@ -104,7 +104,7 @@ module MWS
       # a product, based on Seller SKU
       #
       # @see http://docs.developer.amazonservices.com/en_US/products/Products_GetLowestOfferListingsForSKU.html
-      # @overload get_lowest_offer_listings_for_sku(*seller_sku_list, opts = { marketplace_id: marketplace_id })
+      # @overload get_lowest_offer_listings_for_sku(*seller_sku_list, opts = { marketplace_id: primary_marketplace_id })
       #   @param seller_sku_list [Array<String>]
       #   @param opts [Hash]
       #   @option opts [String] :marketplace_id
@@ -125,7 +125,7 @@ module MWS
       # a product, identified by its ASIN
       #
       # @see http://docs.developer.amazonservices.com/en_US/products/Products_GetLowestOfferListingsForASIN.html
-      # @overload get_lowest_offer_listings_for_asin(*asin_list, opts = { marketplace_id: marketplace_id })
+      # @overload get_lowest_offer_listings_for_asin(*asin_list, opts = { marketplace_id: primary_marketplace_id })
       #   @param asin_list [Array<String>]
       #   @param opts [Hash]
       #   @option opts [String] :marketplace_id
@@ -146,7 +146,7 @@ module MWS
       # Seller SKU
       #
       # @see http://docs.developer.amazonservices.com/en_US/products/Products_GetMyPriceForSKU.html
-      # @overload get_my_price_for_sku(*seller_sku_list, opts = { marketplace_id: marketplace_id })
+      # @overload get_my_price_for_sku(*seller_sku_list, opts = { marketplace_id: primary_marketplace_id })
       #   @param seller_sku_list [Array<String>]
       #   @param opts [Hash]
       #   @option opts [String] :marketplace_id
@@ -166,7 +166,7 @@ module MWS
       # its ASIN
       #
       # @see http://docs.developer.amazonservices.com/en_US/products/Products_GetMyPriceForASIN.html
-      # @overload get_my_price_for_asin(*seller_sku_list, opts = { marketplace_id: marketplace_id })
+      # @overload get_my_price_for_asin(*seller_sku_list, opts = { marketplace_id: primary_marketplace_id })
       #   @param asin_list [Array<String>]
       #   @param opts [Hash]
       #   @option opts [String] :marketplace_id
@@ -186,7 +186,7 @@ module MWS
       # Seller`SKU
       #
       # @see http://docs.developer.amazonservices.com/en_US/products/Products_GetProductCategoriesForSKU.html
-      # @overload get_product_categories_for_sku(sku, opts = { marketplace_id: marketplace_id })
+      # @overload get_product_categories_for_sku(sku, opts = { marketplace_id: primary_marketplace_id })
       #   @param seller_sku [String]
       #   @param opts [Hash]
       #   @option opts [String] :marketplace_id
@@ -201,7 +201,7 @@ module MWS
       # Gets parent product categories that a product belongs to, based on ASIN
       #
       # @see http://docs.developer.amazonservices.com/en_US/products/Products_GetProductCategoriesForASIN.html
-      # @overload get_product_categories_for_asin(asin, opts = { marketplace_id: marketplace_id })
+      # @overload get_product_categories_for_asin(asin, opts = { marketplace_id: primary_marketplace_id })
       #   @param asin [String]
       #   @param opts [Hash]
       #   @option opts [String] :marketplace_id
@@ -226,7 +226,7 @@ module MWS
       def operation_with_marketplace(*args)
         operation(*args).tap do |opts|
           unless opts.key?('MarketplaceId')
-            opts.store('MarketplaceId', marketplace_id)
+            opts.store('MarketplaceId', primary_marketplace_id)
           end
         end
       end

data/lib/mws/recommendations/client.rb

@@ -17,7 +17,7 @@ module MWS
       # @see http://docs.developer.amazonservices.com/en_US/recommendations/Recommendations_GetLastUpdatedTimeForRecommendations.html
       # @param marketplace_id [String]
       # @return [Peddler::XMLParser]
-      def get_last_updated_time_for_recommendations(marketplace_id = marketplace_id())
+      def get_last_updated_time_for_recommendations(marketplace_id = primary_marketplace_id)
         operation('GetLastUpdatedTimeForRecommendations')
           .add('MarketplaceId' => marketplace_id)
 
@@ -35,7 +35,7 @@ module MWS
       #   @option opts [Array<Struct, Hash>] :category_query_list
       # @return [Peddler::XMLParser]
       def list_recommendations(opts = {})
-        opts[:marketplace_id] ||= marketplace_id
+        opts[:marketplace_id] ||= primary_marketplace_id
 
         operation('ListRecommendations')
           .add(opts)

data/lib/mws/reports/client.rb

@@ -188,7 +188,7 @@ module MWS
       # @see http://docs.developer.amazonservices.com/en_US/reports/Reports_GetReportScheduleListByNextToken.html
       # @raise [NotImplementedError]
       def get_report_schedule_list_by_next_token(*)
-        raise NotImplementedError
+        fail NotImplementedError
       end
 
       # Count scheduled reports

data/lib/mws/sellers/client.rb

@@ -41,6 +41,7 @@ module MWS
       # Gets the MWS Auth Token of the seller account
       #
       # @see http://docs.developer.amazonservices.com/en_US/auth_token/AuthToken_GetAuthToken.html
+      # @todo Remove this method after June 30, 2015 as it will no longer be available.
       # @return [Peddler::XMLParser]
       def get_auth_token
         operation('GetAuthToken')

data/lib/mws/subscriptions/client.rb

@@ -18,7 +18,7 @@ module MWS
       # @param sqs_queue_url [String]
       # @param marketplace_id [String]
       # @return [Peddler::XMLParser]
-      def register_destination(sqs_queue_url, marketplace_id = marketplace_id())
+      def register_destination(sqs_queue_url, marketplace_id = primary_marketplace_id)
         operation('RegisterDestination')
           .add('MarketplaceId' => marketplace_id)
           .add(build_destination(sqs_queue_url))
@@ -32,7 +32,7 @@ module MWS
       # @param sqs_queue_url [String]
       # @param marketplace_id [String]
       # @return [Peddler::XMLParser]
-      def deregister_destination(sqs_queue_url, marketplace_id = marketplace_id())
+      def deregister_destination(sqs_queue_url, marketplace_id = primary_marketplace_id)
         operation('DeregisterDestination')
           .add('MarketplaceId' => marketplace_id)
           .add(build_destination(sqs_queue_url))
@@ -45,7 +45,7 @@ module MWS
       # @see http://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_ListRegisteredDestinations.html
       # @param marketplace_id [String]
       # @return [Peddler::XMLParser]
-      def list_registered_destinations(marketplace_id = marketplace_id())
+      def list_registered_destinations(marketplace_id = primary_marketplace_id)
         operation('ListRegisteredDestinations')
           .add('MarketplaceId' => marketplace_id)
 
@@ -58,7 +58,7 @@ module MWS
       # @param sqs_queue_url [String]
       # @param marketplace_id [String]
       # @return [Peddler::XMLParser]
-      def send_test_notification_to_destination(sqs_queue_url, marketplace_id = marketplace_id())
+      def send_test_notification_to_destination(sqs_queue_url, marketplace_id = primary_marketplace_id)
         operation('SendTestNotificationToDestination')
           .add('MarketplaceId' => marketplace_id)
           .add(build_destination(sqs_queue_url))
@@ -73,7 +73,7 @@ module MWS
       # @param sqs_queue_url [String]
       # @param marketplace_id [String]
       # @return [Peddler::XMLParser]
-      def create_subscription(notification_type, sqs_queue_url, marketplace_id = marketplace_id())
+      def create_subscription(notification_type, sqs_queue_url, marketplace_id = primary_marketplace_id)
         operation('CreateSubscription')
           .add('MarketplaceId' => marketplace_id)
           .add(build_subscription(notification_type, sqs_queue_url))
@@ -88,7 +88,7 @@ module MWS
       # @param sqs_queue_url [String]
       # @param marketplace_id [String]
       # @return [Peddler::XMLParser]
-      def get_subscription(notification_type, sqs_queue_url, marketplace_id = marketplace_id())
+      def get_subscription(notification_type, sqs_queue_url, marketplace_id = primary_marketplace_id)
         operation('GetSubscription')
           .add(
             'MarketplaceId' => marketplace_id,
@@ -106,7 +106,7 @@ module MWS
       # @param sqs_queue_url [String]
       # @param marketplace_id [String]
       # @return [Peddler::XMLParser]
-      def delete_subscription(notification_type, sqs_queue_url, marketplace_id = marketplace_id())
+      def delete_subscription(notification_type, sqs_queue_url, marketplace_id = primary_marketplace_id)
         operation('DeleteSubscription')
           .add(
             'MarketplaceId' => marketplace_id,
@@ -122,7 +122,7 @@ module MWS
       # @see http://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_ListSubscriptions.html
       # @param marketplace_id [String]
       # @return [Peddler::XMLParser]
-      def list_subscriptions(marketplace_id = marketplace_id())
+      def list_subscriptions(marketplace_id = primary_marketplace_id)
         operation('ListSubscriptions')
           .add('MarketplaceId' => marketplace_id)
 
@@ -137,7 +137,7 @@ module MWS
       # @param enabled [Boolean]
       # @param marketplace_id [String]
       # @return [Peddler::XMLParser]
-      def update_subscription(notification_type, sqs_queue_url, enabled, marketplace_id = marketplace_id())
+      def update_subscription(notification_type, sqs_queue_url, enabled, marketplace_id = primary_marketplace_id)
         operation('UpdateSubscription')
           .add('MarketplaceId' => marketplace_id)
           .add(build_subscription(notification_type, sqs_queue_url, enabled))

data/lib/mws/webstore/client.rb

@@ -2,8 +2,8 @@ require 'peddler/client'
 
 module MWS
   module Webstore
-    # With the Webstore API section of Amazon MWS, you can get “Email Me When
-    # Available” subscription information for items listed on your Amazon
+    # With the Webstore API section of Amazon MWS, you can get "Email Me When
+    # Available" subscription information for items listed on your Amazon
     # Webstore. The Webstore API section can help you plan your inventory
     # replenishment cycle by enabling you to query for items that your customers
     # subscribed to when they clicked the Email Me When Available button on your
@@ -29,7 +29,7 @@ module MWS
       #   @option opts [Array<String>] :seller_sku_list
       # @return [Peddler::XMLParser]
       def list_subscriptions_count(subscription_state, opts = {})
-        opts[:marketplace_id] ||= marketplace_id
+        opts[:marketplace_id] ||= primary_marketplace_id
         if opts.key?(:seller_sku_list)
           opts['SellerSKUList'] = opts.delete(:seller_sku_list)
         end
@@ -65,12 +65,12 @@ module MWS
       #   @option opts [String, #iso8601] :date_range_end
       # @return [Peddler::XMLParser]
       def get_subscription_details(seller_sku, subscription_state, date_range_start, opts = {})
-        opts[:marketplace_id] ||= marketplace_id
+        opts[:marketplace_id] ||= primary_marketplace_id
         operation('GetSubscriptionDetails')
           .add(opts.update(
-            'SellerSKU' => seller_sku,
-            'SubscriptionState' => subscription_state,
-            'DateRangeStart' => date_range_start
+                 'SellerSKU' => seller_sku,
+                 'SubscriptionState' => subscription_state,
+                 'DateRangeStart' => date_range_start
           ))
 
         run

data/lib/peddler/client.rb

@@ -8,6 +8,8 @@ module Peddler
   # An abstract client
   #
   # Subclass to implement an MWS API section.
+  #
+  # rubocop:disable ClassLength
   class Client
     extend Forwardable
     include Jeff
@@ -16,7 +18,7 @@ module Peddler
     # @return [String]
     attr_accessor :auth_token
 
-    attr_writer :merchant_id, :marketplace_id, :path
+    attr_writer :merchant_id, :primary_marketplace_id, :path
 
     # @api private
     attr_writer :version
@@ -44,12 +46,7 @@ module Peddler
         @parser ||= Parser
       end
 
-      # A custom parser
-      # @!parse attr_writer :parser
-      # @return [Object]
-      def parser=(parser)
-        @parser = parser
-      end
+      attr_writer :parser
 
       # @api private
       def path(path = nil)
@@ -61,7 +58,7 @@ module Peddler
         version ? @version = version : @version
       end
 
-      # Sets an error handler
+      # Sets an error handler
       # @yieldparam request [Excon::Request]
       # @yieldparam response [Excon::Response]
       def on_error(&blk)
@@ -72,7 +69,7 @@ module Peddler
 
       def inherited(base)
         base.params(params)
-        base.on_error &@error_handler if @error_handler
+        base.on_error(&@error_handler) if @error_handler
       end
     end
 
@@ -94,10 +91,20 @@ module Peddler
     end
 
     # The merchant's Marketplace ID
-    # @!parse attr_reader :marketplace_id
+    # @!parse attr_reader :primary_marketplace_id
     # @return [String]
+    def primary_marketplace_id
+      @primary_marketplace_id ||= ENV['MWS_MARKETPLACE_ID']
+    end
+
+    # @deprecated Use {#primary_marketplace_id} instead.
     def marketplace_id
-      @marketplace_id ||= ENV['MWS_MARKETPLACE_ID']
+      @primary_marketplace_id
+    end
+
+    # @deprecated Use {#primary_marketplace_id=} instead.
+    def marketplace_id=(marketplace_id)
+      @primary_marketplace_id = marketplace_id
     end
 
     # The merchant's Seller ID
@@ -140,7 +147,7 @@ module Peddler
       @headers ||= {}
     end
 
-    # Sets an error handler
+    # Sets an error handler
     # @yieldparam request [Excon::Request]
     # @yieldparam response [Excon::Response]
     def on_error(&blk)
@@ -158,6 +165,7 @@ module Peddler
     end
 
     # @api private
+    # rubocop:disable AbcSize, MethodLength
     def run
       opts = defaults.merge(query: operation, headers: headers)
       opts.store(:body, body) if body
@@ -169,7 +177,8 @@ module Peddler
       handle_error(e) or raise
     rescue NoMethodError => e
       if e.message == "undefined method `new' for #{parser}"
-        warn "[DEPRECATION] `Parser.parse` is deprecated. Please use `Parser.new` instead."
+        warn "[DEPRECATION] `Parser.parse` is deprecated. "\
+             "Please use `Parser.new` instead."
         parser.parse(res, encoding)
       else
         raise
@@ -179,7 +188,7 @@ module Peddler
     private
 
     def find_marketplace
-      Marketplace.new(marketplace_id)
+      Marketplace.new(primary_marketplace_id)
     end
 
     def content_type(str)

data/lib/peddler/marketplace.rb

@@ -41,7 +41,7 @@ module Peddler
     private
 
     def find_host
-      HOSTS.fetch(id) { fail BadId, %Q("#{id}" is not a valid MarketplaceId) }
+      HOSTS.fetch(id) { fail BadId, %("#{id}" is not a valid MarketplaceId) }
     end
 
     def japanese?

data/lib/peddler/operation.rb

@@ -11,8 +11,8 @@ module Peddler
 
     def structure!(*list_keys)
       list_key = list_keys.shift
-
-      if found_key = keys.find { |key| key.end_with?(list_key) }
+      found_key = keys.find { |key| key.end_with?(list_key) }
+      if found_key
         builder = StructuredList.new(found_key, *list_keys)
         vals = delete(found_key)
         update(builder.build(vals))
@@ -21,6 +21,7 @@ module Peddler
       self
     end
 
+    # rubocop:disable AbcSize, MethodLength, PerceivedComplexity
     def store(key, val)
       key = camelize(key) if key.is_a?(Symbol)
 

data/lib/peddler/structured_list.rb

@@ -8,7 +8,7 @@ module Peddler
     def build(vals)
       Array(vals)
         .each_with_index
-        .reduce(Hash.new) { |hsh, (v, i)| hsh.merge(compose_key(i + 1) => v) }
+        .reduce({}) { |hsh, (v, i)| hsh.merge(compose_key(i + 1) => v) }
     end
 
     private

data/lib/peddler/version.rb

@@ -1,3 +1,3 @@
 module Peddler
-  VERSION = '0.15.0'
+  VERSION = '0.16.0'
 end

data/test/helper.rb

@@ -1,5 +1,16 @@
+require 'simplecov'
 require 'coveralls'
-Coveralls.wear!
+
+SimpleCov.formatters = [
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+
+SimpleCov.start do
+  add_filter '/test/'
+  minimum_coverage(99.62)
+end
+
 require 'minitest/autorun'
 require 'yaml'
 require 'vcr'
@@ -21,7 +32,7 @@ module Accounts
 
   %w(mws.yml mws.yml.example).each do |path|
     file = File.expand_path("../#{path}", __FILE__)
-    if File.exists?(file)
+    if File.exist?(file)
       @data = YAML.load_file(file)
       break
     end
@@ -70,7 +81,7 @@ VCR.configure do |c|
 
   c.default_cassette_options = {
     match_requests_on: [:host, :path, matcher],
-    record: !!ENV['RECORD'] ? :new_episodes : :none
+    record: !ENV['RECORD'] ? :none : :new_episodes
   }
 
   # So that fixtures do not depend on merchant credentials

data/test/integration/test_fulfillment_inbound_shipment.rb

@@ -3,7 +3,7 @@ require 'mws/fulfillment_inbound_shipment'
 
 class TestFulfillmentInboundShipment < IntegrationTest
   Address = Struct.new(:name, :address_line_1, :city, :state_or_province_code,
-    :postal_code, :country_code)
+                       :postal_code, :country_code)
   Item = Struct.new(:seller_sku, :quantity)
 
   def test_creates_inbound_shipment_plan

data/test/integration/test_recommendations.rb

@@ -5,7 +5,8 @@ class TestRecommendations < IntegrationTest
   def test_lists_recommendations
     clients.each do |client|
       res = client.list_recommendations
-      skip unless content = res.parse
+      content = res.parse
+      skip unless content
       refute_empty content
     end
   end

data/test/integration/test_subscriptions.rb

@@ -9,7 +9,6 @@ class TestSubscriptions < IntegrationTest
     end
   end
 
-
   def test_lists_subscriptions
     clients.each do |client|
       res = client.list_subscriptions

data/test/mws.yml.example

@@ -1,16 +1,16 @@
-- marketplace_id: A2EUQ1WTGCTBG2
+- primary_marketplace_id: A2EUQ1WTGCTBG2
   aws_access_key_id: AWS_ACCESS_KEY_ID
   aws_secret_access_key: AWS_SECRET_ACCESS_KEY
   merchant_id: MERCHANT_ID
-- marketplace_id: A1PA6795UKMFR9
+- primary_marketplace_id: A1PA6795UKMFR9
   aws_access_key_id: AWS_ACCESS_KEY_ID
   aws_secret_access_key: AWS_SECRET_ACCESS_KEY
   merchant_id: MERCHANT_ID
-- marketplace_id: A1VC38T7YXB528
+- primary_marketplace_id: A1VC38T7YXB528
   aws_access_key_id: AWS_ACCESS_KEY_ID
   aws_secret_access_key: AWS_SECRET_ACCESS_KEY
   merchant_id: MERCHANT_ID
-- marketplace_id: ATVPDKIKX0DER
+- primary_marketplace_id: ATVPDKIKX0DER
   aws_access_key_id: AWS_ACCESS_KEY_ID
   aws_secret_access_key: AWS_SECRET_ACCESS_KEY
   merchant_id: MERCHANT_ID

data/test/unit/mws/test_feeds_client.rb

@@ -14,7 +14,7 @@ class TestMWSFeedsClient < MiniTest::Test
     }
 
     @client.stub(:run, nil) do
-      @client.marketplace_id = 'A1F83G8C2ARO7P'
+      @client.primary_marketplace_id = 'A1F83G8C2ARO7P'
       @client.submit_feed('content', 'type', marketplace_id_list: '1')
     end
 

data/test/unit/mws/test_fulfillment_inbound_shipment_client.rb

@@ -55,7 +55,7 @@ class TestMWSFulfillmentInboundShipmentClient < MiniTest::Test
       'ParcelData' => {
         'PackageList' => [
           {
-          'TrackingId' => '123'
+            'TrackingId' => '123'
           }
         ]
       }

data/test/unit/mws/test_fulfillment_outbound_shipment_client.rb

@@ -11,14 +11,16 @@ class TestMWSFulfillmentOutboundShipmentClient < MiniTest::Test
       'Action' => 'GetFulfillmentPreview',
       'Address.Foo' => '1',
       'Items.member.1.Bar' => '2',
-      'ShippingSpeedCategories.1' => '3'
+      'ShippingSpeedCategories.1' => '3',
+      'IncludeCODFulfillmentPreview' => true
     }
 
     @client.stub(:run, nil) do
       @client.get_fulfillment_preview(
         { 'Foo' => '1' },
         [{ 'Bar' => '2' }],
-        shipping_speed_categories: ['3']
+        shipping_speed_categories: ['3'],
+        include_cod_fulfillment_preview: true
       )
     end
 
@@ -35,6 +37,7 @@ class TestMWSFulfillmentOutboundShipmentClient < MiniTest::Test
       'ShippingSpeedCategory' => '5',
       'DestinationAddress.Foo' => '1',
       'Items.member.1.Bar' => '2',
+      'CODSettings.Foo' => '1',
       'NotificationEmailList.member.1' => '1'
     }
 
@@ -43,6 +46,7 @@ class TestMWSFulfillmentOutboundShipmentClient < MiniTest::Test
         '1', '2', '3', '4', '5',
         { 'Foo' => '1' },
         [{ 'Bar' => '2' }],
+        cod_settings: { 'Foo' => '1' },
         notification_email_list: ['1']
       )
     end
@@ -94,6 +98,19 @@ class TestMWSFulfillmentOutboundShipmentClient < MiniTest::Test
     assert_equal operation, @client.operation
   end
 
+  def test_lists_all_fulfillment_orders_by_next_token
+    operation = {
+      'Action' => 'ListAllFulfillmentOrdersByNextToken',
+      'NextToken' => '1'
+    }
+
+    @client.stub(:run, nil) do
+      @client.list_all_fulfillment_orders_by_next_token('1')
+    end
+
+    assert_equal operation, @client.operation
+  end
+
   def test_gets_package_tracking_details
     assert_raises(NotImplementedError) do
       @client.get_package_tracking_details

data/test/unit/mws/test_off_amazon_payments_client.rb

@@ -7,7 +7,7 @@ class TestMWSOffAmazonPaymentsClient < MiniTest::Test
   end
 
   def test_sandboxes
-    @client.marketplace_id = 'A1F83G8C2ARO7P'
+    @client.primary_marketplace_id = 'A1F83G8C2ARO7P'
     refute_includes @client.aws_endpoint, 'Sandbox'
     assert_includes @client.sandbox.aws_endpoint, 'Sandbox'
   end
@@ -188,6 +188,19 @@ class TestMWSOffAmazonPaymentsClient < MiniTest::Test
     assert_equal operation, @client.operation
   end
 
+  def test_gets_authorization_details
+    operation = {
+      'Action' => 'GetAuthorizationDetails',
+      'AmazonAuthorizationId' => '1'
+    }
+
+    @client.stub(:run, nil) do
+      @client.get_authorization_details('1')
+    end
+
+    assert_equal operation, @client.operation
+  end
+
   def test_captures
     operation = {
       'Action' => 'Capture',

data/test/unit/mws/test_products_client.rb

@@ -4,7 +4,7 @@ require 'mws/products/client'
 class TestMWSProductsClient < MiniTest::Test
   def setup
     @client = MWS::Products::Client.new
-    @client.marketplace_id = '123'
+    @client.primary_marketplace_id = '123'
   end
 
   def test_lists_matching_products

data/test/unit/mws/test_recommendations_client.rb

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

data/test/unit/mws/test_sellers_client.rb

@@ -42,4 +42,16 @@ class TestMWSSellersClient < MiniTest::Test
 
     assert_equal operation, @client.operation
   end
+
+  def test_gets_auth_token
+    operation = {
+      'Action' => 'GetAuthToken'
+    }
+
+    @client.stub(:run, nil) do
+      @client.get_auth_token
+    end
+
+    assert_equal operation, @client.operation
+  end
 end

data/test/unit/mws/test_subscriptions_client.rb

@@ -4,7 +4,7 @@ require 'mws/subscriptions/client'
 class TestMWSSubscriptionsClient < MiniTest::Test
   def setup
     @client = MWS::Subscriptions::Client.new
-    @client.marketplace_id = '123'
+    @client.primary_marketplace_id = '123'
   end
 
   def test_registers_destination
@@ -133,7 +133,7 @@ class TestMWSSubscriptionsClient < MiniTest::Test
     operation = {
       'Action' => 'CreateSubscription',
       'MarketplaceId' => '123',
-      'Subscription.IsEnabled'=>true,
+      'Subscription.IsEnabled' => true,
       'Subscription.NotificationType' => 'foo',
       'Subscription.Destination.DeliveryChannel' => 'SQS',
       'Subscription.Destination.AttributeList.member.1.Key' => 'sqsQueueUrl',
@@ -151,7 +151,7 @@ class TestMWSSubscriptionsClient < MiniTest::Test
     operation = {
       'Action' => 'CreateSubscription',
       'MarketplaceId' => '321',
-      'Subscription.IsEnabled'=>true,
+      'Subscription.IsEnabled' => true,
       'Subscription.NotificationType' => 'foo',
       'Subscription.Destination.DeliveryChannel' => 'SQS',
       'Subscription.Destination.AttributeList.member.1.Key' => 'sqsQueueUrl',

data/test/unit/mws/test_webstore_client.rb

@@ -7,7 +7,7 @@ class TestMWSWebstoreClient < MiniTest::Test
   end
 
   def test_lists_subscriptions_count
-    @client.marketplace_id = '123'
+    @client.primary_marketplace_id = '123'
     operation = {
       'Action' => 'ListSubscriptionsCount',
       'MarketplaceId' => '123',
@@ -55,7 +55,7 @@ class TestMWSWebstoreClient < MiniTest::Test
   end
 
   def test_get_subscriptions_details
-    @client.marketplace_id = '123'
+    @client.primary_marketplace_id = '123'
     operation = {
       'Action' => 'GetSubscriptionDetails',
       'MarketplaceId' => '123',

data/test/unit/peddler/test_client.rb

@@ -4,7 +4,9 @@ require 'peddler/client'
 
 class TestPeddlerClient < MiniTest::Test
   module Parser
-    def self.new(res, *); res; end
+    def self.new(res, *)
+      res
+    end
   end
 
   def setup
@@ -18,7 +20,7 @@ class TestPeddlerClient < MiniTest::Test
     @client.aws_access_key_id = 'key'
     @client.aws_secret_access_key = 'secret'
     @client.merchant_id = 'seller'
-    @client.marketplace_id = 'ATVPDKIKX0DER' # US
+    @client.primary_marketplace_id = 'ATVPDKIKX0DER' # US
     @client.operation('Foo')
   end
 
@@ -44,7 +46,7 @@ class TestPeddlerClient < MiniTest::Test
   end
 
   def test_has_user_agent
-    assert @client.connection.data[:headers].has_key?('User-Agent')
+    assert @client.connection.data[:headers].key?('User-Agent')
   end
 
   def test_inherits_parents_params
@@ -80,7 +82,7 @@ class TestPeddlerClient < MiniTest::Test
   end
 
   def test_sets_content_type_header_for_chinese_flat_file_body
-    @client.marketplace_id = 'AAHKV2X7AFYLW'
+    @client.primary_marketplace_id = 'AAHKV2X7AFYLW'
     @client.body = 'foo'
     content_type = @client.headers.fetch('Content-Type')
 
@@ -88,7 +90,7 @@ class TestPeddlerClient < MiniTest::Test
   end
 
   def test_sets_content_type_header_for_japanese_flat_file_body
-    @client.marketplace_id = 'A1VC38T7YXB528'
+    @client.primary_marketplace_id = 'A1VC38T7YXB528'
     @client.body = 'foo'
     content_type = @client.headers.fetch('Content-Type')
 
@@ -131,11 +133,11 @@ class TestPeddlerClient < MiniTest::Test
     @client.run
     headers = instrumentor.events['excon.request'][:headers]
 
-    assert headers.has_key?('User-Agent')
+    assert headers.key?('User-Agent')
   end
 
   def test_error_callback_on_class
-    Excon.stub({}, { status: 503 })
+    Excon.stub({}, status: 503)
 
     assert_raises(Excon::Errors::ServiceUnavailable) do
       @client.run
@@ -152,7 +154,7 @@ class TestPeddlerClient < MiniTest::Test
   end
 
   def test_error_callback_on_instance
-    Excon.stub({}, { status: 503 })
+    Excon.stub({}, status: 503)
 
     assert_raises(Excon::Errors::ServiceUnavailable) do
       @client.run
@@ -168,7 +170,7 @@ class TestPeddlerClient < MiniTest::Test
   end
 
   def test_error_callback_on_client_ancestor
-    Excon.stub({}, { status: 503 })
+    Excon.stub({}, status: 503)
 
     assert_raises(Excon::Errors::ServiceUnavailable) do
       @client.run
@@ -184,7 +186,7 @@ class TestPeddlerClient < MiniTest::Test
     client.aws_access_key_id = 'key'
     client.aws_secret_access_key = 'secret'
     client.merchant_id = 'seller'
-    client.marketplace_id = 'ATVPDKIKX0DER' # US
+    client.primary_marketplace_id = 'ATVPDKIKX0DER' # US
     client.operation('Foo')
     client.run
 
@@ -194,7 +196,9 @@ class TestPeddlerClient < MiniTest::Test
 
   def test_deprecates_call_to_parser_parse
     deprecated_parser = Module.new do
-      def self.parse(res, *); res; end
+      def self.parse(res, *)
+        res
+      end
     end
     @client.stub :warn, nil do
       @klass.parser = deprecated_parser
@@ -202,4 +206,25 @@ class TestPeddlerClient < MiniTest::Test
       assert_equal @body, res.body
     end
   end
+
+  def test_raises_no_method_errors_not_related_to_deprecated_parser
+    bad_parser = Module.new do
+      def self.new(*)
+        fail NoMethodError, "foo"
+      end
+    end
+    @klass.parser = bad_parser
+    @client.stub :warn, nil do
+      assert_raises NoMethodError do
+        @client.run
+      end
+    end
+  end
+
+  def test_deprecated_marketplace_id_accessor
+    refute_nil @client.marketplace_id
+    @client.marketplace_id = "123"
+    assert_equal "123",  @client.marketplace_id
+    assert_equal @client.primary_marketplace_id,  @client.marketplace_id
+  end
 end

data/test/unit/peddler/test_marketplace.rb

@@ -16,7 +16,7 @@ class TestPeddlerMarketplace < MiniTest::Test
 
   def test_guard_against_missing_marketplace_id
     assert_raises(Peddler::Marketplace::BadId, 'missing MarketplaceId') do
-      marketplace = Peddler::Marketplace.new(nil)
+      Peddler::Marketplace.new(nil)
     end
   end
 

data/test/unit/peddler/test_operation.rb

@@ -9,7 +9,7 @@ class TestPeddlerOperation < MiniTest::Test
   def test_converts_key_to_structured_list
     @operation.store('FooStatus', [1, 2])
     @operation.structure!('FooStatus', 'Foo')
-    refute @operation.has_key?('FooStatus')
+    refute @operation.key?('FooStatus')
     assert_equal 1, @operation['FooStatus.Foo.1']
     assert_equal 2, @operation['FooStatus.Foo.2']
   end
@@ -17,20 +17,20 @@ class TestPeddlerOperation < MiniTest::Test
   def test_converts_nested_key_to_structured_list
     @operation.store('Foo.Status', [1])
     @operation.structure!('Status', 'Bar')
-    refute @operation.has_key?('FooStatus')
+    refute @operation.key?('FooStatus')
     assert_equal 1, @operation['Foo.Status.Bar.1']
   end
 
   def test_store_camelizes_key
     @operation.store(:foo_bar, 'baz')
-    assert @operation.has_key?('FooBar')
-    refute @operation.has_key?(:foo_bar)
+    assert @operation.key?('FooBar')
+    refute @operation.key?(:foo_bar)
   end
 
   def test_store_upcases_sku
     @operation.store(:seller_sku, 'baz')
-    assert @operation.has_key?('SellerSKU')
-    refute @operation.has_key?(:seller_sku)
+    assert @operation.key?('SellerSKU')
+    refute @operation.key?(:seller_sku)
   end
 
   def test_store_timestamps_time_values
@@ -42,15 +42,15 @@ class TestPeddlerOperation < MiniTest::Test
   end
 
   def test_stringifies_hash_values
-    @operation.store('Foo', { bar: 1 })
+    @operation.store('Foo', bar: 1)
     assert_equal 1, @operation.fetch('Foo.Bar')
-    refute @operation.has_key?('Foo')
+    refute @operation.key?('Foo')
   end
 
   def test_stringifies_nested_hash_values
-    @operation.store('Foo', { bar: { baz: 1 } })
+    @operation.store('Foo', bar: { baz: 1 })
     assert_equal 1, @operation.fetch('Foo.Bar.Baz')
-    refute @operation.has_key?('Foo')
+    refute @operation.key?('Foo')
   end
 
   def test_stringifies_struct_values

data/test/unit/peddler/test_parser.rb

@@ -4,7 +4,10 @@ require 'peddler/parser'
 class TestPeddlerParser < MiniTest::Test
   def assert_parser(klass, *content_types)
     content_types.each do |content_type|
-      res = OpenStruct.new(headers: { 'Content-Type' => content_type }, body: '')
+      res = OpenStruct.new(
+        headers: { 'Content-Type' => content_type },
+        body: ''
+      )
       parser = Peddler::Parser.new(res)
 
       assert_kind_of klass, parser
@@ -12,10 +15,14 @@ class TestPeddlerParser < MiniTest::Test
   end
 
   def test_parses_xml
-    assert_parser Peddler::XMLParser, 'text/xml', 'text/xml; charset=UTF-8'
+    assert_parser Peddler::XMLParser,
+                  'text/xml',
+                  'text/xml; charset=UTF-8'
   end
 
   def test_parses_flat_files
-    assert_parser Peddler::FlatFileParser, 'text/plain', 'application/octet-stream'
+    assert_parser Peddler::FlatFileParser,
+                  'text/plain',
+                  'application/octet-stream'
   end
 end

data/test/unit/peddler/test_xml_parser.rb

@@ -3,8 +3,12 @@ require 'peddler/xml_parser'
 
 class TestPeddlerXMLParser < MiniTest::Test
   def setup
-    body = '<Response><Result><NextToken>123</NextToken><Foo>Bar</Foo></Result></Response>'
-    res = OpenStruct.new(body: body, headers: { 'Content-Type' => 'text/xml', 'Content-Length' => '78'})
+    body = '<Response><Result><NextToken>123</NextToken>'\
+           '<Foo>Bar</Foo></Result></Response>'
+    res = OpenStruct.new(
+      body: body,
+      headers: { 'Content-Type' => 'text/xml', 'Content-Length' => '78' }
+    )
 
     @parser = Peddler::XMLParser.new(res)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peddler
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Hakan Ensari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeff
@@ -100,7 +100,6 @@ files:
 - test/integration/test_sellers.rb
 - test/integration/test_subscriptions.rb
 - test/integration/test_webstore.rb
-- test/mws.yml.1
 - test/mws.yml.example
 - test/unit/mws/test_cart_information_client.rb
 - test/unit/mws/test_customer_information_client.rb
@@ -178,7 +177,6 @@ test_files:
 - test/integration/test_sellers.rb
 - test/integration/test_subscriptions.rb
 - test/integration/test_webstore.rb
-- test/mws.yml.1
 - test/mws.yml.example
 - test/unit/mws/test_cart_information_client.rb
 - test/unit/mws/test_customer_information_client.rb

data/test/mws.yml.1

@@ -1,4 +0,0 @@
-- marketplace_id: ATVPDKIKX0DER
-  aws_access_key_id: AKIAJOD3NLXHOMANRNQQ
-  aws_secret_access_key: 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
-  merchant_id: A2JYSO6W6KEP83