peddler 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6930c5791ac57b42110c8f753ec49b9e1916ebf1
-  data.tar.gz: 79d8ed7d23625bc790f14f1df4f3cf02a5404ff9
+  metadata.gz: 4d83b099126be1823bbd9bd9c45ea1d7ec3455f9
+  data.tar.gz: 74b18adc957648244ac9b7bf04d60fe3006c4fc2
 SHA512:
-  metadata.gz: ef37d5d4d265fe2e73d4ea6b077f59950f706d14e2fe20b0a7ebf8d363265681c9b0339449fe851484c332a3c614f86ddf8fbda833ecd7cc2b58f8b7d678ff1b
-  data.tar.gz: 030eb49815c4c35e0825a08e1059469195313f2acbaa248bf82d2e3010efafcc31d8c8ddd8b3499a63dff07bc041203ade90795d02faedc5d2bc3fd25cbd368f
+  metadata.gz: 7f977ea894c96c6454bfd442bd8f5e866aaf56029c23649d7d133fbca85b4544a894d99e254847a77afaa36460dfb1caf39f0eefb272982739b0c375cf340ba0
+  data.tar.gz: 3b7f7bdf62a91254838b412ba634eca896f8a4cb14683ecb92b7e1621c6a7b72d92874e1a1f564abb0529e390ae85c7cf9cf9fb2d399d9ef695d0f888c6358ac

data/lib/mws/merchant_fulfillment/client.rb

@@ -22,6 +22,7 @@ module MWS
       def get_eligible_shipping_services(shipment_request_details)
         operation('GetEligibleShippingServices')
           .add('ShipmentRequestDetails' => shipment_request_details)
+          .structure!('ItemList', 'Item')
 
         run
       end
@@ -42,6 +43,7 @@ module MWS
             'ShippingServiceId' => shipping_service_id
           )
           .add(opts)
+          .structure!('ItemList', 'Item')
 
         run
       end

data/lib/peddler/client.rb

@@ -129,13 +129,7 @@ module Peddler
 
     # @!parse attr_writer :body
     def body=(str)
-      if str
-        headers['Content-Type'] = content_type(str)
-      else
-        headers.delete('Content-Type')
-      end
-
-      @body = str
+      str ? add_content(str) : clear_content!
     end
 
     # @api private
@@ -169,6 +163,7 @@ module Peddler
       opts = build_options
       opts.store(:response_block, Proc.new) if block_given?
       res = post(opts)
+      self.body = nil if res.status == 200
 
       parser.new(res, encoding)
     rescue Excon::Error => e
@@ -181,11 +176,19 @@ module Peddler
       Marketplace.new(primary_marketplace_id)
     end
 
-    def content_type(str)
-      if str.start_with?('<?xml')
-        'text/xml'
+    def clear_content!
+      headers.delete('Content-Type')
+      @body = nil
+    end
+
+    def add_content(content)
+      if content.start_with?('<?xml')
+        headers['Content-Type'] = 'text/xml'
+        @body = content
       else
-        "text/tab-separated-values; charset=#{encoding}"
+        headers['Content-Type'] =
+          "text/tab-separated-values; charset=#{encoding}"
+        @body = content.encode(encoding)
       end
     end
 

data/lib/peddler/errors/error.rb

@@ -2,7 +2,7 @@ module Peddler
   # @api private
   module Errors
     # Known codes
-    CODES = %w(
+    CODES = %w[
       AccessDenied
       InvalidMarketplace
       InvalidParameterValue
@@ -10,7 +10,7 @@ module Peddler
       MalformedInput
       QuotaExceeded
       RequestThrottled
-    ).freeze
+    ].freeze
 
     # @api private
     class Error < StandardError

data/lib/peddler/errors/handler.rb

@@ -5,6 +5,9 @@ module Peddler
   module Errors
     # @api private
     class Handler
+      DIGIT_AS_FIRST_CHAR = /^\d/
+      private_constant :DIGIT_AS_FIRST_CHAR
+
       def self.call(exception)
         new(exception).handle
       end
@@ -20,26 +23,35 @@ module Peddler
       end
 
       def handle
-        if http_status_error?
-          raise error_class.new(exception.response.message, exception)
-        else
-          raise exception
-        end
-      rescue NameError
-        raise exception
+        raise exception unless http_status_error?
+        raise exception if bad_name_for_error_class?
+
+        raise error_class.new(error_message, exception)
       end
 
       private
 
       def error_class
-        Errors.const_get(exception.response.code)
+        Errors.const_get(error_name)
       rescue NameError
-        Builder.build(exception.response.code)
+        Builder.build(error_name)
       end
 
       def http_status_error?
         exception.is_a?(::Excon::Error::HTTPStatus)
       end
+
+      def bad_name_for_error_class?
+        error_name =~ DIGIT_AS_FIRST_CHAR
+      end
+
+      def error_name
+        exception.response.code
+      end
+
+      def error_message
+        exception.response.message
+      end
     end
   end
 end

data/lib/peddler/errors/parser.rb

@@ -19,9 +19,7 @@ module Peddler
       private
 
       def find_data
-        xml
-          .fetch('ErrorResponse', {})
-          .fetch('Error', {})
+        xml.dig('ErrorResponse', 'Error')
       end
     end
   end

data/lib/peddler/flat_file_parser.rb

@@ -11,20 +11,20 @@ module Peddler
     # http://stackoverflow.com/questions/8073920/importing-csv-quoting-error-is-driving-me-nuts
     OPTIONS = { col_sep: "\t", quote_char: "\x00", headers: true }.freeze
 
-    attr_reader :content, :summary, :encoding
+    attr_reader :content, :summary
 
     def initialize(res, encoding)
       super(res)
-      @encoding = encoding
-      extract_content
+      scrub_body!(encoding)
+      extract_content_and_summary
     end
 
     def parse(&blk)
-      CSV.parse(scrub_content, OPTIONS, &blk) if content
+      CSV.parse(content, OPTIONS, &blk) if content
     end
 
     def records_count
-      summarize if summary?
+      summarize if summary
     end
 
     def valid?
@@ -33,22 +33,13 @@ module Peddler
 
     private
 
-    def extract_content
-      if summary?
-        @summary, @content = body.split("\n\n")
-      else
-        @content = body.dup
-      end
+    def scrub_body!(encoding)
+      body.force_encoding(encoding) unless body.encoding == 'UTF-8'
     end
 
-    def scrub_content
-      content
-        .force_encoding(encoding)
-        .encode('UTF-8', invalid: :replace, undef: :replace, replace: '?')
-    end
-
-    def summary?
-      body.include?("\n\n")
+    def extract_content_and_summary
+      @content = body.encode('UTF-8', invalid: :replace, undef: :replace)
+      @summary, @content = @content.split("\n\n") if @content.include?("\n\n")
     end
 
     def summarize

data/lib/peddler/headers.rb

@@ -4,6 +4,8 @@ module Peddler
     Quota = Struct.new(:max, :remaining, :resets_on)
 
     def quota
+      return if headers.keys.none? { |key| key.include?('quota') }
+
       Quota.new(
         headers['x-mws-quota-max'].to_i,
         headers['x-mws-quota-remaining'].to_i,

data/lib/peddler/vcr_matcher.rb

@@ -2,13 +2,13 @@ module Peddler
   # A custom matcher that can be used to record MWS interactions when
   # integration-testing
   class VCRMatcher
-    TRANSIENT_PARAMS = %w(
+    TRANSIENT_PARAMS = %w[
       Signature Timestamp StartDate CreatedAfter QueryStartDateTime
-    ).freeze
+    ].freeze
 
-    SELLER_PARAMS = %w(
+    SELLER_PARAMS = %w[
       AWSAccessKeyId SellerId
-    ).freeze
+    ].freeze
 
     class << self
       def call(*requests)

data/lib/peddler/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Peddler
-  VERSION = '1.6.0'.freeze
+  VERSION = '1.6.1'.freeze
 end

data/test/helper.rb

@@ -7,6 +7,7 @@ if RUBY_ENGINE == 'ruby'
 end
 
 require 'minitest/autorun'
+require 'minitest/focus'
 begin
   require 'pry'
 rescue LoadError

data/test/integration/test_feeds.rb

@@ -17,19 +17,21 @@ class TestFeeds < IntegrationTest
   end
 
   def test_submits_feeds
-    content = "sku\tprice\tquantity\nwidget\t\t0\n"
-    type = '_POST_FLAT_FILE_PRICEANDQUANTITYONLY_UPDATE_DATA_'
+    feed_content = "sku\tprice\tquantity\nwidget\t\t0\n"
+    feed_type = '_POST_FLAT_FILE_PRICEANDQUANTITYONLY_UPDATE_DATA_'
 
     clients.each do |client|
-      res = client.submit_feed(content, type)
-      id = res.parse['FeedSubmissionInfo']['FeedSubmissionId']
-      refute_nil id
+      res = client.submit_feed(feed_content, feed_type)
+      feed_submission_id = res.dig('FeedSubmissionInfo', 'FeedSubmissionId')
+      assert feed_submission_id
+
+      res = client.get_feed_submission_result(feed_submission_id)
+      assert res.records_count
 
       # Clean up
-      client.body = nil
       client.cancel_feed_submissions(
-        feed_submission_id: id,
-        feed_type_list: type
+        feed_submission_id: feed_submission_id,
+        feed_type_list: feed_type
       )
     end
   end

data/test/integration/test_reports.rb

@@ -37,18 +37,12 @@ class TestReports < IntegrationTest
     end
   end
 
-  def test_gets_report_list
-    clients.each do |client|
-      res = client.get_report_list
-      refute_empty res.parse
-    end
-  end
-
   def test_gets_report
     clients.each do |client|
       res = client.get_report_list(max_count: 1)
       id = res.parse['ReportInfo']['ReportId']
       res = client.get_report(id)
+      assert res.valid?
       refute_empty res.parse || res.records_count
     end
   end

data/test/integration_helper.rb

@@ -1,7 +1,7 @@
 require 'helper'
 require 'recorder'
 
-%w(mws.yml mws.yml.example).each do |path|
+%w[mws.yml mws.yml.example].each do |path|
   file = File.expand_path("../#{path}", __FILE__)
   if File.exist?(file)
     $mws = YAML.load_file(file)
@@ -16,9 +16,7 @@ class IntegrationTest < MiniTest::Test
 
   def clients
     api = @api || test_name
-    $mws.map do |record|
-      MWS.const_get("#{api}::Client").new(record)
-    end
+    $mws.map { |record| MWS.const_get("#{api}::Client").new(record) }.shuffle
   end
 end
 
@@ -26,9 +24,9 @@ end
 
 VCR.configure do |c|
   c.before_record do |interaction|
-    %w(
+    %w[
       BuyerName BuyerEmail Name AddressLine1 PostalCode Phone Amount
-    ).each do |key|
+    ].each do |key|
       interaction.response.body.gsub!(/<#{key}>[^<]+</, "<#{key}>FILTERED<")
     end
   end

data/test/unit/mws/test_feeds_client.rb

@@ -19,7 +19,6 @@ class TestMWSFeedsClient < MiniTest::Test
     end
 
     assert_equal operation, @client.operation
-    assert_equal 'content', @client.body
   end
 
   def test_gets_feed_submission_list

data/test/unit/mws/test_fulfillment_inbound_shipment_client.rb

@@ -267,7 +267,7 @@ class TestMWSFulfillmentInboundShipmentClient < MiniTest::Test
       @client.get_unique_package_labels(
         'FBAQFGQZ',
         'PackageLabel_Letter_6',
-        %w(CartonA CartonB CartonC CartonD)
+        %w[CartonA CartonB CartonC CartonD]
       )
     end
 

data/test/unit/mws/test_merchant_fulfillment_client.rb

@@ -9,14 +9,26 @@ class TestMWSMerchantFulfillmentClient < MiniTest::Test
   def test_gets_eligible_shipping_services
     operation = {
       'Action' => 'GetEligibleShippingServices',
-      'ShipmentRequestDetails.Id' => '123',
-      'ShipmentRequestDetails.Foo.Bar' => 'baz'
+      'ShipmentRequestDetails.AmazonOrderId' => '123',
+      'ShipmentRequestDetails.Weight.Value' => '10',
+      'ShipmentRequestDetails.Weight.Unit' => 'ounces',
+      'ShipmentRequestDetails.ItemList.Item.1.OrderItemId' => '123',
+      'ShipmentRequestDetails.ItemList.Item.1.Quantity' => '1'
     }
 
     @client.stub(:run, nil) do
       shipment_request_details = {
-        id: '123',
-        foo: { bar: 'baz' }
+        amazon_order_id: '123',
+        weight: {
+          value: '10',
+          unit: 'ounces'
+        },
+        item_list: [
+          {
+            order_item_id: '123',
+            quantity: '1'
+          }
+        ]
       }
       @client.get_eligible_shipping_services(shipment_request_details)
     end
@@ -27,15 +39,27 @@ class TestMWSMerchantFulfillmentClient < MiniTest::Test
   def test_creates_shipment
     operation = {
       'Action' => 'CreateShipment',
-      'ShipmentRequestDetails.Id' => '123',
-      'ShipmentRequestDetails.Foo.Bar' => 'baz',
+      'ShipmentRequestDetails.AmazonOrderId' => '123',
+      'ShipmentRequestDetails.Weight.Value' => '10',
+      'ShipmentRequestDetails.Weight.Unit' => 'ounces',
+      'ShipmentRequestDetails.ItemList.Item.1.OrderItemId' => '123',
+      'ShipmentRequestDetails.ItemList.Item.1.Quantity' => '1',
       'ShippingServiceId' => 'FOO'
     }
 
     @client.stub(:run, nil) do
       shipment_request_details = {
-        id: '123',
-        foo: { bar: 'baz' }
+        amazon_order_id: '123',
+        weight: {
+          value: '10',
+          unit: 'ounces'
+        },
+        item_list: [
+          {
+            order_item_id: '123',
+            quantity: '1'
+          }
+        ]
       }
       @client.create_shipment(shipment_request_details, 'FOO')
     end

data/test/unit/peddler/test_client.rb

@@ -3,9 +3,9 @@ require 'null_client'
 
 class TestPeddlerClient < MiniTest::Test
   def setup
-    @body = 'foo'
+    @response_body = 'foo'
     Excon.defaults[:mock] = true
-    Excon.stub({}, body: @body, status: 200)
+    Excon.stub({}, body: @response_body, status: 200)
 
     @klass = Class.new(Null::Client)
     @client = @klass.new
@@ -71,14 +71,14 @@ class TestPeddlerClient < MiniTest::Test
     assert_equal '123', client.aws_access_key_id
   end
 
-  def test_sets_content_type_header_for_latin_flat_file_body
+  def test_sets_content_type_header_for_latin_flat_file
     @client.body = 'foo'
     content_type = @client.headers.fetch('Content-Type')
 
     assert_equal 'text/tab-separated-values; charset=CP1252', content_type
   end
 
-  def test_sets_content_type_header_for_chinese_flat_file_body
+  def test_sets_content_type_header_for_chinese_flat_file
     @client.primary_marketplace_id = 'AAHKV2X7AFYLW'
     @client.body = 'foo'
     content_type = @client.headers.fetch('Content-Type')
@@ -86,7 +86,7 @@ class TestPeddlerClient < MiniTest::Test
     assert_equal 'text/tab-separated-values; charset=UTF-16', content_type
   end
 
-  def test_sets_content_type_header_for_japanese_flat_file_body
+  def test_sets_content_type_header_for_japanese_flat_file
     @client.primary_marketplace_id = 'A1VC38T7YXB528'
     @client.body = 'foo'
     content_type = @client.headers.fetch('Content-Type')
@@ -94,16 +94,46 @@ class TestPeddlerClient < MiniTest::Test
     assert_equal 'text/tab-separated-values; charset=Windows-31J', content_type
   end
 
-  def test_sets_content_type_header_for_xml_body
+  def test_sets_content_type_header_for_xml
     @client.body = '<?xml version="1.0"?><Foo></Foo>'
     content_type = @client.headers.fetch('Content-Type')
 
     assert_equal 'text/xml', content_type
   end
 
+  def test_encodes_body_for_latin_flat_file
+    @client.body = 'foo'
+    assert_equal 'Windows-1252', @client.body.encoding.to_s
+  end
+
+  def test_encodes_body_for_chinese_flat_file
+    @client.primary_marketplace_id = 'AAHKV2X7AFYLW'
+    @client.body = 'foo'
+    assert_equal 'UTF-16', @client.body.encoding.to_s
+  end
+
+  def test_encodes_body_for_japanese_flat_file
+    @client.primary_marketplace_id = 'A1VC38T7YXB528'
+    @client.body = 'foo'
+    assert_equal 'Windows-31J', @client.body.encoding.to_s
+  end
+
   def test_runs_a_request
     res = @client.run
-    assert_equal @body, res.body
+    assert_equal @response_body, res.body
+  end
+
+  def test_clears_body_when_run_succeeds
+    @client.body = 'foo'
+    @client.run
+    assert_nil @client.body
+  end
+
+  def test_does_not_clear_body_when_run_fails
+    Excon.stub({}, status: 503)
+    @client.body = 'foo'
+    assert_raises { @client.run }
+    refute_nil @client.body
   end
 
   def test_streams_response
@@ -111,7 +141,7 @@ class TestPeddlerClient < MiniTest::Test
     streamer = ->(chunk, _, _) { chunks << chunk }
     @client.run(&streamer)
 
-    assert_equal @body, chunks
+    assert_equal @response_body, chunks
   end
 
   class Instrumentor

data/test/unit/peddler/test_flat_file_parser.rb

@@ -70,7 +70,7 @@ class TestPeddlerFlatFileParser < MiniTest::Test
     body = "Foo\n\xFF\n"
     body.force_encoding('ASCII-8BIT')
     parser = Peddler::FlatFileParser.new(build_mock_response(body), 'ASCII-8BIT')
-    assert_equal '?', parser.parse['Foo'][0]
+    assert_equal '�', parser.parse['Foo'][0]
   end
 
   private

data/test/unit/peddler/test_headers.rb

@@ -35,4 +35,9 @@ class TestPeddlerHeaders < MiniTest::Test
   def test_response_context
     assert response_context
   end
+
+  def test_handles_no_quota
+    @headers = {}
+    assert_nil quota
+  end
 end

data/test/unit/peddler/test_operation.rb

@@ -15,10 +15,10 @@ class TestPeddlerOperation < MiniTest::Test
   end
 
   def test_converts_nested_key_to_structured_list
-    @operation.store('Foo.Status', [1])
+    @operation.store('Foo.Status', [{ 'Baz' => 1 }])
     @operation.structure!('Status', 'Bar')
     refute @operation.key?('FooStatus')
-    assert_equal 1, @operation['Foo.Status.Bar.1']
+    assert_equal 1, @operation['Foo.Status.Bar.1.Baz']
   end
 
   def test_store_camelizes_symbol_key

data/test/unit/peddler/test_structured_list.rb

@@ -13,12 +13,12 @@ class TestPeddlerStructuredList < MiniTest::Test
 
   def test_builds_a_structured_list_for_an_array_of_values
     exp = { 'OrderStatus.Status.1' => 'foo', 'OrderStatus.Status.2' => 'bar' }
-    assert_equal exp, @list.build(%w(foo bar))
+    assert_equal exp, @list.build(%w[foo bar])
   end
 
   def test_flattens_nested_arrays_of_values
     exp = { 'OrderStatus.Status.1' => 'foo', 'OrderStatus.Status.2' => 'bar' }
-    assert_equal exp, @list.build([%w(foo bar)])
+    assert_equal exp, @list.build([%w[foo bar]])
   end
 
   def test_handles_single_key

data/test/unit/peddler/test_xml_response_parser.rb

@@ -31,7 +31,7 @@ class TestPeddlerXMLResponseParser < MiniTest::Test
   def response(body)
     OpenStruct.new(
       body: body,
-      headers: { 'Content-Type' => 'text/xml', 'Content-Length' => '78' }
+      headers: { 'Content-Type' => 'text/xml', 'Content-Length' => body.size }
     )
   end
 end