active_fulfillment 3.0.0.pre7 → 3.0.0.pre8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29a4fec3de142f490e9532546920f1badabb155f
-  data.tar.gz: 3a603f15f239767db8ca8bb3749f0501a64ab44d
+  metadata.gz: 81e4d46fc9e29790dedd89eeab465416f9bc2b8e
+  data.tar.gz: f8b1cb46b86a27625bb50fc3a68e4c301eed1315
 SHA512:
-  metadata.gz: 7775f6ec5b95a3750097587b34a73fba8ec83905167826aea18d355f099e717f7fb31eeb610ab8895d487e8d626c1c148f792e06e8baf331d2ba087a19ec6ee2
-  data.tar.gz: f3d6f781d3b23b7fb81a093c586855ed4f4bdd0a6a24b42fa4f88c6fffe4017e8bd388fdfed31927f0c0892984c86ea1a73f82dd65439859438d1b0c8b167454
+  metadata.gz: faff4e5e9c15dda5586ead4afcb10a973d78ddbf56f4bac42ae7403e7a90ff1f2558287ee23e0878c08dc0bea01259ad03d28a47ce12fcdc63a3c8a7b28285e5
+  data.tar.gz: 06bbeab03d5155dd553af4ffe72fae585aeb06764e904218f5310e75c6f04933e90b0adeb71a95da7289b7efd9953ef40ed0f10ee01f5bbb72c12488268e1393

data/lib/active_fulfillment/services/amazon_mws.rb

@@ -85,21 +85,21 @@ module ActiveFulfillment
     def fulfill(order_id, shipping_address, line_items, options = {})
       requires!(options, :order_date, :shipping_method)
       with_error_handling do
-        data = commit :post, 'CreateFulfillmentOrder', build_fulfillment_request(order_id, shipping_address, line_items, options)
+        data = commit :post, 'FulfillmentOutboundShipment', build_fulfillment_request(order_id, shipping_address, line_items, options)
         parse_fulfillment_response(parse_document(data), 'Successfully submitted the order')
       end
     end
 
     def status
       with_error_handling do
-        data = commit :post, 'GetServiceStatus', build_basic_api_query({ :Action => 'GetServiceStatus' })
+        data = commit :post, 'FulfillmentOutboundShipment', build_basic_api_query({ :Action => 'GetServiceStatus' })
         parse_tracking_response(parse_document(data))
       end
     end
 
     def fetch_current_orders
       with_error_handling do
-        data = commit :post, 'GetServiceStatus', build_get_current_fulfillment_orders_request
+        data = commit :post, 'FulfillmentOutboundShipment', build_get_current_fulfillment_orders_request
         parse_tracking_response(parse_document(data))
       end
     end
@@ -107,12 +107,12 @@ module ActiveFulfillment
     def fetch_stock_levels(options = {})
       options[:skus] = [options.delete(:sku)] if options.include?(:sku)
       response = with_error_handling do
-        data = commit :post, 'ListInventorySupply', build_inventory_list_request(options)
+        data = commit :post, 'FulfillmentInventory', build_inventory_list_request(options)
         parse_inventory_response(parse_document(data))
       end
       while token = response.params['next_token'] do
         next_page = with_error_handling do
-          data = commit :post, 'ListInventorySupplyByNextToken', build_next_inventory_list_request(token)
+          data = commit :post, 'FulfillmentInventory', build_next_inventory_list_request(token)
           parse_inventory_response(parse_document(data))
         end
 
@@ -130,7 +130,7 @@ module ActiveFulfillment
       order_ids.reduce(nil) do |previous, order_id|
         index += 1
         response = with_error_handling do
-          data = commit :post, 'GetFulfillmentOrder', build_tracking_request(order_id, options)
+          data = commit :post, 'FulfillmentOutboundShipment', build_tracking_request(order_id, options)
           parse_tracking_response(parse_document(data))
         end
 
@@ -241,7 +241,6 @@ module ActiveFulfillment
       response[:next_token] = next_token ? next_token.text : nil
 
       response[:response_status] = SUCCESS
-      response
       Response.new(success?(response), message_from(response), response)
     end
 

data/lib/active_fulfillment/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module ActiveFulfillment
-  VERSION = "3.0.0.pre7"
+  VERSION = "3.0.0.pre8"
 end

data/test/unit/services/amazon_mws_test.rb

@@ -245,7 +245,9 @@ class AmazonMarketplaceWebServiceTest < Minitest::Test
   end
 
   def test_successful_fulfillment
-    @service.expects(:ssl_post).returns(successful_fulfillment_response)
+    @service.expects(:ssl_post).with do |uri, query, headers|
+      assert_equal 'https://mws.amazonservices.com/FulfillmentOutboundShipment/2010-10-01', uri
+    end.returns(successful_fulfillment_response)
     response = @service.fulfill('12345678', @address, @line_items, @options)
     assert response.success?
   end
@@ -276,7 +278,9 @@ class AmazonMarketplaceWebServiceTest < Minitest::Test
   end
 
   def test_get_inventory
-    @service.expects(:ssl_post).returns(xml_fixture('amazon_mws/inventory_list_inventory_supply'))
+    @service.expects(:ssl_post).with do |uri, _, _|
+      assert_equal 'https://mws.amazonservices.com/FulfillmentInventory/2010-10-01', uri
+    end.returns(xml_fixture('amazon_mws/inventory_list_inventory_supply'))
 
     @service.class.logger.expects(:info).with do |message|
       assert_match /ListInventorySupply/, message unless message.include?('ListInventorySupplyResult')
@@ -293,10 +297,12 @@ class AmazonMarketplaceWebServiceTest < Minitest::Test
 
   def test_get_inventory_multipage
     @service.expects(:ssl_post).with() { |uri, query, headers|
+      assert_equal 'https://mws.amazonservices.com/FulfillmentInventory/2010-10-01', uri
       query.include?('ListInventorySupply') && !query.include?('ListInventorySupplyByNextToken')
     }.returns(xml_fixture('amazon_mws/inventory_list_inventory_supply_by_next_token'))
 
     @service.expects(:ssl_post).with() { |uri, query, headers|
+      assert_equal 'https://mws.amazonservices.com/FulfillmentInventory/2010-10-01', uri
       assert query.include?('login')
       query.include?('ListInventorySupplyByNextToken') && query.include?('NextToken')
     }.returns(xml_fixture('amazon_mws/inventory_list_inventory_supply'))
@@ -312,15 +318,15 @@ class AmazonMarketplaceWebServiceTest < Minitest::Test
 
   def test_get_inventory_multipage_missing_stock
 
-    @service.expects(:ssl_post).with() { |uri, query, headers|
+    @service.expects(:ssl_post).with { |uri, query, headers|
       query.include?('ListInventorySupply') && !query.include?('ListInventorySupplyByNextToken')
     }.returns(xml_fixture('amazon_mws/inventory_list_inventory_supply_by_next_token'))
 
     # force missing stock by returning token'd ssl_post with a 503 error
     http_response = build_mock_response(response_from_503, "", 503)
-    @service.expects(:ssl_post).with() { |uri, query, headers|
+    @service.expects(:ssl_post).with do |uri, query, headers|
       query.include?('ListInventorySupplyByNextToken') && query.include?('NextToken')
-    }.raises(ActiveUtils::ResponseError.new(http_response))
+    end.raises(ActiveUtils::ResponseError.new(http_response))
 
     response = @service.fetch_stock_levels
     assert !response.success?
@@ -332,8 +338,9 @@ class AmazonMarketplaceWebServiceTest < Minitest::Test
   end
 
   def test_fetch_tracking_numbers
-    @service.expects(:ssl_post).twice.
-      returns(xml_fixture('amazon_mws/fulfillment_get_fulfillment_order')).
+    @service.expects(:ssl_post).twice.with do |uri, query, headers|
+      assert_equal 'https://mws.amazonservices.com/FulfillmentOutboundShipment/2010-10-01', uri
+    end.returns(xml_fixture('amazon_mws/fulfillment_get_fulfillment_order')).
       returns(xml_fixture('amazon_mws/fulfillment_get_fulfillment_order_2'))
 
     response = @service.fetch_tracking_numbers(['extern_id_1154539615776', 'extern_id_1154539615777'])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_fulfillment
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre7
+  version: 3.0.0.pre8
 platform: ruby
 authors:
 - Cody Fauser