kmz_compressor 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a10ed4adcc4059b1d999b870c6f457c7907a3e7
-  data.tar.gz: 3386d433d119d2f9ab293913e3b1488eadbbfc13
+  metadata.gz: c576bf27491bbd056f5568cd90b92e515825298d
+  data.tar.gz: d95f6409fe18975bd648b162c8d559e8f6d2dc9f
 SHA512:
-  metadata.gz: 205e3a574d77b626fd80812f26c67b5b773a0b8631d51cd0a6b52aeb302bebb5b5359a11ddebb52571164139b4d14b321b30a6a27928f54038709f14c1c4d04d
-  data.tar.gz: 7c72ecb00d9fd470d893ab281acd9d345ddf7f4da490b34f5cdfb30e17fcf2932e80c764e8751fe971ec9b071033174debcf342ad98dc2e83d3718fe273753b7
+  metadata.gz: 4771f6df6cc335d22c6581ae08903bd527d228ccadb8acfa9cf2632be8900478e9cb35893b6740c37539b36faede4638183f7f584e0b717353803d209e808670
+  data.tar.gz: 00fb859290d526dd74b2c099cd639903297edfb28ff337298164bd774e4f8058c6b837be1ab5fc31fa15a3f7c0ea11579c7ac7c68dab57bb2db15b709d93b35d

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

@@ -1,6 +1,5 @@
 window.MapLayerManager = function(map){
   var map                   = map;
-  var host                  = location.protocol + "//" + location.host
   var layers                = []
   var loadingCount          = 0 // How many layers are being loaded
   var requestTimestamps     = {}
@@ -8,25 +7,25 @@ window.MapLayerManager = function(map){
   var layerLoadedEventName  = 'map:layerLoaded'
 
   // Prime the KMZ cache on the server before unleashing google's many tilemills
-  function cacheAndLoadKMLLayer(kmlPath, layerName, options) {
+  function cacheAndLoadKMLLayer(kmlURL, layerName, options) {
     var requestTimestamp = new Date;
-    kmlPath = sanitizeURI(kmlPath);
+    kmlURL = sanitizeURI(kmlURL);
 
-    $.ajax(host + kmlPath, {type:'head', complete:function(){
+    $.ajax(kmlURL, {type:'head', complete:function(){
         if (!requestTimestamps[layerName] || requestTimestamps[layerName] < requestTimestamp){
             requestTimestamps[layerName] = requestTimestamp;
-            loadKMLLayer(cachedKMZPath(kmlPath), layerName, options)
+            loadKMLLayer(cachedKMZURL(kmlURL), layerName, options)
         }
     }});
   }
 
-  function loadKMLLayer(kmlPath, layerName, options) {
+  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
-      kmlPath = sanitizeURI(kmlPath);
+      kmlURL = sanitizeURI(kmlURL);
       options = options || {}
       options.map = map;
 
-      var kmlLayer = new google.maps.KmlLayer(host + kmlPath, options);
+      var kmlLayer = new google.maps.KmlLayer(kmlURL, options);
       var layer = addLayer(layerName, kmlLayer)
       loadingCount++
       $(window.document).trigger({type: layerLoadingEventName, layer:layer})
@@ -47,9 +46,10 @@ window.MapLayerManager = function(map){
       });
   }
 
-  // Generates the url of the cached KMZ for the given kmlPath
-  function cachedKMZPath(kmlPath){
-    return '/kmz/' + hex_sha256(kmlPath) + '.kmz'
+  // Generates the url of the cached KMZ for the given kmlURL
+  function cachedKMZURL(kmlURL){
+    var url = $('<a href="' + kmlURL + '"/>')[0]
+    return url.protocol + '//' + url.host + '/kmz/' + hex_sha256(kmlURL) + '.kmz'
   }
 
   function centerWhenLoaded(layerNamez){
@@ -225,7 +225,7 @@ window.MapLayerManager = function(map){
         }).join('=')
       }).join('&')
 
-      return output
+      return url.protocol + '//' + url.host + output
     }
 
 

data/lib/kmz_compressor/middleware.rb

@@ -9,7 +9,7 @@ module KMZCompressor
 
       # If the User is asking for a KMZ file
       if request.path_info.end_with? '.kmz'
-        uri = request.fullpath
+        uri = request.url
 
         # Use a hash of the request path (before we gsub it) as the filename we will save on the HD
         cache_path = "public/kmz/#{Digest::SHA2.hexdigest(uri)}.kmz"

data/lib/kmz_compressor/version.rb

@@ -1,3 +1,3 @@
 module KMZCompressor
-  VERSION = "2.0.3"
+  VERSION = "2.0.4"
 end

metadata

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