rails_i18n_routes 1.1.6 → 1.1.8

data/lib/rails_i18n_routes/{action_controller.rb → action_controller/base.rb}

@@ -1,6 +1,6 @@
 module RailsI18nRoutes
   module ActionController
-    module BaseMethods
+    module Base
         
       def self.included(base)
         base.send :prepend_before_filter, :select_locale

data/lib/rails_i18n_routes/{action_dispatch.rb → action_dispatch/mapper.rb}

@@ -1,6 +1,6 @@
 module RailsI18nRoutes
   module ActionDispatch
-    module MapperMethods
+    module Mapper
     
       def localized
         @locales = I18n.available_locales.dup
@@ -18,18 +18,21 @@ module RailsI18nRoutes
       
       def add_route(action, options)
        if @locales
-          scope = @scope.dup
           @locales.each do |locale|
-            @scope[:path] = i18n_path(@scope[:path], locale) if @scope[:path]
+            path = @scope[:path].dup if @scope[:path].present?
+            path_names = @scope[:path_names].dup
+            @scope[:path] = i18n_path(path, locale) if @scope[:path].present?
+            @scope[:path_names].each { |key, value| @scope[:path_names][key] = I18n.t("routes.#{key}", :locale => locale, :default => value) }
             super(*[i18n_path(action, locale), i18n_options(options, locale)])
+            @scope[:path] = path if @scope[:path].present?
+            @scope[:path_names] = path_names
           end
-          @set.named_routes.define_i18n_route_helper @scope[:as] ? "#{@scope[:as]}_#{options[:as]}" : options[:as] 
-          @scope = scope
+          @set.named_routes.define_i18n_route_helper @scope[:as] ? "#{@scope[:as]}_#{options[:as]}" : options[:as] unless @scope[:scope_level_resource].present?
           return
         end
         super
-      end     
-      
+      end
+
       protected
 
       def i18n_options(options, locale)
@@ -50,37 +53,19 @@ module RailsI18nRoutes
       end
       
       def i18n_path(path, locale)
-        i18n_path = []
-        path.to_s.split('/').each do |part|
-          next if part == ''
-          part.gsub!(/-/, '_')
-          i18n_path << ((part[0] == ':' or part[0] == '*') ? part : I18n.t("routes.#{part}", :locale => locale, :default => part.gsub(/_/, '-')))
-        end  
-        i18n_path.join('/')
+        unless path.is_a? Symbol
+          i18n_path = []
+          path.split('/').each do |part|
+            next if part == ''
+            part.gsub!(/-/, '_')
+            i18n_path << ((part[0] == ':' or part[0] == '*') ? part : I18n.t("routes.#{part}", :locale => locale, :default => part.gsub(/_/, '-')))
+          end  
+          i18n_path.join('/')
+        else
+          path
+        end
       end
     
     end
-    module NamedRouteCollectionMethods
-      
-      def define_i18n_route_helper(name)
-        ['url', 'path'].each do |kind|
-          selector = url_helper_name(name, kind)
-          @module.module_eval <<-END_EVAL, __FILE__, __LINE__ + 1
-            remove_possible_method :#{selector}
-            def #{selector}(*args)
-              options = args.extract_options!
-              if Rails.application.config.i18n_routes.selection == :subdomain
-                suffix = (options[:subdomain] ? options[:subdomain] : request.subdomain)
-              else
-                suffix = (options[:locale] ? options[:locale] : I18n.locale).to_s.gsub('-', '_').downcase
-              end
-              send ("#{name}_" + suffix.to_s + "_#{kind}"), *(args << options)
-            end
-          END_EVAL
-          helpers << selector
-        end                
-      end    
-    
-    end
   end
 end

data/lib/rails_i18n_routes/action_dispatch/route_set/named_route_collection.rb

@@ -0,0 +1,28 @@
+module RailsI18nRoutes
+  module ActionDispatch
+    module RouteSet
+      module NamedRouteCollection
+        
+        def define_i18n_route_helper(name)
+          ['url', 'path'].each do |kind|
+            selector = url_helper_name(name, kind)
+            @module.module_eval <<-END_EVAL, __FILE__, __LINE__ + 1
+              remove_possible_method :#{selector}
+              def #{selector}(*args)
+                options = args.extract_options!
+                if Rails.application.config.i18n_routes.selection == :subdomain
+                  suffix = (options[:subdomain] ? options[:subdomain] : request.subdomain)
+                else
+                  suffix = (options[:locale] ? options[:locale] : I18n.locale).to_s.gsub('-', '_').downcase
+                end
+                send ("#{name}_" + suffix.to_s + "_#{kind}"), *(args << options)
+              end
+            END_EVAL
+            helpers << selector
+          end                
+        end    
+      
+      end
+    end
+  end
+end

data/lib/rails_i18n_routes/railtie.rb

@@ -5,9 +5,9 @@ module RailsI18nRoutes
     config.i18n_routes.selection = :prefix
 
     initializer 'rails_i18n_routes' do
-      ::ActionDispatch::Routing::Mapper.send :include, RailsI18nRoutes::ActionDispatch::MapperMethods
-      ::ActionDispatch::Routing::RouteSet::NamedRouteCollection.send :include, RailsI18nRoutes::ActionDispatch::NamedRouteCollectionMethods
-      ::ActionController::Base.send :include, RailsI18nRoutes::ActionController::BaseMethods
+      ::ActionDispatch::Routing::Mapper.send :include, RailsI18nRoutes::ActionDispatch::Mapper
+      ::ActionDispatch::Routing::RouteSet::NamedRouteCollection.send :include, RailsI18nRoutes::ActionDispatch::RouteSet::NamedRouteCollection
+      ::ActionController::Base.send :include, RailsI18nRoutes::ActionController::Base
     end
   
   end

data/lib/rails_i18n_routes/version.rb

@@ -1,5 +1,5 @@
 module RailsI18nRoutes
 
-  VERSION = '1.1.6'
+  VERSION = '1.1.8'
 
 end

data/lib/rails_i18n_routes.rb

@@ -1,6 +1,8 @@
-require 'rails_i18n_routes/action_controller'
-require 'rails_i18n_routes/action_dispatch'
+require 'rails_i18n_routes/action_controller/base'
+require 'rails_i18n_routes/action_dispatch/route_set/named_route_collection'
+require 'rails_i18n_routes/action_dispatch/mapper'
 require 'rails_i18n_routes/railtie'
+require 'rails_i18n_routes/version'
 
 module RailsI18nRoutes
 end

data/test/dummy/config/locales/en-US.yml

@@ -1,5 +1,7 @@
 en-US:
   routes:
+    new: "new"
+    edit: "edit"
     namespace: "namespace"
     nesteds: "nesteds"
     simples: "simples"

data/test/dummy/config/locales/es-AR.yml

@@ -1,5 +1,7 @@
 es-AR:
   routes:
+    new: "nuevo"
+    edit: "editar"
     namespace: "nombre-de-espacio"
     nesteds: "anidadas"
     simples: "simples"

data/test/dummy/config/locales/es-UY.yml

@@ -1,5 +1,7 @@
 es-UY:
   routes:
+    new: "nuevo"
+    edit: "editar"
     namespace: "nombre-de-espacio"
     nesteds: "anidadas"
     simples: "simples"

data/test/dummy/config/routes.rb

@@ -1,6 +1,9 @@
 Dummy::Application.routes.draw do
   
   localized do
+    namespace :test, :path => 'prueba' do
+      resources :test1, :path => 'prueba1'
+    end
     namespace :namespace do
       match 'nesteds' => 'nesteds#show', :as => :nested
     end

data/test/dummy/log/development.log

@@ -34,3 +34,66 @@ Connecting to database specified by database.yml
    (0.1ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
    (0.0ms)  SELECT version FROM "schema_migrations"
    (0.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml

data/test/dummy/log/test.log

@@ -4397,3 +4397,162 @@ Completed 200 OK in 2ms (Views: 1.4ms | ActiveRecord: 0.0ms)
    (0.1ms)  rollback transaction
    (0.0ms)  begin transaction
    (0.0ms)  rollback transaction
+Connecting to database specified by database.yml
+   (0.2ms)  begin transaction
+Processing by SimplesController#show as HTML
+  Parameters: {"locale"=>"en-US"}
+  Rendered simples/show.html.erb within layouts/application (6.6ms)
+Completed 200 OK in 64ms (Views: 63.1ms | ActiveRecord: 0.0ms)
+Processing by SimplesController#show as HTML
+  Parameters: {"locale"=>"en-US"}
+  Rendered simples/show.html.erb within layouts/application (0.4ms)
+Completed 200 OK in 4ms (Views: 4.2ms | ActiveRecord: 0.0ms)
+Processing by SimplesController#show as HTML
+  Parameters: {"locale"=>"en-US"}
+  Rendered simples/show.html.erb within layouts/application (0.4ms)
+Completed 200 OK in 4ms (Views: 3.8ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by SimplesController#show as HTML
+Completed 200 OK in 2ms (Views: 1.7ms | ActiveRecord: 0.0ms)
+Processing by SimplesController#show as HTML
+Completed 200 OK in 2ms (Views: 1.3ms | ActiveRecord: 0.0ms)
+Processing by SimplesController#show as HTML
+Completed 200 OK in 2ms (Views: 1.4ms | ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+Connecting to database specified by database.yml
+   (0.2ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+Processing by SimplesController#show as HTML
+  Parameters: {"locale"=>"en-US"}
+Completed 200 OK in 152ms (Views: 151.8ms | ActiveRecord: 0.0ms)
+Processing by SimplesController#show as HTML
+  Parameters: {"locale"=>"en-US"}
+Completed 200 OK in 4ms (Views: 4.2ms | ActiveRecord: 0.0ms)
+Processing by SimplesController#show as HTML
+  Parameters: {"locale"=>"en-US"}
+Completed 200 OK in 4ms (Views: 4.0ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by SimplesController#show as HTML
+Completed 200 OK in 2ms (Views: 1.8ms | ActiveRecord: 0.0ms)
+Processing by SimplesController#show as HTML
+Completed 200 OK in 2ms (Views: 1.5ms | ActiveRecord: 0.0ms)
+Processing by SimplesController#show as HTML
+Completed 200 OK in 2ms (Views: 1.5ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+Connecting to database specified by database.yml
+   (0.2ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+Processing by SimplesController#show as HTML
+  Parameters: {"locale"=>"en-US"}
+Completed 200 OK in 173ms (Views: 172.4ms | ActiveRecord: 0.0ms)
+Processing by SimplesController#show as HTML
+  Parameters: {"locale"=>"en-US"}
+Completed 200 OK in 4ms (Views: 4.1ms | ActiveRecord: 0.0ms)
+Processing by SimplesController#show as HTML
+  Parameters: {"locale"=>"en-US"}
+Completed 200 OK in 4ms (Views: 3.7ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by SimplesController#show as HTML
+Completed 200 OK in 2ms (Views: 1.7ms | ActiveRecord: 0.0ms)
+Processing by SimplesController#show as HTML
+Completed 200 OK in 2ms (Views: 1.4ms | ActiveRecord: 0.0ms)
+Processing by SimplesController#show as HTML
+Completed 200 OK in 2ms (Views: 1.4ms | ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+Connecting to database specified by database.yml
+   (0.2ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+Processing by SimplesController#show as HTML
+  Parameters: {"locale"=>"en-US"}
+Completed 200 OK in 46ms (Views: 45.5ms | ActiveRecord: 0.0ms)
+Processing by SimplesController#show as HTML
+  Parameters: {"locale"=>"en-US"}
+Completed 200 OK in 4ms (Views: 4.2ms | ActiveRecord: 0.0ms)
+Processing by SimplesController#show as HTML
+  Parameters: {"locale"=>"en-US"}
+Completed 200 OK in 4ms (Views: 3.7ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by SimplesController#show as HTML
+Completed 200 OK in 2ms (Views: 1.7ms | ActiveRecord: 0.0ms)
+Processing by SimplesController#show as HTML
+Completed 200 OK in 2ms (Views: 1.5ms | ActiveRecord: 0.0ms)
+Processing by SimplesController#show as HTML
+Completed 200 OK in 2ms (Views: 1.4ms | ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+Connecting to database specified by database.yml
+   (0.2ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by SimplesController#show as HTML
+  Parameters: {"locale"=>"en-US"}
+Completed 200 OK in 18ms (Views: 17.3ms | ActiveRecord: 0.0ms)
+Processing by SimplesController#show as HTML
+  Parameters: {"locale"=>"en-US"}
+Completed 200 OK in 4ms (Views: 4.1ms | ActiveRecord: 0.0ms)
+Processing by SimplesController#show as HTML
+  Parameters: {"locale"=>"en-US"}
+Completed 200 OK in 4ms (Views: 3.6ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by SimplesController#show as HTML
+Completed 200 OK in 2ms (Views: 1.7ms | ActiveRecord: 0.0ms)
+Processing by SimplesController#show as HTML
+Completed 200 OK in 2ms (Views: 1.4ms | ActiveRecord: 0.0ms)
+Processing by SimplesController#show as HTML
+Completed 200 OK in 2ms (Views: 1.3ms | ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+Connecting to database specified by database.yml
+   (0.2ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+Processing by SimplesController#show as HTML
+  Parameters: {"locale"=>"en-US"}
+Completed 200 OK in 17ms (Views: 16.8ms | ActiveRecord: 0.0ms)
+Processing by SimplesController#show as HTML
+  Parameters: {"locale"=>"en-US"}
+Completed 200 OK in 4ms (Views: 4.0ms | ActiveRecord: 0.0ms)
+Processing by SimplesController#show as HTML
+  Parameters: {"locale"=>"en-US"}
+Completed 200 OK in 4ms (Views: 3.7ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by SimplesController#show as HTML
+Completed 200 OK in 2ms (Views: 1.7ms | ActiveRecord: 0.0ms)
+Processing by SimplesController#show as HTML
+Completed 200 OK in 2ms (Views: 1.4ms | ActiveRecord: 0.0ms)
+Processing by SimplesController#show as HTML
+Completed 200 OK in 2ms (Views: 1.4ms | ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction

data/test/rails_i18n_routes_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class RailsI18nRoutesTest < ActiveSupport::TestCase
 
-  test 'truth' do
+  test "truth" do
     assert_kind_of Module, RailsI18nRoutes
   end
 

data/test/{action_dispatch_test.rb → routes_test.rb}

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ActionDispatchTest < ActionController::IntegrationTest
+class RoutesTest < ActionController::IntegrationTest
 
   test "should translate subdomain routes" do
     with_routes_type :subdomain do

data/test/{action_controller_test.rb → selection_test.rb}

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ActionControllerTest < ActionController::TestCase
+class SelectionTest < ActionController::TestCase
   tests SimplesController
 
   test "should select correct locale by subdomain" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_i18n_routes
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000 Z
+date: 2013-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -51,16 +51,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/rails_i18n_routes/action_controller.rb
-- lib/rails_i18n_routes/action_dispatch.rb
+- lib/rails_i18n_routes/action_controller/base.rb
+- lib/rails_i18n_routes/action_dispatch/mapper.rb
+- lib/rails_i18n_routes/action_dispatch/route_set/named_route_collection.rb
 - lib/rails_i18n_routes/railtie.rb
 - lib/rails_i18n_routes/version.rb
 - lib/rails_i18n_routes.rb
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
-- test/action_controller_test.rb
-- test/action_dispatch_test.rb
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
@@ -104,6 +103,8 @@ files:
 - test/dummy/README.rdoc
 - test/dummy/script/rails
 - test/rails_i18n_routes_test.rb
+- test/routes_test.rb
+- test/selection_test.rb
 - test/test_helper.rb
 homepage: https://github.com/mattways/rails_i18n_routes
 licenses: []
@@ -130,8 +131,6 @@ signing_key:
 specification_version: 3
 summary: Toolkit for Rails i18n routes.
 test_files:
-- test/action_controller_test.rb
-- test/action_dispatch_test.rb
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
@@ -175,4 +174,6 @@ test_files:
 - test/dummy/README.rdoc
 - test/dummy/script/rails
 - test/rails_i18n_routes_test.rb
+- test/routes_test.rb
+- test/selection_test.rb
 - test/test_helper.rb