Extracted some code into proper helpers

Author: Luca Guidi

Diff for: app/helpers/click_to_globalize_helper.rb

@@ -0,0 +1,14 @@
+module ClickToGlobalizeHelper
+  @@click_partial = 'shared/_click_to_globalize'
+
+  # Render +app/views/shared/_click_to_globalize.html.erb+.
+  def click_to_globalize
+    render @@click_partial if controller.globalize?
+  end
+
+  # Get form_authenticity_token if the application is protected from forgery.
+  # See ActionController::RequestForgeryProtection for details.
+  def authenticity_token
+    protect_against_forgery? ? form_authenticity_token : ''
+  end
+end

Diff for: app/helpers/locales_helper.rb

@@ -1,2 +1,29 @@
 module LocalesHelper
+  # Return all available locales from I18n, except <tt>:root</tt>.
+  def locales
+    I18n.available_locales - [ :root ]
+  end
+
+  # Creates the HTML markup for the languages picker menu.
+  #
+  # Example:
+  # I18n.available_locales # => [:root, :en, :it]
+  # I18n.locale            # => :en
+  #
+  #   <ul>
+  #     <li><a href="/locales/en/change" title="* en">* en</a></li> |
+  #     <li><a href="/locales/it/change" title="it">it</a></li>
+  #   </ul>
+  def locales_menu
+    returning html = "" do
+      html << content_tag(:ul) do
+        locales.map do |locale|
+          title = locale == I18n.locale ? "* #{h(locale)}" : h(locale)
+          content_tag(:li) do
+            link_to title, change_locale_path(locale), :title => title, :method => :put
+          end
+        end * " | "
+      end
+    end
+  end
 end

Diff for: init.rb

@@ -7,5 +7,4 @@
 
 ActionView::Base.class_eval do
   include Click::Observer::View
-  include Click::Helper
 end

Diff for: lib/click_to_globalize.rb

@@ -93,43 +93,4 @@ def globalize?
       end
     end
   end
-
-  module Helper
-    @@click_partial = 'shared/_click_to_globalize'
-
-    # Render +app/views/shared/_click_to_globalize.html.erb+.
-    def click_to_globalize
-      render @@click_partial if controller.globalize?
-    end
-
-    # Get form_authenticity_token if the application is protected from forgery.
-    # See ActionController::RequestForgeryProtection for details.
-    def authenticity_token
-      protect_against_forgery? ? form_authenticity_token : ''
-    end
-
-    def locales
-      I18n.available_locales
-    end
-
-    # Creates the HTML markup for the languages picker menu.
-    #
-    # Example:
-    # I18n.available_locales # => [:en, :it]
-    # I18n.locale            # => :en
-    #
-    #   <ul>
-    #     <li><a href="/locales/set/en" title="* en">* en</a></li> |
-    #     <li><a href="/locales/set/it" title="it">it</a></li>
-    #   </ul>
-    def languages_menu
-      returning result = '<ul>' do
-        result << locales.map do |locale|
-          locale = "* #{locale}" if locale == I18n.locale
-          "<li>#{link_to locale, {:controller => 'locales', :action => 'set', :id => locale}, {:title => "#{language} [#{locale}]"}}</li>"
-        end * ' | '
-      end
-      result << '</ul>'
-    end
-  end
 end

Diff for: test/test_helper.rb

@@ -12,4 +12,17 @@ def load_translations
     def locale_observer
       @locale_observer ||= Click::Observer::LocaleObserver.new
     end
-end
+end
+
+class ActionView::TestCase
+  private
+    # HACK this is a placehoder, dunno why it isn't included by default
+    def protect_against_forgery?
+      false
+    end
+
+    # HACK this is a placehoder, dunno why it isn't included by default
+    def form_authenticity_token
+      "hack"
+    end
+end

Diff for: test/unit/helpers/click_to_globalize_helper_test.rb

@@ -0,0 +1,12 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+
+class ClickToGlobalizeHelperTest < ActionView::TestCase  
+  test "authenticity_token with protection from forgery active" do
+    stubs(:protect_against_forgery?).returns true
+    assert_equal form_authenticity_token, authenticity_token
+  end
+
+  test "authenticity_token with protection from forgery inactive" do
+    assert_equal "", authenticity_token
+  end
+end

Diff for: test/unit/helpers/helper_test.rb

@@ -0,0 +1,17 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+
+class LocalesHelperTest < ActionView::TestCase
+  test "locales" do
+    assert_equal expected_locales, locales
+  end
+  
+  test "locales_menu" do
+    expected = %(<ul><li><a href=\"/locales/en/change\" title=\"en\" onclick=\"var f = document.createElement('form'); f.style.display = 'none'; this.parentNode.appendChild(f); f.method = 'POST'; f.action = this.href;var m = document.createElement('input'); m.setAttribute('type', 'hidden'); m.setAttribute('name', '_method'); m.setAttribute('value', 'put'); f.appendChild(m);f.submit();return false;\">en</a></li></ul>)
+    assert_dom_equal expected, locales_menu
+  end
+
+  private
+    def expected_locales
+      I18n.available_locales - [ :root ]
+    end
+end