paloma 4.1.0 → 4.1.1

data/Changelog.md

@@ -1,13 +1,15 @@
-# Changelog
+## 4.1.1
+* https://github.com/kbparagua/paloma/pull/57 - Fix Turbolinks Issues. 
+* https://github.com/kbparagua/paloma/pull/55 - Fix issues when Paloma hook is not found.
 
-## Version 4.1.0
+## 4.1.0
 * Support for Turbolinks.
 * `Paloma.executeHook()` to manually run the hook from the DOM.
 * Paloma hook will be appended using all `render` calls, except for calls that has the following keys `[:json, :js, :xml, :file]`.
 * Restore `Paloma.engine.start()` to start processing queued request.
 
 
-## Version 4.0.0
+## 4.0.0
 * https://github.com/kbparagua/paloma/issues/26 - Paloma requests are not saved on `session`.
 * https://github.com/kbparagua/paloma/issues/26 - Chaining with redirect is removed.
 * Routing from javascript is removed.
@@ -16,15 +18,15 @@
 * https://github.com/kbparagua/paloma/issues/29 - Disable `console.log` and `console.warn` for non-development environments.
 
 
-## Version 3.0.2
+## 3.0.2
 * Bug Fix: Converting Rails controller name to singular form.
 
 
-## Version 3.0.1
+## 3.0.1
 * Bug Fix: Can't handle Rails controller with Multi-word name.
 * Bug Fix: Paloma Engine is halting when a warning is encountered.
 * Don't create Paloma request if rendering js, json, xml, or file.
 
 
-## Version 3.0.0
+## 3.0.0
 * Rewrite Initial Release

data/README.md

@@ -292,6 +292,20 @@ $(document).on('page:restore', function(){
 });
 ```
 
+### Turbolinks without `jquery.turbolinks` gem
+
+You need to manually run Paloma every page load if you are not using `jquery.turbolinks` gem.
+
+In your `application.js`
+
+```js
+$(document).on('page:load', function(){
+   Paloma.executeHook();
+   Paloma.engine.start();
+});
+```
+
+
 ## Gotchas
 
 * Paloma  will execute on all `render` calls, except for calls with the following formats: `js`, `json`, `xml`, and `file`.

data/app/views/paloma/_hook.html.erb

@@ -3,12 +3,6 @@
 <div class="js-paloma-hook" data-id="<%= id %>">
   <script type="text/javascript">
     (function(){
-      // Do not continue if Paloma not found.
-      if (window['Paloma'] === undefined && window['console'] !== undefined){
-        console.warn("Paloma not found. Require it in your application.js.");
-        return true;
-      }
-
       Paloma.env = '<%= Rails.env %>';
 
       // Remove any callback details if any
@@ -20,8 +14,6 @@
         request['resource'],
         request['action'],
         request['params']);
-
-      $(document).ready(function(){ Paloma.engine.start(); });
     })();
   </script>
 </div>

data/lib/paloma/action_controller_extension.rb

@@ -115,10 +115,15 @@ module Paloma
       #
       def append_paloma_hook
         return true if self.paloma.has_no_request?
-
-        hook = view_context.render(
-                  :partial => 'paloma/hook',
-                  :locals => {:request => self.paloma.request})
+       
+        # Render the partial if it is present, otherwise do nothing. 
+        begin
+          hook = view_context.render(
+                   :partial => 'paloma/hook',
+                   :locals => {:request => self.paloma.request})
+        rescue ActionView::MissingTemplate
+          return true
+        end
 
         before_body_end_index = response_body[0].rindex('</body>')
 

data/paloma.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'paloma'
-  s.version     = '4.1.0'
+  s.version     = '4.1.1'
   s.summary     = "Provides an easy way to execute page-specific javascript for Rails."
   s.description = "Page-specific javascript for Rails done right"
   s.authors     = ['Karl Paragua']

data/test_app/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
 
 gem 'selenium-webdriver'
+gem 'jquery-turbolinks'
 gemspec :path => '../'

data/test_app/app/assets/javascripts/application.js

@@ -11,14 +11,17 @@
 // GO AFTER THE REQUIRES BELOW.
 //
 //= require jquery
+//= require jquery.turbolinks
 //= require jquery_ujs
 //= require turbolinks
 //= require paloma
 //= require_tree .
 
 
-// $(document).on('page:restore', function(){
+// Uncomment if jquery.turbolinks is not used.
+// $(document).on('page:load', function(){
 //   Paloma.executeHook();
+//   Paloma.engine.start();
 // });
 
 

data/vendor/assets/javascripts/paloma/init.js

@@ -3,15 +3,29 @@ window.Paloma = window.Paloma || {};
 //
 // Do nothing if there is no available console.
 //
-if (!window['console']){ Paloma.log = Paloma.warn = function(msg){}; }
+if ( !window['console'] ){
+  Paloma.log = Paloma.warn = function(msg){};
+}
 else {
   Paloma.warn = function(msg){
-    if(Paloma.env != 'development') return;
+    if (Paloma.env != 'development'){ return; }
     console.warn(msg);
   };
 
   Paloma.log = function(msg){
-    if(Paloma.env != 'development') return;
+    if (Paloma.env != 'development'){ return; }
     console.log(msg);
   };
 }
+
+$(document).ready(function(){
+  // Do not continue if Paloma not found.
+  if (window['Paloma'] === undefined) {
+    if (window['console'] !== undefined) {
+      console.warn("Paloma not found. Require it in your application.js.");
+    }
+    return true;
+  }
+
+  Paloma.engine.start();
+});

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paloma
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-07 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails