From 17781aaa602df226ad9ab9bc8c3e493b0d8de37a Mon Sep 17 00:00:00 2001
From: kbparauga <kb.paragua@gmail.com>
Date: Fri, 1 May 2015 13:43:38 +0800
Subject: [PATCH 1/2] version 4.2.0

---
 Changelog.md   | 3 +++
 paloma.gemspec | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 47952f2..003657e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,6 @@
+## 4.2.0
+* https://github.com/kbparagua/paloma/pull/75 - Explicitly insert hook in view.
+
 ## 4.1.2
 * https://github.com/kbparagua/paloma/issues/73 - Fix `js false` issue.
 
diff --git a/paloma.gemspec b/paloma.gemspec
index 0047c98..0f94f54 100644
--- a/paloma.gemspec
+++ b/paloma.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'paloma'
-  s.version     = '4.1.2'
+  s.version     = '4.2.0'
   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']

From bca7898cb8f783dbc4b5455d00ea69ddfefc33aa Mon Sep 17 00:00:00 2001
From: kbparauga <kb.paragua@gmail.com>
Date: Fri, 28 Aug 2015 11:58:12 +0800
Subject: [PATCH 2/2] Solved issue #79

---
 lib/paloma/action_controller_extension.rb   | 2 +-
 test_app/app/controllers/main_controller.rb | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/paloma/action_controller_extension.rb b/lib/paloma/action_controller_extension.rb
index 4fc3d06..da919e4 100644
--- a/lib/paloma/action_controller_extension.rb
+++ b/lib/paloma/action_controller_extension.rb
@@ -113,7 +113,7 @@ module Paloma
       # will execute the tracked Paloma requests.
       #
       def insert_paloma_hook
-        return true if self.paloma.has_no_request?
+        return nil if self.paloma.has_no_request?
 
         hook = view_context.render(
                  :partial => 'paloma/hook',
diff --git a/test_app/app/controllers/main_controller.rb b/test_app/app/controllers/main_controller.rb
index 0649a0b..cc74637 100644
--- a/test_app/app/controllers/main_controller.rb
+++ b/test_app/app/controllers/main_controller.rb
@@ -8,6 +8,7 @@ class MainController < ApplicationController
 
   # Override controller
   def show
+    js false
     js 'OtherMain', :x => 1
     render :inline => 'Main#show', :layout => 'application'
   end