js_application_reloader 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjE0MWUzNWUzMjEyMjE4N2E5N2U4ODZiZTk5ZTA3Y2FmM2YxMGVlZg==
+    MjM0ZmRjY2VlNWM1OWI2NGFmNjliNWY3NTZiYzI1OGUyZDE1YTdjZg==
   data.tar.gz: !binary |-
-    Yjk3YzUwYjZkMzRiOWU4YzM2NWZhMjU1OTgxMTQ0MjU0MTE4NTk3ZQ==
+    NGIxZGNkNTAxYzFkMjdkNDJkNjhjODBkMjBkYjdkMGIzOTJkY2NlMw==
 SHA512:
   metadata.gz: !binary |-
-    NWRlNGY3YmQwMmYyMjUzN2JjNWQ0MDhiNTk2NGMwMTZmY2I2NTMzYjdhZDNj
-    MDUwMGM4MTc2NmJmZTE5NWVhZjk2NjAxNzJjZmNhM2FlN2NkMTgwYWFlYmE1
-    ZTM2MDE5MjA0ZGIzZDlmOGIyMzUwYjk0ZDA4ZmY1NjIxYThmMzQ=
+    M2VlYjMxMDllNjg5ZDRlMWRkNGFkNDhkYzkyM2IxMWMzZGZlNjJlODg5MzRl
+    OGIxYzRlZjlmMmE2MDkwMjZmZDk5ODBhMzk5ZWM4ZTg1NTIzNmFkMGZjMzlh
+    NTQxMWQ1MmM4ZWEyNDIxZGNjZTVhNzY2OTVhOWFiNDZkMzNhNzA=
   data.tar.gz: !binary |-
-    ZTgxMDc0MzEwYjc2OTE1OWM2YzMxMDk1NGIxMmE4NjVkZTdjN2MyNWY4OGI4
-    NjgyZWQwYmI1MjhiZjhlYzc0MmY4YWI4NDFiOWMxOTUyMmQ0MzQ4OWZmMDRj
-    ODQxMjhmMjM2YTUwM2E5MzI2YTRkZjNlZWFiNGNiNTQ5OWFiODU=
+    MDI3MWVkYjZmMGI2NmQ0NjMzNjNhODZjM2QwMzRlMDgxZDUwYWIxZGQ1MzI3
+    MjkwYTgwODk0M2JlOTE5ZmY5ZWZkYzNiYTZhNWMyYjFkODc1Yzc1ZTFlMWFl
+    Nzc3MDg1MjE4ZTIzY2JhOWNhZjU1YTMwODdlZDVkZWJmYWVhOGY=

data/README.md

@@ -122,10 +122,19 @@ MVC framework you are using.
 
 In BackboneJS you would insert this into the application's startup code, for example in application.js file. The only requirement is that Backbone is initialised.
 
-    // -- Override Backbone sync() to handle expiration
+    // -- Override Backbone sync() to handle expiration on success or error
     // -- Do the equivalent for your chosen framework
     var oldSyncMethod = Backbone.sync;
     Backbone.sync = function(method, model, options) {
+        var oldSuccess = options.success;                                 
+        options.success = function(data, textStatus, xhr) {               
+            if (JsApplicationReloader.isTokenExpired(xhr)) {              
+                return JsApplicationReloader.handleTokenExpiration(xhr);    
+            } else if (oldSuccess) {                                      
+                oldSuccess(data, textStatus, xhr);                        
+            }                                                                                                    
+        };    
+
         var oldError = options.error;
         options.error = function(xhr, textStatus, errorThrown) {
             // These are the important 3 lines
@@ -183,7 +192,17 @@ You can skip the before filter that JsApplicationReloader uses via
     # The reload_required_http_status, application_name, redirect_url attributes
     # are available to you on the JsApplicationReloader object.
     def render_js_application_reloader_expiration
-      render :text => "A new version of #{JsApplicationReloader.application_name} is available. Please click <a href='#{JsApplicationReloader.redirect_url}'>here</a> to load it.", :status => JsApplicationReloader.reload_required_http_status
+      message = "A new version of #{JsApplicationReloader.application_name} is available. " +
+            "Please click <a href='#{JsApplicationReloader.redirect_url}'>here</a> to load it."
+
+      respond_to do |format|
+        format.html {
+          render :text => message, :status => JsApplicationReloader.reload_required_http_status
+        }
+        format.json {
+          render :json => {:message => message}, :status => JsApplicationReloader.reload_required_http_status
+        }
+      end
     end
 
 ## Override how the client handles the reloading of the application
@@ -193,8 +212,13 @@ config/initializers/js_application_reloader.rb (outside of the 'config' block).
     def JsApplicationReloader.handle_reloader_token_expiration_on_client
       <<-EOF
           JsApplicationReloader.handleTokenExpiration = function(xhr) {
-            // $('body').html(xhr.responseText); // Original code
-            alert(xhr.responseText); // We change it to this
+            var contentType = xhr.getResponseHeader("content-type") || "";
+            if (contentType.indexOf('html') > -1) {
+              alert(xhr.responseText); // Changed to use an alert box
+            }
+            if (contentType.indexOf('json') > -1) {
+              alert(xhr.responseJSON.message); // Changed to use an alert box
+            }
             return false;
           };
       EOF

data/lib/js_application_reloader.rb

@@ -58,7 +58,13 @@ module JsApplicationReloader
   def self.handle_reloader_token_expiration_on_client
     <<-EOF
         JsApplicationReloader.handleTokenExpiration = function(xhr) {
-          $('body').html(xhr.responseText); // Display the HTML returned by xhr.responseText as you see fit
+          var contentType = xhr.getResponseHeader("content-type") || "";
+          if (contentType.indexOf('html') > -1) {
+            $('body').html(xhr.responseText); // Display the HTML returned by xhr.responseText as you see fit
+          }
+          if (contentType.indexOf('json') > -1) {
+            $('body').html(xhr.responseJSON.message); // Display the HTML returned by xhr.responseJSON.message as you see fit
+          }
           return false;
         };
     EOF

data/lib/js_application_reloader/controller_extensions.rb

@@ -16,7 +16,17 @@ module JsApplicationReloader
     # override me in your ApplicationController to customize what gets
     # sent back to the client on token expiration
     def render_js_application_reloader_expiration
-        render :text => "A new version of #{JsApplicationReloader.application_name} is available. Please click <a href='#{JsApplicationReloader.redirect_url}'>here</a> to load it.", :status => JsApplicationReloader.reload_required_http_status
+      message = "A new version of #{JsApplicationReloader.application_name} is available. " +
+            "Please click <a href='#{JsApplicationReloader.redirect_url}'>here</a> to load it."
+
+      respond_to do |format|
+        format.html {
+          render :text => message, :status => JsApplicationReloader.reload_required_http_status
+        }
+        format.json {
+          render :json => {:message => message}, :status => JsApplicationReloader.reload_required_http_status
+        }
+      end
     end
 
   end

data/lib/js_application_reloader/version.rb

@@ -1,3 +1,3 @@
 module JsApplicationReloader
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: js_application_reloader
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Declan McGrath
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler