route_translator 2.0.1 → 3.0.0

data/lib/route_translator.rb

@@ -3,65 +3,26 @@ require 'action_controller'
 require 'action_mailer'
 require 'action_dispatch'
 
-require 'route_translator/route_set'
-require 'route_translator/routes_reloader'
-require 'route_translator/railtie' if defined?(Rails::Railtie)
+require File.expand_path('../route_translator/extensions', __FILE__)
+require File.expand_path('../route_translator/translator', __FILE__)
 
 module RouteTranslator
 
   TRANSLATABLE_SEGMENT = /^([-_a-zA-Z0-9]+)(\()?/.freeze
-  LOCALE_PARAM_KEY = :locale
-  ROUTE_HELPER_CONTAINER = [
-    ActionController::Base,
-    ActionView::Base,
-    ActionMailer::Base,
-    ActionDispatch::Routing::UrlFor
-  ].freeze
 
-  Configuration = Struct.new(:force_locale, :generate_unlocalized_routes, :translation_file)
+  Configuration = Struct.new(:force_locale, :generate_unlocalized_routes, :translation_file, :locale_param_key)
 
-  def self.locale_suffix locale
-    locale.to_s.underscore
-  end
-
-  def self.config
+  def self.config(&block)
     @config ||= Configuration.new
+    @config.force_locale ||= false
+    @config.generate_unlocalized_routes ||= false
+    @config.locale_param_key ||= :locale
+    yield @config if block
+    @config
   end
 
-  # Attributes
-
-  module Controller
-    def set_locale_from_url
-      I18n.locale = params[RouteTranslator::LOCALE_PARAM_KEY]
-    end
-  end
-
-  module Mapper
-    #yield the block and add all the routes created
-    #in it to the localized_routes array
-    def localized
-      routes_before = @set.routes.map(&:to_s)
-      yield
-      routes_after = @set.routes.map(&:to_s)
-      @set.localized_routes ||= []
-      @set.localized_routes.concat(routes_after - routes_before)
-      @set.localized_routes.uniq!
-    end
+  def self.locale_param_key
+    self.config.locale_param_key
   end
 
-  ActiveSupport.run_load_hooks(:route_translator, self)
 end
-
-# Add locale_suffix to controllers, views and mailers
-RouteTranslator::ROUTE_HELPER_CONTAINER.each do |klass|
-  klass.class_eval do
-    private
-    def locale_suffix locale
-      RouteTranslator.locale_suffix locale
-    end
-  end
-end
-
-ActionController::Base.send(:include, RouteTranslator::Controller)
-ActionDispatch::Routing::Mapper.send(:include, RouteTranslator::Mapper)
-ActionDispatch::Routing::RouteSet.send(:include, RouteTranslator::RouteSet)

data/lib/route_translator/extensions.rb

@@ -0,0 +1,3 @@
+require File.expand_path('../extensions/mapper', __FILE__)
+require File.expand_path('../extensions/route_set', __FILE__)
+require File.expand_path('../extensions/action_controller', __FILE__)

data/lib/route_translator/extensions/action_controller.rb

@@ -0,0 +1,11 @@
+require 'action_controller'
+
+module ActionController
+  class Base
+    before_filter :set_locale_from_url
+
+    def set_locale_from_url
+      I18n.locale = params[RouteTranslator.locale_param_key]
+    end
+  end
+end

data/lib/route_translator/extensions/mapper.rb

@@ -0,0 +1,52 @@
+require 'action_dispatch'
+
+module ActionDispatch
+  module Routing
+    class Mapper
+      def localized
+        @localized = true
+        yield
+        @localized = false
+      end
+
+      if instance_methods.map(&:to_s).include?('add_route')
+        def add_route(action, options) # :nodoc:
+          path = path_for_action(action, options.delete(:path))
+
+          if action.to_s =~ /^[\w\/]+$/
+            options[:action] ||= action unless action.to_s.include?("/")
+          else
+            action = nil
+          end
+
+          if !options.fetch(:as, true)
+            options.delete(:as)
+          else
+            options[:as] = name_for_action(options[:as], action)
+          end
+
+          mapping = Mapping.new(@set, @scope, path, options)
+          app, conditions, requirements, defaults, as, anchor = mapping.to_route
+          if @localized
+            @set.add_localized_route(app, conditions, requirements, defaults, as, anchor)
+          else
+            @set.add_route(app, conditions, requirements, defaults, as, anchor)
+          end
+        end
+      else
+        module Base
+          def match(path, options=nil)
+            mapping = Mapping.new(@set, @scope, path, options || {})
+            app, conditions, requirements, defaults, as, anchor = mapping.to_route
+            if @localized
+              @set.add_localized_route(app, conditions, requirements, defaults, as, anchor)
+            else
+              @set.add_route(app, conditions, requirements, defaults, as, anchor)
+            end
+            self
+          end
+        end
+      end
+    end
+  end
+end

data/lib/route_translator/extensions/route_set.rb

@@ -0,0 +1,13 @@
+require 'action_dispatch'
+
+module ActionDispatch
+  module Routing
+    class RouteSet
+      def add_localized_route(app, conditions = {}, requirements = {}, defaults = {}, as = nil, anchor = true)
+        RouteTranslator::Translator.translations_for(app, conditions, requirements, defaults, as, anchor, self) do |*translated_args|
+          add_route(*translated_args)
+        end
+      end
+    end
+  end
+end

data/lib/route_translator/translator.rb

@@ -0,0 +1,84 @@
+module RouteTranslator
+  module Translator
+    # Add standard route helpers for default locale e.g.
+    #   I18n.locale = :de
+    #   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)
+      ['path', 'url'].each do |suffix|
+        new_helper_name = "#{old_name}_#{suffix}"
+
+        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}")
+            __send__("#{old_name}_#{locale_suffix}_#{suffix}", *args)
+          else
+            __send__("#{old_name}_#{I18n.default_locale.to_s.underscore}_#{suffix}", *args)
+          end
+        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)
+      I18n.available_locales.each do |locale|
+        new_conditions = conditions.dup
+        new_conditions[:path_info] = translate_path(conditions[:path_info], locale)
+        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]
+        end
+        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 :(
+        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
+    end
+
+    # Translates a path and adds the locale prefix.
+    def self.translate_path(path, locale)
+      new_path = path.dup
+      final_optional_segments = new_path.slice!(/(\(.+\))$/)
+      new_path = new_path.split("/").map{|seg| translate_path_segment(seg, locale)}.join('/')
+
+      # Add locale prefix if it's not the default locale,
+      # or forcing locale to all routes,
+      # or already generating actual unlocalized routes
+      if !default_locale?(locale) || RouteTranslator.config.force_locale || RouteTranslator.config.generate_unlocalized_routes
+        new_path = "/#{locale.to_s.downcase}#{new_path}"
+      end
+
+      new_path = "/" if new_path.blank?
+
+      "#{new_path}#{final_optional_segments}"
+    end
+
+    def self.translate_name(n, locale)
+      "#{n}_#{locale.to_s.underscore}" if n.present?
+    end
+
+    def self.default_locale?(locale)
+      I18n.default_locale.to_sym == locale.to_sym
+    end
+
+    # Tries to translate a single path segment. If the path segment
+    # contains sth. like a optional format "people(.:format)", only
+    # "people" will be translated, if there is no translation, the path
+    # segment is blank or begins with a ":" (param key), the segment
+    # is returned untouched
+    def self.translate_path_segment segment, locale
+      return segment if segment.blank? or segment.starts_with?(":")
+
+      match = TRANSLATABLE_SEGMENT.match(segment)[1] rescue nil
+
+      (translate_string(match, locale) || segment)
+    end
+
+    def self.translate_string(str, locale)
+      fallback = I18n.translate(str, :locale => locale, :default => str)
+      I18n.translate("routes.#{str}", :locale => locale, :default => fallback)
+    end
+  end
+end

data/lib/route_translator/version.rb

@@ -1,3 +1,3 @@
 module RouteTranslator
-  VERSION = '2.0.1'
+  VERSION = '3.0.0'
 end

data/test/dummy/app/controllers/dummy_controller.rb

@@ -0,0 +1,5 @@
+class DummyController < ActionController::Base
+  def dummy
+    render :text => I18n.locale
+  end
+end

data/test/dummy/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run Dummy::Application

data/test/dummy/config/application.rb

@@ -0,0 +1,13 @@
+require "action_controller/railtie"
+begin
+require "active_resource/railtie"
+rescue LoadError
+end
+require "route_translator"
+
+module Dummy
+  class Application < Rails::Application
+    # config.logger = Logger.new(File.new("/dev/null", 'w'))
+    config.active_support.deprecation = :log
+  end
+end

data/test/dummy/config/environment.rb

@@ -0,0 +1,5 @@
+# Load the rails application
+require File.expand_path('../application', __FILE__)
+
+# Initialize the rails application
+Dummy::Application.initialize!

data/test/dummy/config/initializers/secret_token.rb

@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+Dummy::Application.config.secret_token = '831d41b30a9e2d662a2d0c6f1f05b5f0b7db5d59446a18686b122e623e10bc5462eb48f9c9245f3e8b00cbe0cf007786482ba7012331de8f1bde93985c4d9686'

data/test/dummy/config/initializers/session_store.rb

@@ -0,0 +1,8 @@
+# Be sure to restart your server when you modify this file.
+
+Dummy::Application.config.session_store :cookie_store, :key => '_dummy_session'
+
+# Use the database for sessions instead of the cookie-based default,
+# which shouldn't be used to store highly confidential information
+# (create the session table with "rails generate session_migration")
+# Dummy::Application.config.session_store :active_record_store

data/test/dummy/config/locales/all.yml

@@ -0,0 +1,9 @@
+# Sample localization file for English. Add more files in this directory for other locales.
+# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+en:
+  routes:
+    dummy: 'dummy'
+es:
+  routes:
+    dummy: 'dummy'

data/test/dummy/config/routes.rb

@@ -0,0 +1,6 @@
+Dummy::Application.routes.draw do
+  localized do
+    get 'dummy', :to => 'dummy#dummy'
+  end
+  mount DummyMountedApp => '/dummy_mounted_app'
+end

data/test/dummy/dummy_mounted_app.rb

@@ -0,0 +1,6 @@
+require 'sinatra'
+class DummyMountedApp < Sinatra::Base
+  get "/" do
+    "Good"
+  end
+end

data/test/dummy/script/rails

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require File.expand_path('../../config/boot',  __FILE__)
+require 'rails/commands'

data/test/integration_test.rb

@@ -0,0 +1,23 @@
+require File.expand_path('../test_helper', __FILE__)
+require 'route_translator'
+require File.expand_path('../dummy/dummy_mounted_app', __FILE__)
+require File.expand_path('../dummy/config/environment', __FILE__)
+
+class_to_inherit = defined?(ActionDispatch::IntegrationTest) ? ActionDispatch::IntegrationTest : ActionController::IntegrationTest
+class IntegrationTest < class_to_inherit
+  include RouteTranslator::TestHelper
+
+  def test_set_locale_from_params
+    config_default_locale_settings 'en'
+
+    get '/es/dummy'
+    assert_equal 'es', @response.body
+    assert_response :success
+  end
+
+  def test_mounted_apps_work_with_correct_path
+    get 'dummy_mounted_app'
+    assert_equal "Good", @response.body
+    assert_response :success
+  end
+end

data/test/locales/routes.yml

@@ -1,10 +1,6 @@
-# es:
-#   people: gente
-#   
-# en:
-
 es:
   people: gente
   products: productos
 
-en:  
+en:
+  m: m

data/test/{route_translator_test.rb → routing_test.rb}

@@ -1,13 +1,5 @@
-require 'test/unit'
-require 'mocha'
-
-require "rails"
-require "action_controller/railtie"
-
-require 'route_translator'
-require "route_translator/test_request"
-
 require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
+require 'route_translator'
 
 class PeopleController < ActionController::Base;  end
 class ProductsController < ActionController::Base;  end
@@ -16,60 +8,70 @@ class TranslateRoutesTest < ActionController::TestCase
   include ActionDispatch::Assertions::RoutingAssertions
   include RouteTranslator::TestHelper
 
-  def config_default_locale_settings(locale)
-    I18n.default_locale = locale
-  end
-
-  def config_force_locale(boolean)
-    RouteTranslator.config.force_locale = boolean
-  end
-
-  def config_generate_unlocalized_routes(boolean)
-    RouteTranslator.config.generate_unlocalized_routes = boolean
-  end
-
-  def config_translation_file (file)
-    RouteTranslator.config.translation_file = file
-  end
-
   def setup
-    setup_application
-
-    @controller = ActionController::Base.new
-    @view = ActionView::Base.new
     @routes = ActionDispatch::Routing::RouteSet.new
+    I18n.backend = I18n::Backend::Simple.new
+    I18n.load_path = [ File.expand_path('../locales/routes.yml', __FILE__) ]
+    I18n.reload!
   end
 
   def teardown
     config_force_locale false
     config_generate_unlocalized_routes false
     config_default_locale_settings("en")
-    routes_file ""
-    FileUtils.rm_rf "#{tmp_path}/log"
   end
 
   def test_unnamed_root_route
-    @routes.draw do
+    config_default_locale_settings 'en'
+    draw_routes do
       localized do
         root :to => 'people#index'
       end
     end
-    config_default_locale_settings 'en'
-    @routes.translate_with_dictionary{|t| t['en'] = {}; t['es'] = {'people' => 'gente'} }
 
     assert_routing '/', :controller => 'people', :action => 'index', :locale => 'en'
     assert_routing '/es', :controller => 'people', :action => 'index', :locale => 'es'
   end
 
-  def test_unnamed_root_route_without_prefix
-    @routes.draw do
+  def test_resources
+    config_default_locale_settings 'es'
+
+    draw_routes do
       localized do
-        root :to => 'people#index'
+        resources :products
+      end
+    end
+
+
+    assert_routing '/en/products', :controller => 'products', :action => 'index', :locale => 'en'
+    assert_routing '/productos', :controller => 'products', :action => 'index', :locale => 'es'
+    assert_routing({:path => '/productos/1', :method => "GET"}, {:controller => 'products', :action => 'show', :id => '1', :locale => 'es'})
+    assert_routing({:path => '/productos/1', :method => "PUT"}, {:controller => 'products', :action => 'update', :id => '1', :locale => 'es'})
+  end
+
+  def test_resources_with_only
+    config_default_locale_settings 'es'
+
+    draw_routes do
+      localized do
+        resources :products, :only => [:index, :show]
       end
     end
+
+    assert_routing '/en/products', :controller => 'products', :action => 'index', :locale => 'en'
+    assert_routing '/productos', :controller => 'products', :action => 'index', :locale => 'es'
+    assert_routing({:path => '/productos/1', :method => "GET"}, {:controller => 'products', :action => 'show', :id => '1', :locale => 'es'})
+    assert_unrecognized_route({:path => '/productos/1', :method => "PUT"}, {:controller => 'products', :action => 'update', :id => '1', :locale => 'es'})
+  end
+
+  def test_unnamed_root_route_without_prefix
     config_default_locale_settings 'es'
 
-    @routes.translate_from_file(File.expand_path('locales/routes.yml', File.dirname(__FILE__)))
+    draw_routes do
+      localized do
+        root :to => 'people#index'
+      end
+    end
 
     assert_routing '/', :controller => 'people', :action => 'index', :locale => 'es'
     assert_routing '/en', :controller => 'people', :action => 'index', :locale => 'en'
@@ -77,55 +79,53 @@ class TranslateRoutesTest < ActionController::TestCase
   end
 
   def test_unnamed_untranslated_route
-    @routes.draw do
+    config_default_locale_settings 'en'
+
+    draw_routes do
       localized do
-        match 'foo', :to => 'people#index'
+        get 'foo', :to => 'people#index'
       end
     end
-    config_default_locale_settings 'en'
-    @routes.translate_with_dictionary{|t| t['en'] = {}; t['es'] = {'people' => 'gente'} }
 
     assert_routing '/es/foo', :controller => 'people', :action => 'index', :locale => 'es'
     assert_routing '/foo', :controller => 'people', :action => 'index', :locale => 'en'
   end
 
   def test_unnamed_translated_route_on_default_locale
-    @routes.draw { match 'people', :to => 'people#index' }
-    @routes.draw do
+    config_default_locale_settings 'es'
+
+    @routes.draw { get 'people', :to => 'people#index' }
+    draw_routes do
       localized do
-        match 'people', :to => 'people#index'
+        get 'people', :to => 'people#index'
       end
     end
 
-    config_default_locale_settings 'es'
-
-    @routes.translate_with_dictionary{|t| t['en'] = {}; t['es'] = {'people' => 'gente'} }
 
     assert_routing '/en/people', :controller => 'people', :action => 'index', :locale => 'en'
     assert_routing '/gente', :controller => 'people', :action => 'index', :locale => 'es'
   end
 
   def test_unnamed_translated_route_on_non_default_locale
-    @routes.draw do
+    config_default_locale_settings 'en'
+    draw_routes do
       localized do
-        match 'people', :to => 'people#index'
+        get 'people', :to => 'people#index'
       end
     end
-    config_default_locale_settings 'en'
-    @routes.translate_with_dictionary{|t| t['en'] = {}; t['es'] = {'people' => 'gente'} }
 
     assert_routing '/es/gente', :controller => 'people', :action => 'index', :locale => 'es'
     assert_routing '/people', :controller => 'people', :action => 'index', :locale => 'en'
   end
 
   def test_named_translated_route_with_prefix_must_have_locale_as_static_segment
-    @routes.draw do
+    config_default_locale_settings 'en'
+
+    draw_routes do
       localized do
-        match 'people', :to => 'people#index'
+        get 'people', :to => 'people#index'
       end
     end
-    config_default_locale_settings 'en'
-    @routes.translate_with_dictionary{|t| t['en'] = {}; t['es'] = {'people' => 'gente'} }
 
     # we check the string representation of the route,
     # if it stores locale as a dynamic segment it would be represented as: "/:locale/gente"
@@ -133,13 +133,12 @@ class TranslateRoutesTest < ActionController::TestCase
   end
 
   def test_named_empty_route_without_prefix
-    @routes.draw do
+    config_default_locale_settings 'es'
+    draw_routes do
       localized do
         root :to => 'people#index', :as => 'people'
       end
     end
-    config_default_locale_settings 'es'
-    @routes.translate_with_dictionary{|t|  t['es'] = {};  t['en'] = {'people' => 'gente'}; }
 
     assert_routing '/en', :controller => 'people', :action => 'index', :locale => 'en'
     assert_routing '/', :controller => 'people', :action => 'index', :locale => 'es'
@@ -147,76 +146,73 @@ class TranslateRoutesTest < ActionController::TestCase
   end
 
   def test_named_root_route_without_prefix
-    @routes.draw do
+    config_default_locale_settings 'es'
+
+    draw_routes do
       localized do
         root :to => 'people#index'
       end
     end
 
-    config_default_locale_settings 'es'
-
-    @routes.translate_from_file(File.expand_path('locales/routes.yml', File.dirname(__FILE__)))
-
     assert_routing '/', :controller => 'people', :action => 'index', :locale => 'es'
     assert_routing '/en', :controller => 'people', :action => 'index', :locale => 'en'
     assert_unrecognized_route '/es', :controller => 'people', :action => 'index', :locale => 'es'
   end
 
   def test_named_untranslated_route_without_prefix
-    @routes.draw do
+    config_default_locale_settings 'es'
+
+    draw_routes do
       localized do
-        match 'foo', :to => 'people#index', :as => 'people'
+        get 'foo', :to => 'people#index', :as => 'people'
       end
     end
-    config_default_locale_settings 'es'
-    @routes.translate_with_dictionary{ |t| t['en'] = {}; t['es'] = {'people' => 'gente'} }
 
     assert_routing '/en/foo', :controller => 'people', :action => 'index', :locale => 'en'
     assert_routing '/foo', :controller => 'people', :action => 'index', :locale => 'es'
+
     assert_helpers_include :people_en, :people_es, :people
   end
 
   def test_named_translated_route_on_default_locale_without_prefix
-    @routes.draw do
+    config_default_locale_settings 'es'
+
+    draw_routes do
       localized do
-        match 'people', :to => 'people#index', :as => 'people'
+        get 'people', :to => 'people#index', :as => 'people'
       end
     end
 
-    config_default_locale_settings 'es'
-
-    @routes.translate_with_dictionary{|t| t['en'] = {}; t['es'] = {'people' => 'gente'} }
-
     assert_routing '/en/people', :controller => 'people', :action => 'index', :locale => 'en'
     assert_routing 'gente', :controller => 'people', :action => 'index', :locale => 'es'
+
+    
     assert_helpers_include :people_en, :people_es, :people
   end
 
   def test_named_translated_route_on_non_default_locale_without_prefix
-    @routes.draw do
+    draw_routes do
       localized do
-        match 'people', :to => 'people#index', :as => 'people'
+        get 'people', :to => 'people#index', :as => 'people'
       end
     end
 
     config_default_locale_settings 'en'
 
-    @routes.translate_with_dictionary{|t| t['en'] = {}; t['es'] = {'people' => 'gente'} }
-
     assert_routing '/people', :controller => 'people', :action => 'index', :locale => 'en'
     assert_routing '/es/gente', :controller => 'people', :action => 'index', :locale => 'es'
+
+    
     assert_helpers_include :people_en, :people_es, :people
   end
 
   def test_formatted_root_route
-    @routes.draw do
+    draw_routes do
       localized do
         root :to => 'people#index', :as => 'root'
       end
     end
 
-    @routes.translate_with_dictionary{ |t| t['en'] = {}; t['es'] = {'people' => 'gente'} }
-
     if formatted_root_route?
       assert_equal '/(.:format)', path_string(named_route('root_en'))
       assert_equal '/es(.:format)', path_string(named_route('root_es'))
@@ -226,112 +222,62 @@ class TranslateRoutesTest < ActionController::TestCase
     end
   end
 
-  def test_routes_locale_prefixes_are_never_downcased
-    @routes.draw do
-      localized do
-        match 'people', :to => 'people#index', :as => 'people'
-      end
-    end
+  def test_i18n_based_translations_setting_locales
     config_default_locale_settings 'en'
 
-    @routes.translate_with_dictionary{ |t| t['en'] = {}; t['ES'] = {'people' => 'Gente'} }
-
-    assert_routing '/es/Gente', :controller => 'people', :action => 'index', :locale => 'ES'
-  end
-
-  def test_languages_load_from_file
-    @routes.draw do
+    draw_routes do
       localized do
-        match 'people', :to => 'people#index', :as => 'people'
+        get 'people', :to => 'people#index', :as => 'people'
       end
     end
-    config_default_locale_settings 'en'
-
-    @routes.translate_from_file(File.expand_path('locales/routes.yml', File.dirname(__FILE__)))
 
-    assert_routing '/people', :controller => 'people', :action => 'index', :locale => 'en'
     assert_routing '/es/gente', :controller => 'people', :action => 'index', :locale => 'es'
-    assert_helpers_include :people_en, :people_es, :people
-  end
-
-  def test_languages_load_from_file_without_dictionary_for_default_locale
-    @routes.draw do
-      localized do
-        match 'people', :to => 'people#index', :as => 'people'
-      end
-    end
-    config_default_locale_settings 'fr'
-
-    @routes.translate_from_file(File.expand_path('locales/routes.yml', File.dirname(__FILE__)))
+    assert_routing '/people', :controller => 'people', :action => 'index', :locale => 'en'
 
-    assert_routing '/people', :controller => 'people', :action => 'index', :locale => 'fr'
-    assert_routing '/en/people', :controller => 'people', :action => 'index', :locale => 'en'
-    assert_routing '/es/gente', :controller => 'people', :action => 'index', :locale => 'es'
-    assert_helpers_include :people_fr, :people_en, :people_es, :people
+    
+    assert_helpers_include :people_en, :people_es, :people
   end
 
-  def test_i18n_based_translations_setting_locales
-    @routes.draw do
-      localized do
-        match 'people', :to => 'people#index', :as => 'people'
-      end
-    end
+  def test_translations_depend_on_available_locales
     config_default_locale_settings 'en'
 
-    I18n.backend = StubbedI18nBackend
-
-    @routes.translate_with_i18n('es')
-
-    assert_routing '/es/gente', :controller => 'people', :action => 'index', :locale => 'es'
-    assert_routing '/people', :controller => 'people', :action => 'index', :locale => 'en'
-    assert_helpers_include :people_en, :people_es, :people
-  end
-
-  def test_i18n_based_translations_taking_i18n_available_locales
-    @routes.draw do
-      localized do
-        match 'people', :to => 'people#index', :as => 'people'
+    I18n.stub(:available_locales, [:es, :en, :fr]) do
+      draw_routes do
+        localized do
+          get 'people', :to => 'people#index', :as => 'people'
+        end
       end
     end
-    config_default_locale_settings 'en'
-    I18n.stubs(:available_locales).at_least_once.returns StubbedI18nBackend.available_locales
-    I18n.backend = StubbedI18nBackend
-
-    @routes.translate_with_i18n
 
     assert_routing '/fr/people', :controller => 'people', :action => 'index', :locale => 'fr'
     assert_routing '/es/gente', :controller => 'people', :action => 'index', :locale => 'es'
     assert_routing '/people', :controller => 'people', :action => 'index', :locale => 'en'
+
     assert_helpers_include :people_fr, :people_en, :people_es, :people
   end
 
   def test_2_localized_blocks
-    @routes.draw do
+    draw_routes do
       localized do
-        match 'people', :to => 'people#index', :as => 'people'
+        get 'people', :to => 'people#index', :as => 'people'
       end
       localized do
-        match 'products', :to => 'products#index', :as => 'products'
+        get 'products', :to => 'products#index', :as => 'products'
       end
     end
-    config_default_locale_settings 'en'
-
-    @routes.translate_from_file(File.expand_path('locales/routes.yml', File.dirname(__FILE__)))
 
     assert_routing '/es/gente', :controller => 'people', :action => 'index', :locale => 'es'
     assert_routing '/es/productos', :controller => 'products', :action => 'index', :locale => 'es'
   end
 
   def test_not_localizing_routes_outside_blocks
-    @routes.draw do
+    config_default_locale_settings 'en'
+    draw_routes do
       localized do
-        match 'people', :to => 'people#index', :as => 'people'
+        get 'people', :to => 'people#index', :as => 'people'
       end
-      match 'products', :to => 'products#index', :as => 'products'
+      get 'products', :to => 'products#index', :as => 'products'
     end
-    config_default_locale_settings 'en'
-
-    @routes.translate_from_file(File.expand_path('locales/routes.yml', File.dirname(__FILE__)))
 
     assert_routing '/es/gente', :controller => 'people', :action => 'index', :locale => 'es'
     assert_routing '/products', :controller => 'products', :action => 'index'
@@ -339,75 +285,47 @@ class TranslateRoutesTest < ActionController::TestCase
   end
 
   def test_force_locale
-    @routes.draw do
-      localized do
-        match 'people', :to => 'people#index', :as => 'people'
-      end
-    end
-
     config_default_locale_settings 'en'
     config_force_locale true
 
-    @routes.translate_from_file(File.expand_path('locales/routes.yml', File.dirname(__FILE__)))
+    draw_routes do
+      localized do
+        get 'people', :to => 'people#index', :as => 'people'
+      end
+    end
 
     assert_routing '/en/people', :controller => 'people', :action => 'index', :locale => 'en'
     assert_unrecognized_route '/people', :controller => 'people', :action => 'index'
   end
 
   def test_generate_unlocalized_routes
-    @routes.draw do
-      localized do
-        match 'people', :to => 'people#index', :as => 'people'
-      end
-    end
-
     config_default_locale_settings 'en'
     config_generate_unlocalized_routes true
 
-    @routes.translate_from_file(File.expand_path('locales/routes.yml', File.dirname(__FILE__)))
+    draw_routes do
+      localized do
+        get 'people', :to => 'people#index', :as => 'people'
+      end
+    end
 
     assert_routing '/en/people', :controller => 'people', :action => 'index', :locale => 'en'
     assert_routing '/people', :controller => 'people', :action => 'index'
   end
 
   def test_config_translation_file
-    @routes.draw do
+    config_default_locale_settings 'es'
+
+    draw_routes do
       localized do
         root :to => 'people#index'
       end
     end
 
-    config_default_locale_settings 'es'
-    config_translation_file File.expand_path('locales/routes.yml', File.dirname(__FILE__))
-
-    @routes.translate_from_file
-
     assert_routing '/', :controller => 'people', :action => 'index', :locale => 'es'
     assert_routing '/en', :controller => 'people', :action => 'index', :locale => 'en'
     assert_unrecognized_route '/es', :controller => 'people', :action => 'index', :locale => 'es'
   end
 
-  def test_auto_translate
-
-    routes_file <<-RUBY
-      Rails.application.routes.draw do
-        localized do
-          root :to => 'people#index'
-        end
-      end
-    RUBY
-
-    config_default_locale_settings 'es'
-    config_translation_file File.expand_path('locales/routes.yml', File.dirname(__FILE__))
-
-    app.reload_routes!
-
-    @routes = app.routes
-
-    assert_routing '/', :controller => 'people', :action => 'index', :locale => 'es'
-    assert_routing '/en', :controller => 'people', :action => 'index', :locale => 'en'
-    assert_unrecognized_route '/es', :controller => 'people', :action => 'index', :locale => 'es'
-  end
 
   def test_action_controller_gets_locale_setter
     ActionController::Base.instance_methods.include?('set_locale_from_url')
@@ -420,5 +338,4 @@ class TranslateRoutesTest < ActionController::TestCase
   def test_action_view_gets_locale_suffix_helper
     ActionView::Base.instance_methods.include?('locale_suffix')
   end
-
 end