url_tokenizer 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 383116a0335fab26f54f76cfdd73f05363ab8f50
-  data.tar.gz: 0672bcc8b9ada416f6d3ff903965365961428845
+  metadata.gz: 1b457a2c1764fdf030bb170f3c9772eff9f01238
+  data.tar.gz: 843287412ab80ef4a06e147060d91055caaeb5b1
 SHA512:
-  metadata.gz: f7b018000703293b316d08edd2bc4c57dea06054753cec2501581bea113116cd4cc7efea241a40abbf34edb0727a7d3ba72959b85e5c97512c96805314edce9d
-  data.tar.gz: a63a20a9315b0ec9a5659bc96d1623e12bffbe75f2b1e040c8b9fec9fd1e897b641878d9cae05ca01d9ebdec92476e2ef5e4d3ca934d69f3ea61544d20e4b6f6
+  metadata.gz: b82d7e5d12b2221d486d27885612b77dc9218b060204a3ef21c1832d7e07604b5d36e488b2d2998ed8382acc4b753ef9486a93671f87ae7143e404c810e2961f
+  data.tar.gz: c4ee7dc583c929b493acf07d0a739f22a572a002f1bd5eb08bd0874493996d625f3c16b0fbc52f1c733d83dc9cd404783120b661f194566363d380a57366f9be

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.4.0

data/lib/url_tokenizer/fastly_query_string.rb

@@ -1,4 +1,5 @@
 require_relative 'fastly'
+require 'rack'
 
 module UrlTokenizer
   class FastlyQueryString < Fastly
@@ -9,13 +10,31 @@ module UrlTokenizer
       return if path.empty? || path == '/'
 
       expiration = expiration_date(options[:expires_in])
-      dir = File.dirname(path)
 
-      token = digest [dir, expiration].compact.join
+      token = digest [string_to_tokenize(uri), expiration].compact.join
       token = [expiration, token].compact.join '_'
 
-      uri.query = build_query token: token
+      params = parse_query_string(uri).merge(token: token)
+
+      uri.query = build_query params
       uri.to_s
     end
+
+    def string_to_tokenize(uri)
+      query = parse_query_string(uri)
+      return query['chname'] if query.include?('chname')
+
+      File.basename File.dirname(uri.path)
+    end
+
+    private
+
+    def parse_query_string(uri)
+      return {} if uri.query.nil?
+
+      Rack::Utils.parse_query(uri.query).tap do |params|
+        params.delete('token')
+      end
+    end
   end
 end

data/url_tokenizer.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.0"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rack"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "dotenv"
   spec.add_development_dependency "codeclimate-test-reporter"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: url_tokenizer
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Alexander Paramonov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-10 00:00:00.000000000 Z
+date: 2017-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facets
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -154,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Tokenize url by variety of providers.