From 01ad0fd18eb09f9310f6de5a118e823e97bbda80 Mon Sep 17 00:00:00 2001
From: Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
Date: Wed, 18 Jul 2012 05:40:05 -0300
Subject: [PATCH] Fixed google_cse files names to match plugin routes

---
 plugins/google_cse/controllers/google_cse_plugin_controller.rb                      |  4 ++++
 plugins/google_cse/controllers/google_cse_plugin_environment_controller.rb          |  4 ----
 plugins/google_cse/test/functional/google_cse_plugin_controller_test.rb             | 20 ++++++++++++++++++++
 plugins/google_cse/test/functional/google_cse_plugin_environment_controller_test.rb | 20 --------------------
 plugins/google_cse/views/google_cse_plugin/results.rhtml                            | 30 ++++++++++++++++++++++++++++++
 plugins/google_cse/views/google_cse_plugin_environment/results.rhtml                | 30 ------------------------------
 6 files changed, 54 insertions(+), 54 deletions(-)
 create mode 100644 plugins/google_cse/controllers/google_cse_plugin_controller.rb
 delete mode 100644 plugins/google_cse/controllers/google_cse_plugin_environment_controller.rb
 create mode 100644 plugins/google_cse/test/functional/google_cse_plugin_controller_test.rb
 delete mode 100644 plugins/google_cse/test/functional/google_cse_plugin_environment_controller_test.rb
 create mode 100644 plugins/google_cse/views/google_cse_plugin/results.rhtml
 delete mode 100644 plugins/google_cse/views/google_cse_plugin_environment/results.rhtml

diff --git a/plugins/google_cse/controllers/google_cse_plugin_controller.rb b/plugins/google_cse/controllers/google_cse_plugin_controller.rb
new file mode 100644
index 0000000..28de1bc
--- /dev/null
+++ b/plugins/google_cse/controllers/google_cse_plugin_controller.rb
@@ -0,0 +1,4 @@
+class GoogleCsePluginController < ApplicationController
+  append_view_path File.join(File.dirname(__FILE__) + '/../views')
+  no_design_blocks
+end
diff --git a/plugins/google_cse/controllers/google_cse_plugin_environment_controller.rb b/plugins/google_cse/controllers/google_cse_plugin_environment_controller.rb
deleted file mode 100644
index 3845b90..0000000
--- a/plugins/google_cse/controllers/google_cse_plugin_environment_controller.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-class GoogleCsePluginEnvironmentController < ApplicationController
-  append_view_path File.join(File.dirname(__FILE__) + '/../views')
-  no_design_blocks
-end
diff --git a/plugins/google_cse/test/functional/google_cse_plugin_controller_test.rb b/plugins/google_cse/test/functional/google_cse_plugin_controller_test.rb
new file mode 100644
index 0000000..b5c4a80
--- /dev/null
+++ b/plugins/google_cse/test/functional/google_cse_plugin_controller_test.rb
@@ -0,0 +1,20 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../../controllers/google_cse_plugin_controller'
+
+# Re-raise errors caught by the controller.
+class GoogleCsePluginController; def rescue_action(e) raise e end; end
+
+class GoogleCsePluginControllerTest < ActionController::TestCase
+
+  def setup
+    @controller = GoogleCsePluginController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+
+  should 'get results page' do
+    get :results
+    assert_response :success
+  end
+
+end
diff --git a/plugins/google_cse/test/functional/google_cse_plugin_environment_controller_test.rb b/plugins/google_cse/test/functional/google_cse_plugin_environment_controller_test.rb
deleted file mode 100644
index 11eb4ea..0000000
--- a/plugins/google_cse/test/functional/google_cse_plugin_environment_controller_test.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
-require File.dirname(__FILE__) + '/../../controllers/google_cse_plugin_environment_controller'
-
-# Re-raise errors caught by the controller.
-class GoogleCsePluginEnvironmentController; def rescue_action(e) raise e end; end
-
-class GoogleCsePluginEnvironmentControllerTest < ActionController::TestCase
-
-  def setup
-    @controller = GoogleCsePluginEnvironmentController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
-
-  should 'get results page' do
-    get :results
-    assert_response :success
-  end
-
-end
diff --git a/plugins/google_cse/views/google_cse_plugin/results.rhtml b/plugins/google_cse/views/google_cse_plugin/results.rhtml
new file mode 100644
index 0000000..6090fdf
--- /dev/null
+++ b/plugins/google_cse/views/google_cse_plugin/results.rhtml
@@ -0,0 +1,30 @@
+<% plugin = @plugins[:google_cse] %>
+<div id="cse" style="width: 100%;"><%= _('Loading') %></div>
+<script src="//www.google.com/jsapi" type="text/javascript"></script>
+<script type="text/javascript">
+  function parseQueryFromUrl () {
+    var queryParamName = "q";
+    var search = window.location.search.substr(1);
+    var parts = search.split('&');
+    for (var i = 0; i < parts.length; i++) {
+      var keyvaluepair = parts[i].split('=');
+      if (decodeURIComponent(keyvaluepair[0]) == queryParamName) {
+        return decodeURIComponent(keyvaluepair[1].replace(/\+/g, ' '));
+      }
+    }
+    return '';
+  }
+  google.load('search', '1', {style : google.loader.themes.MINIMALIST});
+  google.setOnLoadCallback(function() {
+    var customSearchControl = new google.search.CustomSearchControl(
+      '<%= plugin && plugin.google_id %>');
+    customSearchControl.setResultSetSize(google.search.Search.FILTERED_CSE_RESULTSET);
+    var options = new google.search.DrawOptions();
+    options.enableSearchResultsOnly();
+    customSearchControl.draw('cse', options);
+    var queryFromUrl = parseQueryFromUrl();
+    if (queryFromUrl) {
+      customSearchControl.execute(queryFromUrl);
+    }
+  }, true);
+</script>
diff --git a/plugins/google_cse/views/google_cse_plugin_environment/results.rhtml b/plugins/google_cse/views/google_cse_plugin_environment/results.rhtml
deleted file mode 100644
index 6090fdf..0000000
--- a/plugins/google_cse/views/google_cse_plugin_environment/results.rhtml
+++ /dev/null
@@ -1,30 +0,0 @@
-<% plugin = @plugins[:google_cse] %>
-<div id="cse" style="width: 100%;"><%= _('Loading') %></div>
-<script src="//www.google.com/jsapi" type="text/javascript"></script>
-<script type="text/javascript">
-  function parseQueryFromUrl () {
-    var queryParamName = "q";
-    var search = window.location.search.substr(1);
-    var parts = search.split('&');
-    for (var i = 0; i < parts.length; i++) {
-      var keyvaluepair = parts[i].split('=');
-      if (decodeURIComponent(keyvaluepair[0]) == queryParamName) {
-        return decodeURIComponent(keyvaluepair[1].replace(/\+/g, ' '));
-      }
-    }
-    return '';
-  }
-  google.load('search', '1', {style : google.loader.themes.MINIMALIST});
-  google.setOnLoadCallback(function() {
-    var customSearchControl = new google.search.CustomSearchControl(
-      '<%= plugin && plugin.google_id %>');
-    customSearchControl.setResultSetSize(google.search.Search.FILTERED_CSE_RESULTSET);
-    var options = new google.search.DrawOptions();
-    options.enableSearchResultsOnly();
-    customSearchControl.draw('cse', options);
-    var queryFromUrl = parseQueryFromUrl();
-    if (queryFromUrl) {
-      customSearchControl.execute(queryFromUrl);
-    }
-  }, true);
-</script>
--
libgit2 0.21.2