peddler 2.1.1 → 2.3.0

data/lib/peddler/content.rb

@@ -3,10 +3,10 @@
 module Peddler
   # Parses content metadata provided in the headers of a response
   class Content
-    # @api private
+    # @!visibility private
     attr_reader :headers
 
-    # @api private
+    # @!visibility private
     def initialize(headers)
       @headers = headers.select { |key| key.start_with?('Content') }
     end

data/lib/peddler/errors/builder.rb

@@ -7,7 +7,7 @@ require 'peddler/errors/parser'
 
 module Peddler
   module Errors
-    # @api private
+    # @!visibility private
     class Builder
       extend Forwardable
 
@@ -28,6 +28,7 @@ module Peddler
 
       def build
         parse_original_response
+        return if no_error_response?
         return if bad_class_name?
 
         error_class.new(error_message, error)
@@ -36,7 +37,11 @@ module Peddler
       private
 
       def bad_class_name?
-        error_name =~ DIGIT_AS_FIRST_CHAR
+        error_name.match?(DIGIT_AS_FIRST_CHAR)
+      end
+
+      def no_error_response?
+        response.parse.nil?
       end
 
       def error_class

data/lib/peddler/errors/class_generator.rb

@@ -5,7 +5,7 @@ require 'peddler/errors/error'
 
 module Peddler
   module Errors
-    # @api private
+    # @!visibility private
     class ClassGenerator
       include Singleton
 

data/lib/peddler/errors/error.rb

@@ -3,11 +3,15 @@
 require 'forwardable'
 
 module Peddler
-  # @api private
+  # @!visibility private
   module Errors
     # These error codes are common to all Amazon MWS API sections.
     #
     # @see https://docs.developer.amazonservices.com/en_US/dev_guide/DG_Errors.html
+    #
+    # There are quite a few other error types they do not explicitly document
+    # above. I decided not to define any for the sake of consistency and future
+    # maintenance.
     CODES = %w[
       AccessDenied
       InputStreamDisconnected
@@ -20,7 +24,7 @@ module Peddler
       SignatureDoesNotMatch
     ].freeze
 
-    # @api private
+    # @!visibility private
     class Error < StandardError
       extend Forwardable
 

data/lib/peddler/errors/parser.rb

@@ -4,7 +4,7 @@ require 'peddler/xml_parser'
 
 module Peddler
   module Errors
-    # @api private
+    # @!visibility private
     class Parser < XMLParser
       def message
         parse['Message']

data/lib/peddler/flat_file_parser.rb

@@ -6,7 +6,7 @@ require 'digest/md5'
 require 'peddler/headers'
 
 module Peddler
-  # @api private
+  # @!visibility private
   class FlatFileParser < SimpleDelegator
     include Headers
 
@@ -23,7 +23,7 @@ module Peddler
     end
 
     def parse(&blk)
-      CSV.parse(content, OPTIONS, &blk) unless content.empty?
+      CSV.parse(content, **OPTIONS, &blk) unless content.empty?
     end
 
     def records_count
@@ -44,7 +44,9 @@ module Peddler
 
     def extract_content_and_summary
       @content = body.encode('UTF-8', invalid: :replace, undef: :replace)
-      @summary, @content = @content.split("\n\n", 2) if @content =~ /\t\t.*\n\n/
+      return unless @content.match?(/\t\t.*\n\n/)
+
+      @summary, @content = @content.split("\n\n", 2)
     end
 
     def summarize

data/lib/peddler/marketplace.rb

@@ -1,29 +1,24 @@
 # frozen_string_literal: true
 
 module Peddler
-  # @api private
+  # @!visibility private
   # @see https://docs.developer.amazonservices.com/en_US/dev_guide/DG_Endpoints.html
-  Marketplace = Struct.new(:id, :country_code, :host) do
+  class Marketplace
     class << self
       attr_reader :all
 
       def find(key)
-        marketplace = if key.nil?
-                        missing_key!
-                      elsif key.size == 2
-                        find_by_country_code(key)
-                      else
-                        find_by_id(key)
-                      end
+        missing_key! unless key
+        marketplace = key.size == 2 ? find_by_country(key) : find_by_id(key)
 
         marketplace || not_found!(key)
       end
 
       private
 
-      def find_by_country_code(country_code)
-        country_code = 'GB' if country_code == 'UK'
-        all.find { |marketplace| marketplace.country_code == country_code }
+      def find_by_country(code)
+        code = 'GB' if code == 'UK'
+        all.find { |marketplace| marketplace.country_code == code }
       end
 
       def find_by_id(id)
@@ -39,32 +34,41 @@ module Peddler
       end
     end
 
+    attr_reader :id, :country_code, :host
+
+    def initialize(id, country_code, host)
+      @id = id
+      @country_code = country_code
+      @host = host
+    end
+
     def encoding
       case country_code
       when 'JP'
         'Windows-31J'
-      when 'CN'
-        'UTF-16'
       else
         'CP1252'
       end
     end
 
     @all = [
+      ['A2Q3Y263D00KWC', 'BR', 'mws.amazonservices.com'],
       ['A2EUQ1WTGCTBG2', 'CA', 'mws.amazonservices.com'],
       ['A1AM78C64UM0Y8', 'MX', 'mws.amazonservices.com'],
       ['ATVPDKIKX0DER', 'US', 'mws.amazonservices.com'],
-      ['A2Q3Y263D00KWC', 'BR', 'mws.amazonservices.com'],
+      ['A2VIGQ35RCS4UG', 'AE', 'mws.amazonservices.ae'],
       ['A1PA6795UKMFR9', 'DE', 'mws-eu.amazonservices.com'],
+      ['ARBP9OOSHTCHU', 'EG', 'mws-eu.amazonservices.com'],
       ['A1RKKUPIHCS9HS', 'ES', 'mws-eu.amazonservices.com'],
       ['A13V1IB3VIYZZH', 'FR', 'mws-eu.amazonservices.com'],
-      ['APJ6JRA9NG5V4', 'IT', 'mws-eu.amazonservices.com'],
       ['A1F83G8C2ARO7P', 'GB', 'mws-eu.amazonservices.com'],
-      ['A33AVAJ2PDY3EV', 'TR', 'mws-eu.amazonservices.com'],
       ['A21TJRUUN4KGV', 'IN', 'mws.amazonservices.in'],
+      ['APJ6JRA9NG5V4', 'IT', 'mws-eu.amazonservices.com'],
+      ['A17E79C6D8DWNP', 'SA', 'mws-eu.amazonservices.com'],
+      ['A33AVAJ2PDY3EV', 'TR', 'mws-eu.amazonservices.com'],
+      ['A19VAU5U5O7RUS', 'SG', 'mws-fe.amazonservices.com'],
       ['A39IBJ37TRP1C6', 'AU', 'mws.amazonservices.com.au'],
-      ['A1VC38T7YXB528', 'JP', 'mws.amazonservices.jp'],
-      ['AAHKV2X7AFYLW', 'CN', 'mws.amazonservices.com.cn']
+      ['A1VC38T7YXB528', 'JP', 'mws.amazonservices.jp']
     ].map do |values|
       new(*values)
     end

data/lib/peddler/mws.rb

@@ -3,10 +3,10 @@
 module Peddler
   # Parses MWS metadata provided in the headers of a response
   class MWS
-    # @api private
+    # @!visibility private
     attr_reader :headers
 
-    # @api private
+    # @!visibility private
     def initialize(headers)
       @headers = headers.select { |key| key.start_with?('x-mws') }
     end

data/lib/peddler/operation.rb

@@ -5,7 +5,7 @@ require 'time'
 require 'peddler/structured_list'
 
 module Peddler
-  # @api private
+  # @!visibility private
   class Operation < SimpleDelegator
     CAPITAL_LETTERS = /[A-Z]/.freeze
     ALL_CAPS = %w[sku cod].freeze
@@ -28,15 +28,12 @@ module Peddler
       self
     end
 
-    def store(key, val, parent: '')
-      key = camelize(key) if key.is_a?(Symbol)
-      key = "#{parent}.#{key}" unless parent.empty?
-
-      val = val.iso8601 if val.respond_to?(:iso8601)
-      val = val.to_h if val.is_a?(Struct)
+    def store(key, val, parent = nil)
+      key = [parent, camelize(key)].compact.join('.')
+      val = format_known_types(val)
 
       if val.is_a?(Hash)
-        val.each { |keyval| store(*keyval, parent: key) }
+        val.each { |keyval| store(*keyval, key) }
       else
         __getobj__.store(key, val)
       end
@@ -51,10 +48,11 @@ module Peddler
 
     private
 
-    def camelize(sym)
-      return sym.to_s if sym =~ CAPITAL_LETTERS
+    def camelize(key)
+      return key unless key.is_a?(Symbol)
+      return key.to_s if key.match?(CAPITAL_LETTERS)
 
-      sym
+      key
         .to_s
         .split('_')
         .map { |token| capitalize(token) }
@@ -68,5 +66,13 @@ module Peddler
         word.capitalize
       end
     end
+
+    def format_known_types(val)
+      val = val.utc.iso8601(2) if val.is_a?(Time)
+      val = val.iso8601 if val.is_a?(Date)
+      val = val.to_h if val.is_a?(Struct)
+
+      val
+    end
   end
 end

data/lib/peddler/parser.rb

@@ -4,7 +4,7 @@ require 'peddler/flat_file_parser'
 require 'peddler/xml_response_parser'
 
 module Peddler
-  # @api private
+  # @!visibility private
   module Parser
     class << self
       # We're massaging data produced by a motley army of developers. It's

data/lib/peddler/structured_list.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Peddler
-  # @api private
+  # @!visibility private
   class StructuredList
     def initialize(*keys)
       @keys = keys

data/lib/peddler/vcr_matcher.rb

@@ -4,23 +4,23 @@ module Peddler
   # A custom matcher that can be used to record MWS interactions when
   # writing integration tests
   class VCRMatcher
-    # @api private
+    # @!visibility private
     TRANSIENT_PARAMS = %w[
       Signature Timestamp StartDate CreatedAfter QueryStartDateTime
     ].freeze
 
-    # @api private
+    # @!visibility private
     SELLER_PARAMS = %w[
       AWSAccessKeyId SellerId
     ].freeze
 
     class << self
-      # @api private
+      # @!visibility private
       def call(*requests)
         new(*requests).compare
       end
 
-      # @api private
+      # @!visibility private
       def ignored_params
         @ignored_params ||= TRANSIENT_PARAMS.dup
       end
@@ -33,15 +33,15 @@ module Peddler
       end
     end
 
-    # @api private
+    # @!visibility private
     attr_reader :requests
 
-    # @api private
+    # @!visibility private
     def initialize(*requests)
       @requests = requests
     end
 
-    # @api private
+    # @!visibility private
     def compare
       compare_uris && compare_bodies
     end

data/lib/peddler/version.rb

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

data/lib/peddler/xml_parser.rb

@@ -6,7 +6,7 @@ require 'peddler/headers'
 require 'multi_xml'
 
 module Peddler
-  # @api private
+  # @!visibility private
   class XMLParser < SimpleDelegator
     extend Forwardable
     include Headers

data/lib/peddler/xml_response_parser.rb

@@ -3,7 +3,7 @@
 require 'peddler/xml_parser'
 
 module Peddler
-  # @api private
+  # @!visibility private
   class XMLResponseParser < XMLParser
     MATCHER = /^Message$|Report|Result/.freeze
     private_constant :MATCHER

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peddler
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Hakan Ensari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-05 00:00:00.000000000 Z
+date: 2020-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -52,9 +52,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
-description: A Ruby interface to the Amazon MWS API
+description: 
 email:
-- hakanensari@gmail.com
+- me@hakanensari.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -62,6 +62,8 @@ files:
 - LICENSE
 - README.md
 - lib/mws.rb
+- lib/mws/easy_ship.rb
+- lib/mws/easy_ship/client.rb
 - lib/mws/feeds.rb
 - lib/mws/feeds/client.rb
 - lib/mws/finances.rb
@@ -75,7 +77,6 @@ files:
 - lib/mws/merchant_fulfillment.rb
 - lib/mws/merchant_fulfillment/client.rb
 - lib/mws/off_amazon_payments.rb
-- lib/mws/off_amazon_payments/client.rb
 - lib/mws/orders.rb
 - lib/mws/orders/client.rb
 - lib/mws/products.rb
@@ -86,6 +87,8 @@ files:
 - lib/mws/reports/client.rb
 - lib/mws/sellers.rb
 - lib/mws/sellers/client.rb
+- lib/mws/shipment_invoicing.rb
+- lib/mws/shipment_invoicing/client.rb
 - lib/mws/subscriptions.rb
 - lib/mws/subscriptions/client.rb
 - lib/peddler.rb
@@ -106,75 +109,6 @@ files:
 - lib/peddler/version.rb
 - lib/peddler/xml_parser.rb
 - lib/peddler/xml_response_parser.rb
-- test/credentials.rb
-- test/helper.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_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
-- 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_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_off_amazon_payments_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_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_class_generator.rb
-- test/unit/peddler/errors/test_error.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/vcr_cassettes/CartInformation.yml
-- test/vcr_cassettes/CustomerInformation.yml
-- test/vcr_cassettes/Errors.yml
-- test/vcr_cassettes/Feeds.yml
-- test/vcr_cassettes/FulfillmentInboundShipment.yml
-- test/vcr_cassettes/FulfillmentInventory.yml
-- test/vcr_cassettes/FulfillmentOutboundShipment.yml
-- test/vcr_cassettes/MWSHeaders.yml
-- test/vcr_cassettes/MerchantFulfillment.yml
-- test/vcr_cassettes/MultibyteQueries.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/Subscriptions.yml
 homepage: https://github.com/hakanensari/peddler
 licenses:
 - MIT
@@ -194,77 +128,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 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_class_generator.rb
-- test/unit/peddler/errors/test_parser.rb
-- test/unit/peddler/test_parser.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_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/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_feeds.rb
-- test/integration/test_fulfillment_outbound_shipment.rb
-- test/integration/test_fulfillment_inbound_shipment.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_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/mws.yml
-- test/vcr_cassettes/Products.yml
-- test/vcr_cassettes/MerchantFulfillment.yml
-- test/vcr_cassettes/CustomerInformation.yml
-- test/vcr_cassettes/Recommendations.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/FulfillmentOutboundShipment.yml
-- test/vcr_cassettes/PeddlerVCRMatcher.yml
-- test/vcr_cassettes/OffAmazonPayments.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
+summary: A Ruby wrapper to the Amazon MWS API
+test_files: []