lib/peddler/client.rb in peddler-0.9.2 vs lib/peddler/client.rb in peddler-0.10.0

@@ -1,35 +1,24 @@
+require 'forwardable'
 require 'jeff'
+require 'peddler/marketplace'
 require 'peddler/operation'
 require 'peddler/parser'
 
 module Peddler
   # @abstract Subclass to implement an MWS API section.
   class Client
+    extend Forwardable
     include Jeff
 
-    BadMarketplaceId = Class.new(StandardError)
-
-    HOSTS = {
-      'A2EUQ1WTGCTBG2' => 'mws.amazonservices.ca',
-      'AAHKV2X7AFYLW'  => 'mws.amazonservices.com.cn',
-      'A1PA6795UKMFR9' => 'mws-eu.amazonservices.com',
-      'A1RKKUPIHCS9HS' => 'mws-eu.amazonservices.com',
-      'A13V1IB3VIYZZH' => 'mws-eu.amazonservices.com',
-      'A1F83G8C2ARO7P' => 'mws-eu.amazonservices.com',
-      'A21TJRUUN4KGV'  => 'mws.amazonservices.in',
-      'APJ6JRA9NG5V4'  => 'mws-eu.amazonservices.com',
-      'A1VC38T7YXB528' => 'mws.amazonservices.jp',
-      'ATVPDKIKX0DER'  => 'mws.amazonservices.com'
-    }
-
-    attr_accessor :path
-    attr_writer :merchant_id, :marketplace_id
+    attr_writer :merchant_id, :marketplace_id, :path
     attr_reader :body
 
     alias_method :configure, :tap
 
+    def_delegators :marketplace, :host, :encoding
+
     params('SellerId' => -> { merchant_id })
 
     def self.parser
       @parser ||= Parser
     end
@@ -49,77 +38,84 @@
     def initialize(opts = {})
       opts.each { |k, v| send("#{k}=", v) }
     end
 
     def aws_endpoint
-      "https://#{host}#{path || self.class.path}"
+      "https://#{host}#{path}"
     end
 
     def marketplace_id
       @marketplace_id ||= ENV['MWS_MARKETPLACE_ID']
     end
 
     def merchant_id
       @merchant_id ||= ENV['MWS_MERCHANT_ID']
     end
 
+    def marketplace
+      @marketplace ||= find_marketplace
+    end
+
     def defaults
       @defaults ||= { expects: 200 }
     end
 
     def headers
       @headers ||= {}
     end
 
+    def path
+      @path ||= self.class.path
+    end
+
     def body=(str)
       headers['Content-Type'] = content_type(str)
       @body = str
     end
 
+    def on_error(&blk)
+      @error_handler = blk
+    end
+
     def operation(action = nil)
       action ? @operation = Operation.new(action) : @operation
     end
 
     def run(&blk)
       opts = defaults.merge(query: operation, headers: headers)
       opts.store(:body, body) if body
       opts.store(:response_block, blk) if block_given?
       res = post(opts)
 
-      parser.parse(res, host_encoding)
+      parser.parse(res, encoding)
+    rescue Excon::Errors::Error => ex
+      handle_error(ex) or raise
     end
 
     private
 
+    def find_marketplace
+      Marketplace.new(marketplace_id)
+    end
+
     def content_type(str)
       if str.start_with?('<?xml')
         'text/xml'
       else
-        "text/tab-separated-values; charset=#{host_encoding}"
+        "text/tab-separated-values; charset=#{encoding}"
       end
     end
 
-    def host_encoding
-      if host.end_with?('jp')
-        # Caveat: I've had one instance in the past where Shift_JIS didn't
-        # work but Windows-31J did when parsing a report.
-        'Shift_JIS'
-      elsif host.end_with?('cn')
-        'UTF-16'
-      else
-        'ISO-8859-1'
-      end
-    end
-
-    def host
-      HOSTS.fetch(marketplace_id) { raise BadMarketplaceId }
-    end
-
     def extract_options(args)
       args.last.is_a?(Hash) ? args.pop : {}
     end
 
     def parser
       self.class.parser
+    end
+
+    def handle_error(ex)
+      return false unless @error_handler
+      @error_handler.call(ex.request, ex.response)
     end
   end
 end