active_fulfillment 3.2.10 → 3.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d2f2bc1e7527f482f533716bc17c0d590807f9a91d29c5eb60ca6b96f943aab
-  data.tar.gz: b0e85546fe8d3942a241771de702ae9cad16f5b543470a2eceb94dbdb668c624
+  metadata.gz: 5a9b9b2acd1f20e8d2ada62d9bc3d0544dc51f72fcbb9bc473f9958efd6c0d7b
+  data.tar.gz: b9e205c36d36a4e7fabc9890d9e54572531e143df9fc89f1121e958b4267884f
 SHA512:
-  metadata.gz: 8cd7609c6cfd4df16874a25c2319267d6aac8d58ed9755ddeadeb6467750c3c8794d95197f051e81137a3ce358333670cf51b7e3c7250cba62fd4705af96675e
-  data.tar.gz: da98accaf911f8a6d6ee152feafc400a9425c567c62a4aff908ea9ce4c1b67fe500d392442685a1d88d2747446c6a7f5924588a0b648ede78c319e1233257c8d
+  metadata.gz: 0c231a91b35cdda7ba0395c3c5190b1401902b6b2ca6ec7266de08a25f231e507591057f4b1a3b551f84b67eeabd4b21139e6b023cdbfb5f179825bfb73a8bf8
+  data.tar.gz: f0bfa7d61333afb33f453587a609749035e6288519541e5beb76d0b4d5a86b209a4f10677410c7b528dca4ff816af01be285d07fa0d648f98dc933c535aa813b

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # ActiveFulfillment changelog
 
+### Version 3.2.11 (September 11, 2020)
+- Fix callback url to handle trailing segment and trailing slash
+
 ### Version 3.2.10 (September 1, 2020)
 - Relax ruby version requirement to allow installation on Ruby 3.0
 

data/lib/active_fulfillment/services/shopify_api.rb

@@ -68,7 +68,7 @@ module ActiveFulfillment
     private
 
     def request_uri(action, data)
-      url = URI.join(@callback_url, "#{action}.#{@format}?#{data.to_query}")
+      url = File.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.10"
+  VERSION = "3.2.11"
 end

data/test/unit/services/shopify_api_test.rb

@@ -35,6 +35,19 @@ class ShopifyAPITest < Minitest::Test
     end
   end
 
+  def test_request_uri_is_correct_when_callback_url_has_additional_element
+    Timecop.freeze do
+      service = build_service(callback_url: 'https://dotcom-prod.bluemercuryio.com/v1/dotcom')
+      timestamp = Time.now.utc.to_i
+      uri = service.send(:request_uri, 'fetch_stock', {sku: '123', timestamp: timestamp, shop: 'www.snowwowdevil.ca'})
+      assert_equal "https://dotcom-prod.bluemercuryio.com/v1/dotcom/fetch_stock.json?shop=www.snowwowdevil.ca&sku=123&timestamp=#{timestamp}", uri.to_s
+
+      service = build_service(callback_url: 'http://supershopifyapptwin.com/shopify/')
+      uri = service.send(:request_uri, 'fetch_stock', {sku: '123', timestamp: timestamp, shop: 'www.snowwowdevil.ca'})
+      assert_equal "http://supershopifyapptwin.com/shopify/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.10
+  version: 3.2.11
 platform: ruby
 authors:
 - Cody Fauser
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-01 00:00:00.000000000 Z
+date: 2020-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport