kmz_compressor 2.0.20 → 2.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cd1222730e62982f4c2cd8b6c9ee1589b7285e0
-  data.tar.gz: 48ec32ef2f3812667804a0c5888c2d291db7f20c
+  metadata.gz: e22aba0509514efb8239afffafda9f4b54109f40
+  data.tar.gz: 7a21381d0c48f1136c234c2ee11efb423793963a
 SHA512:
-  metadata.gz: 436b2c0df6239b37e859093542e040d7dd203f5372abf8f1027fdc20ad27b3d2db89a7050130180504328b61d28d231f498bf01a51db35960d04de74d30d7c51
-  data.tar.gz: 45b8f0e3e8a1a87b7e5391d251d65fbd91214d12483c7709d38968eaa96b007469f2be3ff012ce496c796ad40169ecba0d7b17b9e1d3a3c38eb08b00c2ab9d2b
+  metadata.gz: c81b20493bd109cf7b692b16430aed4a5d47e32014c0c7e2bc7cbf2cdd36254f2ff30120ac45c080f40064d19471c59176d0c84174ab28f3cef9126331e59ab9
+  data.tar.gz: ceb030a69d360f877d38154d1aa081c86a00121cafea3dfef8ab59460fc9d68cfe800b9a2db07d0ff4833745662bf4dabc2cf440d54f3c210f16770b56936d23

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

@@ -10,16 +10,24 @@ window.MapLayerManager = function(map){
   var layerClickedEventName = 'map:layerClicked'
 
   // Prime the KMZ cache on the server before unleashing google's many tilemills
-  function cacheAndLoadKMLLayer(kmlURL, layerName, options) {
+  function cacheAndLoadKMLLayer(kmlURL, layerName, options, retryDelay) {
     var requestTimestamp = new Date;
+    var retryDelay = retryDelay || 2000;
+
     kmlURL = sanitizeURI(kmlURL);
 
-    $.ajax(kmlURL, {type:'head', complete:function(){
+    return $.ajax(kmlURL, {type:'head', statusCode:{
+      202: function(){ setTimeout(function(){ cacheAndLoadKMLLayer(kmlURL, layerName, options, retryDelay * 2) }, retryDelay) },
+      200: function(){
         if (!requestTimestamps[layerName] || requestTimestamps[layerName] < requestTimestamp){
             requestTimestamps[layerName] = requestTimestamp;
             loadKMLLayer(cachedKMZURL(kmlURL), layerName, options)
         }
-    }});
+      }
+    }}).error(function(){
+      console.error("Server returned an error when checking if " + kmlURL + " was cached")
+    })
+
   }
 
   function loadKMLLayer(kmlURL, layerName, options) {

data/app/helpers/kmz_compressor/kml_helper.rb

@@ -0,0 +1,8 @@
+module KmzCompressor
+  module KmlHelper
+    # Converts KML colours which are BBGGRR into web colours which are RRGGBB
+    def kml_colour(html_hex_colour)
+      html_hex_colour.gsub(/([0-9A-F][0-9A-F])([0-9A-F][0-9A-F])([0-9A-F][0-9A-F])/i, '\3\2\1')
+    end
+  end
+end

data/lib/kmz_compressor/controller_extensions.rb

@@ -0,0 +1,31 @@
+require 'digest'
+
+module KMZCompressor
+  module ControllerExtensions
+
+    module ClassMethods
+      def defer_until_kmz_cached(*actions)
+        around_filter :render_202_while_caching, :only => actions
+      end
+    end
+
+    module InstanceMethods
+      # Subsequent calls to this action return a 202 while the original result is being cached
+      def render_202_while_caching(&action)
+        cache_key = [:kmz_in_progress, Digest::SHA256.base64digest(params.inspect)]
+
+        if Rails.cache.exist?(cache_key)
+          render :status => 202, :nothing => true
+        else
+          begin
+            Rails.cache.write(cache_key, true, :expires_in => 1.hour) # Expire in case we somehow leave the cache key behind
+            action.call
+          ensure
+            # Rails.cache.delete(cache_key)
+          end
+        end
+      end
+    end
+
+  end
+end

data/lib/kmz_compressor/engine.rb

@@ -1,4 +1,12 @@
+require 'kmz_compressor/controller_extensions'
+
 module KMZCompressor
 	class Engine < Rails::Engine
+
+    initializer 'kmz_compressor.extend_application_controller' do |app|
+      ApplicationController.extend ControllerExtensions::ClassMethods
+      ApplicationController.include ControllerExtensions::InstanceMethods
+    end
+
 	end
 end

data/lib/kmz_compressor/version.rb

@@ -1,3 +1,3 @@
 module KMZCompressor
-  VERSION = "2.0.20"
+  VERSION = "2.0.21"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kmz_compressor
 version: !ruby/object:Gem::Version
-  version: 2.0.20
+  version: 2.0.21
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -59,7 +59,9 @@ files:
 - app/assets/javascripts/kmz_compressor/map_layer_manager.js
 - app/assets/javascripts/kmz_compressor/polyfills.js
 - app/assets/javascripts/kmz_compressor/sha2.js
+- app/helpers/kmz_compressor/kml_helper.rb
 - lib/kmz_compressor.rb
+- lib/kmz_compressor/controller_extensions.rb
 - lib/kmz_compressor/engine.rb
 - lib/kmz_compressor/middleware.rb
 - lib/kmz_compressor/railtie.rb
@@ -83,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.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.