peddler 1.6.7 → 2.0.0

data/lib/mws/recommendations/client.rb

@@ -9,18 +9,17 @@ module MWS
     # is an actionable, timely, and personalized opportunity to increase your
     # sales and performance.
     class Client < ::Peddler::Client
-      version '2013-04-01'
-      path "/Recommendations/#{version}"
+      self.version = '2013-04-01'
+      self.path = "/Recommendations/#{version}"
 
       # Checks whether there are active recommendations for each category for
       # the given marketplace, and if there are, returns the time when
       # recommendations were last updated for each category
       #
-      # @see http://docs.developer.amazonservices.com/en_US/recommendations/Recommendations_GetLastUpdatedTimeForRecommendations.html
+      # @see https://docs.developer.amazonservices.com/en_US/recommendations/Recommendations_GetLastUpdatedTimeForRecommendations.html
       # @param [String] marketplace_id
       # @return [Peddler::XMLParser]
-      def get_last_updated_time_for_recommendations(marketplace_id =
-                                                      primary_marketplace_id)
+      def get_last_updated_time_for_recommendations(marketplace_id)
         operation('GetLastUpdatedTimeForRecommendations')
           .add('MarketplaceId' => marketplace_id)
 
@@ -30,19 +29,16 @@ module MWS
       # Lists active recommendations for a specific category or for all
       # categories for a specific marketplace
       #
-      # @see http://docs.developer.amazonservices.com/en_US/recommendations/Recommendations_ListRecommendations.html
-      # @overload list_recommendations(opts = { marketplace_id:
-      #   primary_marketplace_id })
-      #   @param [Hash] opts
-      #   @option opts [String] :marketplace_id
-      #   @option opts [String] :recommendation_category
-      #   @option opts [Array<Struct, Hash>] :category_query_list
+      # @see https://docs.developer.amazonservices.com/en_US/recommendations/Recommendations_ListRecommendations.html
+      # @param [String] marketplace_id
+      # @param [Hash] opts
+      # @option opts [String] :recommendation_category
+      # @option opts [Array<Struct, Hash>] :category_query_list
       # @return [Peddler::XMLParser]
-      def list_recommendations(opts = {})
-        opts[:marketplace_id] ||= primary_marketplace_id
-
+      def list_recommendations(marketplace_id, opts = {})
         operation('ListRecommendations')
           .add(opts)
+          .add('MarketplaceId' => marketplace_id)
           .structure!(
             'CategoryQueryList', 'CategoryQuery', '1', 'FilterOptions',
             'FilterOption'
@@ -53,7 +49,7 @@ module MWS
 
       # Lists the next page of active recommendations
       #
-      # @see http://docs.developer.amazonservices.com/en_US/recommendations/Recommendations_ListRecommendationsByNextToken.html
+      # @see https://docs.developer.amazonservices.com/en_US/recommendations/Recommendations_ListRecommendationsByNextToken.html
       # @param [String] next_token
       # @return [Peddler::XMLParser]
       def list_recommendations_by_next_token(next_token)
@@ -65,7 +61,7 @@ module MWS
 
       # Gets the service status of the API
       #
-      # @see http://docs.developer.amazonservices.com/en_US/recommendations/Recommendations_GetServiceStatus.html
+      # @see https://docs.developer.amazonservices.com/en_US/recommendations/Recommendations_GetServiceStatus.html
       # @return [Peddler::XMLParser]
       def get_service_status
         operation('GetServiceStatus')

data/lib/mws/reports/client.rb

@@ -6,11 +6,12 @@ module MWS
   module Reports
     # The Reports API lets you request reports about your inventory and orders.
     class Client < ::Peddler::Client
-      version '2009-01-01'
+      self.version = '2009-01-01'
+      self.path = "/Reports/#{version}"
 
       # Creates a report request
       #
-      # @see http://docs.developer.amazonservices.com/en_US/reports/Reports_RequestReport.html
+      # @see https://docs.developer.amazonservices.com/en_US/reports/Reports_RequestReport.html
       # @param [String] report_type
       # @param [Hash] opts
       # @option opts [String, #iso8601] :start_date
@@ -20,7 +21,8 @@ module MWS
       # @return [Peddler::XMLParser]
       def request_report(report_type, opts = {})
         operation('RequestReport')
-          .add(opts.update('ReportType' => report_type))
+          .add(opts)
+          .add('ReportType' => report_type)
           .structure!('MarketplaceIdList', 'Id')
 
         run
@@ -28,7 +30,7 @@ module MWS
 
       # Lists report requests
       #
-      # @see http://docs.developer.amazonservices.com/en_US/reports/Reports_GetReportRequestList.html
+      # @see https://docs.developer.amazonservices.com/en_US/reports/Reports_GetReportRequestList.html
       # @param [Hash] opts
       # @option opts [Array<String>, String] :report_request_id_list
       # @option opts [Array<String>, String] :report_type_list
@@ -49,7 +51,7 @@ module MWS
 
       # Lists the next page of the report requests
       #
-      # @see http://docs.developer.amazonservices.com/en_US/reports/Reports_GetReportRequestListByNextToken.html
+      # @see https://docs.developer.amazonservices.com/en_US/reports/Reports_GetReportRequestListByNextToken.html
       # @param [String] next_token
       # @return [Peddler::XMLParser]
       def get_report_request_list_by_next_token(next_token)
@@ -61,7 +63,7 @@ module MWS
 
       # Counts requested reports
       #
-      # @see http://docs.developer.amazonservices.com/en_US/reports/Reports_GetReportRequestCount.html
+      # @see https://docs.developer.amazonservices.com/en_US/reports/Reports_GetReportRequestCount.html
       # @param [Hash] opts
       # @option opts [Array<String>, String] :report_type_list
       # @option opts [Array<String>, String] :report_processing_status_list
@@ -79,7 +81,7 @@ module MWS
 
       # Cancels one or more report requests
       #
-      # @see http://docs.developer.amazonservices.com/en_US/reports/Reports_CancelReportRequests.html
+      # @see https://docs.developer.amazonservices.com/en_US/reports/Reports_CancelReportRequests.html
       # @param [Hash] opts
       # @option opts [Array<String>, String] :report_type_list
       # @option opts [Array<String>, String] :report_processing_status_list
@@ -97,7 +99,7 @@ module MWS
 
       # Lists reports
       #
-      # @see http://docs.developer.amazonservices.com/en_US/reports/Reports_GetReportList.html
+      # @see https://docs.developer.amazonservices.com/en_US/reports/Reports_GetReportList.html
       # @param [Hash] opts
       # @option opts [Integer] :max_count
       # @option opts [Array<String>, String] :report_type_list
@@ -117,7 +119,7 @@ module MWS
 
       # Lists the next page of reports
       #
-      # @see http://docs.developer.amazonservices.com/en_US/reports/Reports_GetReportListByNextToken.html
+      # @see https://docs.developer.amazonservices.com/en_US/reports/Reports_GetReportListByNextToken.html
       # @param [String] next_token
       # @return [Peddler::XMLParser]
       def get_report_list_by_next_token(next_token)
@@ -129,7 +131,7 @@ module MWS
 
       # Counts reports
       #
-      # @see http://docs.developer.amazonservices.com/en_US/reports/Reports_GetReportCount.html
+      # @see https://docs.developer.amazonservices.com/en_US/reports/Reports_GetReportCount.html
       # @param [Hash] opts
       # @option opts [Array<String>, String] :report_type_list
       # @option opts [Boolean] :acknowledged
@@ -146,7 +148,7 @@ module MWS
 
       # Gets a report and its Content-MD5 header
       #
-      # @see http://docs.developer.amazonservices.com/en_US/reports/Reports_GetReport.html
+      # @see https://docs.developer.amazonservices.com/en_US/reports/Reports_GetReport.html
       # @param [String] report_id
       # @return [Peddler::XMLParser] if report is in XML format
       # @return [Peddler::FlatFileParser] if report is a flat file
@@ -159,7 +161,7 @@ module MWS
 
       # Creates, updates, or deletes a report request schedule
       #
-      # @see http://docs.developer.amazonservices.com/en_US/reports/Reports_ManageReportSchedule.html
+      # @see https://docs.developer.amazonservices.com/en_US/reports/Reports_ManageReportSchedule.html
       # @param [String] report_type
       # @param [String] schedule
       # @param [Hash] opts
@@ -167,15 +169,16 @@ module MWS
       # @return [Peddler::XMLParser]
       def manage_report_schedule(report_type, schedule, opts = {})
         operation('ManageReportSchedule')
-          .add(opts.update('ReportType' => report_type, 'Schedule' => schedule))
+          .add(opts)
+          .add('ReportType' => report_type, 'Schedule' => schedule)
 
         run
       end
 
       # Lists scheduled reports
       #
-      # @see http://docs.developer.amazonservices.com/en_US/reports/Reports_GetReportScheduleList.html
-      # @param [*Array<String>] report_type_list
+      # @see https://docs.developer.amazonservices.com/en_US/reports/Reports_GetReportScheduleList.html
+      # @param [Array<String>] report_type_list
       # @return [Peddler::XMLParser]
       def get_report_schedule_list(*report_type_list)
         operation('GetReportScheduleList')
@@ -187,7 +190,7 @@ module MWS
 
       # Lists next page of scheduled reports
       #
-      # @see http://docs.developer.amazonservices.com/en_US/reports/Reports_GetReportScheduleListByNextToken.html
+      # @see https://docs.developer.amazonservices.com/en_US/reports/Reports_GetReportScheduleListByNextToken.html
       # @raise [NotImplementedError]
       def get_report_schedule_list_by_next_token(*)
         raise NotImplementedError
@@ -195,9 +198,8 @@ module MWS
 
       # Counts scheduled reports
       #
-      # @see http://docs.developer.amazonservices.com/en_US/reports/Reports_GetReportScheduleCount.html
-      # @overload get_report_schedule_count(*report_types)
-      #   @param [String] report_type one or more report_types
+      # @see https://docs.developer.amazonservices.com/en_US/reports/Reports_GetReportScheduleCount.html
+      # @param [Array<String>] report_type_list
       # @return [Peddler::XMLParser]
       def get_report_schedule_count(*report_type_list)
         operation('GetReportScheduleCount')
@@ -209,10 +211,9 @@ module MWS
 
       # Updates acknowledged status of one or more reports
       #
-      # @see http://docs.developer.amazonservices.com/en_US/reports/Reports_UpdateReportAcknowledgements.html
-      # @overload update_report_acknowledgements(acknowledged, *report_ids)
-      #   @param [Boolean] acknowledged
-      #   @param [String] report_id one or more report_ids
+      # @see https://docs.developer.amazonservices.com/en_US/reports/Reports_UpdateReportAcknowledgements.html
+      # @param [Boolean] acknowledged
+      # @param [Array<String>] report_id_list
       # @return [Peddler::XMLParser]
       def update_report_acknowledgements(acknowledged, *report_id_list)
         operation('UpdateReportAcknowledgements')

data/lib/mws/sellers/client.rb

@@ -7,12 +7,12 @@ module MWS
     # The Sellers API lets sellers retrieve information about their seller
     # account, such as the marketplaces they participate in.
     class Client < ::Peddler::Client
-      version '2011-07-01'
-      path "/Sellers/#{version}"
+      self.version = '2011-07-01'
+      self.path = "/Sellers/#{version}"
 
       # Lists the marketplaces the seller participates in
       #
-      # @see http://docs.developer.amazonservices.com/en_US/sellers/Sellers_ListMarketplaceParticipations.html
+      # @see https://docs.developer.amazonservices.com/en_US/sellers/Sellers_ListMarketplaceParticipations.html
       # @return [Peddler::XMLParser]
       def list_marketplace_participations
         operation('ListMarketplaceParticipations')
@@ -21,7 +21,7 @@ module MWS
 
       # Lists the next page of marketplaces the seller participates in
       #
-      # @see http://docs.developer.amazonservices.com/en_US/sellers/Sellers_ListMarketplaceParticipationsByNextToken.html
+      # @see https://docs.developer.amazonservices.com/en_US/sellers/Sellers_ListMarketplaceParticipationsByNextToken.html
       # @param [String] next_token
       # @return [Peddler::XMLParser]
       def list_marketplace_participations_by_next_token(next_token)
@@ -33,7 +33,7 @@ module MWS
 
       # Gets the service status of the API
       #
-      # @see http://docs.developer.amazonservices.com/en_US/sellers/Sellers_GetServiceStatus.html
+      # @see https://docs.developer.amazonservices.com/en_US/sellers/Sellers_GetServiceStatus.html
       # @return [Peddler::XMLParser]
       def get_service_status
         operation('GetServiceStatus')

data/lib/mws/subscriptions/client.rb

@@ -11,17 +11,16 @@ module MWS
     # Amazon MWS service. Instead, the information is sent directly to you when
     # an event occurs to which you are subscribed.
     class Client < ::Peddler::Client
-      version '2013-07-01'
-      path "/Subscriptions/#{version}"
+      self.version = '2013-07-01'
+      self.path = "/Subscriptions/#{version}"
 
       # Registers a new destination to receive notifications
       #
-      # @see http://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_RegisterDestination.html
+      # @see https://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_RegisterDestination.html
       # @param [String] sqs_queue_url
       # @param [String] marketplace_id
       # @return [Peddler::XMLParser]
-      def register_destination(sqs_queue_url,
-                               marketplace_id = primary_marketplace_id)
+      def register_destination(sqs_queue_url, marketplace_id)
         operation('RegisterDestination')
           .add('MarketplaceId' => marketplace_id)
           .add(build_destination(sqs_queue_url))
@@ -31,12 +30,11 @@ module MWS
 
       # Removes an existing destination from the list of registered destinations
       #
-      # @see http://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_DeregisterDestination.html
+      # @see https://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_DeregisterDestination.html
       # @param [String] sqs_queue_url
       # @param [String] marketplace_id
       # @return [Peddler::XMLParser]
-      def deregister_destination(sqs_queue_url,
-                                 marketplace_id = primary_marketplace_id)
+      def deregister_destination(sqs_queue_url, marketplace_id)
         operation('DeregisterDestination')
           .add('MarketplaceId' => marketplace_id)
           .add(build_destination(sqs_queue_url))
@@ -46,10 +44,10 @@ module MWS
 
       # Lists all registered destinations
       #
-      # @see http://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_ListRegisteredDestinations.html
+      # @see https://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_ListRegisteredDestinations.html
       # @param [String] marketplace_id
       # @return [Peddler::XMLParser]
-      def list_registered_destinations(marketplace_id = primary_marketplace_id)
+      def list_registered_destinations(marketplace_id)
         operation('ListRegisteredDestinations')
           .add('MarketplaceId' => marketplace_id)
 
@@ -58,13 +56,11 @@ module MWS
 
       # Sends a test notification to an existing destination
       #
-      # @see http://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_SendTestNotificationToDestination.html
+      # @see https://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_SendTestNotificationToDestination.html
       # @param [String] sqs_queue_url
       # @param [String] marketplace_id
       # @return [Peddler::XMLParser]
-      def send_test_notification_to_destination(sqs_queue_url,
-                                                marketplace_id =
-                                                  primary_marketplace_id)
+      def send_test_notification_to_destination(sqs_queue_url, marketplace_id)
         operation('SendTestNotificationToDestination')
           .add('MarketplaceId' => marketplace_id)
           .add(build_destination(sqs_queue_url))
@@ -74,13 +70,12 @@ module MWS
 
       # Creates a new subscription
       #
-      # @see http://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_CreateSubscription.html
+      # @see https://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_CreateSubscription.html
       # @param [String] notification_type
       # @param [String] sqs_queue_url
       # @param [String] marketplace_id
       # @return [Peddler::XMLParser]
-      def create_subscription(notification_type, sqs_queue_url,
-                              marketplace_id = primary_marketplace_id)
+      def create_subscription(notification_type, sqs_queue_url, marketplace_id)
         operation('CreateSubscription')
           .add('MarketplaceId' => marketplace_id)
           .add(build_subscription(notification_type, sqs_queue_url))
@@ -90,18 +85,15 @@ module MWS
 
       # Gets a subscription
       #
-      # @see http://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_GetSubscription.html
+      # @see https://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_GetSubscription.html
       # @param [String] notification_type
       # @param [String] sqs_queue_url
       # @param [String] marketplace_id
       # @return [Peddler::XMLParser]
-      def get_subscription(notification_type, sqs_queue_url,
-                           marketplace_id = primary_marketplace_id)
+      def get_subscription(notification_type, sqs_queue_url, marketplace_id)
         operation('GetSubscription')
-          .add(
-            'MarketplaceId' => marketplace_id,
-            'NotificationType' => notification_type
-          )
+          .add('MarketplaceId' => marketplace_id,
+               'NotificationType' => notification_type)
           .add(build_destination(sqs_queue_url))
 
         run
@@ -109,18 +101,15 @@ module MWS
 
       # Deletes a subscription
       #
-      # @see http://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_DeleteSubscription.html
+      # @see https://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_DeleteSubscription.html
       # @param [String] notification_type
       # @param [String] sqs_queue_url
       # @param [String] marketplace_id
       # @return [Peddler::XMLParser]
-      def delete_subscription(notification_type, sqs_queue_url,
-                              marketplace_id = primary_marketplace_id)
+      def delete_subscription(notification_type, sqs_queue_url, marketplace_id)
         operation('DeleteSubscription')
-          .add(
-            'MarketplaceId' => marketplace_id,
-            'NotificationType' => notification_type
-          )
+          .add('MarketplaceId' => marketplace_id,
+               'NotificationType' => notification_type)
           .add(build_destination(sqs_queue_url))
 
         run
@@ -128,10 +117,10 @@ module MWS
 
       # Lists current subscriptions
       #
-      # @see http://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_ListSubscriptions.html
+      # @see https://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_ListSubscriptions.html
       # @param [String] marketplace_id
       # @return [Peddler::XMLParser]
-      def list_subscriptions(marketplace_id = primary_marketplace_id)
+      def list_subscriptions(marketplace_id)
         operation('ListSubscriptions')
           .add('MarketplaceId' => marketplace_id)
 
@@ -140,14 +129,14 @@ module MWS
 
       # Updates a subscription
       #
-      # @see http://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_UpdateSubscription.html
+      # @see https://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_UpdateSubscription.html
       # @param [String] notification_type
       # @param [String] sqs_queue_url
       # @param [Boolean] enabled
       # @param [String] marketplace_id
       # @return [Peddler::XMLParser]
       def update_subscription(notification_type, sqs_queue_url, enabled,
-                              marketplace_id = primary_marketplace_id)
+                              marketplace_id)
         operation('UpdateSubscription')
           .add('MarketplaceId' => marketplace_id)
           .add(build_subscription(notification_type, sqs_queue_url, enabled))
@@ -157,7 +146,7 @@ module MWS
 
       # Gets the service status of the API
       #
-      # @see http://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_GetServiceStatus.html
+      # @see https://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_GetServiceStatus.html
       # @return [Peddler::XMLParser]
       def get_service_status
         operation('GetServiceStatus')

data/lib/peddler/client.rb

@@ -2,7 +2,7 @@
 
 require 'forwardable'
 require 'jeff'
-require 'peddler/errors/parser'
+require 'peddler/errors/builder'
 require 'peddler/marketplace'
 require 'peddler/operation'
 require 'peddler/parser'
@@ -10,130 +10,84 @@ require 'peddler/parser'
 module Peddler
   # An abstract client
   #
-  # Subclass to implement an MWS API section.
+  # Subclass this to implement an MWS API section.
   class Client
     extend Forwardable
     include Jeff
 
-    # The MWSAuthToken used to access another seller's account
-    # @return [String]
-    attr_accessor :auth_token
-
-    attr_writer :merchant_id, :primary_marketplace_id, :path
-
-    # @api private
-    attr_writer :version
-
-    # The body of the HTTP request
-    # @return [String]
-    attr_reader :body
-
-    alias configure tap
-
-    def_delegators :marketplace, :host, :encoding
-
-    params(
-      'SellerId' => -> { merchant_id },
-      'MWSAuthToken' => -> { auth_token },
-      'Version' => -> { version }
-    )
-
     class << self
       # @api private
-      attr_accessor :error_handler, :parser
-
-      # @api private
-      def path(path = nil)
-        path ? @path = path : @path ||= '/'
-      end
-
-      # @api private
-      def version(version = nil)
-        version ? @version = version : @version ||= nil
-      end
-
-      # Sets an error handler
-      # @yieldparam [Excon::Error] error
-      def on_error(&blk)
-        @error_handler = blk
-      end
+      attr_accessor :parser, :path, :version
 
       private
 
       def inherited(base)
         base.parser = parser
-        base.error_handler = error_handler
-        base.path(path)
-        base.params(params)
+        base.params params
       end
     end
 
-    self.error_handler = proc { raise }
+    params 'SellerId' => -> { merchant_id },
+           'MWSAuthToken' => -> { auth_token },
+           'Version' => -> { version }
     self.parser = Parser
 
-    # Creates a new client instance
-    #
+    def_delegators :marketplace, :host, :encoding
+    def_delegators :'self.class', :parser, :version
+
+    # Creates a new client
     # @param [Hash] opts
-    # @option opts [String] :primary_marketplace_id
-    # @option opts [String] :merchant_id
     # @option opts [String] :aws_access_key_id
     # @option opts [String] :aws_secret_access_key
+    # @option opts [String, Peddler::Marketplace] :marketplace
+    # @option opts [String] :merchant_id
     # @option opts [String] :auth_token
     def initialize(opts = {})
       opts.each { |k, v| send("#{k}=", v) }
     end
 
-    # @api private
-    def aws_endpoint
-      "https://#{host}#{path}"
-    end
+    # The MWS Auth Token for a seller's account
+    # @note You can omit this if you are accessing your own seller account
+    # @return [String]
+    attr_accessor :auth_token
 
-    # The merchant's Marketplace ID
-    # @!parse attr_reader :primary_marketplace_id
+    # The seller's Merchant ID
     # @return [String]
-    def primary_marketplace_id
-      @primary_marketplace_id ||= ENV['MWS_MARKETPLACE_ID']
-    end
+    attr_accessor :merchant_id
 
-    # @deprecated Use {#primary_marketplace_id}.
-    def marketplace_id
-      @primary_marketplace_id
-    end
+    # The marketplace where you signed up as application developer
+    # @note You can pass the two-letter country code of the marketplace as
+    #   shorthand when setting
+    # @return [Peddler::Marketplace]
+    attr_reader :marketplace
 
-    # @deprecated Use {#primary_marketplace_id=}.
-    def marketplace_id=(marketplace_id)
-      @primary_marketplace_id = marketplace_id
+    # @!parse attr_writer :marketplace
+    def marketplace=(marketplace)
+      @marketplace =
+        if marketplace.is_a?(Marketplace)
+          marketplace
+        else
+          Marketplace.find(marketplace)
+        end
     end
 
-    # The merchant's Seller ID
-    # @!parse attr_reader :merchant_id
+    # The body of the HTTP request
     # @return [String]
-    def merchant_id
-      @merchant_id ||= ENV['MWS_MERCHANT_ID']
+    attr_reader :body
+
+    # @!parse attr_writer :body
+    def body=(str)
+      str ? add_content(str) : clear_content!
     end
 
     # @api private
-    def marketplace
-      @marketplace ||= find_marketplace
-    end
+    attr_writer :path
 
-    # The HTTP path of the API
-    # @!parse attr_reader :path
-    # @return [String]
+    # @api private
     def path
       @path ||= self.class.path
     end
 
-    # @api private
-    def version
-      @version ||= self.class.version
-    end
-
-    # @!parse attr_writer :body
-    def body=(str)
-      str ? add_content(str) : clear_content!
-    end
-
     # @api private
     def defaults
       @defaults ||= { expects: 200 }
@@ -144,15 +98,9 @@ module Peddler
       @headers ||= {}
     end
 
-    # Sets an error handler
-    # @yieldparam [Excon::Error] error
-    def on_error(&blk)
-      @error_handler = blk
-    end
-
     # @api private
-    def error_handler
-      (@error_handler ||= nil) || self.class.error_handler
+    def aws_endpoint
+      "https://#{host}#{path}"
     end
 
     # @api private
@@ -168,16 +116,12 @@ module Peddler
       self.body = nil if res.status == 200
 
       parser.new(res, encoding)
-    rescue Excon::Error => e
-      handle_error(e)
+    rescue ::Excon::Error::HTTPStatus => error
+      handle_http_status_error(error)
     end
 
     private
 
-    def find_marketplace
-      Marketplace.find(primary_marketplace_id)
-    end
-
     def clear_content!
       headers.delete('Content-Type')
       @body = nil
@@ -198,35 +142,14 @@ module Peddler
       args.last.is_a?(Hash) ? args.pop : {}
     end
 
-    def parser
-      self.class.parser
-    end
-
     def build_options
       opts = defaults.merge(query: operation, headers: headers)
       body ? opts.update(body: body) : opts
     end
 
-    def handle_error(e)
-      e = decorate_error(e)
-      error_handler.call(*deprecate_error_handler_arguments(e))
-    end
-
-    def decorate_error(e)
-      if e.is_a?(:: Excon::Error::HTTPStatus)
-        e.instance_variable_set(:@response, Errors::Parser.new(e.response))
-      end
-
-      e
-    end
-
-    def deprecate_error_handler_arguments(e)
-      if error_handler.parameters.size == 2
-        warn '[DEPRECATION] Error handler now expects exception as argument.'
-        [e.request, e.response]
-      else
-        [e]
-      end
+    def handle_http_status_error(error)
+      new_error = Errors::Builder.call(error)
+      raise new_error || error
     end
   end
 end