translatable_routes 1.2.0 → 1.3.0

data/test/helpers_test.rb

@@ -0,0 +1,17 @@
+require 'test_helper'
+
+class HelpersTest < ActionView::TestCase
+
+  test "should create helpers" do
+    I18n.available_locales.each do |locale|
+      I18n.locale = locale
+      
+      assert_equal "/#{locale}/#{I18n.t('routes.namespace')}/#{I18n.t('routes.nested')}", namespace_nested_path
+      assert_equal "/#{locale}/#{I18n.t('routes.namespace')}/#{I18n.t('routes.resources')}", namespace_resources_path
+      assert_equal "/#{locale}/#{I18n.t('routes.simple')}", simple_path
+      assert_equal "/#{locale}/complex/1/2", complex_path(1, 2)
+      assert_equal "/#{locale}/#{I18n.t('routes.resources')}", resources_path
+    end
+  end
+
+end

data/test/routes_test.rb

@@ -2,94 +2,35 @@ require 'test_helper'
 
 class RoutesTest < ActionDispatch::IntegrationTest
 
-  test "should translate subdomain routes" do
-    with_routes_type :subdomain do
-      Rails.application.config.translatable_routes.mapping.each_pair do |lang, countries|
-        countries = [countries] unless countries.is_a? Array
-        countries.each do |country|
-          I18n.locale = "#{lang}-#{country.upcase}"
+  test "should translate routes" do
+    I18n.available_locales.each do |locale|
+      I18n.locale = locale
+
+      assert_recognizes(
+        { controller: 'namespace/pages', action: 'nested', locale: locale.to_s },
+        "/#{locale}/#{I18n.t('routes.namespace')}/#{I18n.t('routes.nested')}"
+      )
+
+      assert_recognizes(
+        { controller: 'namespace/resources', action: 'index', locale: locale.to_s },
+        "/#{locale}/#{I18n.t('routes.namespace')}/#{I18n.t('routes.resources')}"
+      )
+
+      assert_recognizes(
+        { controller: 'pages', action: 'simple', locale: locale.to_s },
+        "/#{locale}/#{I18n.t('routes.simple')}"
+      )
+
+      assert_recognizes(
+        { controller: 'pages', action: 'complex', locale: locale.to_s, p1: '1', p2: '2' },
+        "/#{locale}/complex/1/2"
+      )
+
+      assert_recognizes(
+        { controller: 'resources', action: 'index', locale: locale.to_s },
+        "/#{locale}/#{I18n.t('routes.resources')}"
+      )
 
-          assert_recognizes(
-            { controller: 'namespace/nested_resources', action: 'show', subdomain: country.to_s },
-            "http://#{country}.example.org/#{I18n.t('routes.namespace')}/#{I18n.t('routes.nested_resources')}"
-          )
-
-          assert_recognizes(
-            { controller: 'namespace/nested', action: 'show', subdomain: country.to_s },
-            "http://#{country}.example.org/#{I18n.t('routes.namespace')}/#{I18n.t('routes.nested')}"
-          )
-
-          assert_recognizes(
-            { controller: 'simple', action: 'show', subdomain: country.to_s },
-            "http://#{country}.example.org/#{I18n.t('routes.simple')}"
-          )
-
-          assert_recognizes(
-            { controller: 'params', action: 'show', p1: '1', p2: '2', subdomain: country.to_s },
-            "http://#{country}.example.org/params/1/2"
-          )
-
-          assert_recognizes(
-            { controller: 'resources', action: 'show', subdomain: country.to_s },
-            "http://#{country}.example.org/#{I18n.t('routes.resources')}"
-          )
-
-        end
-      end    
-    end    
-  end
-
-  test "should translate prefix routes" do
-    with_routes_type :prefix do
-      I18n.available_locales.select{ |l| l != :en }.each do |locale|            
-        I18n.locale = locale
-
-        assert_recognizes(
-          { controller: 'namespace/nested', action: 'show', locale: locale.to_s },
-          "/#{locale}/#{I18n.t('routes.namespace')}/#{I18n.t('routes.nested')}"
-        )
-
-        assert_recognizes(
-          { controller: 'namespace/nested_resources', action: 'show', locale: locale.to_s },
-          "/#{locale}/#{I18n.t('routes.namespace')}/#{I18n.t('routes.nested_resources')}"
-        )
-
-        assert_recognizes(
-          { controller: 'simple', action: 'show', locale: locale.to_s },
-          "/#{locale}/#{I18n.t('routes.simple')}"
-        )
-
-        assert_recognizes(
-          { controller: 'params', action: 'show', locale: locale.to_s, p1: '1', p2: '2' },
-          "/#{locale}/params/1/2"
-        )
-
-        assert_recognizes(
-          { controller: 'resources', action: 'show', locale: locale.to_s },
-          "/#{locale}/#{I18n.t('routes.resources')}"
-        )
-
-      end
-    end
-  end
-
-  protected
-
-  def with_routes_type(type)
-    Rails.application.config.translatable_routes.selection = type
-    with_routing do |set|
-      set.draw do
-        localized do
-          namespace :namespace do
-            get 'nested', to: 'nested#show', as: :nested
-            resource :nested_resources
-          end        
-          get 'simple', to: 'simple#show', as: :simple
-          get 'params/:p1/:p2', to: 'params#show', as: :params
-          resource :resources
-        end
-      end
-      yield
     end
   end
 

metadata

@@ -1,75 +1,74 @@
 --- !ruby/object:Gem::Specification
 name: translatable_routes
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
-- Mattways
+- Museways
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-20 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Minimalistic toolkit to handle translatable routes and detect locale
   from subdomain or prefix.
 email:
-- contact@mattways.com
+- contact@museways.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/translatable_routes/action_controller/base.rb
+- MIT-LICENSE
+- README.rdoc
+- Rakefile
+- lib/translatable_routes.rb
 - lib/translatable_routes/action_dispatch/mapper.rb
 - lib/translatable_routes/action_dispatch/named_route_collection.rb
 - lib/translatable_routes/railtie.rb
 - lib/translatable_routes/version.rb
-- lib/translatable_routes.rb
-- MIT-LICENSE
-- Rakefile
-- README.rdoc
+- test/dummy/README.rdoc
+- test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/controllers/namespace/nested_controller.rb
-- test/dummy/app/controllers/namespace/nested_resources_controller.rb
+- test/dummy/app/controllers/namespace/pages_controller.rb
+- test/dummy/app/controllers/namespace/resources_controller.rb
 - test/dummy/app/controllers/pages_controller.rb
-- test/dummy/app/controllers/params_controller.rb
 - test/dummy/app/controllers/resources_controller.rb
-- test/dummy/app/controllers/simple_controller.rb
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/views/pages/show.html.erb
 - test/dummy/bin/bundle
 - test/dummy/bin/rails
 - test/dummy/bin/rake
+- test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
 - test/dummy/config/database.yml
@@ -84,11 +83,9 @@ files:
 - test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en-US.yml
-- test/dummy/config/locales/es-AR.yml
-- test/dummy/config/locales/es-UY.yml
+- test/dummy/config/locales/en.yml
+- test/dummy/config/locales/es.yml
 - test/dummy/config/routes.rb
-- test/dummy/config.ru
 - test/dummy/db/development.sqlite3
 - test/dummy/db/schema.rb
 - test/dummy/log/development.log
@@ -97,18 +94,16 @@ files:
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
-- test/dummy/Rakefile
-- test/dummy/README.rdoc
 - test/dummy/tmp/cache/assets/test/sprockets/13fe41fee1fe35b49d145bcc06610705
 - test/dummy/tmp/cache/assets/test/sprockets/2f5173deea6c795b8fdde723bb4b63af
 - test/dummy/tmp/cache/assets/test/sprockets/357970feca3ac29060c1e3861e2c0953
 - test/dummy/tmp/cache/assets/test/sprockets/cffd775d018f68ce5dba1ee0d951a994
 - test/dummy/tmp/cache/assets/test/sprockets/d771ace226fc8215a3572e0aa35bb0d6
 - test/dummy/tmp/cache/assets/test/sprockets/f7cbd26ba1d28d48de824f0e94586655
-- test/locale_test.rb
+- test/helpers_test.rb
 - test/routes_test.rb
 - test/test_helper.rb
-homepage: https://github.com/mattways/translatable_routes
+homepage: https://github.com/museways/translatable_routes
 licenses:
 - MIT
 metadata: {}
@@ -118,17 +113,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Translatable Routes for Rails.
@@ -136,15 +131,12 @@ test_files:
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/controllers/namespace/nested_controller.rb
-- test/dummy/app/controllers/namespace/nested_resources_controller.rb
+- test/dummy/app/controllers/namespace/pages_controller.rb
+- test/dummy/app/controllers/namespace/resources_controller.rb
 - test/dummy/app/controllers/pages_controller.rb
-- test/dummy/app/controllers/params_controller.rb
 - test/dummy/app/controllers/resources_controller.rb
-- test/dummy/app/controllers/simple_controller.rb
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/views/pages/show.html.erb
 - test/dummy/bin/bundle
 - test/dummy/bin/rails
 - test/dummy/bin/rake
@@ -162,9 +154,8 @@ test_files:
 - test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en-US.yml
-- test/dummy/config/locales/es-AR.yml
-- test/dummy/config/locales/es-UY.yml
+- test/dummy/config/locales/en.yml
+- test/dummy/config/locales/es.yml
 - test/dummy/config/routes.rb
 - test/dummy/config.ru
 - test/dummy/db/development.sqlite3
@@ -183,6 +174,6 @@ test_files:
 - test/dummy/tmp/cache/assets/test/sprockets/cffd775d018f68ce5dba1ee0d951a994
 - test/dummy/tmp/cache/assets/test/sprockets/d771ace226fc8215a3572e0aa35bb0d6
 - test/dummy/tmp/cache/assets/test/sprockets/f7cbd26ba1d28d48de824f0e94586655
-- test/locale_test.rb
+- test/helpers_test.rb
 - test/routes_test.rb
 - test/test_helper.rb

data/lib/translatable_routes/action_controller/base.rb

@@ -1,38 +0,0 @@
-module TranslatableRoutes
-  module ActionController
-    module Base
-      extend ActiveSupport::Concern
-        
-      included do
-        prepend_before_filter :select_locale
-      end
-      
-      protected
-      
-      def select_locale
-        if Rails.application.config.translatable_routes.selection == :subdomain
-          Rails.application.config.translatable_routes.mapping.each_pair do |key, value|
-            if (value.is_a? Array and value.include? request.subdomain.to_sym) or value == request.subdomain.to_sym
-              I18n.locale = "#{key}-#{request.subdomain.upcase}" 
-              break
-            end
-          end
-        elsif not params[:locale].nil?
-          I18n.locale = params[:locale] 
-        end       
-      end
-      
-      def subdomains
-        @subdomains ||= begin
-          values = []
-          Rails.application.config.translatable_routes.mapping.values.each do |value|
-            value = [value] unless value.is_a? Array
-            values.concat value
-          end
-          values
-        end
-      end
-
-    end
-  end
-end

data/test/dummy/app/controllers/namespace/nested_controller.rb

@@ -1,6 +0,0 @@
-class Namespace::NestedController < ApplicationController
-
-  def show
-  end
-  
-end

data/test/dummy/app/controllers/namespace/nested_resources_controller.rb

@@ -1,6 +0,0 @@
-class Namespace::NestedResourcesController < ApplicationController
-
-  def show
-  end
-  
-end

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

@@ -1,6 +0,0 @@
-class ParamsController < ApplicationController
-
-  def show
-  end
-
-end

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

@@ -1,6 +0,0 @@
-class SimpleController < ApplicationController
-
-  def show
-  end
-
-end

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

@@ -1,9 +0,0 @@
-es-UY:
-  routes:
-    new: "nuevo"
-    edit: "editar"
-    namespace: "nombre-de-espacio"
-    nested: "anidado"
-    simple: "simple"
-    resources: "recursos"
-    nested_resources: "recursos-anidados"

data/test/locale_test.rb

@@ -1,34 +0,0 @@
-require 'test_helper'
-
-class LocaleTest < ActionController::TestCase
-  tests PagesController
-
-  test "should select correct locale by subdomain" do
-    Rails.application.config.translatable_routes.selection = :subdomain
-    subdomains = []
-    Rails.application.config.translatable_routes.mapping.each_pair do |lang, countries|
-      countries = [countries] unless countries.is_a? Array
-      countries.each do |country|
-
-        @request.host = "#{country}.example.org"
-        get :show
-        assert_equal I18n.locale.to_s, "#{lang}-#{country.upcase}"
- 
-        subdomains << country  
-
-      end
-    end
-    assert_equal @controller.send(:subdomains), subdomains
-  end
-
-  test "should select correct locale by prefix" do
-    Rails.application.config.translatable_routes.selection = :prefix 
-    I18n.available_locales.select{ |l| l != :en }.each do |locale|
-      
-      get :show, locale: locale.to_s
-      assert_equal I18n.locale.to_s, locale.to_s
-
-    end
-  end
-
-end