From 26658b5350fc051ead703f1288a8d78cb218b5b1 Mon Sep 17 00:00:00 2001
From: kbparagua <kb.paragua@gmail.com>
Date: Thu, 31 Oct 2013 16:07:55 +0800
Subject: [PATCH] Bug Fix: Converting Rails controller name to singular form

---
 Changelog.md                                   | 5 +++++
 lib/paloma/action_controller_extension.rb      | 2 +-
 test_app/app/assets/javascripts/application.js | 6 +++---
 test_app/spec/integration/main_spec.rb         | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 801807a..be158a7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,10 @@
 # Changelog
 
+
+## Version 3.0.2
+* Bug Fix: Converting Rails controller name to singular form.
+
+
 ## Version 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.
diff --git a/lib/paloma/action_controller_extension.rb b/lib/paloma/action_controller_extension.rb
index 15b274e..b0f7e24 100644
--- a/lib/paloma/action_controller_extension.rb
+++ b/lib/paloma/action_controller_extension.rb
@@ -35,7 +35,7 @@ module Paloma
       # Keeps track of what Rails controller/action is executed.
       #
       def track_paloma_request
-        resource = controller_path.split('/').map(&:classify).join('/')
+        resource = controller_path.split('/').map(&:titleize).join('/').gsub(' ', '')
 
         paloma_request = {:resource => resource,
                           :action => self.action_name}
diff --git a/test_app/app/assets/javascripts/application.js b/test_app/app/assets/javascripts/application.js
index 57a50a8..f6f7975 100644
--- a/test_app/app/assets/javascripts/application.js
+++ b/test_app/app/assets/javascripts/application.js
@@ -86,8 +86,8 @@ Bar.prototype.show = function(){
 
 
 
-var MultipleName = Paloma.controller('MultipleName');
+var MultipleNames = Paloma.controller('MultipleNames');
 
-MultipleName.prototype.index = function(){
-  window.called.push('MultipleName#index')
+MultipleNames.prototype.index = function(){
+  window.called.push('MultipleNames#index')
 };
diff --git a/test_app/spec/integration/main_spec.rb b/test_app/spec/integration/main_spec.rb
index e1952e4..89b3407 100644
--- a/test_app/spec/integration/main_spec.rb
+++ b/test_app/spec/integration/main_spec.rb
@@ -63,7 +63,7 @@ feature 'executing Paloma controller', :js => true do
 
         called = page.evaluate_script 'window.called.pop()'
 
-        expect(called).to eq 'MultipleName#index'
+        expect(called).to eq 'MultipleNames#index'
       end
     end