active_fulfillment 3.2.8 → 3.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa2427ef745737a0dfb2284df85693cec175294067469843760134665ef85415
-  data.tar.gz: 856771fc183ba05a3160eb6864256e6fa7393f6fc19327192e439581fdf12e70
+  metadata.gz: 3d2f2bc1e7527f482f533716bc17c0d590807f9a91d29c5eb60ca6b96f943aab
+  data.tar.gz: b0e85546fe8d3942a241771de702ae9cad16f5b543470a2eceb94dbdb668c624
 SHA512:
-  metadata.gz: 4c3c4241f4623d7313772e6a8200fe13b6307edd73e3289e0549a5601d30304f31daae6ebb6246724f62e2f1e2b31d138c93c9f6fe1da9b5244fde553f656f93
-  data.tar.gz: cf6c27339ebe46e2afed84510de1f7cf9635e1facd208ad209644fe46cf4e3f053da4782ee19251d31bd9c2a5accf166123bf749ff9afaea0b83c1f6c8689cd0
+  metadata.gz: 8cd7609c6cfd4df16874a25c2319267d6aac8d58ed9755ddeadeb6467750c3c8794d95197f051e81137a3ce358333670cf51b7e3c7250cba62fd4705af96675e
+  data.tar.gz: da98accaf911f8a6d6ee152feafc400a9425c567c62a4aff908ea9ce4c1b67fe500d392442685a1d88d2747446c6a7f5924588a0b648ede78c319e1233257c8d

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # ActiveFulfillment changelog
 
+### Version 3.2.10 (September 1, 2020)
+- Relax ruby version requirement to allow installation on Ruby 3.0
+
+### Version 3.2.9 (January 30, 2020)
+- Fix an issue with trailing slash on callback urls
+
 ### Version 3.2.8 (December 20, 2019)
 - Sending MarketplaceId for all Amazon requests
 

data/lib/active_fulfillment/services/shopify_api.rb

@@ -68,7 +68,7 @@ module ActiveFulfillment
     private
 
     def request_uri(action, data)
-      URI.parse "#{@callback_url}/#{action}.#{@format}?#{data.to_query}"
+      url = URI.join(@callback_url, "#{action}.#{@format}?#{data.to_query}")
     end
 
     def send_app_request(action, headers, data)

data/lib/active_fulfillment/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module ActiveFulfillment
-  VERSION = "3.2.8"
+  VERSION = "3.2.10"
 end

data/test/unit/services/shopify_api_test.rb

@@ -22,6 +22,19 @@ class ShopifyAPITest < Minitest::Test
     end
   end
 
+  def test_request_uri_is_correct_when_callback_url_has_trailing_slash
+    Timecop.freeze do
+      service = build_service(callback_url: 'http://supershopifyapptwin.com/')
+      timestamp = Time.now.utc.to_i
+      uri = service.send(:request_uri, 'fetch_stock', {sku: '123', timestamp: timestamp, shop: 'www.snowwowdevil.ca'})
+      assert_equal "http://supershopifyapptwin.com/fetch_stock.json?shop=www.snowwowdevil.ca&sku=123&timestamp=#{timestamp}", uri.to_s
+
+      service = build_service(callback_url: 'http://supershopifyapptwin.com')
+      uri = service.send(:request_uri, 'fetch_stock', {sku: '123', timestamp: timestamp, shop: 'www.snowwowdevil.ca'})
+      assert_equal "http://supershopifyapptwin.com/fetch_stock.json?shop=www.snowwowdevil.ca&sku=123&timestamp=#{timestamp}", uri.to_s
+    end
+  end
+
   def test_response_from_failed_stock_request
     mock_app_request('fetch_stock', anything, nil)
     response = @service.fetch_stock_levels()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_fulfillment
 version: !ruby/object:Gem::Version
-  version: 3.2.8
+  version: 3.2.10
 platform: ruby
 authors:
 - Cody Fauser
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-20 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -170,14 +170,15 @@ files:
 homepage: http://github.com/shopify/active_fulfillment
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -192,14 +193,14 @@ specification_version: 4
 summary: Framework and tools for dealing with shipping, tracking and order fulfillment
   services.
 test_files:
+- test/remote/amazon_mws_test.rb
+- test/remote/james_and_james_test.rb
+- test/remote/webgistix_test.rb
+- test/remote/shipwire_test.rb
 - test/unit/base_test.rb
 - test/unit/services/amazon_mws_test.rb
+- test/unit/services/james_and_james_test.rb
 - test/unit/services/webgistix_test.rb
 - test/unit/services/shopify_api_test.rb
 - test/unit/services/shipwire_test.rb
-- test/unit/services/james_and_james_test.rb
 - test/test_helper.rb
-- test/remote/amazon_mws_test.rb
-- test/remote/webgistix_test.rb
-- test/remote/shipwire_test.rb
-- test/remote/james_and_james_test.rb