normalize_url 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc28344596c36795dbe9e99a32aafef83338b833
-  data.tar.gz: f6d80c0b99786a59e03bd4a79a9da857ce6cabc8
+  metadata.gz: 7aaea38f5f19347a15ea18728ae96f405c81ce03
+  data.tar.gz: 73a549a8aaf2941a3ad7e9f477e13dbb10fa2eb7
 SHA512:
-  metadata.gz: ea1afeacb3afecd2925ad6f21ff453a4aba887e34e58d900c3ae1444d8b35e0825071f385278ee5530fb5d802eafe763d1413f65b7e1f3bd59df0dca5151088c
-  data.tar.gz: 1ee821c5e8a359a8d2cb6065add1d3068fa3b5e6c851cdb5614d4b80bbf9fcc8fb6857220ee3596bdf45de8b581d36d711b552a17f025364ad5efae3ac82e70e
+  metadata.gz: 8d522e53f691736bb59295b06de9a6278b50394a77043c57a3b6291a22665185942ee4d68bc7658b2ca50ab7a2ba1eae67a52a1c6a6fe0fd2838ec038f5ef7e5
+  data.tar.gz: 4bfc571d1283e71f67cd2db0ce577a4f036e8e663cb1b6c54e3e9060236692cd13b7a3cc8a00f8ec6e27856c2af21391903ff150536c6f6aa773fb62e632fd3a

data/README.md

@@ -15,7 +15,7 @@ For example:
 - `http://example.com/foo/../products?product_id=123`
 - `http://example.com/products?product_id=123#comments-section`
 - `http://example.com//products/?product_id=123`
-- `http://example.com//products/?product_id=123&`
+- `http://example.com/products/?product_id=123&`
 - `http://example.com/products?utm_source=whatever&product_id=123&utm_medium=twitter&utm_campaign=blah`
 
 will all become `http://example.com/products?product_id=123` after normalization.
@@ -46,10 +46,11 @@ Or install it yourself as:
 NormalizeUrl.process("http://example.com/products/?foo=bar&baz") # => "http://example.com/products?baz&foo=bar"
 ```
 
-Each tranformation could be skipped by demand. All you need is to pass it as a
-optional value to `normalize` method:
+Some tranformations could be skipped by demand. All you need is to pass its
+name as a optional value to `normalize` method:
 
 ```ruby
+NormalizeUrl.process("http://example.com/foo/") # => "http://example.com/foo"
 NormalizeUrl.process("http://example.com/foo/", remove_trailing_slash: false) # => "http://example.com/foo/"
 ```
 
@@ -73,12 +74,6 @@ NormalizeUrl.process("http://example.com/foo/", remove_trailing_slash: false) #
 
     `http://example.com/foo#bar` -> `http://example.com/foo`
 
-- Reparse query params. Option `:reparse_query`.
-
-    Example:
-
-    `http://example.com/?foo=BAR+BAZ` -> `http://example.com/?foo=BAR%20BAZ`
-
 - Remove known commonly used tracking query parameters. Option `:remove_tracking`.
 
     Example:

data/lib/normalize_url/normalizer.rb

@@ -30,10 +30,7 @@ module NormalizeUrl
       process :remove_trailing_slash
       process :remove_repeating_slashes
       process :remove_hash
-      process :reparse_query
-      process :remove_tracking
-      process :remove_params
-      process :sort_query
+      process_query
       uri.to_s
     end
 
@@ -43,18 +40,25 @@ module NormalizeUrl
       send "process_#{step}" if process?(step)
     end
 
+    def process_query
+      query_values = uri.query_values
+      return if query_values.nil?
+
+      query_values = remove_params(query_values, TRACKING_QUERY_PARAMS) if process?(:remove_tracking)
+      query_values = remove_params(query_values, params_to_remove) if process?(:remove_params)
+      query_values = query_values.to_a unless process?(:sort_query)
+
+      uri.query_values = query_values.empty? ? nil : query_values
+    end
+
     def process?(step)
-      @options.fetch(step, true)
+      options.fetch(step, true)
     end
 
     def process_remove_trailing_slash
       uri.path = uri.path.chomp(?/) unless uri.path == ?/
     end
 
-    def process_sort_query
-      uri.query = uri.query.split(?&).sort.join(?&) if uri.query
-    end
-
     def process_remove_hash
       uri.fragment = nil
     end
@@ -63,32 +67,16 @@ module NormalizeUrl
       uri.path = uri.path.squeeze(?/) if uri.host
     end
 
-    def process_remove_tracking
-      remove_params TRACKING_QUERY_PARAMS
-    end
-
-    def process_remove_params
-      remove_params Array(@options.fetch(:remove_params, nil)).map(&:to_s)
-    end
-
-    def process_reparse_query
-      uri.query_values = uri.query_values.to_a
-    end
-
-    def remove_params(params)
-      return unless uri.query_values
-      original = uri.query_values
-      cleaned = original.reject{ |key, _| params.include?(key) }
-
-      if cleaned.empty?
-        uri.query_values = nil
-      elsif cleaned != original
-        uri.query_values = cleaned
-      end
+    def remove_params(query_values, params)
+      query_values.reject{ |key, _| params.include?(key) }
     end
 
     def fail_uri(message)
       fail ArgumentError, message
     end
+
+    def params_to_remove
+      Array(options.fetch(:remove_params, nil)).map(&:to_s)
+    end
   end
 end

data/lib/normalize_url/version.rb

@@ -1,3 +1,3 @@
 module NormalizeUrl
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: normalize_url
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Pavel Pravosud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable