translatable_routes 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec25e210398145edc2a2021602b5a48b1ada634a
-  data.tar.gz: 1353d95eb6f9ff625a21d6749f36f16c4770a047
+  metadata.gz: be4091ea73bb827796addc31258c8be2796284cc
+  data.tar.gz: eeeee1ab0fb27a8072d7f8a939ff877cde527c1b
 SHA512:
-  metadata.gz: 086e5600e84c582bce332e771f985b7ba6ba29c52a42b0e84aa2249c679c761e00ad815448d27296060ddbec7943f18ceafe7a56b1fc0eb2f001c2712e3311d0
-  data.tar.gz: 83ce66bba1083954613d1911cbf3734cf0e6c44001e98a1411aa4fcbf9d9e83d8272a0c30e18514ba479bdb069e096b322139c50fc4788cb56e5c75dba7d4e82
+  metadata.gz: 062244dd2bb527f8f94bf4bea9da1dcd8af0660a852a91ea1fd3484848f43f3b4e5ccc9d6bdf6fffae6423a14ee9e5966a40d398a1306c44ea256e049b411f73
+  data.tar.gz: 559de805002e6d4afb6d7128ca57ec9a56b7d53803ebf56298f3df4db84fe9a9178a207d6dbdddb6b5eac209e0541b23eea079aa03f67a34207d27f6bac0a3c0

data/README.rdoc

@@ -1,18 +1,18 @@
-{<img src="https://badge.fury.io/rb/translatable_routes.png" alt="Gem Version" />}[http://badge.fury.io/rb/translatable_routes] {<img src="https://codeclimate.com/github/museways/translatable_routes.png" />}[https://codeclimate.com/github/museways/translatable_routes] {<img src="https://travis-ci.org/museways/translatable_routes.png?branch=master" alt="Build Status" />}[https://travis-ci.org/museways/translatable_routes] {<img src="https://gemnasium.com/museways/translatable_routes.png" alt="Dependency Status" />}[https://gemnasium.com/museways/translatable_routes]
+{<img src="https://badge.fury.io/rb/translatable_routes.png" alt="Gem Version" />}[http://badge.fury.io/rb/translatable_routes] {<img src="https://codeclimate.com/github/museways/translatable_routes.png" />}[https://codeclimate.com/github/museways/translatable_routes] {<img src="https://travis-ci.org/museways/translatable_routes.png?branch=master" alt="Build Status" />}[https://travis-ci.org/museways/translatable_routes]
 
 = Translatable Routes
 
-Minimalistic toolkit to translate routes.
+Minimalistic toolkit to translate routes in rails.
 
 = Install
 
 Put this line in your Gemfile:
   gem 'translatable_routes'
-  
+
 Then bundle:
   $ bundle
-  
-= Usage
+ 
+= Configuration
 
 In your config/routes.rb use the localized method to decide wich routes will be localized:
   localized do
@@ -25,13 +25,15 @@ Put your translations inside the routes key in your locales yamls:
       users: "usuarios"
       profile: "perfil"
       about: "nosotros"
- 
-(There is no need to put the full path "users/1/profile", just translate each slug individually)
+
+NOTE: There is no need to put the full path, just translate each part individually.
+
+= Usage
 
 Helpers will continue working the same but I18n.locale will be use as default locale:
-  about_path # /en/about in case I18n.locale is :en
+  about_path # Will output /en/about in case I18n.locale is :en
 
-This gem will not provide a default locale selection, since you may be interested in differente types of logics, you should add it manually. Here it's a very simple example:
+Here is an example of what you may want to add to your controllers to select the current locale:
   before_action :select_locale
 
   protected
@@ -39,3 +41,11 @@ This gem will not provide a default locale selection, since you may be intereste
   def select_locale
     I18n.locale = params[:locale]
   end
+
+= Credits
+
+This gem is maintained and funded by museways[http://museways.com].
+
+= License
+
+It is free software, and may be redistributed under the terms specified in the MIT-LICENSE file.

data/lib/translatable_routes.rb

@@ -1,7 +1,6 @@
 require 'translatable_routes/action_dispatch/named_route_collection'
 require 'translatable_routes/action_dispatch/mapper'
 require 'translatable_routes/railtie'
-require 'translatable_routes/version'
 
 module TranslatableRoutes
 end

data/lib/translatable_routes/action_dispatch/mapper.rb

@@ -8,16 +8,22 @@ module TranslatableRoutes
         scope(':locale') { yield }
         @locales = nil
       end
- 
+
       def add_route(action, options)
         if @locales
           @locales.each do |locale|
-            original_scope_level_resource = @scope[:scope_level_resource].dup if @scope[:scope_level_resource]
-            original_path = @scope[:path].dup if @scope[:path]
+            if @scope[:scope_level_resource]
+              original_scope_level_resource = @scope[:scope_level_resource].dup
+            end
+            if @scope[:path]
+              original_path = @scope[:path].dup
+            end
             original_path_names = @scope[:path_names].dup
             original_options = options.dup
             @scope[:path] = i18n_path(@scope[:path], locale)
-            @scope[:path_names].each { |key, value| value = i18n_path(value, locale) }
+            @scope[:path_names].each do |key, value|
+              @scope[:path_names][key] = i18n_path(value, locale)
+            end
             options[:path] = i18n_path(options[:path], locale)
             options[:constraints] = { locale: locale.to_s }
             options[:defaults] = { locale: locale.to_s }
@@ -33,8 +39,12 @@ module TranslatableRoutes
               options[:as] = "#{options[:as] || action}_#{locale}"
             end
             super i18n_path(action, locale), options
-            @scope[:scope_level_resource] = original_scope_level_resource if @scope[:scope_level_resource]
-            @scope[:path] = original_path if @scope[:path]
+            if @scope[:scope_level_resource]
+              @scope[:scope_level_resource] = original_scope_level_resource
+            end
+            if @scope[:path]
+              @scope[:path] = original_path
+            end
             @scope[:path_names] = original_path_names
             options = original_options
           end
@@ -51,14 +61,18 @@ module TranslatableRoutes
       end
 
       protected
- 
+
       def i18n_path(path, locale)
         case path
         when String
           i18n_path = []
           path.split('/').each do |part|
             next if part == ''
-            i18n_path << ((part[0] == ':' or part[0] == '*') ? part : I18n.t("routes.#{part}", locale: locale, default: part.gsub(/_/, '-')))
+            if part[0] == ':' or part[0] == '*'
+              i18n_path << part
+            else
+              i18n_path << I18n.t("routes.#{part}", locale: locale, default: part.gsub(/_/, '-'))
+            end
           end
           i18n_path.join('/')
         when Symbol

data/lib/translatable_routes/action_dispatch/named_route_collection.rb

@@ -7,7 +7,7 @@ module TranslatableRoutes
         %w(path url).each do |type|
           helper = :"#{name}_#{type}"
           @module.remove_possible_method helper
-          @module.module_eval do 
+          @module.module_eval do
             define_method helper do |*args|
               options = args.extract_options!
               suffix = (options[:locale] || I18n.locale).to_s.gsub('-', '_').downcase

data/lib/translatable_routes/version.rb

@@ -1,5 +1,5 @@
 module TranslatableRoutes
 
-  VERSION = '1.3.2'
+  VERSION = '1.3.3'
 
 end

data/test/dummy/log/test.log

@@ -6359,3 +6359,138 @@ RoutesTest: test_should_translate_routes
 HelpersTest: test_should_create_helpers
 ---------------------------------------
    (0.0ms)  rollback transaction
+   (0.2ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (0.2ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (0.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+   (0.1ms)  begin transaction
+---------------------------------
+RoutesTest: test_translate_routes
+---------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+--------------------------------
+HelpersTest: test_create_helpers
+--------------------------------
+   (0.0ms)  rollback transaction
+   (0.2ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (0.1ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (0.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+   (0.1ms)  begin transaction
+---------------------------------
+RoutesTest: test_translate_routes
+---------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+--------------------------------
+HelpersTest: test_create_helpers
+--------------------------------
+   (0.1ms)  rollback transaction
+   (0.3ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (0.2ms)  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')
+   (0.1ms)  begin transaction
+---------------------------------
+RoutesTest: test_translate_routes
+---------------------------------
+   (0.2ms)  rollback transaction
+   (0.1ms)  begin transaction
+--------------------------------
+HelpersTest: test_create_helpers
+--------------------------------
+   (0.1ms)  rollback transaction
+   (0.3ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (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')
+   (0.1ms)  begin transaction
+---------------------------------
+RoutesTest: test_translate_routes
+---------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+--------------------------------
+HelpersTest: test_create_helpers
+--------------------------------
+   (0.1ms)  rollback transaction
+   (0.3ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (0.1ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (0.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+   (0.1ms)  begin transaction
+---------------------------------
+RoutesTest: test_translate_routes
+---------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+--------------------------------
+HelpersTest: test_create_helpers
+--------------------------------
+   (0.1ms)  rollback transaction
+   (0.2ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (0.1ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (0.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+   (0.1ms)  begin transaction
+--------------------------------
+HelpersTest: test_create_helpers
+--------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+---------------------------------
+RoutesTest: test_translate_routes
+---------------------------------
+   (0.1ms)  rollback transaction
+   (0.2ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (0.1ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (0.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+   (0.1ms)  begin transaction
+--------------------------------
+HelpersTest: test_create_helpers
+--------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+---------------------------------
+RoutesTest: test_translate_routes
+---------------------------------
+   (0.1ms)  rollback transaction
+   (0.2ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (0.2ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (0.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+   (0.1ms)  begin transaction
+---------------------------------
+RoutesTest: test_translate_routes
+---------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+--------------------------------
+HelpersTest: test_create_helpers
+--------------------------------
+   (0.0ms)  rollback transaction
+   (0.3ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (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')
+   (0.1ms)  begin transaction
+--------------------------------
+HelpersTest: test_create_helpers
+--------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+---------------------------------
+RoutesTest: test_translate_routes
+---------------------------------
+   (0.1ms)  rollback transaction

data/test/helpers_test.rb

@@ -2,15 +2,45 @@ require 'test_helper'
 
 class HelpersTest < ActionView::TestCase
 
-  test "should create helpers" do
+  test "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
+      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.namespace')}/#{I18n.t('routes.resources')}/#{I18n.t('routes.new')}",
+        new_namespace_resource_path
+      )
+      assert_equal(
+        "/#{locale}/#{I18n.t('routes.namespace')}/#{I18n.t('routes.resources')}/10/#{I18n.t('routes.edit')}",
+        edit_namespace_resource_path(10)
+      )
+      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
+      )
+      assert_equal(
+        "/#{locale}/#{I18n.t('routes.resources')}/#{I18n.t('routes.new')}",
+        new_resource_path
+      )
+      assert_equal(
+        "/#{locale}/#{I18n.t('routes.resources')}/10/#{I18n.t('routes.edit')}",
+        edit_resource_path(10)
+      )
     end
   end
 

data/test/routes_test.rb

@@ -2,35 +2,45 @@ require 'test_helper'
 
 class RoutesTest < ActionDispatch::IntegrationTest
 
-  test "should translate routes" do
+  test "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: 'namespace/resources', action: 'new', locale: locale.to_s },
+        "/#{locale}/#{I18n.t('routes.namespace')}/#{I18n.t('routes.resources')}/#{I18n.t('routes.new')}"
+      )
+      assert_recognizes(
+        { controller: 'namespace/resources', action: 'edit', locale: locale.to_s, id: '10' },
+        "/#{locale}/#{I18n.t('routes.namespace')}/#{I18n.t('routes.resources')}/10/#{I18n.t('routes.edit')}"
+      )
       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: 'resources', action: 'new', locale: locale.to_s },
+        "/#{locale}/#{I18n.t('routes.resources')}/#{I18n.t('routes.new')}"
+      )
+      assert_recognizes(
+        { controller: 'resources', action: 'edit', locale: locale.to_s, id: '10' },
+        "/#{locale}/#{I18n.t('routes.resources')}/10/#{I18n.t('routes.edit')}"
+      )
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: translatable_routes
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Museways
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-09 00:00:00.000000000 Z
+date: 2014-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,7 +44,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-description: Minimalistic toolkit to translate routes.
+description: Minimalistic toolkit to translate routes in rails.
 email:
 - contact@museways.com
 executables: []
@@ -131,7 +131,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Translatable Routes for Rails.
+summary: Translatable routes for rails.
 test_files:
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css