peddler 1.6.3 → 1.6.4

data/test/helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 if RUBY_ENGINE == 'ruby'
   require 'simplecov'
 

data/test/integration/test_errors.rb

@@ -1,12 +1,15 @@
+# frozen_string_literal: true
+
 require 'integration_helper'
 require 'mws/orders'
 require 'peddler/errors/handler'
 
 class TestErrors < IntegrationTest
+  use 'Orders'
+
   def setup
     @previous_error_handler = MWS::Orders::Client.error_handler
     MWS::Orders::Client.error_handler = Peddler::Errors::Handler
-    @api = 'Orders'
     super
   end
 
@@ -17,20 +20,18 @@ class TestErrors < IntegrationTest
 
   def test_invalid_key
     clients.each do |client|
-      e = assert_raises Peddler::Errors::Error do
+      assert_raises(Peddler::Errors::InvalidAccessKeyId) do
         client.aws_access_key_id = 'foo'
         client.get_order('bar')
       end
-      assert_instance_of Peddler::Errors::InvalidAccessKeyId, e
     end
   end
 
   def test_request_throttled
     clients.each do |client|
-      e = assert_raises Peddler::Errors::Error do
+      assert_raises(Peddler::Errors::RequestThrottled) do
         client.get_order('foo')
       end
-      assert_instance_of Peddler::Errors::RequestThrottled, e
     end
   end
 end

data/test/integration/test_feeds.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'integration_helper'
 require 'mws/feeds'
 

data/test/integration/test_fulfillment_inbound_shipment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'integration_helper'
 require 'mws/fulfillment_inbound_shipment'
 

data/test/integration/test_fulfillment_inventory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'integration_helper'
 require 'mws/fulfillment_inventory'
 

data/test/integration/test_fulfillment_outbound_shipment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'integration_helper'
 require 'mws/fulfillment_outbound_shipment'
 

data/test/integration/test_merchant_fulfillment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'integration_helper'
 require 'mws/merchant_fulfillment'
 

data/test/integration/test_multibyte_queries.rb

@@ -1,11 +1,10 @@
+# frozen_string_literal: true
+
 require 'integration_helper'
 require 'mws/products'
 
 class TestMultibyteQueries < IntegrationTest
-  def setup
-    @api = 'Products'
-    super
-  end
+  use 'Products'
 
   def test_posts_multibyte_queries_properly
     ret = clients.map do |client|

data/test/integration/test_mws_headers.rb

@@ -1,11 +1,10 @@
+# frozen_string_literal: true
+
 require 'integration_helper'
 require 'mws/products'
 
 class TestMWSHeaders < IntegrationTest
-  def setup
-    @api = 'Products'
-    super
-  end
+  use 'Products'
 
   def test_parses_headers
     clients.each do |client|

data/test/integration/test_off_amazon_payments.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'integration_helper'
 require 'mws/off_amazon_payments'
 

data/test/integration/test_orders.rb

@@ -1,22 +1,20 @@
+# frozen_string_literal: true
+
 require 'integration_helper'
 require 'mws/orders'
 
 class TestOrders < IntegrationTest
   def test_gets_orders
     clients.each do |client|
-      order_ids = client
-        .list_orders(
-          created_after: Date.new(2015),
-          max_results_per_page: 5
-        )
-        .dig('Orders', 'Order')
-        .map { |order| order['AmazonOrderId'] }
+      order_ids = client.list_orders(created_after: Date.new(2015),
+                                     max_results_per_page: 5)
+                        .dig('Orders', 'Order')
+                        .map { |order| order['AmazonOrderId'] }
 
       next if order_ids.count < 2
 
-      orders = client
-        .get_order(*order_ids)
-        .dig('Orders', 'Order')
+      orders = client.get_order(*order_ids)
+                     .dig('Orders', 'Order')
 
       assert_equal order_ids.count, orders.count
     end

data/test/integration/test_products.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'integration_helper'
 require 'mws/products'
 

data/test/integration/test_recommendations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'integration_helper'
 require 'mws/recommendations'
 

data/test/integration/test_reports.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'integration_helper'
 require 'mws/reports'
 

data/test/integration/test_sellers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'integration_helper'
 require 'mws/sellers'
 

data/test/integration/test_subscriptions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'integration_helper'
 require 'mws/subscriptions'
 

data/test/integration_helper.rb

@@ -1,22 +1,35 @@
+# frozen_string_literal: true
+
+require 'credentials'
 require 'helper'
 require 'recorder'
 
-%w[mws.yml mws.yml.example].each do |path|
-  file = File.expand_path("../#{path}", __FILE__)
-  if File.exist?(file)
-    $mws = YAML.load_file(file)
-    break
-  end
-end
-
 class IntegrationTest < MiniTest::Test
   include Recorder
 
-  private
+  class << self
+    def use(endpoint)
+      @current_endpoint = endpoint
+    end
+
+    def clients
+      @clients ||= build_clients
+    end
+
+    private
+
+    def build_clients
+      klass = MWS.const_get("#{current_endpoint}::Client")
+      ::Credentials.map { |credentials| klass.new(credentials) }.shuffle
+    end
+
+    def current_endpoint
+      @current_endpoint || name.sub('Test', '')
+    end
+  end
 
   def clients
-    api = @api || test_name
-    $mws.map { |record| MWS.const_get("#{api}::Client").new(record) }.shuffle
+    self.class.clients
   end
 end
 
@@ -31,7 +44,7 @@ VCR.configure do |c|
     end
   end
 
-  $mws.each do |record|
+  Credentials.each do |record|
     c.filter_sensitive_data('FILTERED') { record['merchant_id'] }
     c.filter_sensitive_data('FILTERED') { record['aws_access_key_id'] }
   end

data/test/null_client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'peddler/client'
 require 'securerandom'
 

data/test/recorder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'peddler/vcr_matcher'
 require 'yaml'
 require 'vcr'

data/test/unit/mws/test_feeds_client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'helper'
 require 'mws/feeds/client'
 

data/test/unit/mws/test_finances_client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'helper'
 require 'mws/finances/client'
 

data/test/unit/mws/test_fulfillment_inbound_shipment_client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'helper'
 require 'mws/fulfillment_inbound_shipment/client'
 

data/test/unit/mws/test_fulfillment_inventory_client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'helper'
 require 'mws/fulfillment_inventory/client'
 

data/test/unit/mws/test_fulfillment_outbound_shipment_client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'helper'
 require 'mws/fulfillment_outbound_shipment/client'
 
@@ -87,12 +89,15 @@ class TestMWSFulfillmentOutboundShipmentClient < MiniTest::Test
   end
 
   def test_lists_all_fulfillment_orders
+    started_at = Time.now
+
     operation = {
-      'Action' => 'ListAllFulfillmentOrders'
+      'Action' => 'ListAllFulfillmentOrders',
+      'QueryStartDateTime' => started_at.iso8601
     }
 
     @client.stub(:run, nil) do
-      @client.list_all_fulfillment_orders
+      @client.list_all_fulfillment_orders(started_at)
     end
 
     assert_equal operation, @client.operation

data/test/unit/mws/test_merchant_fulfillment_client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'helper'
 require 'mws/merchant_fulfillment/client'
 

data/test/unit/mws/test_off_amazon_payments_client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'helper'
 require 'mws/off_amazon_payments/client'
 

data/test/unit/mws/test_orders_client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'helper'
 require 'mws/orders/client'
 

data/test/unit/mws/test_products_client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'helper'
 require 'mws/products/client'
 

data/test/unit/mws/test_recommendations_client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'helper'
 require 'mws/recommendations/client'
 

data/test/unit/mws/test_reports_client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'helper'
 require 'mws/reports/client'
 

data/test/unit/mws/test_sellers_client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'helper'
 require 'mws/sellers/client'
 

data/test/unit/mws/test_subscriptions_client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'helper'
 require 'mws/subscriptions/client'
 

data/test/unit/peddler/errors/test_builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'helper'
 require 'peddler/errors/builder'
 

data/test/unit/peddler/errors/test_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'helper'
 require 'peddler/errors/error'
 

data/test/unit/peddler/errors/test_handler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'helper'
 require 'peddler/errors/handler'
 

data/test/unit/peddler/errors/test_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'helper'
 require 'peddler/errors/parser'
 

data/test/unit/peddler/test_client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'helper'
 require 'null_client'
 
@@ -132,13 +134,15 @@ class TestPeddlerClient < MiniTest::Test
   def test_does_not_clear_body_when_run_fails
     Excon.stub({}, status: 503)
     @client.body = 'foo'
-    assert_raises { @client.run }
+    assert_raises(Excon::Error::ServiceUnavailable) do
+      @client.run
+    end
     refute_nil @client.body
   end
 
   def test_streams_response
     chunks = ''
-    streamer = ->(chunk, _, _) { chunks << chunk }
+    streamer = ->(chunk, _, _) { chunks += chunk }
     @client.run(&streamer)
 
     assert_equal @response_body, chunks

data/test/unit/peddler/test_flat_file_parser.rb

@@ -1,17 +1,19 @@
+# frozen_string_literal: true
+
 require 'helper'
 require 'peddler/flat_file_parser'
 
 class TestPeddlerFlatFileParser < MiniTest::Test
   def test_parses_data
-    body = "Feed Processing Summary:\n\tNumber of records processed\t\t11006\n\tNumber of records successful\t\t11006\n\noriginal-record-number\tsku\terror-code\terror-type\terror-message\n1822\t85da472e-ba6c-11e3-95af-002590a74356\t5000\tWarning\tThe update for Sku '85da472e-ba6c-11e3-95af-002590a74356' was skipped because it is identical to the update in feed '9518995390'.\n"
-    body.encode!('ASCII-8BIT')
+    body = build_body("Feed Processing Summary:\n\tNumber of records processed\t\t11006\n\tNumber of records successful\t\t11006\n\noriginal-record-number\tsku\terror-code\terror-type\terror-message\n1822\t85da472e-ba6c-11e3-95af-002590a74356\t5000\tWarning\tThe update for Sku '85da472e-ba6c-11e3-95af-002590a74356' was skipped because it is identical to the update in feed '9518995390'.\n",
+                      encoding: Encoding::ASCII_8BIT)
     parser = Peddler::FlatFileParser.new(build_mock_response(body), 'ISO-8859-1')
     assert_kind_of CSV::Table, parser.parse
   end
 
   def test_parses_data_a_line_at_a_time
-    body = "Feed Processing Summary:\n\tNumber of records processed\t\t11006\n\tNumber of records successful\t\t11006\n\noriginal-record-number\tsku\terror-code\terror-type\terror-message\n1822\t85da472e-ba6c-11e3-95af-002590a74356\t5000\tWarning\tThe update for Sku '85da472e-ba6c-11e3-95af-002590a74356' was skipped because it is identical to the update in feed '9518995390'.\n"
-    body.encode!('ASCII-8BIT')
+    body = build_body("Feed Processing Summary:\n\tNumber of records processed\t\t11006\n\tNumber of records successful\t\t11006\n\noriginal-record-number\tsku\terror-code\terror-type\terror-message\n1822\t85da472e-ba6c-11e3-95af-002590a74356\t5000\tWarning\tThe update for Sku '85da472e-ba6c-11e3-95af-002590a74356' was skipped because it is identical to the update in feed '9518995390'.\n",
+                      encoding: Encoding::ASCII_8BIT)
     parser = Peddler::FlatFileParser.new(build_mock_response(body), 'ISO-8859-1')
     counter = 0
     parser.parse { counter += 1 }
@@ -19,22 +21,22 @@ class TestPeddlerFlatFileParser < MiniTest::Test
   end
 
   def test_summarises
-    body = "Feed Processing Summary:\n\tNumber of records processed\t\t11006\n\tNumber of records successful\t\t11006\n\noriginal-record-number\tsku\terror-code\terror-type\terror-message\n1822\t85da472e-ba6c-11e3-95af-002590a74356\t5000\tWarning\tThe update for Sku '85da472e-ba6c-11e3-95af-002590a74356' was skipped because it is identical to the update in feed '9518995390'.\n"
-    body.encode!('ASCII-8BIT')
+    body = build_body("Feed Processing Summary:\n\tNumber of records processed\t\t11006\n\tNumber of records successful\t\t11006\n\noriginal-record-number\tsku\terror-code\terror-type\terror-message\n1822\t85da472e-ba6c-11e3-95af-002590a74356\t5000\tWarning\tThe update for Sku '85da472e-ba6c-11e3-95af-002590a74356' was skipped because it is identical to the update in feed '9518995390'.\n",
+                      encoding: Encoding::ASCII_8BIT)
     parser = Peddler::FlatFileParser.new(build_mock_response(body), 'ISO-8859-1')
     refute_empty parser.records_count
   end
 
   def test_summarises_non_english_reports
-    body = "Riepilogo elaborazione feed:\n\tNumero record elaborati\t\t1\n\tNumero record elaborati con successo\t\t1\n\n"
-    body.encode!('Cp1252')
+    body = build_body("Riepilogo elaborazione feed:\n\tNumero record elaborati\t\t1\n\tNumero record elaborati con successo\t\t1\n\n",
+                      encoding: 'Cp1252')
     parser = Peddler::FlatFileParser.new(build_mock_response(body), 'ISO-8859-1')
     refute_empty parser.records_count
   end
 
   def test_validates
-    body = "Feed Processing Summary:\n\tNumber of records processed\t\t11006\n\tNumber of records successful\t\t11006\n\noriginal-record-number\tsku\terror-code\terror-type\terror-message\n1822\t85da472e-ba6c-11e3-95af-002590a74356\t5000\tWarning\tThe update for Sku '85da472e-ba6c-11e3-95af-002590a74356' was skipped because it is identical to the update in feed '9518995390'.\n"
-    body.encode!('ASCII-8BIT')
+    body = build_body("Feed Processing Summary:\n\tNumber of records processed\t\t11006\n\tNumber of records successful\t\t11006\n\noriginal-record-number\tsku\terror-code\terror-type\terror-message\n1822\t85da472e-ba6c-11e3-95af-002590a74356\t5000\tWarning\tThe update for Sku '85da472e-ba6c-11e3-95af-002590a74356' was skipped because it is identical to the update in feed '9518995390'.\n",
+                      encoding: Encoding::ASCII_8BIT)
     parser = Peddler::FlatFileParser.new(build_mock_response(body), 'ISO-8859-1')
     assert parser.valid?
   end
@@ -46,43 +48,44 @@ class TestPeddlerFlatFileParser < MiniTest::Test
   end
 
   def test_handles_japanese_flat_files
-    body = "Foo\nこんにちは\n"
-    body.encode!('SHIFT_JIS')
-    parser = Peddler::FlatFileParser.new(build_mock_response(body), 'Windows-31J')
+    body = build_body("Foo\nこんにちは\n", encoding: Encoding::SHIFT_JIS)
+    parser = Peddler::FlatFileParser.new(build_mock_response(body), Encoding::WINDOWS_31J)
     assert_equal 'こんにちは', parser.parse[0]['Foo']
   end
 
   def test_handles_japanese_curly_braces
-    body = "Foo\n〝\n"
-    body.encode!('Windows-31J')
-    parser = Peddler::FlatFileParser.new(build_mock_response(body), 'Windows-31J')
+    body = build_body("Foo\n〝\n", encoding: Encoding::WINDOWS_31J)
+    parser = Peddler::FlatFileParser.new(build_mock_response(body), Encoding::WINDOWS_31J)
     assert_equal '〝', parser.parse[0]['Foo']
   end
 
   def test_handles_latin_1_flat_files
-    body = "Foo\n™\n"
-    body.encode!('Cp1252')
-    parser = Peddler::FlatFileParser.new(build_mock_response(body), 'Cp1252')
+    body = build_body("Foo\n™\n", encoding: 'Cp1252')
+    parser = Peddler::FlatFileParser.new(build_mock_response(body), Encoding::CP1252)
     assert_equal '™', parser.parse['Foo'][0]
   end
 
   def test_handles_undefined_characters
-    body = "Foo\n\xFF\n"
-    body.force_encoding('ASCII-8BIT')
-    parser = Peddler::FlatFileParser.new(build_mock_response(body), 'ASCII-8BIT')
+    body = "Foo\n\xFF\n".dup
+    body.force_encoding(Encoding::ASCII_8BIT)
+    parser = Peddler::FlatFileParser.new(build_mock_response(body), Encoding::ASCII_8BIT)
     assert_equal '�', parser.parse['Foo'][0]
   end
 
   def test_handles_utf8_flat_files
     body = "Foo\nfür\n"
-    parser = Peddler::FlatFileParser.new(build_mock_response(body, ascii: false), 'CP1252')
+    parser = Peddler::FlatFileParser.new(build_mock_response(body, ascii: false), Encoding::CP1252)
     assert_equal 'für', parser.parse['Foo'][0]
   end
 
   private
 
+  def build_body(str, encoding:)
+    str.dup.encode(encoding)
+  end
+
   def build_mock_response(body, ascii: true)
-    body.force_encoding('ASCII-8BIT') if ascii
+    body.force_encoding(Encoding::ASCII_8BIT) if ascii
     headers = {
       'Content-MD5' => Digest::MD5.base64digest(body)
     }