rails-translate-routes 0.0.5 → 0.1.0

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem "rails", ">= 3.0"
+gem "railties", ">= 3.1"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -1,9 +1,6 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.3)
-      actionpack (= 3.1.3)
-      mail (~> 2.3.0)
     actionpack (3.1.3)
       activemodel (= 3.1.3)
       activesupport (= 3.1.3)
@@ -19,17 +16,8 @@ GEM
       activesupport (= 3.1.3)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activerecord (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-      arel (~> 2.2.1)
-      tzinfo (~> 0.3.29)
-    activeresource (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
     activesupport (3.1.3)
       multi_json (~> 1.0)
-    arel (2.2.1)
     builder (3.0.0)
     erubis (2.7.0)
     git (1.2.5)
@@ -40,14 +28,8 @@ GEM
       git (>= 1.2.5)
       rake
     json (1.6.5)
-    mail (2.3.0)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.17.2)
     minitest (2.10.1)
     multi_json (1.0.4)
-    polyglot (0.3.3)
     rack (1.3.6)
     rack-cache (1.1)
       rack (>= 0.4)
@@ -57,14 +39,6 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.3)
-      actionmailer (= 3.1.3)
-      actionpack (= 3.1.3)
-      activerecord (= 3.1.3)
-      activeresource (= 3.1.3)
-      activesupport (= 3.1.3)
-      bundler (~> 1.0)
-      railties (= 3.1.3)
     railties (3.1.3)
       actionpack (= 3.1.3)
       activesupport (= 3.1.3)
@@ -79,13 +53,9 @@ GEM
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.5)
+    sqlite3 (1.3.6)
     thor (0.14.6)
     tilt (1.3.3)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
 
 PLATFORMS
   ruby
@@ -94,5 +64,5 @@ DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.6.4)
   minitest
-  rails (>= 3.0)
+  railties (>= 3.1)
   sqlite3

data/README.rdoc

@@ -1,5 +1,7 @@
 = rails-translate-routes
 
+Important change from version 0.0.5 (Feb 2012) to 0.1.0 (June 2012): if you're updating from an earlier version take into account that now translations defined in routes.yml are namespaced to avoid conflicts with other translations from app (thanks to cawel for the patch). To upgrade you just have to add the namespace 'routes' to your routes.yml (see example in the below docs).
+
 Rails >=3.1 routes translations based on Raul's translate_routes (https://github.com/raul/translate_routes).
 
 It's currently a stripped down version of the forked gem, adding some bugfixes for rails 3.1 and features I needed for my project. See doc below to see what it can do.
@@ -41,11 +43,13 @@ We want to have them in two languages english and spanish, to accomplish this wi
 2) Now we can write translations on a standard YAML file (e.g: in config/locales/routes.yml), including all the locales and their translations:
 
   en:
-    # you can leave empty locales, for example the default one
+    routes:
+      # you can leave empty locales, for example the default one
   es:
-    products: productos
-    contact: contacto
-    new: crear
+    routes:
+      products: productos
+      contact: contacto
+      new: crear
 
 3) Include this filter in your ApplicationController:
 
@@ -151,6 +155,20 @@ You can specify the following option:
 
 Note that the 'no_prefixes' option will override the 'prefix_on_default_locale' option.
 
+<b>Keep untranslated routes</b>
+
+In case you want to keep access to untranslated routes, for easier api or ajax integration for example. Resulting in this structure:
+
+  /en/available-products
+  /fr/produits-disponibles/
+  /products/
+
+You can specify the following option:
+
+  ActionDispatch::Routing::Translator.translate_from_file('config/locales/routes.yml', { :keep_untranslated_routes => true })
+
+This option is not meant to be used with :no_prefixes.
+
 <b>Namespaced backends</b>
 
 I usually build app backend in namespaced controllers, routes, ... using translated routes will result in duplicated routes or prefixed ones. In most cases you won't want to have the backend in several languages, you can set 'routes.rb' this way:
@@ -194,6 +212,8 @@ Thanks to:
   * Johan Gyllenspetz (https://github.com/gyllen)
   * Nico Ritsche (https://github.com/ncri)
   * Jean-Loup Fenaux (https://github.com/jlfenaux)
+  * Cyril Mouge (https://github.com/shingara)
+  * Nicolas Arbogast (https://github.com/NicoArbogast)
 
 * Main development of forked gem:
   * Raul Murciano (http://github.com/raul)

data/Rakefile

@@ -34,7 +34,7 @@ end
 
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.1.0

data/lib/controller_test_helper.rb

@@ -1,4 +1,4 @@
-# This monkey patch injects the locale in the controller's params 
+# This monkey patch injects the locale in the controller's params
 # Reason: ActionController::TestCase doesn't support "default_url_options"
 #
 # Example: when the request you are testing needs the locale, e.g.
@@ -11,7 +11,7 @@ class ActionController::TestCase
 
   module Behavior
     def process_with_default_locale(action, parameters = nil, session = nil, flash = nil, http_method = 'GET')
-      parameters = { :locale => I18n.default_locale }.merge(parameters || {} )
+      parameters = { :locale => I18n.default_locale.to_s }.merge(parameters || {} )
       process_without_default_locale(action, parameters, session, flash, http_method)
     end
     alias_method_chain :process, :default_locale

data/lib/rails-translate-routes.rb

@@ -52,6 +52,21 @@ class RailsTranslateRoutes
     @no_prefixes = no_prefixes
   end
 
+  # option allowing to keep untranslated routes 
+  # *Ex: 
+  #   *resources :users
+  #   *translated routes
+  #     en/members
+  #     fr/membres
+  #     /users
+  def keep_untranslated_routes
+    @keep_untranslated_routes ||= false
+  end
+
+  def keep_untranslated_routes= keep_untranslated_routes
+    @keep_untranslated_routes = keep_untranslated_routes
+  end
+  
   class << self
     # Default locale suffix generator
     def locale_suffix locale
@@ -117,7 +132,7 @@ class RailsTranslateRoutes
     def add_dictionary_from_file file_path
       yaml = YAML.load_file(file_path)
       yaml.each_pair do |locale, translations|
-        merge_translations locale, translations
+        merge_translations locale, translations['routes']
       end
       set_available_locales_from_dictionary
     end
@@ -244,9 +259,14 @@ class RailsTranslateRoutes
 
     # Generate translations for a single route for all available locales
     def translations_for route
+      translated_routes = []
       available_locales.map do |locale|
-        translate_route route, locale
+        translated_routes << translate_route(route, locale)
       end
+      
+      # add untranslated_route without url helper if we want to keep untranslated routes
+      translated_routes << untranslated_route(route) if @keep_untranslated_routes
+      translated_routes
     end
 
     # Generate translation for a single route for one locale
@@ -268,6 +288,23 @@ class RailsTranslateRoutes
       [route.app, conditions, requirements, defaults, new_name]
     end
 
+    # Re-generate untranslated routes (original routes) with name set to nil (which prevents conflict with default untranslated_urls)
+    def untranslated_route route
+      conditions = {} 
+      if Rails.version >= '3.2'
+        conditions[:path_info] = route.path.spec.to_s
+        conditions[:request_method] = parse_request_methods route.verb if route.verb != //
+        conditions[:subdomain] = route.constraints[:subdomain] if route.constraints
+      else
+        conditions[:path_info] = route.path
+        conditions[:request_method] = parse_request_methods route.conditions[:request_method] if route.conditions.has_key? :request_method
+      end
+      requirements = route.requirements
+      defaults = route.defaults
+
+      [route.app, conditions, requirements, defaults]
+    end
+    
     # Add prefix for all non-default locales
     def add_prefix? locale
       if @no_prefixes
@@ -345,6 +382,7 @@ module ActionDispatch
           r = RailsTranslateRoutes.init_from_file(File.join(Rails.root, file_path))
           r.prefix_on_default_locale = true if options && options[:prefix_on_default_locale] == true
           r.no_prefixes = true if options && options[:no_prefixes] == true
+          r.keep_untranslated_routes = true if options && options[:keep_untranslated_routes] == true
           r.translate Rails.application.routes
         end
 

data/rails-translate-routes.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rails-translate-routes"
-  s.version = "0.0.5"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francesc Pla"]
-  s.date = "2012-02-24"
+  s.date = "2012-06-20"
   s.description = "Simple gem to translate routes in Rails 3.x based on translate_routes"
   s.email = "francesc@francesc.net"
   s.extra_rdoc_files = [
@@ -40,20 +40,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, [">= 3.0"])
+      s.add_runtime_dependency(%q<railties>, [">= 3.1"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<minitest>, [">= 0"])
     else
-      s.add_dependency(%q<rails>, [">= 3.0"])
+      s.add_dependency(%q<railties>, [">= 3.1"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<minitest>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, [">= 3.0"])
+    s.add_dependency(%q<railties>, [">= 3.1"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<sqlite3>, [">= 0"])

data/test/helper.rb

@@ -11,7 +11,6 @@ rescue Bundler::BundlerError => e
 end
 
 require 'minitest/autorun'
-require 'active_record'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-translate-routes
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-24 00:00:00.000000000 Z
+date: 2012-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
-  requirement: &70357017041480 !ruby/object:Gem::Requirement
+  name: railties
+  requirement: &70352912284960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70357017041480
+  version_requirements: *70352912284960
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70357017121120 !ruby/object:Gem::Requirement
+  requirement: &70352912284200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70357017121120
+  version_requirements: *70352912284200
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70357017118860 !ruby/object:Gem::Requirement
+  requirement: &70352912283440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70357017118860
+  version_requirements: *70352912283440
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70357017117280 !ruby/object:Gem::Requirement
+  requirement: &70352912282700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70357017117280
+  version_requirements: *70352912282700
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70357017114020 !ruby/object:Gem::Requirement
+  requirement: &70352912281900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70357017114020
+  version_requirements: *70352912281900
 description: Simple gem to translate routes in Rails 3.x based on translate_routes
 email: francesc@francesc.net
 executables: []
@@ -101,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3359756678233219504
+      hash: 2092619227610633287
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: