active_fulfillment 2.1.8 → 2.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea505b9200ab9ce56aa78d4ce33ca1d2a463ef75
-  data.tar.gz: 5545000751eb0953f98162c575d7d7fb6716fb85
+  metadata.gz: 908c6b7616644ccd234c5bcb5291ce17c71bacbc
+  data.tar.gz: a8e969ac0783a479a4001a90aee2655cea935bf9
 SHA512:
-  metadata.gz: 0380c97200c34c13f1fbdcdb0101e2ba4899977a34b627d08503d202df7c67f28d3e4fb13cefd6a91954b4d1ab6ebde6bb533ff5d2bd62be198f9fff9f11e617
-  data.tar.gz: 81ac1667af7a67cd7202a7137c8d58f3c9e08b8e05c067b20e4cd1c4123ff576866358b2123e0594669bce1969913624799fe17602f4f7250a01d4929a3ac82c
+  metadata.gz: a1fc6a0fa38da6054d7553ac8c6741ad8dba55f077b70c7f6662a5396b898955afa370b55341db68f692e455f930b0d3f5229d3ba17801b5eecf33ffcd2eb6dc
+  data.tar.gz: fa0eb29009332c2090a66fdad0c89dbc23df137ef03f88b033f8cd932b22ef3d7ea64d7ab3fd6d3b5108174e2efc7a2f1433b11562b313dd60b94e86d488278a

data/lib/active_fulfillment/fulfillment/services/shopify_api.rb

@@ -2,6 +2,8 @@ module ActiveMerchant
   module Fulfillment
     class ShopifyAPIService < Service
 
+      OrderIdCutoffDate = Date.iso8601("2015-03-01")
+
       RESCUABLE_CONNECTION_ERRORS = [
         Net::ReadTimeout,
         Net::OpenTimeout,
@@ -47,8 +49,8 @@ module ActiveMerchant
         end
       end
 
-      def fetch_tracking_data(order_ids, options = {})
-        options.merge!({:order_ids => order_ids})
+      def fetch_tracking_data(order_numbers, options = {})
+        options.merge!({:order_ids => order_numbers, :order_names => order_numbers})
         response = send_app_request('fetch_tracking_numbers', options.delete(:headers), options)
         if response
           tracking_numbers = parse_response(response, 'TrackingNumbers', 'Order', 'ID', 'Tracking') { |o| o }
@@ -56,7 +58,7 @@ module ActiveMerchant
                                                       :tracking_companies => {},
                                                       :tracking_urls => {}})
         else
-          Response.new(false, "Unable to fetch remote tracking numbers #{order_ids.inspect}")
+          Response.new(false, "Unable to fetch remote tracking numbers #{order_numbers.inspect}")
         end
       end
 

data/lib/active_fulfillment/fulfillment/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module ActiveMerchant
   module Fulfillment
-    VERSION = "2.1.8"
+    VERSION = "2.1.9"
   end
 end

data/test/unit/services/shopify_api_test.rb

@@ -68,9 +68,13 @@ class ShopifyAPITest < Test::Unit::TestCase
     service = build_service(format: 'xml')
     xml = '<TrackingNumbers><Order><ID>123</ID><Tracking>abc</Tracking></Order><Order><ID>456</ID><Tracking>def</Tracking></Order></TrackingNumbers>'
     expected = {'123' => 'abc', '456' => 'def'}
+    request_params = {order_ids: [1, 2, 4], order_names: [1, 2, 4]}
 
-    mock_app_request('fetch_tracking_numbers', anything, xml)
+    mock_app_request('fetch_tracking_numbers', request_params, xml)
     assert_equal expected, service.fetch_tracking_data([1,2,4]).tracking_numbers
+
+    after_deprecation = Time.now.to_date >= ShopifyAPIService::OrderIdCutoffDate
+    flunk "The request params should no longer include 'order_ids'" if after_deprecation
   end
 
   def test_parse_stock_level_response_parses_json_with_root_correctly

metadata

@@ -1,37 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: active_fulfillment
 version: !ruby/object:Gem::Version
-  version: 2.1.8
+  version: 2.1.9
 platform: ruby
 authors:
 - Cody Fauser
 - James MacAulay
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MQ8wDQYDVQQDDAZhZG1p
-  bnMxFzAVBgoJkiaJk/IsZAEZFgdzaG9waWZ5MRMwEQYKCZImiZPyLGQBGRYDY29t
-  MB4XDTE0MDUxNTIwMzM0OFoXDTE1MDUxNTIwMzM0OFowPzEPMA0GA1UEAwwGYWRt
-  aW5zMRcwFQYKCZImiZPyLGQBGRYHc2hvcGlmeTETMBEGCgmSJomT8ixkARkWA2Nv
-  bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL0/81O3e1vh5smcwp2G
-  MpLQ6q0kejQLa65bPYPxdzWA1SYOKyGfw+yR9LdFzsuKpwWzKq6zX35lj1IckWS4
-  bNBEQzxmufUxU0XPM02haFB8fOfDJzdXsWte9Ge4IFwahwn68gpMqN+BvxL+KMYz
-  Iut9YmN44d4LZdsENEIO5vmybuG2vYDz7R56qB0PA+Q2P2CdhymsBad2DQs69FBo
-  uico9V6VMYYctL9lCYdzu9IXrOYNTt88suKIVzzAlHOKeN0Ng5qdztFoTR8sfxDr
-  Ydg3KHl5n47wlpgd8R0f/4b5gGxW+v9pyJCgQnLlRu7DedVSvv7+GMtj3g9r3nhJ
-  KqECAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFI/o
-  maf34HXbUOQsdoLHacEKQgunMB0GA1UdEQQWMBSBEmFkbWluc0BzaG9waWZ5LmNv
-  bTAdBgNVHRIEFjAUgRJhZG1pbnNAc2hvcGlmeS5jb20wDQYJKoZIhvcNAQEFBQAD
-  ggEBADkK9aj5T0HPExsov4EoMWFnO+G7RQ28C30VAfKxnL2UxG6i4XMHVs6Xi94h
-  qXFw1ec9Y2eDUqaolT3bviOk9BB197+A8Vz/k7MC6ci2NE+yDDB7HAC8zU6LAx8Y
-  Iqvw7B/PSZ/pz4bUVFlTATif4mi1vO3lidRkdHRtM7UePSn2rUpOi0gtXBP3bLu5
-  YjHJN7wx5cugMEyroKITG5gL0Nxtu21qtOlHX4Hc4KdE2JqzCPOsS4zsZGhgwhPs
-  fl3hbtVFTqbOlwL9vy1fudXcolIE/ZTcxQ+er07ZFZdKCXayR9PPs64heamfn0fp
-  TConQSX2BnZdhIEYW+cKzEC/bLc=
-  -----END CERTIFICATE-----
-date: 2014-09-03 00:00:00.000000000 Z
+cert_chain: []
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -240,41 +218,41 @@ specification_version: 4
 summary: Framework and tools for dealing with shipping, tracking and order fulfillment
   services.
 test_files:
-- test/test_helper.rb
-- test/remote/amazon_test.rb
-- test/remote/webgistix_test.rb
-- test/remote/shipwire_test.rb
-- test/remote/amazon_mws_test.rb
-- test/unit/services/shopify_api_test.rb
-- test/unit/services/amazon_test.rb
-- test/unit/services/webgistix_test.rb
-- test/unit/services/shipwire_test.rb
-- test/unit/services/amazon_mws_test.rb
-- test/unit/base_test.rb
-- test/fixtures/xml/webgistix/multiple_tracking_response.xml
-- test/fixtures/xml/webgistix/tracking_response.xml
+- test/fixtures/xml/amazon/inventory_get_response.xml
+- test/fixtures/xml/amazon/inventory_list_response.xml
+- test/fixtures/xml/amazon/inventory_list_response_with_next_1.xml
+- test/fixtures/xml/amazon/inventory_list_response_with_next_2.xml
+- test/fixtures/xml/amazon/tracking_response_1.xml
+- test/fixtures/xml/amazon/tracking_response_2.xml
+- test/fixtures/xml/amazon/tracking_response_error.xml
+- test/fixtures/xml/amazon/tracking_response_not_found.xml
+- test/fixtures/xml/amazon_mws/fulfillment_get_fulfillment_order.xml
 - test/fixtures/xml/amazon_mws/fulfillment_get_fulfillment_order_2.xml
-- test/fixtures/xml/amazon_mws/tracking_response_error.xml
-- test/fixtures/xml/amazon_mws/inventory_list_inventory_supply_by_next_token.xml
-- test/fixtures/xml/amazon_mws/inventory_list_inventory_supply.xml
+- test/fixtures/xml/amazon_mws/fulfillment_get_fullfillment_order_with_multiple_tracking_numbers.xml
 - test/fixtures/xml/amazon_mws/fulfillment_list_all_fulfillment_orders.xml
-- test/fixtures/xml/amazon_mws/tracking_response_not_found.xml
-- test/fixtures/xml/amazon_mws/fulfillment_get_fulfillment_order.xml
 - test/fixtures/xml/amazon_mws/inventory_list_inventory_item_supply.xml
-- test/fixtures/xml/amazon_mws/fulfillment_get_fullfillment_order_with_multiple_tracking_numbers.xml
+- test/fixtures/xml/amazon_mws/inventory_list_inventory_supply.xml
+- test/fixtures/xml/amazon_mws/inventory_list_inventory_supply_by_next_token.xml
+- test/fixtures/xml/amazon_mws/tracking_response_error.xml
+- test/fixtures/xml/amazon_mws/tracking_response_not_found.xml
+- test/fixtures/xml/shipwire/fulfillment_failure_response.xml
+- test/fixtures/xml/shipwire/invalid_login_response.xml
 - test/fixtures/xml/shipwire/inventory_get_response.xml
-- test/fixtures/xml/shipwire/successful_tracking_response.xml
 - test/fixtures/xml/shipwire/successful_empty_tracking_response.xml
-- test/fixtures/xml/shipwire/successful_tracking_response_with_tracking_urls.xml
 - test/fixtures/xml/shipwire/successful_live_tracking_response.xml
-- test/fixtures/xml/shipwire/invalid_login_response.xml
-- test/fixtures/xml/shipwire/fulfillment_failure_response.xml
-- test/fixtures/xml/amazon/inventory_get_response.xml
-- test/fixtures/xml/amazon/inventory_list_response_with_next_1.xml
-- test/fixtures/xml/amazon/tracking_response_2.xml
-- test/fixtures/xml/amazon/tracking_response_error.xml
-- test/fixtures/xml/amazon/inventory_list_response.xml
-- test/fixtures/xml/amazon/tracking_response_1.xml
-- test/fixtures/xml/amazon/inventory_list_response_with_next_2.xml
-- test/fixtures/xml/amazon/tracking_response_not_found.xml
+- test/fixtures/xml/shipwire/successful_tracking_response.xml
+- test/fixtures/xml/shipwire/successful_tracking_response_with_tracking_urls.xml
+- test/fixtures/xml/webgistix/multiple_tracking_response.xml
+- test/fixtures/xml/webgistix/tracking_response.xml
 - test/fixtures.yml
+- test/remote/amazon_mws_test.rb
+- test/remote/amazon_test.rb
+- test/remote/shipwire_test.rb
+- test/remote/webgistix_test.rb
+- test/test_helper.rb
+- test/unit/base_test.rb
+- test/unit/services/amazon_mws_test.rb
+- test/unit/services/amazon_test.rb
+- test/unit/services/shipwire_test.rb
+- test/unit/services/shopify_api_test.rb
+- test/unit/services/webgistix_test.rb

data.tar.gz.sig

@@ -1,6 +0,0 @@
-q
-�Z	nG�b�VdpD�����[��������?��v�Pʋ�q�S�9
-v��2Pb�����3K���y�_<*\�����W7T������X�Q�#t�
-��d��L>1�jQ��gr`���1<R��气��۽hR�W^�0�+��)�	3
-�RjZ�K��>#�;\�TT��/�׳��-�/f�2�v����;�~8����;�y�e)�h�E�R}	5Qk��ƝL|`
-^����?������k3�

metadata.gz.sig

@@ -1,2 +0,0 @@
-��qUBI=&n�Tc*s_����!�/_3*hʹ�M�D��ϻX�C9�<O�'����.��Q�9�
-;��NK$���JRsOwxm���F�ngV�f��!O<|.�q4�N�|?D�<��E���