peddler 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f41b36a62c193efceb4d464ce3447e4934c8ca97907ca6940c431914f0b1406
-  data.tar.gz: f28498baf2e3c8aa67bd983e74f9c4ca4daffcb15424a25ededee6b72fa3606a
+  metadata.gz: 5e7134fb2dff4131780197cb98d282b481c650c9042b71c235557db707d02e10
+  data.tar.gz: 491ddd1e18e480cb2b4250eb1cee4422239cc511ff2c6c1ade32d2ec7717e89e
 SHA512:
-  metadata.gz: b62d1f3d5eec15b6e2a7d3fee02445a3edc2596a6c8bafbf25deac633a01f401467cbe7d4214a4e1bf6a3b8958ec437b4ac1ed1f7d5a1c7f3638cdfcb80815ba
-  data.tar.gz: d5c7e57ed43bdf7f1aeba013a499d10b5bdf18361b1f5edf2e25eb82703ddec81eafe596aa0ae57fc920a1591d5ab399ef2c7093bb350c1f319e3e3709a857f8
+  metadata.gz: ed79ae488893ad0fd4e4fceebbbeb28074f1b8825dae4b23827db946e3d332b199ce29212de4d48970d2a54316a7aacf9121e9f58581aa57d3be7e75047dcad2
+  data.tar.gz: dbcc2289dcc8dafbd1dc157fdcfcdb6e11712c89a7c1f1ba35ddd280a54a33ef8e382cf5926da276286a24eeb5b15b766ff72be81b07d6bc914ab0677b75fbdb

data/lib/mws/fulfillment_inbound_shipment/client.rb

@@ -155,8 +155,8 @@ module MWS
       # Work around a bug upstream
       #
       # @see https://github.com/hakanensari/peddler/issues/122
-      rescue Peddler::Errors::Error => error
-        raise unless error.message.include?("Value null at 'asinList'")
+      rescue Peddler::Errors::Error => e
+        raise unless e.message.include?("Value null at 'asinList'")
 
         get_prep_instructions_for_asin_with_bad_params(ship_to_country_code,
                                                        *asin_list)

data/lib/mws/reports/client.rb

@@ -12,6 +12,7 @@ module MWS
       # Creates a report request
       #
       # @see https://docs.developer.amazonservices.com/en_US/reports/Reports_RequestReport.html
+      # @see https://docs.developer.amazonservices.com/en_US/reports/Reports_ReportType.html
       # @param [String] report_type
       # @param [Hash] opts
       # @option opts [String, #iso8601] :start_date
@@ -31,6 +32,7 @@ module MWS
       # Lists report requests
       #
       # @see https://docs.developer.amazonservices.com/en_US/reports/Reports_GetReportRequestList.html
+      # @see https://docs.developer.amazonservices.com/en_US/reports/Reports_ReportType.html
       # @param [Hash] opts
       # @option opts [Array<String>, String] :report_request_id_list
       # @option opts [Array<String>, String] :report_type_list
@@ -64,6 +66,7 @@ module MWS
       # Counts requested reports
       #
       # @see https://docs.developer.amazonservices.com/en_US/reports/Reports_GetReportRequestCount.html
+      # @see https://docs.developer.amazonservices.com/en_US/reports/Reports_ReportType.html
       # @param [Hash] opts
       # @option opts [Array<String>, String] :report_type_list
       # @option opts [Array<String>, String] :report_processing_status_list
@@ -82,6 +85,7 @@ module MWS
       # Cancels one or more report requests
       #
       # @see https://docs.developer.amazonservices.com/en_US/reports/Reports_CancelReportRequests.html
+      # @see https://docs.developer.amazonservices.com/en_US/reports/Reports_ReportType.html
       # @param [Hash] opts
       # @option opts [Array<String>, String] :report_type_list
       # @option opts [Array<String>, String] :report_processing_status_list
@@ -100,6 +104,7 @@ module MWS
       # Lists reports
       #
       # @see https://docs.developer.amazonservices.com/en_US/reports/Reports_GetReportList.html
+      # @see https://docs.developer.amazonservices.com/en_US/reports/Reports_ReportType.html
       # @param [Hash] opts
       # @option opts [Integer] :max_count
       # @option opts [Array<String>, String] :report_type_list
@@ -132,6 +137,7 @@ module MWS
       # Counts reports
       #
       # @see https://docs.developer.amazonservices.com/en_US/reports/Reports_GetReportCount.html
+      # @see https://docs.developer.amazonservices.com/en_US/reports/Reports_ReportType.html
       # @param [Hash] opts
       # @option opts [Array<String>, String] :report_type_list
       # @option opts [Boolean] :acknowledged
@@ -162,6 +168,7 @@ module MWS
       # Creates, updates, or deletes a report request schedule
       #
       # @see https://docs.developer.amazonservices.com/en_US/reports/Reports_ManageReportSchedule.html
+      # @see https://docs.developer.amazonservices.com/en_US/reports/Reports_ReportType.html
       # @param [String] report_type
       # @param [String] schedule
       # @param [Hash] opts
@@ -178,6 +185,7 @@ module MWS
       # Lists scheduled reports
       #
       # @see https://docs.developer.amazonservices.com/en_US/reports/Reports_GetReportScheduleList.html
+      # @see https://docs.developer.amazonservices.com/en_US/reports/Reports_ReportType.html
       # @param [Array<String>] report_type_list
       # @return [Peddler::XMLParser]
       def get_report_schedule_list(*report_type_list)
@@ -199,6 +207,7 @@ module MWS
       # Counts scheduled reports
       #
       # @see https://docs.developer.amazonservices.com/en_US/reports/Reports_GetReportScheduleCount.html
+      # @see https://docs.developer.amazonservices.com/en_US/reports/Reports_ReportType.html
       # @param [Array<String>] report_type_list
       # @return [Peddler::XMLParser]
       def get_report_schedule_count(*report_type_list)

data/lib/peddler/client.rb

@@ -116,8 +116,8 @@ module Peddler
       self.body = nil if res.status == 200
 
       parser.new(res, encoding)
-    rescue ::Excon::Error::HTTPStatus => error
-      handle_http_status_error(error)
+    rescue ::Excon::Error::HTTPStatus => e
+      handle_http_status_error(e)
     end
 
     private

data/lib/peddler/content.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module Peddler
+  # Parses content metadata provided in the headers of a response
+  class Content
+    # @api private
+    attr_reader :headers
+
+    # @api private
+    def initialize(headers)
+      @headers = headers.select { |key| key.start_with?('Content') }
+    end
+
+    # The size of the response body in bytes
+    # @return [String, nil]
+    def length
+      return unless headers['Content-Length']
+
+      headers['Content-Length'].to_i
+    end
+
+    # The MD5 digest of the response body
+    # @return [String, nil]
+    def md5
+      headers['Content-MD5']
+    end
+
+    # The MIME type of the response
+    # @return [String, nil]
+    def media_type
+      return unless headers['Content-Type']
+
+      headers['Content-Type'].split(';').first
+    end
+
+    # The general category into which the MIME type falls
+    # @return [String, nil]
+    def type
+      return unless media_type
+
+      media_type.split('/').first
+    end
+
+    # The exact kind of data of the specified type the MIME type represents
+    # @return [String, nil]
+    def subtype
+      return unless media_type
+
+      media_type.split('/').last
+    end
+
+    # The character encoding of the response
+    # @return [Encoding, nil]
+    def charset
+      match_data = headers['Content-Type']&.match(/charset=(.*);?/)
+      return unless match_data
+
+      Encoding.find(match_data[1])
+    end
+
+    # Whether the response is an XML document
+    # @return [Boolean, nil]
+    def xml?
+      return unless subtype
+
+      subtype == 'xml'
+    end
+  end
+end

data/lib/peddler/flat_file_parser.rb

@@ -39,7 +39,7 @@ module Peddler
     def scrub_body!(encoding)
       return if body.encoding == Encoding::UTF_8
 
-      self.body = body.dup.force_encoding(encoding)
+      self.body = body.dup.force_encoding(content_charset || encoding)
     end
 
     def extract_content_and_summary

data/lib/peddler/headers.rb

@@ -1,8 +1,55 @@
 # frozen_string_literal: true
 
 module Peddler
-  # Parses MWS-specific headers
+  # Parses useful metadata returned in response headers
   module Headers
+    # The size of the response body in bytes
+    # @return [String, nil]
+    def content_length
+      return unless headers['Content-Length']
+
+      headers['Content-Length'].to_i
+    end
+
+    # The MD5 digest of the response body
+    # @return [String, nil]
+    def content_md5
+      headers['Content-MD5']
+    end
+
+    # The MIME type of the response
+    # @return [String, nil]
+    def content_media_type
+      return unless headers['Content-Type']
+
+      headers['Content-Type'].split(';').first
+    end
+
+    # The general category into which the MIME type falls
+    # @return [String, nil]
+    def content_type
+      return unless content_media_type
+
+      content_media_type.split('/').first
+    end
+
+    # The exact kind of data of the specified type the MIME type represents
+    # @return [String, nil]
+    def content_subtype
+      return unless content_media_type
+
+      content_media_type.split('/').last
+    end
+
+    # The character encoding of the response
+    # @return [Encoding, nil]
+    def content_charset
+      match_data = headers['Content-Type']&.match(/charset=(.*);?/)
+      return unless match_data
+
+      Encoding.find(match_data[1])
+    end
+
     # The max hourly request quota for the requested operation
     # @return [Integer, nil]
     def mws_quota_max

data/lib/peddler/marketplace.rb

@@ -39,9 +39,6 @@ module Peddler
       end
     end
 
-    # Caveat: We use supersets Windows-31J and CP1252 in place of Shift_JIS and
-    # ISO 8859-1 respectively to handle some edge cases. These should be safe to
-    # drop in as replacements.
     def encoding
       case country_code
       when 'JP'

data/lib/peddler/mws.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Peddler
+  # Parses MWS metadata provided in the headers of a response
+  class MWS
+    # @api private
+    attr_reader :headers
+
+    # @api private
+    def initialize(headers)
+      @headers = headers.select { |key| key.start_with?('x-mws') }
+    end
+
+    # The max hourly request quota for the requested operation
+    # @return [Integer, nil]
+    def quota_max
+      return unless headers['x-mws-quota-max']
+
+      headers['x-mws-quota-max'].to_i
+    end
+
+    # The remaining hourly request quota for the requested operation
+    # @return [Integer, nil]
+    def quota_remaining
+      return unless headers['x-mws-quota-remaining']
+
+      headers['x-mws-quota-remaining'].to_i
+    end
+
+    # When the hourly request quota for the requested operation resets
+    # @return [Time, nil]
+    def quota_resets_on
+      return unless headers['x-mws-quota-resetsOn']
+
+      Time.parse(headers['x-mws-quota-resetsOn'])
+    end
+
+    # The ID of the request
+    # @return [String, nil]
+    def request_id
+      headers['x-mws-request-id']
+    end
+
+    # The timestamp of the request
+    # @return [Time, nil]
+    def timestamp
+      return unless headers['x-mws-timestamp']
+
+      Time.parse(headers['x-mws-timestamp'])
+    end
+
+    # The context of the response
+    # @return [String, nil]
+    def response_context
+      headers['x-mws-response-context']
+    end
+  end
+end

data/lib/peddler/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Peddler
-  VERSION = '2.1.0'
+  VERSION = '2.1.1'
 end

data/test/integration/{test_errors.rb → internals/test_errors.rb}

@@ -14,12 +14,4 @@ class TestErrors < IntegrationTest
       end
     end
   end
-
-  def test_request_throttled
-    clients.each do |client|
-      assert_raises Peddler::Errors::RequestThrottled do
-        client.get_order('foo')
-      end
-    end
-  end
 end

data/test/integration/{test_mws_headers.rb → internals/test_mws_headers.rb}

@@ -11,6 +11,11 @@ class TestMWSHeaders < IntegrationTest
       res = client.get_lowest_priced_offers_for_asin(client.marketplace.id,
                                                      '1780935374', 'New')
       refute_nil res.mws_quota_max
+      refute_nil res.mws_quota_remaining
+      refute_nil res.mws_quota_resets_on
+      refute_nil res.mws_request_id
+      refute_nil res.mws_timestamp
+      refute_nil res.mws_response_context
     end
   end
 end

data/test/integration/internals/test_string_encodings.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'integration_helper'
+require 'mws/reports'
+
+class TestStringEncodings < IntegrationTest
+  use 'Reports'
+
+  def setup
+    skip unless ENV['LIVE']
+  end
+
+  def test_flat_file_responses
+    get_report('_GET_SELLER_FEEDBACK_DATA_') do |res|
+      assert_equal res.content_charset, res.body.encoding
+    end
+  end
+
+  private
+
+  def get_report(report_type, start_date: Date.today - 30)
+    clients.each do |client|
+      res = client.request_report(report_type, start_date: start_date)
+      report_request_id = res.dig('ReportRequestInfo', 'ReportRequestId')
+      loop do
+        sleep 15
+        res = client.get_report_request_list(report_request_id_list:
+                                             report_request_id)
+        status = res.dig('ReportRequestInfo', 'ReportProcessingStatus')
+        next unless status.include?('_DONE_')
+
+        report_id = res.dig('ReportRequestInfo', 'GeneratedReportId')
+        yield client.get_report(report_id)
+        break
+      end
+    end
+  end
+end

data/test/unit/peddler/test_flat_file_parser.rb

@@ -54,6 +54,14 @@ class TestPeddlerFlatFileParser < MiniTest::Test
     refute_empty parser.content
   end
 
+  def test_encoding_if_passed_in_header
+    body = build_body("Foo\nfür\n", encoding: Encoding::UTF_8)
+    parser = Peddler::FlatFileParser.new(build_mock_response(body,
+                                                             charset: 'UTF-8'),
+                                         Encoding::CP1252)
+    assert_equal 'für', parser.parse[0]['Foo']
+  end
+
   def test_handling_japanese_flat_files
     body = build_body("Foo\nこんにちは\n", encoding: Encoding::SHIFT_JIS)
     parser = Peddler::FlatFileParser.new(build_mock_response(body), Encoding::WINDOWS_31J)
@@ -91,11 +99,12 @@ class TestPeddlerFlatFileParser < MiniTest::Test
     str.dup.encode(encoding)
   end
 
-  def build_mock_response(body, ascii: true)
+  def build_mock_response(body, ascii: true, charset: nil)
     body.force_encoding(Encoding::ASCII_8BIT) if ascii
     headers = {
       'Content-MD5' => Digest::MD5.base64digest(body)
     }
+    headers['Content-Type'] = "text/plain;charset=#{charset}" if charset
 
     OpenStruct.new(body: body, headers: headers)
   end

data/test/unit/peddler/test_headers.rb

@@ -10,6 +10,9 @@ class TestPeddlerHeaders < MiniTest::Test
 
   def setup
     @headers = {
+      'Content-Length' => '100',
+      'Content-MD5' => 'rkkx1Xv/k56/onrN0m7E/Q==',
+      'Content-Type' => 'text/plain;charset=UTF-8',
       'x-mws-quota-max' => '200.0',
       'x-mws-quota-remaining' => '200.0',
       'x-mws-quota-resetsOn' => '2017-01-30T00:03:00.000Z',
@@ -19,6 +22,51 @@ class TestPeddlerHeaders < MiniTest::Test
     }
   end
 
+  def test_content_length
+    assert_kind_of Integer, content_length
+  end
+
+  def test_content_md5
+    assert content_md5
+  end
+
+  def test_content_media_type
+    assert content_media_type
+  end
+
+  def test_content_type
+    assert content_type
+  end
+
+  def test_content_subtype
+    assert content_subtype
+  end
+
+  def test_content_charset
+    assert_kind_of Encoding, content_charset
+  end
+
+  def test_no_content_length
+    @headers.delete('Content-Length')
+    assert_nil content_length
+  end
+
+  def test_no_content_type
+    @headers.delete('Content-Type')
+    assert_nil content_media_type
+    assert_nil content_type
+    assert_nil content_subtype
+    assert_nil content_charset
+  end
+
+  def test_no_content_charset
+    @headers['Content-Type'] = 'text/xml'
+    assert content_media_type
+    assert content_type
+    assert content_subtype
+    assert_nil content_charset
+  end
+
   def test_mws_quota_max
     assert_kind_of Integer, mws_quota_max
   end

data/test/vcr_cassettes/Errors.yml

@@ -441,445 +441,4 @@ http_interactions:
         </ErrorResponse>
     http_version:
   recorded_at: Mon, 23 May 2016 12:17:08 GMT
-- request:
-    method: post
-    uri: https://mws.amazonservices.com/Orders/2013-09-01
-    body:
-      encoding: UTF-8
-      string: AWSAccessKeyId=AWS_ACCESS_KEY_ID&Action=GetOrder&AmazonOrderId.Id.1=foo&SellerId=MERCHANT_ID&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2016-05-23T12%3A25%3A16Z&Version=2013-09-01&Signature=PxxDltfEifbWVzOka2AIu%2BS4JdOtTe%2BinKYqPi1%2B2iw%3D
-    headers:
-      User-Agent:
-      - Jeff/1.5.1 (Language=Ruby; Hakans-MacBook.home)
-      Content-Type:
-      - application/x-www-form-urlencoded
-  response:
-    status:
-      code: 503
-      message:
-    headers:
-      Server:
-      - Server
-      Date:
-      - Mon, 23 May 2016 12:25:16 GMT
-      Content-Type:
-      - text/xml
-      Content-Length:
-      - '291'
-      Connection:
-      - keep-alive
-      x-mws-request-id:
-      - c09da471-3728-45bd-b149-011107c6b222
-      x-mws-timestamp:
-      - '2016-05-23T12:25:16.616Z'
-      x-mws-response-context:
-      - NjwFjq6NP9uKH9Af1NGr1x+LsCj2WwqkWXNsTBkYiXZlNsJ8pl1i+/gTf/YxABEMxhTUNJB6UynL
-        fVn4cBVpOQ==
-      Vary:
-      - Accept-Encoding,User-Agent
-    body:
-      encoding: UTF-8
-      string: |
-        <?xml version="1.0"?>
-        <ErrorResponse xmlns="https://mws.amazonservices.com/Orders/2013-09-01">
-          <Error>
-            <Type></Type>
-            <Code>RequestThrottled</Code>
-            <Message>Request is throttled</Message>
-          </Error>
-          <RequestID>c09da471-3728-45bd-b149-011107c6b222</RequestID>
-        </ErrorResponse>
-    http_version:
-  recorded_at: Mon, 23 May 2016 12:25:16 GMT
-- request:
-    method: post
-    uri: https://mws-eu.amazonservices.com/Orders/2013-09-01
-    body:
-      encoding: UTF-8
-      string: AWSAccessKeyId=AWS_ACCESS_KEY_ID&Action=GetOrder&AmazonOrderId.Id.1=foo&SellerId=MERCHANT_ID&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2016-05-23T12%3A25%3A30Z&Version=2013-09-01&Signature=2Q4itZiyhGRa1gv4WxdPXz02OraSOyuqZnyTR9QVYkA%3D
-    headers:
-      User-Agent:
-      - Jeff/1.5.1 (Language=Ruby; Hakans-MacBook.home)
-      Content-Type:
-      - application/x-www-form-urlencoded
-  response:
-    status:
-      code: 503
-      message:
-    headers:
-      Server:
-      - Server
-      Date:
-      - Mon, 23 May 2016 12:25:31 GMT
-      Content-Type:
-      - text/xml
-      Content-Length:
-      - '291'
-      Connection:
-      - keep-alive
-      x-mws-request-id:
-      - 7e25a2e4-32ee-4e6f-9e55-87a7466cfa76
-      x-mws-timestamp:
-      - '2016-05-23T12:25:31.071Z'
-      x-mws-response-context:
-      - VKqFU1/KuOtUTSZ9hzO/1Tz2lAgZN6R+E1Hu9GVhDpD7QU8PSbL4SQhLAmIbrxaiElKpSnRxkhyv
-        NaM9fPte4Q==
-      Vary:
-      - Accept-Encoding,User-Agent
-    body:
-      encoding: UTF-8
-      string: |
-        <?xml version="1.0"?>
-        <ErrorResponse xmlns="https://mws.amazonservices.com/Orders/2013-09-01">
-          <Error>
-            <Type></Type>
-            <Code>RequestThrottled</Code>
-            <Message>Request is throttled</Message>
-          </Error>
-          <RequestID>7e25a2e4-32ee-4e6f-9e55-87a7466cfa76</RequestID>
-        </ErrorResponse>
-    http_version:
-  recorded_at: Mon, 23 May 2016 12:25:31 GMT
-- request:
-    method: post
-    uri: https://mws-eu.amazonservices.com/Orders/2013-09-01
-    body:
-      encoding: UTF-8
-      string: AWSAccessKeyId=AWS_ACCESS_KEY_ID&Action=GetOrder&AmazonOrderId.Id.1=foo&SellerId=MERCHANT_ID&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2016-05-23T12%3A25%3A31Z&Version=2013-09-01&Signature=o%2FXv5yNJiV14RGA0gVC0QY7M9%2FU8Cx8CzvFxz36%2FIN8%3D
-    headers:
-      User-Agent:
-      - Jeff/1.5.1 (Language=Ruby; Hakans-MacBook.home)
-      Content-Type:
-      - application/x-www-form-urlencoded
-  response:
-    status:
-      code: 503
-      message:
-    headers:
-      Server:
-      - Server
-      Date:
-      - Mon, 23 May 2016 12:25:31 GMT
-      Content-Type:
-      - text/xml
-      Content-Length:
-      - '291'
-      Connection:
-      - keep-alive
-      x-mws-request-id:
-      - 46605ebf-ff3a-4413-8f10-07698078db28
-      x-mws-timestamp:
-      - '2016-05-23T12:25:31.340Z'
-      x-mws-response-context:
-      - QgEen8lhyUfFg2KboDYF5Yu8MuocS3bvS0G50Z0U1ZFnJ8G3JbKQNzx+XkxHTNeyORu1+z6efJNB
-        lHXQnDK7OQ==
-      Vary:
-      - Accept-Encoding,User-Agent
-    body:
-      encoding: UTF-8
-      string: |
-        <?xml version="1.0"?>
-        <ErrorResponse xmlns="https://mws.amazonservices.com/Orders/2013-09-01">
-          <Error>
-            <Type></Type>
-            <Code>RequestThrottled</Code>
-            <Message>Request is throttled</Message>
-          </Error>
-          <RequestID>46605ebf-ff3a-4413-8f10-07698078db28</RequestID>
-        </ErrorResponse>
-    http_version:
-  recorded_at: Mon, 23 May 2016 12:25:31 GMT
-- request:
-    method: post
-    uri: https://mws.amazonservices.com/Orders/2013-09-01
-    body:
-      encoding: UTF-8
-      string: AWSAccessKeyId=AWS_ACCESS_KEY_ID&Action=GetOrder&AmazonOrderId.Id.1=foo&SellerId=MERCHANT_ID&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2016-05-23T12%3A26%3A15Z&Version=2013-09-01&Signature=IZu%2FVXyk42RToI%2FBx42JvU4rcaOVydIJy5FxE06tQRg%3D
-    headers:
-      User-Agent:
-      - Jeff/1.5.1 (Language=Ruby; Hakans-MacBook.home)
-      Content-Type:
-      - application/x-www-form-urlencoded
-  response:
-    status:
-      code: 503
-      message:
-    headers:
-      Server:
-      - Server
-      Date:
-      - Mon, 23 May 2016 12:26:16 GMT
-      Content-Type:
-      - text/xml
-      Content-Length:
-      - '291'
-      Connection:
-      - keep-alive
-      x-mws-request-id:
-      - 7f0f0820-dc56-41d1-9962-580e1b92966d
-      x-mws-timestamp:
-      - '2016-05-23T12:26:16.027Z'
-      x-mws-response-context:
-      - CFLgOA9pzgjsRxjXR7bINfg1tMGVNb+3mfQZa4+The0i8HWIxM06sLRJUOt0hq426i8PIO3bFVNQ
-        JuMPU0CUzQ==
-      Vary:
-      - Accept-Encoding,User-Agent
-    body:
-      encoding: UTF-8
-      string: |
-        <?xml version="1.0"?>
-        <ErrorResponse xmlns="https://mws.amazonservices.com/Orders/2013-09-01">
-          <Error>
-            <Type></Type>
-            <Code>RequestThrottled</Code>
-            <Message>Request is throttled</Message>
-          </Error>
-          <RequestID>7f0f0820-dc56-41d1-9962-580e1b92966d</RequestID>
-        </ErrorResponse>
-    http_version:
-  recorded_at: Mon, 23 May 2016 12:26:16 GMT
-- request:
-    method: post
-    uri: https://mws-eu.amazonservices.com/Orders/2013-09-01
-    body:
-      encoding: UTF-8
-      string: AWSAccessKeyId=AWS_ACCESS_KEY_ID&Action=GetOrder&AmazonOrderId.Id.1=foo&SellerId=MERCHANT_ID&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2016-05-23T12%3A26%3A36Z&Version=2013-09-01&Signature=S9d0UNtrXTA%2FL7BZB14TAVZvtIlopBhmoyHmzTPejbc%3D
-    headers:
-      User-Agent:
-      - Jeff/1.5.1 (Language=Ruby; Hakans-MacBook.home)
-      Content-Type:
-      - application/x-www-form-urlencoded
-  response:
-    status:
-      code: 503
-      message:
-    headers:
-      Server:
-      - Server
-      Date:
-      - Mon, 23 May 2016 12:26:36 GMT
-      Content-Type:
-      - text/xml
-      Content-Length:
-      - '291'
-      Connection:
-      - keep-alive
-      x-mws-request-id:
-      - 429d190c-0c4a-46c8-b9a9-5f46511b53b3
-      x-mws-timestamp:
-      - '2016-05-23T12:26:36.747Z'
-      x-mws-response-context:
-      - cfmuZjCu4F8iJQa0nKHETjvnCfAVDCAkt/Us5XzHjlsIROVZ0G6zeLPb5hhIJiCCX83im4tq9GN4
-        34itm7iJzA==
-      Vary:
-      - Accept-Encoding,User-Agent
-    body:
-      encoding: UTF-8
-      string: |
-        <?xml version="1.0"?>
-        <ErrorResponse xmlns="https://mws.amazonservices.com/Orders/2013-09-01">
-          <Error>
-            <Type></Type>
-            <Code>RequestThrottled</Code>
-            <Message>Request is throttled</Message>
-          </Error>
-          <RequestID>429d190c-0c4a-46c8-b9a9-5f46511b53b3</RequestID>
-        </ErrorResponse>
-    http_version:
-  recorded_at: Mon, 23 May 2016 12:26:36 GMT
-- request:
-    method: post
-    uri: https://mws.amazonservices.jp/Orders/2013-09-01
-    body:
-      encoding: UTF-8
-      string: AWSAccessKeyId=AWS_ACCESS_KEY_ID&Action=GetOrder&AmazonOrderId.Id.1=foo&SellerId=MERCHANT_ID&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2016-05-23T12%3A28%3A23Z&Version=2013-09-01&Signature=R%2B8ZRIBw3XDPt9F9Mfoo%2Bw%2Bot6dqahDq2BYqXTOh6Zc%3D
-    headers:
-      User-Agent:
-      - Jeff/1.5.1 (Language=Ruby; Hakans-MacBook.home)
-      Content-Type:
-      - application/x-www-form-urlencoded
-  response:
-    status:
-      code: 503
-      message:
-    headers:
-      Server:
-      - Server
-      Date:
-      - Mon, 23 May 2016 12:28:24 GMT
-      Content-Type:
-      - text/xml
-      Content-Length:
-      - '278'
-      Connection:
-      - keep-alive
-      x-mws-request-id:
-      - 759022d5-6990-4bfc-9351-7cc67d008955
-      x-mws-timestamp:
-      - '2016-05-23T12:28:24.370Z'
-      x-mws-response-context:
-      - lyk6D6bzzrWJabg2K47GU1ZWgRd9GuKznFtvfMEq8ZR/luGH+UkRBES1fTrCUabXCkaaMdOy0bKq
-        6z4ZKfQuwg==
-      Vary:
-      - Accept-Encoding,User-Agent
-    body:
-      encoding: UTF-8
-      string: |
-        <?xml version="1.0"?>
-        <ErrorResponse xmlns="https://mws.amazonservices.com/Orders/2013-09-01">
-          <Error>
-            <Type></Type>
-            <Code>RequestThrottled</Code>
-            <Message>Request is throttled</Message>
-          </Error>
-          <RequestID>759022d5-6990-4bfc-9351-7cc67d008955</RequestID>
-        </ErrorResponse>
-    http_version:
-  recorded_at: Mon, 23 May 2016 12:28:24 GMT
-- request:
-    method: post
-    uri: https://mws-eu.amazonservices.com/Orders/2013-09-01
-    body:
-      encoding: UTF-8
-      string: AWSAccessKeyId=AWS_ACCESS_KEY_ID&Action=GetOrder&AmazonOrderId.Id.1=foo&SellerId=MERCHANT_ID&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2016-05-23T12%3A29%3A37Z&Version=2013-09-01&Signature=7hG243Xw2rPWKYyfIKoGUA0LTRDLL6H3FJYfeG9y5kQ%3D
-    headers:
-      User-Agent:
-      - Jeff/1.5.1 (Language=Ruby; Hakans-MacBook.home)
-      Content-Type:
-      - application/x-www-form-urlencoded
-  response:
-    status:
-      code: 503
-      message:
-    headers:
-      Server:
-      - Server
-      Date:
-      - Mon, 23 May 2016 12:29:37 GMT
-      Content-Type:
-      - text/xml
-      Content-Length:
-      - '291'
-      Connection:
-      - keep-alive
-      x-mws-request-id:
-      - 19f0a252-96de-4a79-8052-b66fb4f441be
-      x-mws-timestamp:
-      - '2016-05-23T12:29:37.344Z'
-      x-mws-response-context:
-      - lyk6D6bzzrWJabg2K47GU1ZWgRd9GuKznFtvfMEq8ZR/luGH+UkRBES1fTrCUabXCkaaMdOy0bKq
-        6z4ZKfQuwg==
-      Vary:
-      - Accept-Encoding,User-Agent
-    body:
-      encoding: UTF-8
-      string: |
-        <?xml version="1.0"?>
-        <ErrorResponse xmlns="https://mws.amazonservices.com/Orders/2013-09-01">
-          <Error>
-            <Type></Type>
-            <Code>RequestThrottled</Code>
-            <Message>Request is throttled</Message>
-          </Error>
-          <RequestID>19f0a252-96de-4a79-8052-b66fb4f441be</RequestID>
-        </ErrorResponse>
-    http_version:
-  recorded_at: Mon, 23 May 2016 12:29:37 GMT
-- request:
-    method: post
-    uri: https://mws-eu.amazonservices.com/Orders/2013-09-01
-    body:
-      encoding: UTF-8
-      string: AWSAccessKeyId=AWS_ACCESS_KEY_ID&Action=GetOrder&AmazonOrderId.Id.1=foo&SellerId=MERCHANT_ID&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2016-05-23T12%3A30%3A11Z&Version=2013-09-01&Signature=%2Be9QXTopUhMUaQ0kEmtB2pEUEjt7vI7LoLVqNtV6ZCA%3D
-    headers:
-      User-Agent:
-      - Jeff/1.5.1 (Language=Ruby; Hakans-MacBook.home)
-      Content-Type:
-      - application/x-www-form-urlencoded
-  response:
-    status:
-      code: 503
-      message:
-    headers:
-      Server:
-      - Server
-      Date:
-      - Mon, 23 May 2016 12:30:11 GMT
-      Content-Type:
-      - text/xml
-      Content-Length:
-      - '291'
-      Connection:
-      - keep-alive
-      x-mws-request-id:
-      - 840d7fe6-fbf4-4bc6-a7d6-018269e8e57b
-      x-mws-timestamp:
-      - '2016-05-23T12:30:11.392Z'
-      x-mws-response-context:
-      - oE6oYNMqkjV8eW/BRjuzEzjF3NARnODl8w8C4anviesEnSpZ96k17Rg+xbcBCWGmYUake7FbiO4k
-        r3+dcWKcsg==
-      Vary:
-      - Accept-Encoding,User-Agent
-    body:
-      encoding: UTF-8
-      string: |
-        <?xml version="1.0"?>
-        <ErrorResponse xmlns="https://mws.amazonservices.com/Orders/2013-09-01">
-          <Error>
-            <Type></Type>
-            <Code>RequestThrottled</Code>
-            <Message>Request is throttled</Message>
-          </Error>
-          <RequestID>840d7fe6-fbf4-4bc6-a7d6-018269e8e57b</RequestID>
-        </ErrorResponse>
-    http_version:
-  recorded_at: Mon, 23 May 2016 12:30:11 GMT
-- request:
-    method: post
-    uri: https://mws.amazonservices.com/Orders/2013-09-01
-    body:
-      encoding: UTF-8
-      string: AWSAccessKeyId=AWS_ACCESS_KEY_ID&Action=GetOrder&AmazonOrderId.Id.1=foo&SellerId=MERCHANT_ID&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2016-05-23T12%3A33%3A44Z&Version=2013-09-01&Signature=afEobB041YouF04d%2F8460n2%2ByPiR6UVaShWiAKFuOQo%3D
-    headers:
-      User-Agent:
-      - Jeff/1.5.1 (Language=Ruby; Hakans-MacBook.home)
-      Content-Type:
-      - application/x-www-form-urlencoded
-  response:
-    status:
-      code: 503
-      message:
-    headers:
-      Server:
-      - Server
-      Date:
-      - Mon, 23 May 2016 12:33:45 GMT
-      Content-Type:
-      - text/xml
-      Content-Length:
-      - '291'
-      Connection:
-      - keep-alive
-      x-mws-request-id:
-      - 5ca0af8a-0443-4a26-8b63-a9764863c7d8
-      x-mws-timestamp:
-      - '2016-05-23T12:33:45.154Z'
-      x-mws-response-context:
-      - ecBayQO8iftN3M2GSxDGtX4wcqNrso6pTS5SBv8W1UYGGcnV/9z023Ged2cfmM21hd96dLt8fxTW
-        mxislaXEhA==
-      Vary:
-      - Accept-Encoding,User-Agent
-    body:
-      encoding: UTF-8
-      string: |
-        <?xml version="1.0"?>
-        <ErrorResponse xmlns="https://mws.amazonservices.com/Orders/2013-09-01">
-          <Error>
-            <Type></Type>
-            <Code>RequestThrottled</Code>
-            <Message>Request is throttled</Message>
-          </Error>
-          <RequestID>5ca0af8a-0443-4a26-8b63-a9764863c7d8</RequestID>
-        </ErrorResponse>
-    http_version:
-  recorded_at: Mon, 23 May 2016 12:33:45 GMT
 recorded_with: VCR 3.0.1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peddler
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Hakan Ensari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-15 00:00:00.000000000 Z
+date: 2019-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -84,13 +84,13 @@ files:
 - lib/mws/recommendations/client.rb
 - lib/mws/reports.rb
 - lib/mws/reports/client.rb
-- lib/mws/reports/parser.rb
 - lib/mws/sellers.rb
 - lib/mws/sellers/client.rb
 - lib/mws/subscriptions.rb
 - lib/mws/subscriptions/client.rb
 - lib/peddler.rb
 - lib/peddler/client.rb
+- lib/peddler/content.rb
 - lib/peddler/errors/builder.rb
 - lib/peddler/errors/class_generator.rb
 - lib/peddler/errors/error.rb
@@ -98,6 +98,7 @@ files:
 - lib/peddler/flat_file_parser.rb
 - lib/peddler/headers.rb
 - lib/peddler/marketplace.rb
+- lib/peddler/mws.rb
 - lib/peddler/operation.rb
 - lib/peddler/parser.rb
 - lib/peddler/structured_list.rb
@@ -107,14 +108,15 @@ files:
 - lib/peddler/xml_response_parser.rb
 - test/credentials.rb
 - test/helper.rb
-- test/integration/test_errors.rb
+- test/integration/internals/test_errors.rb
+- test/integration/internals/test_multibyte_queries.rb
+- test/integration/internals/test_mws_headers.rb
+- test/integration/internals/test_string_encodings.rb
 - test/integration/test_feeds.rb
 - test/integration/test_fulfillment_inbound_shipment.rb
 - test/integration/test_fulfillment_inventory.rb
 - test/integration/test_fulfillment_outbound_shipment.rb
 - test/integration/test_merchant_fulfillment.rb
-- test/integration/test_multibyte_queries.rb
-- test/integration/test_mws_headers.rb
 - test/integration/test_off_amazon_payments.rb
 - test/integration/test_orders.rb
 - test/integration/test_products.rb
@@ -185,15 +187,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Wraps the Amazon MWS APIs
@@ -231,15 +232,16 @@ test_files:
 - test/helper.rb
 - test/integration/test_orders.rb
 - test/integration/test_recommendations.rb
-- test/integration/test_multibyte_queries.rb
 - test/integration/test_feeds.rb
 - test/integration/test_fulfillment_outbound_shipment.rb
 - test/integration/test_fulfillment_inbound_shipment.rb
-- test/integration/test_mws_headers.rb
 - test/integration/test_reports.rb
 - test/integration/test_subscriptions.rb
+- test/integration/internals/test_multibyte_queries.rb
+- test/integration/internals/test_mws_headers.rb
+- test/integration/internals/test_errors.rb
+- test/integration/internals/test_string_encodings.rb
 - test/integration/test_merchant_fulfillment.rb
-- test/integration/test_errors.rb
 - test/integration/test_sellers.rb
 - test/integration/test_products.rb
 - test/integration/test_off_amazon_payments.rb

data/lib/mws/reports/parser.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-require 'peddler/flat_file_parser'
-require 'peddler/xml_response_parser'
-
-module MWS
-  module Reports
-    # @api private
-    module Parser
-      class << self
-        # We're massaging data produced by a motley army of developers. It's
-        # messy.
-        def new(res, encoding)
-          # Don't parse if there's no body
-          return res unless res.body
-
-          if xml?(res)
-            XMLResponseParser.new(res)
-          else
-            # Amazon returns a variety of content types for flat files. I simply
-            # assume anything not XML is a flat file.
-            FlatFileParser.new(res, encoding)
-          end
-        end
-
-        def xml?(res)
-          return true if res.headers['Content-Type'].start_with?('text/xml')
-          return true if res.body.start_with?('<?xml')
-
-          false
-        end
-      end
-    end
-  end
-end