url_tokenizer 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc1c6093170ce607d703963d8d6d76227c35a634
-  data.tar.gz: 39c39fc1ae56dd9fe286e3db59bd588cf90365c7
+  metadata.gz: 383116a0335fab26f54f76cfdd73f05363ab8f50
+  data.tar.gz: 0672bcc8b9ada416f6d3ff903965365961428845
 SHA512:
-  metadata.gz: 3c4157d89ab23ece8988f0c3dfcb94b24a60c98d41863fadd532c211ffc9984e04ebdea0f95671ecccad82e6bbdc557b21d0baa1f9ede2a28b65a91c293ff9e5
-  data.tar.gz: c356ff40f9e68a677e64bffd4481bb4eefeaaef67cf8d322bcfe0611ba31bd068b98ee586030ca801bdb0177f9ab73be9abd50b783bdb31c619915e46e9c1e34
+  metadata.gz: f7b018000703293b316d08edd2bc4c57dea06054753cec2501581bea113116cd4cc7efea241a40abbf34edb0727a7d3ba72959b85e5c97512c96805314edce9d
+  data.tar.gz: a63a20a9315b0ec9a5659bc96d1623e12bffbe75f2b1e040c8b9fec9fd1e897b641878d9cae05ca01d9ebdec92476e2ef5e4d3ca934d69f3ea61544d20e4b6f6

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.3.1

data/lib/url_tokenizer/fastly.rb

@@ -7,21 +7,28 @@ module UrlTokenizer
     def call(input_url, **options)
       options = global_options.merge options
       uri = URI.parse input_url
-      path = uri.path
+      path = remove_old_token(uri.path)
+
       return if path.empty? || path == '/'
 
       expiration = expiration_date(options[:expires_in])
+      dir = File.dirname(path)
 
-      token = digest [path, expiration].compact.join
+      token = digest [dir, expiration].compact.join
       token = [expiration, token].compact.join '_'
 
-      uri.query = build_query token: token
+      uri.path = ['/', token, path].join
       uri.to_s
     end
 
     private
+
     def digest(string_to_sign)
       OpenSSL::HMAC.hexdigest('sha1', key, string_to_sign)
     end
+
+    def remove_old_token(path)
+      path.sub(/\d{10,}_\w{40}\/?/, '')
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: url_tokenizer
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Alexander Paramonov