kmz_compressor 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e0dec3407ff226655aa0aa6a608d3e1a0dc67436
-  data.tar.gz: 502c8a5dbabe34988e8c8efa80302808d699f088
+SHA256:
+  metadata.gz: '0285357fa92cfc382325fb2571dee9fb9d07014253c50b13fa4013f5f4895f2c'
+  data.tar.gz: b46dc5a57ec53f34e5a78f2c6d656832402707994128f73afec9396fc5870694
 SHA512:
-  metadata.gz: 90ccc96b7c12f0b458f3438a1ccd17633f8d8cb77edc8055d3c7e4ea0efeb071d0e8843e502be7d5d7e961e496e34f8fc02b545e1e308672acd08938f55d4685
-  data.tar.gz: 26bb0ba0e26bd3021d3726575507bc79a006109a9dde859366a8b328fb647a2a4aabf3869a68d53fcd9905dfb76a70e61029a7d2e8674860dfb724f8adbabba9
+  metadata.gz: 372278c020ec26c3b92b571be27df158c62eccccabc64971e8b34852e2dffbb3380a12efe35625dff970dcd91b1d1b3284f1a2ee419aa2ae0f3c9e54c8871a9e
+  data.tar.gz: 5e56612ba29b9527e38ae18012739bcff3ab35c22072750ac4698827215925e2625d41808ebd74d26b8a01a4fd2a004372e05714786099777724e1122e994af4

data/app/assets/javascripts/kmz_compressor/map_layer_manager.js

@@ -34,7 +34,6 @@ window.MapLayerManager = function(map){
   }
 
   function loadKMLLayer(kmlURL, layerName, options) {
-      // Replace spaces with pluses so we don't have problems with some things turning them into %20s and some not
       kmlURL = sanitizeURI(kmlURL);
       options = jQuery.extend(true, {zIndex:getDrawOrder(layerName), map:map}, options);
 
@@ -269,28 +268,34 @@ window.MapLayerManager = function(map){
       })
   }
 
-  // Replace spaces with pluses so we don't have problems with some things turning them into %20s and some not
-  // Matches the middleware process
-  function sanitizeURI(uri){
+  function sanitizeURI(uri) {
     var url = urlToObject(uri)
-    var pathname = ('/' + decodeURI(url.pathname)).replace(/^\/+/, '/').trim()                  // Ensure there is a leading slash (IE doesn't provide one, Chrome does, FF does)
-    var search = decodeURIComponent(url.search.replace(/\+/g, '%20')).trim().replace(/^\?/, '') // Ensure all "plus spaces" are hex encoded spaces
+    var pathname = ('/' + decodeURI(url.pathname)).replace(/^\/+/, '/').trim() // Ensure there is a leading slash (IE doesn't provide one, Chrome does, FF does)
 
-    output = pathname
+    var search = url.search.replace(/%26/g, '%2526').replace(/%3D/g, '%253D') // Double encode & and = or else we will be unable to tell them apart from unencoded ones
+    search = search.replace(/\+/g, '%20') // Ensure all "plus spaces" are hex encoded spaces
+    search = decodeURIComponent(search).trim().replace(/^\?/, '') // Remove any leading ?
 
-    if (search !== ''){
-      output += '?'
-    }
+    output = pathname
+    if (search !== '') { output += '?' }
 
     // Encode the individual uri components
     output += $.map(search.split('&'), function(component){
       return $.map(component.split('='), function(kv){
+        // Unencode double encoded & and = from earlier
+        kv = kv.replace(/%26/g, '&').replace(/%3D/g, '=')
+
+        kv = encodeURIComponent(kv)
+
         // HACK: Firefox 'helps' us out by encoding apostrophes as %27 in AJAX requests, However its encodeURIcomponent method
         // does not. This difference causes a mismatch between the url we use to calculate the cache path in the browser
         // and on the server. This hack undoes the damage. See https://bugzilla.mozilla.org/show_bug.cgi?id=407172
-        return encodeURIComponent(kv).replace(/'/g, '%27')
+        kv = kv.replace(/'/g, '%27')
+
+        return kv
       }).join('=')
     }).join('&')
+
     url.href = output
 
     return url.href

data/lib/kmz_compressor/version.rb

@@ -1,3 +1,3 @@
 module KMZCompressor
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kmz_compressor
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-09 00:00:00.000000000 Z
+date: 2018-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: Rack Middleware which retrieves KML from Rails and produces KMZ for the client.