route_translator 3.0.1 → 3.0.2

data/lib/route_translator/translator.rb

@@ -31,7 +31,7 @@ module RouteTranslator
         new_defaults = defaults.merge(RouteTranslator.locale_param_key => locale.to_s)
         new_requirements = requirements.merge(RouteTranslator.locale_param_key => locale.to_s)
         new_route_name = translate_name(route_name, locale)
-        new_route_name = nil if route_set.named_routes.routes[new_route_name.to_sym] #TODO: Investigate this :(
+        new_route_name = nil if new_route_name && route_set.named_routes.routes[new_route_name.to_sym] #TODO: Investigate this :(
         block.call(app, new_conditions, new_requirements, new_defaults, new_route_name, anchor)
       end
       block.call(app, conditions, requirements, defaults, route_name, anchor) if RouteTranslator.config.generate_unlocalized_routes

data/lib/route_translator/version.rb

@@ -1,3 +1,3 @@
 module RouteTranslator
-  VERSION = '3.0.1'
+  VERSION = '3.0.2'
 end

data/test/locales/routes.yml

@@ -1,6 +1,8 @@
 es:
-  people: gente
-  products: productos
+  routes:
+    people: gente
+    products: productos
+    tr_param: tr_parametro
 
 ru:
   people: люди

data/test/routing_test.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
 require 'route_translator'
 
@@ -33,6 +34,36 @@ class TranslateRoutesTest < ActionController::TestCase
     assert_routing '/es', :controller => 'people', :action => 'index', :locale => 'es'
   end
 
+  def test_params
+    draw_routes do
+      localized do
+        resources :products
+      end
+    end
+
+    assert_routing '/es/productos/product_slug', :controller => 'products', :action => 'show', :locale => 'es', :id => 'product_slug'
+  end
+
+  def test_optional_segments
+    draw_routes do
+      localized do
+        get 'products(/:optional_param)/:non_optional_param', :to => 'products#index'
+      end
+    end
+
+    assert_routing '/es/productos/a', :controller => 'products', :action => 'index', :locale => 'es', :non_optional_param => 'a'
+    assert_routing '/es/productos/a/b', :controller => 'products', :action => 'index', :locale => 'es', :non_optional_param => 'b', :optional_param => 'a'
+  end
+
+  def test_dynamic_segments_dont_get_translated
+    draw_routes do
+      localized do
+        get 'products/:tr_param', :to => 'products#index', :constraints => { :tr_param => /\w/ }
+      end
+    end
+    assert_routing '/es/productos/a', :controller => 'products', :action => 'index', :locale => 'es', :tr_param => 'a'
+  end
+
   def test_resources
     config_default_locale_settings 'es'
 

metadata

@@ -1,63 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: route_translator
-version: !ruby/object:Gem::Version 
-  hash: 5
+version: !ruby/object:Gem::Version
+  version: 3.0.2
   prerelease: 
-  segments: 
-  - 3
-  - 0
-  - 1
-  version: 3.0.1
 platform: ruby
-authors: 
+authors:
 - Raul Murciano
 - Enric Lluelles
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-05-03 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-05-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: minitest
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 35
-        segments: 
-        - 4
-        - 7
-        - 0
+      - !ruby/object:Gem::Version
         version: 4.7.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.7.0
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-description: Translates the Rails routes of your application into the languages defined in your locale files
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Translates the Rails routes of your application into the languages defined
+  in your locale files
 email: enric@lluell.es
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/route_translator.rb
 - lib/route_translator/extensions.rb
 - lib/route_translator/extensions/action_controller.rb
@@ -80,41 +73,31 @@ files:
 - test/locales/routes.yml
 - test/routing_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://github.com/enriclluelles/route_translator
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Translate your Rails routes in a simple manner
-test_files: 
+test_files:
 - test/dummy/app/controllers/dummy_controller.rb
 - test/dummy/config.ru
 - test/dummy/config/application.rb