peddler 1.6.5 → 1.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e96842d3eb385391fb5732931bd8d65afeca33f4
-  data.tar.gz: 36e28997e1c35ba8673b90bc27d2f58e21125084
+  metadata.gz: f768c3add9b97c6d2af14872792feb553197fdb8
+  data.tar.gz: f33a7fd7ca78654a866191f0d2b5ac17629d0b38
 SHA512:
-  metadata.gz: f9cfa3d9f6abd4bba7ae2b3b09c16ffd5c0f3fcbc8e7331cd7333eb5d61e5ea2bb4939afc9c03fad72e7cb5980899f0c61b7a63c2916d12b039289c3501b2014
-  data.tar.gz: 32dcdf2f84b098cf3784136f856085e004f5332dfd753a2df0bfe1ec49f17e3d61cde3799fcab3b314fe59e199d6fd18c6c150a6cd9d594ee7273a533f9cbbe2
+  metadata.gz: 289d38d3d615f8f99c6695b4a665fdc6a464b104df4f23fc7bfcb4074c9689d02bead5e8418c3f8746e13ffb1f8cf0e94b021cbe9d8c65d2f614d3d946ba71d9
+  data.tar.gz: 628fdb1df72fe2e9164fb90c2dc4a7cbdd2307409e1b5ae9870756917c982474c3112ce33e212b38731e3e0412ae8b83719fef5bfe8f4b6c1f1e35b70ebe4b23

data/README.md

@@ -76,7 +76,7 @@ Peddler wraps successful responses in a parser that handles both XML documents a
 ```ruby
 parser = client.get_service_status
 parser.parse # will return a Hash object
-parser.dig('Status') # delegates to Hash#dig for convenience
+parser.dig('Status') # delegates to Hash#dig if available
 ```
 
 You can swap the default parser with a purpose-built abstraction.

data/lib/peddler/client.rb

@@ -175,7 +175,7 @@ module Peddler
     private
 
     def find_marketplace
-      Marketplace.new(primary_marketplace_id)
+      Marketplace.find(primary_marketplace_id)
     end
 
     def clear_content!

data/lib/peddler/errors/error.rb

@@ -3,15 +3,13 @@
 module Peddler
   # @api private
   module Errors
-    # Known codes
+    # Here I curate error classes I see value in creating up front so we can use
+    # them for control flow. All other errors will be created at runtime.
     CODES = %w[
       AccessDenied
       InternalError
       InvalidAccessKeyId
       InvalidMarketplace
-      InvalidParameterValue
-      InvalidRequest
-      MalformedInput
       QuotaExceeded
       RequestThrottled
     ].freeze

data/lib/peddler/marketplace.rb

@@ -3,53 +3,21 @@
 module Peddler
   # @api private
   # @see https://docs.developer.amazonservices.com/en_US/dev_guide/DG_Endpoints.html
-  class Marketplace
-    IDS = {
-      'CA' => 'A2EUQ1WTGCTBG2',
-      'MX' => 'A1AM78C64UM0Y8',
-      'US' => 'ATVPDKIKX0DER',
-      'BR' => 'A2Q3Y263D00KWC',
-      'DE' => 'A1PA6795UKMFR9',
-      'ES' => 'A1RKKUPIHCS9HS',
-      'FR' => 'A13V1IB3VIYZZH',
-      'IT' => 'APJ6JRA9NG5V4',
-      'UK' => 'A1F83G8C2ARO7P',
-      'IN' => 'A21TJRUUN4KGV',
-      'AU' => 'A39IBJ37TRP1C6',
-      'JP' => 'A1VC38T7YXB528',
-      'CN' => 'AAHKV2X7AFYLW'
-    }.freeze
-
-    HOSTS = {
-      'CA' => 'mws.amazonservices.com',
-      'MX' => 'mws.amazonservices.com',
-      'US' => 'mws.amazonservices.com',
-      'BR' => 'mws.amazonservices.com',
-      'DE' => 'mws-eu.amazonservices.com',
-      'ES' => 'mws-eu.amazonservices.com',
-      'FR' => 'mws-eu.amazonservices.com',
-      'IT' => 'mws-eu.amazonservices.com',
-      'UK' => 'mws-eu.amazonservices.com',
-      'IN' => 'mws.amazonservices.in',
-      'AU' => 'mws.amazonservices.com.au',
-      'JP' => 'mws.amazonservices.jp',
-      'CN' => 'mws.amazonservices.com.cn'
-    }.freeze
-
-    BadId = Class.new(StandardError)
-
-    attr_reader :id
-
-    def initialize(id)
-      @id = id || raise(BadId, 'missing MarketplaceId')
-    end
-
-    def country_code
-      @country_code ||= find_country_code
-    end
-
-    def host
-      @host ||= find_host
+  Marketplace = Struct.new(:id, :country_code, :host) do
+    class << self
+      attr_reader :all
+
+      def find(id)
+        all.find { |marketplace| marketplace.id == id } || begin
+          message = if id
+                      %("#{id}" is not a valid MarketplaceId)
+                    else
+                      'missing MarketplaceId'
+                    end
+
+          raise ArgumentError, message
+        end
+      end
     end
 
     # Caveat: We use the supersets Windows-31J and CP1252 in place of Shift_JIS
@@ -67,14 +35,22 @@ module Peddler
       end
     end
 
-    private
-
-    def find_country_code
-      IDS.key(id) || raise(BadId, %("#{id}" is not a valid MarketplaceId))
-    end
-
-    def find_host
-      HOSTS[country_code]
+    @all = [
+      ['A2EUQ1WTGCTBG2', 'CA', 'mws.amazonservices.com'],
+      ['A1AM78C64UM0Y8', 'MX', 'mws.amazonservices.com'],
+      ['ATVPDKIKX0DER', 'US', 'mws.amazonservices.com'],
+      ['A2Q3Y263D00KWC', 'BR', 'mws.amazonservices.com'],
+      ['A1PA6795UKMFR9', 'DE', 'mws-eu.amazonservices.com'],
+      ['A1RKKUPIHCS9HS', 'ES', 'mws-eu.amazonservices.com'],
+      ['A13V1IB3VIYZZH', 'FR', 'mws-eu.amazonservices.com'],
+      ['APJ6JRA9NG5V4', 'IT', 'mws-eu.amazonservices.com'],
+      ['A1F83G8C2ARO7P', 'UK', 'mws-eu.amazonservices.com'],
+      ['A21TJRUUN4KGV', 'IN', 'mws.amazonservices.in'],
+      ['A39IBJ37TRP1C6', 'AU', 'mws.amazonservices.com.au'],
+      ['A1VC38T7YXB528', 'JP', 'mws.amazonservices.jp'],
+      ['AAHKV2X7AFYLW', 'CN', 'mws.amazonservices.com.cn']
+    ].map do |values|
+      new(*values)
     end
   end
 end

data/lib/peddler/version.rb

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

data/lib/peddler/xml_parser.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'delegate'
-require 'dig_rb'
 require 'forwardable'
 require 'peddler/headers'
 require 'multi_xml'
@@ -12,7 +11,7 @@ module Peddler
     extend Forwardable
     include Headers
 
-    def_delegator :parse, :dig
+    def_delegator :parse, :dig if Hash.method_defined?(:dig)
 
     def parse
       @data ||= find_data

data/test/helper.rb

@@ -1,13 +1,12 @@
 # frozen_string_literal: true
 
-if RUBY_ENGINE == 'ruby'
-  require 'simplecov'
-
-  SimpleCov.start do
-    add_filter '/test/'
-  end
+# Keep SimpleCov at top.
+require 'simplecov'
+SimpleCov.start do
+  add_filter '/test/'
 end
 
+require 'backports/2.3.0/hash/dig'
 require 'minitest/autorun'
 require 'minitest/focus'
 begin

data/test/unit/peddler/test_marketplace.rb

@@ -5,31 +5,30 @@ require 'peddler/marketplace'
 
 class TestPeddlerMarketplace < MiniTest::Test
   def setup
-    @marketplace = Peddler::Marketplace.new('ATVPDKIKX0DER')
+    @marketplace = Peddler::Marketplace.find('ATVPDKIKX0DER')
   end
 
-  def test_has_a_country_code
+  def test_country_code
     assert @marketplace.country_code
   end
 
-  def test_has_a_host
+  def test_host
     assert @marketplace.host
   end
 
-  def test_has_an_encoding
+  def test_encoding
     assert @marketplace.encoding
   end
 
   def test_guard_against_missing_marketplace_id
-    assert_raises(Peddler::Marketplace::BadId, 'missing MarketplaceId') do
-      Peddler::Marketplace.new(nil)
+    assert_raises(ArgumentError, 'missing ID') do
+      Peddler::Marketplace.find(nil)
     end
   end
 
-  def test_guard_against_bad_marketplace_id
-    assert_raises(Peddler::Marketplace::BadId, '"123" is not a valid MarketplaceId') do
-      marketplace = Peddler::Marketplace.new('123')
-      marketplace.host
+  def test_guard_against_invalid_marketplace_id
+    assert_raises(ArgumentError, '"123" is not a valid ID') do
+      Peddler::Marketplace.find('123')
     end
   end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: peddler
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.6.6
 platform: ruby
 authors:
 - Hakan Ensari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-08 00:00:00.000000000 Z
+date: 2018-02-22 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: dig_rb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
@@ -42,22 +28,16 @@ dependencies:
   name: jeff
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.2
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.2
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: multi_xml
   requirement: !ruby/object:Gem::Requirement
@@ -216,70 +196,70 @@ signing_key:
 specification_version: 4
 summary: Wraps the Amazon MWS APIs
 test_files:
-- test/unit/peddler/test_headers.rb
-- test/unit/peddler/test_vcr_matcher.rb
-- test/unit/peddler/test_marketplace.rb
-- test/unit/peddler/test_operation.rb
-- test/unit/peddler/test_structured_list.rb
-- test/unit/peddler/test_client.rb
-- test/unit/peddler/test_xml_response_parser.rb
-- test/unit/peddler/test_xml_parser.rb
-- test/unit/peddler/test_flat_file_parser.rb
-- test/unit/peddler/errors/test_error.rb
-- test/unit/peddler/errors/test_builder.rb
-- test/unit/peddler/errors/test_handler.rb
-- test/unit/peddler/errors/test_parser.rb
-- test/unit/peddler/test_parser.rb
+- test/credentials.rb
+- test/helper.rb
+- test/integration/test_errors.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
+- test/integration/test_recommendations.rb
+- test/integration/test_reports.rb
+- test/integration/test_sellers.rb
+- test/integration/test_subscriptions.rb
+- test/integration_helper.rb
+- test/mws.yml.example
+- test/null_client.rb
+- test/recorder.rb
+- test/unit/mws/test_feeds_client.rb
 - test/unit/mws/test_finances_client.rb
-- test/unit/mws/test_sellers_client.rb
 - test/unit/mws/test_fulfillment_inbound_shipment_client.rb
+- test/unit/mws/test_fulfillment_inventory_client.rb
+- test/unit/mws/test_fulfillment_outbound_shipment_client.rb
 - test/unit/mws/test_merchant_fulfillment_client.rb
-- test/unit/mws/test_subscriptions_client.rb
 - test/unit/mws/test_off_amazon_payments_client.rb
-- test/unit/mws/test_reports_client.rb
-- test/unit/mws/test_fulfillment_outbound_shipment_client.rb
 - test/unit/mws/test_orders_client.rb
 - test/unit/mws/test_products_client.rb
 - test/unit/mws/test_recommendations_client.rb
-- test/unit/mws/test_fulfillment_inventory_client.rb
-- test/unit/mws/test_feeds_client.rb
+- test/unit/mws/test_reports_client.rb
+- test/unit/mws/test_sellers_client.rb
+- test/unit/mws/test_subscriptions_client.rb
+- test/unit/peddler/errors/test_builder.rb
+- test/unit/peddler/errors/test_error.rb
+- test/unit/peddler/errors/test_handler.rb
+- test/unit/peddler/errors/test_parser.rb
+- test/unit/peddler/test_client.rb
+- test/unit/peddler/test_flat_file_parser.rb
+- test/unit/peddler/test_headers.rb
+- test/unit/peddler/test_marketplace.rb
+- test/unit/peddler/test_operation.rb
+- test/unit/peddler/test_parser.rb
+- test/unit/peddler/test_structured_list.rb
+- test/unit/peddler/test_vcr_matcher.rb
+- test/unit/peddler/test_xml_parser.rb
+- test/unit/peddler/test_xml_response_parser.rb
 - test/unit/test_mws.rb
-- test/null_client.rb
-- test/mws.yml.example
-- 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/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
-- test/integration/test_fulfillment_inventory.rb
-- test/integration_helper.rb
-- test/vcr_cassettes/Products.yml
-- test/vcr_cassettes/MerchantFulfillment.yml
+- test/vcr_cassettes/CartInformation.yml
 - test/vcr_cassettes/CustomerInformation.yml
-- test/vcr_cassettes/Recommendations.yml
+- test/vcr_cassettes/Errors.yml
 - test/vcr_cassettes/Feeds.yml
-- test/vcr_cassettes/Orders.yml
-- test/vcr_cassettes/MultibyteQueries.yml
-- test/vcr_cassettes/CartInformation.yml
 - test/vcr_cassettes/FulfillmentInboundShipment.yml
+- test/vcr_cassettes/FulfillmentInventory.yml
 - test/vcr_cassettes/FulfillmentOutboundShipment.yml
-- test/vcr_cassettes/PeddlerVCRMatcher.yml
+- test/vcr_cassettes/MerchantFulfillment.yml
+- test/vcr_cassettes/MultibyteQueries.yml
+- test/vcr_cassettes/MWSHeaders.yml
 - test/vcr_cassettes/OffAmazonPayments.yml
+- test/vcr_cassettes/Orders.yml
+- test/vcr_cassettes/PeddlerVCRMatcher.yml
+- test/vcr_cassettes/Products.yml
+- test/vcr_cassettes/Recommendations.yml
+- test/vcr_cassettes/Reports.yml
 - test/vcr_cassettes/Sellers.yml
-- test/vcr_cassettes/FulfillmentInventory.yml
-- test/vcr_cassettes/Errors.yml
 - test/vcr_cassettes/Subscriptions.yml
-- test/vcr_cassettes/MWSHeaders.yml
-- test/vcr_cassettes/Reports.yml
-- test/recorder.rb
-- test/credentials.rb