peddler 0.8.0 → 0.9.0

data/lib/mws/subscriptions/client.rb

@@ -0,0 +1,177 @@
+require 'peddler/client'
+
+module MWS
+  module Subscriptions
+    # The Amazon MWS Subscriptions API section enables you to subscribe to
+    # receive notifications that are relevant to your business with Amazon. With
+    # the operations in the Subscriptions API section, you can register to
+    # receive important information from Amazon without having to poll the
+    # Amazon MWS service. Instead, the information is sent directly to you when
+    # an event occurs to which you are subscribed.
+    class Client < ::Peddler::Client
+      path '/Subscriptions/2013-07-01'
+
+      # Registers a new destination to receive notifications
+      #
+      # @see http://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_RegisterDestination.html
+      # @param sqs_queue_url [String]
+      # @param marketplace_id [String]
+      # @return [Peddler::XMLParser]
+      def register_destination(sqs_queue_url, marketplace_id = marketplace_id)
+        operation('RegisterDestination')
+          .add('MarketplaceId' => marketplace_id)
+          .add(build_destination(sqs_queue_url))
+
+        run
+      end
+
+      # Removes an existing destination from the list of registered destinations
+      #
+      # @see http://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_DeregisterDestination.html
+      # @param sqs_queue_url [String]
+      # @param marketplace_id [String]
+      # @return [Peddler::XMLParser]
+      def deregister_destination(sqs_queue_url, marketplace_id = marketplace_id)
+        operation('DeregisterDestination')
+          .add('MarketplaceId' => marketplace_id)
+          .add(build_destination(sqs_queue_url))
+
+        run
+      end
+
+      # Lists all registered destinations
+      #
+      # @see http://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_ListRegisteredDestinations.html
+      # @param marketplace_id [String]
+      # @return [Peddler::XMLParser]
+      def list_registered_destinations(marketplace_id = marketplace_id)
+        operation('ListRegisteredDestinations')
+          .add('MarketplaceId' => marketplace_id)
+
+        run
+      end
+
+      # Sends a test notification to an existing destination
+      #
+      # @see http://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_SendTestNotificationToDestination.html
+      # @param sqs_queue_url [String]
+      # @param marketplace_id [String]
+      # @return [Peddler::XMLParser]
+      def send_test_notification_to_destination(sqs_queue_url, marketplace_id = marketplace_id)
+        operation('SendTestNotificationToDestination')
+          .add('MarketplaceId' => marketplace_id)
+          .add(build_destination(sqs_queue_url))
+
+        run
+      end
+
+      # Creates a new subscription
+      #
+      # @see http://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_CreateSubscription.html
+      # @param notification_type [String]
+      # @param sqs_queue_url [String]
+      # @param marketplace_id [String]
+      # @return [Peddler::XMLParser]
+      def create_subscription(notification_type, sqs_queue_url, marketplace_id = marketplace_id)
+        operation('CreateSubscription')
+          .add('MarketplaceId' => marketplace_id)
+          .add(build_subscription(notification_type, sqs_queue_url))
+
+        run
+      end
+
+      # Gets a subscription
+      #
+      # @see http://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_GetSubscription.html
+      # @param notification_type [String]
+      # @param sqs_queue_url [String]
+      # @param marketplace_id [String]
+      # @return [Peddler::XMLParser]
+      def get_subscription(notification_type, sqs_queue_url, marketplace_id = marketplace_id)
+        operation('GetSubscription')
+          .add(
+            'MarketplaceId' => marketplace_id,
+            'NotificationType' => notification_type
+          )
+          .add(build_destination(sqs_queue_url))
+
+        run
+      end
+
+      # Deletes a subscription
+      #
+      # @see http://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_DeleteSubscription.html
+      # @param notification_type [String]
+      # @param sqs_queue_url [String]
+      # @param marketplace_id [String]
+      # @return [Peddler::XMLParser]
+      def delete_subscription(notification_type, sqs_queue_url, marketplace_id = marketplace_id)
+        operation('DeleteSubscription')
+          .add(
+            'MarketplaceId' => marketplace_id,
+            'NotificationType' => notification_type
+          )
+          .add(build_destination(sqs_queue_url))
+
+        run
+      end
+
+      # Lists current subscriptions
+      #
+      # @see http://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_ListSubscriptions.html
+      # @param marketplace_id [String]
+      # @return [Peddler::XMLParser]
+      def list_subscriptions(marketplace_id = marketplace_id)
+        operation('ListSubscriptions')
+          .add('MarketplaceId' => marketplace_id)
+
+        run
+      end
+
+      # Updates a subscription
+      #
+      # @see http://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_UpdateSubscription.html
+      # @param notification_type [String]
+      # @param sqs_queue_url [String]
+      # @param enabled [Boolean]
+      # @param marketplace_id [String]
+      # @return [Peddler::XMLParser]
+      def update_subscription(notification_type, sqs_queue_url, enabled, marketplace_id = marketplace_id)
+        operation('CreateSubscription')
+          .add('MarketplaceId' => marketplace_id)
+          .add(build_subscription(notification_type, sqs_queue_url, enabled))
+
+        run
+      end
+
+      # Gets the service status of the API
+      #
+      # @see http://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_GetServiceStatus.html
+      # @return [Peddler::XMLParser]
+      def get_service_status
+        operation('GetServiceStatus')
+        run
+      end
+
+      private
+
+      def build_destination(sqs_queue_url)
+        {
+          'Destination.DeliveryChannel' => 'SQS',
+          'Destination.AttributeList.member.1.Key' => 'sqsQueueUrl',
+          'Destination.AttributeList.member.1.Value' => sqs_queue_url
+        }
+      end
+
+      def build_subscription(notification_type, sqs_queue_url, enabled = true)
+        {
+          'Subscription.IsEnabled' => enabled,
+          'Subscription.NotificationType' => notification_type,
+          'Subscription.Destination.DeliveryChannel' => 'SQS',
+          'Subscription.Destination.AttributeList.member.1.Key' => 'sqsQueueUrl',
+          'Subscription.Destination.AttributeList.member.1.Value' => sqs_queue_url
+        }
+      end
+    end
+  end
+end

data/lib/mws/subscriptions.rb

@@ -1,169 +1 @@
-require 'peddler/client'
-
-module MWS
-  # The Amazon MWS Subscriptions API section enables you to subscribe to
-  # receive notifications that are relevant to your business with Amazon. With
-  # the operations in the Subscriptions API section, you can register to
-  # receive important information from Amazon without having to poll the
-  # Amazon MWS service. Instead, the information is sent directly to you when
-  # an event occurs to which you are subscribed.
-  class Subscriptions < ::Peddler::Client
-    path '/Subscriptions/2013-07-01'
-
-    # Registers a new destination to receive notifications
-    #
-    # @see http://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_RegisterDestination.html
-    # @param sqs_queue_url [String]
-    # @param marketplace_id [String]
-    # @return [Peddler::XMLParser]
-    def register_destination(sqs_queue_url, marketplace_id = marketplace_id)
-      operation('RegisterDestination')
-        .add('MarketplaceId' => marketplace_id)
-        .add(build_destination(sqs_queue_url))
-
-      run
-    end
-
-    # Removes an existing destination from the list of registered destinations
-    #
-    # @see http://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_DeregisterDestination.html
-    # @param sqs_queue_url [String]
-    # @param marketplace_id [String]
-    # @return [Peddler::XMLParser]
-    def deregister_destination(sqs_queue_url, marketplace_id = marketplace_id)
-      operation('DeregisterDestination')
-        .add('MarketplaceId' => marketplace_id)
-        .add(build_destination(sqs_queue_url))
-
-      run
-    end
-
-    # Lists all registered destinations
-    #
-    # @see http://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_ListRegisteredDestinations.html
-    # @param marketplace_id [String]
-    # @return [Peddler::XMLParser]
-    def list_registered_destinations( marketplace_id = marketplace_id)
-      operation('ListRegisteredDestinations')
-        .add('MarketplaceId' => marketplace_id)
-
-      run
-    end
-
-    # Sends a test notification to an existing destination
-    #
-    # @see http://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_SendTestNotificationToDestination.html
-    # @param sqs_queue_url [String]
-    # @param marketplace_id [String]
-    # @return [Peddler::XMLParser]
-    def send_test_notification_to_destination(sqs_queue_url, marketplace_id = marketplace_id)
-      operation('SendTestNotificationToDestination')
-        .add('MarketplaceId' => marketplace_id)
-        .add(build_destination(sqs_queue_url))
-
-      run
-    end
-
-    # Creates a new subscription
-    #
-    # @see http://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_CreateSubscription.html
-    # @param notification_type [String]
-    # @param sqs_queue_url [String]
-    # @param marketplace_id [String]
-    # @return [Peddler::XMLParser]
-    def create_subscription(notification_type, sqs_queue_url, marketplace_id = marketplace_id)
-      operation('CreateSubscription')
-        .add('MarketplaceId' => marketplace_id)
-        .add(build_subscription(notification_type, sqs_queue_url))
-
-      run
-    end
-
-    # Gets a subscription
-    #
-    # @see http://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_GetSubscription.html
-    # @param notification_type [String]
-    # @param sqs_queue_url [String]
-    # @param marketplace_id [String]
-    # @return [Peddler::XMLParser]
-    def get_subscription(notification_type, sqs_queue_url, marketplace_id = marketplace_id)
-      operation('GetSubscription')
-        .add('MarketplaceId' => marketplace_id, 'NotificationType' => notification_type)
-        .add(build_destination(sqs_queue_url))
-
-      run
-    end
-
-    # Deletes a subscription
-    #
-    # @see http://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_DeleteSubscription.html
-    # @param notification_type [String]
-    # @param sqs_queue_url [String]
-    # @param marketplace_id [String]
-    # @return [Peddler::XMLParser]
-    def delete_subscription(notification_type, sqs_queue_url, marketplace_id = marketplace_id)
-      operation('DeleteSubscription')
-        .add('MarketplaceId' => marketplace_id, 'NotificationType' => notification_type)
-        .add(build_destination(sqs_queue_url))
-
-      run
-    end
-
-    # Lists current subscriptions
-    #
-    # @see http://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_ListSubscriptions.html
-    # @param marketplace_id [String]
-    # @return [Peddler::XMLParser]
-    def list_subscriptions(marketplace_id = marketplace_id)
-      operation('ListSubscriptions')
-        .add('MarketplaceId' => marketplace_id)
-
-      run
-    end
-
-    # Updates a subscription
-    #
-    # @see http://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_UpdateSubscription.html
-    # @param notification_type [String]
-    # @param sqs_queue_url [String]
-    # @param enabled [Boolean]
-    # @param marketplace_id [String]
-    # @return [Peddler::XMLParser]
-    def update_subscription(notification_type, sqs_queue_url, enabled, marketplace_id = marketplace_id)
-      operation('CreateSubscription')
-        .add('MarketplaceId' => marketplace_id)
-        .add(build_subscription(notification_type, sqs_queue_url, enabled))
-
-      run
-    end
-
-    # Gets the service status of the API
-    #
-    # @see http://docs.developer.amazonservices.com/en_US/subscriptions/Subscriptions_GetServiceStatus.html
-    # @return [Peddler::XMLParser]
-    def get_service_status
-      operation('GetServiceStatus')
-      run
-    end
-
-    private
-
-    def build_destination(sqs_queue_url)
-      {
-        'Destination.DeliveryChannel' => 'SQS',
-        'Destination.AttributeList.member.1.Key' => 'sqsQueueUrl',
-        'Destination.AttributeList.member.1.Value' => sqs_queue_url
-      }
-    end
-
-    def build_subscription(notification_type, sqs_queue_url, enabled = true)
-      {
-        'Subscription.IsEnabled' => enabled,
-        'Subscription.NotificationType' => notification_type,
-        'Subscription.Destination.DeliveryChannel' => 'SQS',
-        'Subscription.Destination.AttributeList.member.1.Key' => 'sqsQueueUrl',
-        'Subscription.Destination.AttributeList.member.1.Value' => sqs_queue_url
-      }
-    end
-  end
-end
+require 'mws/subscriptions/client'

data/lib/mws.rb

@@ -18,8 +18,8 @@ module MWS
     extend Forwardable
 
     MWS.constants.each do |klass|
-      method_name = klass.to_s.gsub(/(.)([A-Z])/,'\1_\2').downcase
-      def_delegator MWS.const_get(klass), :new, method_name
+      method_name = klass.to_s.gsub(/(.)([A-Z])/, '\1_\2').downcase
+      def_delegator MWS.const_get(klass).const_get(:Client), :new, method_name
     end
   end
 end

data/lib/peddler/client.rb

@@ -26,7 +26,7 @@ module Peddler
     attr_writer :merchant_id, :marketplace_id, :parser
     attr_reader :body
 
-    alias :configure :tap
+    alias_method :configure, :tap
 
     params('SellerId' => -> { merchant_id })
 
@@ -39,7 +39,7 @@ module Peddler
     end
 
     def initialize(opts = {})
-      opts.each { |k, v| self.send("#{k}=", v) }
+      opts.each { |k, v| send("#{k}=", v) }
     end
 
     def aws_endpoint
@@ -103,7 +103,7 @@ module Peddler
     end
 
     def host
-      HOSTS.fetch(marketplace_id) { raise BadMarketplaceId }
+      HOSTS.fetch(marketplace_id) { fail BadMarketplaceId }
     end
 
     def extract_options(args)

data/lib/peddler/flat_file_parser.rb

@@ -21,7 +21,7 @@ module Peddler
     end
 
     def records_count
-      summarize if has_summary?
+      summarize if summary?
     end
 
     def valid?
@@ -31,7 +31,7 @@ module Peddler
     private
 
     def extract_content
-      if has_summary?
+      if summary?
         @summary, @content = body.split("\n\n")
       else
         @content = body.dup
@@ -42,7 +42,7 @@ module Peddler
       content.force_encoding(encoding).encode('UTF-8')
     end
 
-    def has_summary?
+    def summary?
       body.start_with?('Feed Processing Summary')
     end
 

data/lib/peddler/operation.rb

@@ -12,7 +12,7 @@ module Peddler
     def structure!(*list_keys)
       list_key = list_keys.first
 
-      if has_key?(list_key)
+      if key?(list_key)
         builder = StructuredList.new(*list_keys)
         vals = delete(list_key)
         update(builder.build(vals))
@@ -24,7 +24,6 @@ module Peddler
     def store(key, val)
       key = camelize(key) if key.is_a?(Symbol)
 
-
       if val.respond_to?(:iso8601)
         val = val.iso8601
       elsif val.is_a?(Struct)
@@ -46,7 +45,7 @@ module Peddler
       self
     end
 
-    alias :add :update
+    alias_method :add, :update
 
     private
 

data/lib/peddler/structured_list.rb

@@ -8,9 +8,7 @@ module Peddler
     def build(vals)
       Array(vals)
         .each_with_index
-        .reduce(Hash.new) { |hsh, (v, i)|
-          hsh.merge(compose_key(i + 1) => v)
-        }
+        .reduce(Hash.new) { |hsh, (v, i)| hsh.merge(compose_key(i + 1) => v) }
     end
 
     private

data/lib/peddler/version.rb

@@ -1,3 +1,3 @@
 module Peddler
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
 end

data/lib/peddler/xml_parser.rb

@@ -23,7 +23,7 @@ module Peddler
     private
 
     def find_result
-      results = xml.values[0].find { |k, v| k.include?('Result') }
+      results = xml.values[0].find { |k, _| k.include?('Result') }
       results ? results.last : nil
     end
   end

data/test/integration/test_cart_information.rb

@@ -1,7 +1,7 @@
-require 'integration_helper'
+require 'integration_test_helper'
 require 'mws/cart_information'
 
-class CartInformationTest < IntegrationTest
+class TestCartInformation < IntegrationTest
   def test_gets_service_status
     clients.each do |client|
       res = client.get_service_status

data/test/integration/test_customer_information.rb

@@ -1,7 +1,7 @@
-require 'integration_helper'
+require 'integration_test_helper'
 require 'mws/customer_information'
 
-class CustomerInformationTest < IntegrationTest
+class TestCustomerInformation < IntegrationTest
   def test_gets_service_status
     clients.each do |client|
       res = client.get_service_status

data/test/integration/test_feeds.rb

@@ -1,7 +1,7 @@
-require 'integration_helper'
+require 'integration_test_helper'
 require 'mws/feeds'
 
-class FeedsTest < IntegrationTest
+class TestFeeds < IntegrationTest
   def test_gets_feed_submission_count
     clients.each do |client|
       res = client.get_feed_submission_count

data/test/integration/test_fulfillment_inbound_shipment.rb

@@ -1,7 +1,7 @@
-require 'integration_helper'
+require 'integration_test_helper'
 require 'mws/fulfillment_inbound_shipment'
 
-class FulfillmentInboundShipmentTest < IntegrationTest
+class TestFulfillmentInboundShipment < IntegrationTest
   def test_gets_service_status
     clients.each do |client|
       res = client.get_service_status

data/test/integration/test_fulfillment_inventory.rb

@@ -1,14 +1,10 @@
-require 'integration_helper'
+require 'integration_test_helper'
 require 'mws/fulfillment_inventory'
 
-class FulfillmentInventoryTest < IntegrationTest
-  def a_month_ago
-    Date.today - 30
-  end
-
+class TestFulfillmentInventory < IntegrationTest
   def test_lists_inventory_supply
     clients.each do |client|
-      res = client.list_inventory_supply(query_start_date_time: a_month_ago)
+      res = client.list_inventory_supply(query_start_date_time: Date.today - 30)
       refute_empty res.parse
     end
   end

data/test/integration/test_fulfillment_outbound_shipment.rb

@@ -1,58 +1,11 @@
-require 'integration_helper'
+require 'integration_test_helper'
 require 'mws/fulfillment_outbound_shipment'
-require 'excon/errors'
-
-class FulfillmentOutboundShipmentTest < IntegrationTest
-  TEST_VER = 4
 
+class TestFulfillmentOutboundShipment < IntegrationTest
   def test_gets_service_status
     clients.each do |client|
       res = client.get_service_status
       refute_empty res.parse
     end
   end
-
-  def test_create_fulfillment_order
-    begin
-      clients.each do |client|
-        seller_fulfillment_order_id = "frobnitz-#{TEST_VER}"
-        displayable_order_id = "Schnizzlebits-#{TEST_VER}"
-        displayable_order_date_time = "2014-04-15T08:18:44+00:00"
-        displayable_order_comment = "Thanks for your fantastic order"
-        shipping_speed_category = "Standard"
-
-        address = {
-          :name => "Snoop Dog",
-          :line1 => "4339 H Dr.",
-          :city => "Oakland",
-          :state_or_province_code => "CA",
-          :country_code => "US",
-          :postal_code => "94618"
-        }
-
-        item = {
-          'SellerSKU' => 'PI-ANX1-KMPO',
-          :seller_fulfillment_order_item_id => "orderfrobnitz-#{TEST_VER}",
-          :quantity => 1
-        }
-
-        res = client.create_fulfillment_order(seller_fulfillment_order_id, displayable_order_id, displayable_order_date_time,
-                                              displayable_order_comment, shipping_speed_category, address, [item])
-
-        # Note: sometimes this test fails because you can't cancel an order immediately after
-        # creating it.  MWS will return an internal server error like "SIRM call failed"
-        # If this happens, comment out the create_fulfillment_order call and try running the test again
-        # after a minute or two, and it should pass.  Once you have all the VCR cassettes you should be fine
-        client.cancel_fulfillment_order(seller_fulfillment_order_id)
-      end
-
-    rescue Excon::Errors::HTTPStatusError => e
-      if e.response.body.include?('Seller is not registered')
-        skip('Seller not registered')
-      else
-        warn "Failure (status: #{e.response.status}): #{e.response.body}"
-        raise e
-      end
-    end
-  end
 end

data/test/integration/test_off_amazon_payments.rb

@@ -1,7 +1,7 @@
-require 'integration_helper'
+require 'integration_test_helper'
 require 'mws/off_amazon_payments'
 
-class OffAmazonPaymentsTest < IntegrationTest
+class TestOffAmazonPayments < IntegrationTest
   def test_gets_service_status
     clients.each do |client|
       res = client.get_service_status

data/test/integration/test_orders.rb

@@ -1,18 +1,7 @@
-require 'integration_helper'
+require 'integration_test_helper'
 require 'mws/orders'
 
-class OrdersTest < IntegrationTest
-  def a_year_ago
-    Date.today - 365
-  end
-
-  def test_lists_orders
-    clients.each do |client|
-      res = client.list_orders(created_after: a_year_ago)
-      refute_empty res.parse
-    end
-  end
-
+class TestOrders < IntegrationTest
   def test_gets_service_status
     clients.each do |client|
       res = client.get_service_status

data/test/integration/test_products.rb

@@ -1,7 +1,7 @@
-require 'integration_helper'
+require 'integration_test_helper'
 require 'mws/products'
 
-class ProductsTest < IntegrationTest
+class TestProducts < IntegrationTest
   def test_lists_matching_products
     clients.each do |client|
       res = client.list_matching_products('architecture')

data/test/integration/test_recommendations.rb

@@ -1,16 +1,7 @@
-require 'integration_helper'
+require 'integration_test_helper'
 require 'mws/recommendations'
 
-class RecommendationsTest < IntegrationTest
-  def test_gets_last_updated_time_for_recommendations
-    clients.each do |client|
-      res = client.get_last_updated_time_for_recommendations
-      # MWS won't recommend unless account has actual sales
-      skip unless content = res.parse
-      refute_empty content
-    end
-  end
-
+class TestRecommendations < IntegrationTest
   def test_lists_recommendations
     clients.each do |client|
       res = client.list_recommendations

data/test/integration/test_reports.rb

@@ -1,7 +1,7 @@
-require 'integration_helper'
+require 'integration_test_helper'
 require 'mws/reports'
 
-class ReportsTest < IntegrationTest
+class TestReports < IntegrationTest
   def test_gets_report_request_count
     clients.each do |client|
       res = client.get_report_request_count
@@ -31,7 +31,6 @@ class ReportsTest < IntegrationTest
   end
 
   def test_gets_report_count
-    skip("Some endpoints don't work")
     clients.each do |client|
       res = client.get_report_count
       refute_empty res.parse