route_translator 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 077e37f57ea89aa141aa2e271ba08e832cd85ef5
-  data.tar.gz: d6d9c89e7c57dcf22975bdc9e2194107ddf0b290
+  metadata.gz: dee4174f252499d6bc2dd422c15ba1c539532b77
+  data.tar.gz: 06c136f125a12a4764145088525eb0b72e672dba
 SHA512:
-  metadata.gz: 554ab0400cbdffbfc854c3de668d892513bf1195598d6611df9057bfaa26f764682fc25a370531366ba8e4b1ac06620ee49138cd2584e695516a228303297168
-  data.tar.gz: d5e661b4a03807afe05d7ba8c066fde6979b656b949464cccf667f75855ec083aab15301fdb92c5ee5d3b03f36bf1d4f2bf73a59beeceba18bf13f722f93129f
+  metadata.gz: f60b0e973d0258ad00d6bcd1db400fd6850c3450e790880130c6aa3378284b4ac7cb5ce00a7cd3c15564c1406fdda1ca28cc37d5186f34072f40a3086ceac286
+  data.tar.gz: 26e6d96d602c8af382982ef485639fc0b006f2c5e4154649950ad1f338c5630188b5790de20e02860c0f3c1ebe0294a8394e0cc88c018544ba4f7b4cb1d1c494

data/lib/route_translator.rb

@@ -11,8 +11,8 @@ module RouteTranslator
 
   Configuration = Struct.new(:force_locale, :hide_locale,
                              :generate_unlocalized_routes, :locale_param_key,
-                             :generate_unnamed_unlocalized_routes,
-                             :host_locales)
+                             :generate_unnamed_unlocalized_routes, :available_locales,
+                             :host_locales, :disable_fallback)
 
   def self.config(&block)
     @config                                     ||= Configuration.new
@@ -22,6 +22,8 @@ module RouteTranslator
     @config.locale_param_key                    ||= :locale
     @config.generate_unnamed_unlocalized_routes ||= false
     @config.host_locales                        ||= ActiveSupport::OrderedHash.new
+    @config.available_locales                   ||= nil
+    @config.disable_fallback                    ||= false
     yield @config if block
     resolve_config_conflicts
     @config

data/lib/route_translator/extensions/action_controller.rb

@@ -24,4 +24,11 @@ module ActionController
       I18n.locale = current_locale if tmp_locale
     end
   end
+
+  class TestCase
+    include ActionController::UrlFor
+
+    delegate :env, :request, :to => :@controller
+    def _routes; @routes; end
+  end
 end

data/lib/route_translator/translator.rb

@@ -29,6 +29,11 @@ module RouteTranslator
         helper_container.__send__(:define_method, new_helper_name) do |*args|
           __send__(Translator.route_name_for(args, old_name, suffix, self), *args)
         end
+
+        # Including the named routes helpers module
+        [ActionController::TestCase, ActionView::TestCase, ActionMailer::TestCase].each do |klass|
+          klass.__send__(:include, helper_container)
+        end
       end
     end
 
@@ -37,10 +42,15 @@ module RouteTranslator
 
       available_locales.each do |locale|
         new_conditions = conditions.dup
-        new_conditions[:path_info] = translate_path(conditions[:path_info], locale)
+        begin
+          new_conditions[:path_info] = translate_path(conditions[:path_info], locale)
+        rescue I18n::MissingTranslationData => e
+          raise e unless RouteTranslator.config.disable_fallback
+          next
+        end
         new_conditions[:parsed_path_info] = ActionDispatch::Journey::Parser.new.parse(new_conditions[:path_info]) if conditions[:parsed_path_info]
         if new_conditions[:required_defaults] && !new_conditions[:required_defaults].include?(RouteTranslator.locale_param_key)
-          new_conditions[:required_defaults] << RouteTranslator.locale_param_key if new_conditions[:required_defaults]
+          new_conditions[:required_defaults] << RouteTranslator.locale_param_key
         end
         new_defaults = defaults.merge(RouteTranslator.locale_param_key => locale.to_s.gsub('native_', ''))
         new_requirements = requirements.merge(RouteTranslator.locale_param_key => locale.to_s)
@@ -57,7 +67,7 @@ module RouteTranslator
 
     private
     def self.available_locales
-      available_locales = I18n.available_locales.dup
+      available_locales = config_locales || I18n.available_locales.dup
       available_locales.push(*RouteTranslator.native_locales) if RouteTranslator.native_locales.present?
       # Make sure the default locale is translated in last place to avoid
       # problems with wildcards when default locale is omitted in paths. The
@@ -65,6 +75,12 @@ module RouteTranslator
       available_locales.push(available_locales.delete(I18n.default_locale))
     end
 
+    def self.config_locales
+      if RouteTranslator.config.available_locales
+        RouteTranslator.config.available_locales.map{|l| l.to_sym}
+      end
+    end
+
     # Translates a path and adds the locale prefix.
     def self.translate_path(path, locale)
       new_path = path.dup
@@ -115,7 +131,13 @@ module RouteTranslator
 
     def self.translate_string(str, locale)
       locale = "#{locale}".gsub('native_', '')
-      res    = I18n.translate(str, :scope => :routes, :locale => locale, :default => str)
+      opts = {:scope => :routes, :locale => locale}
+      if RouteTranslator.config.disable_fallback && locale.to_s != I18n.default_locale.to_s
+        opts[:fallback] = true
+      else
+        opts[:default] = str
+      end
+      res    = I18n.translate(str, opts)
       URI.escape(res)
     end
 

data/lib/route_translator/version.rb

@@ -1,3 +1,3 @@
 module RouteTranslator
-  VERSION = '4.0.0'
+  VERSION = '4.1.0'
 end

data/test/routing_test.rb

@@ -537,6 +537,88 @@ class TranslateRoutesTest < ActionController::TestCase
     assert_routing '/path/to/another/product', :controller => 'products', :action => 'show', :id => 'path/to/another/product'
   end
 
+  def test_config_available_locales
+    config_available_locales [:en, :ru]
+
+    draw_routes do
+      localized do
+        resources :people
+      end
+    end
+
+    assert_routing URI.escape('/ru/люди'), :controller => 'people', :action => 'index', :locale => 'ru'
+    assert_routing '/people', :controller => 'people', :action => 'index', :locale => 'en'
+    assert_unrecognized_route '/es/gente', :controller => 'people', :action => 'index', :locale => 'es'
+
+    config_available_locales nil
+  end
+
+  def test_config_available_locales_handles_strings
+    config_available_locales %w( en ru )
+
+    draw_routes do
+      localized do
+        resources :people
+      end
+    end
+
+    assert_routing URI.escape('/ru/люди'), :controller => 'people', :action => 'index', :locale => 'ru'
+    assert_routing '/people', :controller => 'people', :action => 'index', :locale => 'en'
+    assert_unrecognized_route '/es/gente', :controller => 'people', :action => 'index', :locale => 'es'
+
+    config_available_locales nil
+  end
+
+  def test_disable_fallback_does_not_draw_non_default_routes
+    config_disable_fallback(true)
+
+    draw_routes do
+      localized do
+        get 'tr_param', :to => 'people#index', :as => 'people'
+      end
+    end
+
+    config_disable_fallback(false)
+
+    assert_routing '/tr_param', :controller => 'people', :action => 'index', :locale => 'en'
+    assert_routing '/es/tr_parametro', :controller => 'people', :action => 'index', :locale => 'es'
+    assert_unrecognized_route '/ru/tr_param', :controller => 'people', :action => 'index', :locale => 'ru'
+  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
+
+  def test_action_mailer_test_case_reads_default_urls
+    test_case_reads_default_urls(ActionMailer::TestCase)
+  end
+
+  private
+
+  def test_case_reads_default_urls(klass)
+    config_default_locale_settings 'en'
+
+    draw_routes do
+      localized do
+        resources :person
+      end
+    end
+
+    test_case = klass.new(nil)
+
+    # Not localized
+    assert test_case.respond_to?(:people_path)
+    assert test_case.respond_to?(:new_person_path)
+
+    # Localized
+    assert test_case.respond_to?(:people_en_path)
+    assert test_case.respond_to?(:new_person_en_path)
+  end
+
 end
 
 class ProductsControllerTest < ActionController::TestCase

data/test/support/configuration_helper.rb

@@ -1,7 +1,5 @@
-
 module RouteTranslator
   module ConfigurationHelper
-
     def config_reset
       config_force_locale false
       config_hide_locale false
@@ -39,13 +37,16 @@ module RouteTranslator
       RouteTranslator.config.host_locales = hash
     end
 
-    def host_locales_config_hash
-      if RUBY_VERSION < '1.9'
-        ::ActiveSupport::OrderedHash.new
-      else
-        ::Hash.new
-      end
+    def config_available_locales(arr)
+      RouteTranslator.config.available_locales = arr
     end
 
+    def config_disable_fallback(boolean)
+      RouteTranslator.config.disable_fallback = boolean
+    end
+
+    def host_locales_config_hash
+      ::Hash.new
+    end
   end
 end

data/test/test_helper.rb

@@ -11,6 +11,7 @@ end
 
 require "rails"
 require "action_controller/railtie"
+require "action_mailer/railtie"
 
 require 'route_translator'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: route_translator
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Raul Murciano
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,7 +17,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
@@ -37,7 +37,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
@@ -47,7 +47,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
@@ -55,16 +55,16 @@ dependencies:
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.1
 description: Translates the Rails routes of your application into the languages defined
   in your locale files
 email: enric@lluell.es
@@ -107,7 +107,8 @@ files:
 - test/support/routes_helper.rb
 - test/test_helper.rb
 homepage: http://github.com/enriclluelles/route_translator
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -125,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Translate your Rails routes in a simple manner