route_translator 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: baab3c78c16c578fd058f629b0194719b4284494
-  data.tar.gz: 49d208644c13a219b5343af3c4b260b7d0d5f252
+  metadata.gz: 2978c69c256242672228bd99538e631a12446cef
+  data.tar.gz: 2fcb536aa8f1ce290696dd3a3e8f44cd84deb8c5
 SHA512:
-  metadata.gz: a4db686f84980ed7e6f7dd8d39cc31254a6554e21d2c13a7c209ea1e373507460e6016319ceb79a393a6ee10a8c832fa5b9c89f8bacee6accac948219ce8225b
-  data.tar.gz: 233344cea148bfb6c4db43314caf26c07a9b15e77b4aa3be6ecd4a4d630e3502101dcbdbe2d41547cde507a1e98393b73202f7e6315069be312dbee56ac10e0f
+  metadata.gz: f29d2badba785d4a7dbae525d908b6440a99e77c8ea900ab99eb354898075ae4b131b96a350dde15557f224cf1e9b0a976b33a4880287f0b9480883cc1b39ccf
+  data.tar.gz: cd7d39f3ab0ca1fdaa108803fcde30e7d87afefdfccb09a097b90f8cbe889fc9ecd3cc2c2b378e8896a3cb07bd2ad8378da4283205b20d43213dd8cbed41515b

data/lib/route_translator/translator.rb

@@ -5,10 +5,12 @@ module RouteTranslator
     #   people_path -> people_de_path
     #   I18n.locale = :fr
     #   people_path -> people_fr_path
-    def self.add_untranslated_helpers_to_controllers_and_views(old_name, helper_container)
+    def self.add_untranslated_helpers_to_controllers_and_views(old_name, helper_container, helper_list)
       ['path', 'url'].each do |suffix|
         new_helper_name = "#{old_name}_#{suffix}"
 
+        helper_list.push(new_helper_name.to_sym) unless helper_list.include?(new_helper_name.to_sym)
+
         helper_container.__send__(:define_method, new_helper_name) do |*args|
           locale_suffix = I18n.locale.to_s.underscore
           if respond_to?("#{old_name}_#{locale_suffix}_#{suffix}")
@@ -18,15 +20,11 @@ module RouteTranslator
           end
         end
 
-        # Including the named routes helpers module
-        [ActionController::TestCase, ActionView::TestCase, ActionMailer::TestCase].each do |klass|
-          klass.__send__(:include, helper_container)
-        end
       end
     end
 
     def self.translations_for(app, conditions, requirements, defaults, route_name, anchor, route_set, &block)
-      add_untranslated_helpers_to_controllers_and_views(route_name, route_set.named_routes.module)
+      add_untranslated_helpers_to_controllers_and_views(route_name, route_set.named_routes.module, route_set.named_routes.helpers)
       # Make sure the default locale is translated in last place to avoid
       # problems with wildcards when default locale is omitted in paths. The
       # default routes will catch all paths like wildcard if it is translated first

data/lib/route_translator/version.rb

@@ -1,3 +1,3 @@
 module RouteTranslator
-  VERSION = '3.2.1'
+  VERSION = '3.2.2'
 end

data/test/routing_test.rb

@@ -468,37 +468,45 @@ class TranslateRoutesTest < ActionController::TestCase
   def test_action_view_gets_locale_suffix_helper
     ActionView::Base.instance_methods.include?('locale_suffix')
   end
+end
 
-  def test_action_controller_test_case_reads_default_urls
-    test_case_reads_default_urls(ActionController::TestCase)
-  end
-
-  def test_action_view_test_case_reads_default_urls
-    test_case_reads_default_urls(ActionView::TestCase)
-  end
+class ProductsControllerTest < ActionController::TestCase
+  include ActionDispatch::Assertions::RoutingAssertions
+  include RouteTranslator::TestHelper
 
-  def test_action_mailer_test_case_reads_default_urls
-    test_case_reads_default_urls(ActionMailer::TestCase)
-  end
+  def setup
+    @routes = ActionDispatch::Routing::RouteSet.new
+    I18n.backend = I18n::Backend::Simple.new
+    I18n.load_path = [ File.expand_path('../locales/routes.yml', __FILE__) ]
+    I18n.reload!
 
-  private
-  def test_case_reads_default_urls(klass)
     config_default_locale_settings 'en'
 
     draw_routes do
       localized do
-        resources :person
+        resources :products
       end
     end
+  end
 
-    test_case = klass.new(:respond_to?)
+  def teardown
+    config_force_locale false
+    config_hide_locale false
+    config_generate_unlocalized_routes false
+    config_default_locale_settings("en")
+    config_generate_unnamed_unlocalized_routes false
+  end
 
-    # Not localized
-    assert test_case.respond_to?(:people_path)
-    assert test_case.respond_to?(:new_person_path)
+  def test_url_helpers_are_included
 
-    # Localized
-    assert test_case.respond_to?(:people_en_path)
-    assert test_case.respond_to?(:new_person_en_path)
+    #doing it this way because assert_nothing_raised doesn't work on all rails versions
+    %w(product_path product_url product_es_path product_es_url).each do |method|
+      begin
+        send(method)
+      rescue Exception => e
+        raise e if e.is_a?(NameError) #swallow anything that isn't a NameError
+      end
+    end
   end
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: route_translator
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
 platform: ruby
 authors:
 - Raul Murciano