i18n_routing 0.6.1 → 0.6.2

data/README.rdoc

@@ -2,9 +2,9 @@
 
 I18n_routing is a plugin for Ruby on Rails that lets you easily translate your routes trough the I18n api included in Rails since version 2.2
 
-All necessary informations are available on the wiki: http://wiki.github.com/kwi/i18n_routing
+All necessary information is available on the wiki: http://wiki.github.com/kwi/i18n_routing
 
-For any question, use the i18_routing google group: http://groups.google.com/group/i18n-routing
+For your questions, use the i18_routing google group: http://groups.google.com/group/i18n-routing
 
 Works with Rails 2.3, 3.0, 3.1 and 3.2
 

data/lib/i18n_routing_rails31.rb

@@ -7,7 +7,7 @@ module I18nRouting
   module Mapper
 
     private
-    
+
     # Just create a Mapper:Resource with given parameters
     def resource_from_params(type, *resources)
       res = resources.clone
@@ -17,7 +17,7 @@ module I18nRouting
 
       type == :resource ? ActionDispatch::Routing::Mapper::SingletonResource.new(r, options.dup) : ActionDispatch::Routing::Mapper::Resource.new(r, options.dup)
     end
-    
+
     # Localize a resources or a resource
     def localized_resources(type = :resources, *resources, &block)
       localizable_route = nil
@@ -42,7 +42,7 @@ module I18nRouting
             opts = options.dup
             opts[:path] = localized_path
             opts[:controller] ||= r.to_s.pluralize
-            
+
             resource = resource_from_params(type, r, opts.dup)
 
             res = ["#{I18nRouting.locale_escaped(locale)}_#{r}".to_sym, opts]
@@ -53,7 +53,7 @@ module I18nRouting
             scope(:constraints => constraints, :path_names => I18nRouting.path_names(resource.name, @scope)) do
               localized_branch(locale) do
                 send(type, *res) do
-                  
+
                   # In the resource(s) block, we need to keep and restore some context :
                   if block
                     old_name = @scope[:i18n_real_resource_name]
@@ -92,7 +92,7 @@ module I18nRouting
     # If yes, localizable is a name, or a Mapper::Resource
     # Can take a block, if so, save the current context, set the new
     # Call the block, then restore the old context and return the block return
-    def set_localizable_route(localizable)      
+    def set_localizable_route(localizable)
       if block_given?
         old = @set.named_routes.localizable
         @set.named_routes.set_localizable_route(localizable)
@@ -103,11 +103,11 @@ module I18nRouting
         @set.named_routes.set_localizable_route(localizable)
       end
     end
-    
+
     def localizable_route
       @set.named_routes.localizable
     end
-    
+
     # Return the aproximate deep in scope level
     def nested_deep
       (@scope and Array === @scope[:nested_deep] and @scope[:scope_level]) ? @scope[:nested_deep].size : 0
@@ -156,7 +156,7 @@ module I18nRouting
         I18n.load_path = (I18n.load_path << Dir[Rails.root.join('config', 'locales', '*.yml')]).flatten.uniq
         @i18n_routing_path_set = true
       end
-      
+
       old_value = @locales
       @locales = locales
       @i18n_verbose ||= opts.delete(:verbose)
@@ -164,7 +164,7 @@ module I18nRouting
     ensure
       @locales = old_value
     end
-    
+
     # Create a branch for create routes in the specified locale
     def localized_branch(locale)
       set_localizable_route(nil) do
@@ -176,7 +176,7 @@ module I18nRouting
         @localized_branch = old
       end
     end
-    
+
     # Set we do not want to localize next resource
     def skip_localization
       old = @skip_localization
@@ -227,7 +227,7 @@ module I18nRouting
 
       super
     end
-    
+
     def create_globalized_resources(type, *resources, &block)
       #puts "#{' ' * nested_deep}Call #{type} : #{resources.inspect} (#{@locales.inspect}) (#{@localized_branch}) (#{@skip_localization})"
 
@@ -254,16 +254,16 @@ module I18nRouting
           send("#{type}_without_i18n_routing".to_sym, *resources, &block)
         end
       end
-      
+
       @scope[:nested_deep].pop
     end
-    
+
     # Alias methods in order to handle i18n routes
     def self.included(mod)
       mod.send :alias_method_chain, :initialize, :i18n_routing
       mod.send :alias_method_chain, :resource, :i18n_routing
       mod.send :alias_method_chain, :resources, :i18n_routing
-      
+
       # Here we redefine some methods, in order to handle
       # correct path_names translation on the fly
       [:map_method, :member, :collection].each do |m|
@@ -272,7 +272,7 @@ module I18nRouting
           if @localized_branch and @scope[:i18n_scope_level_resource] and @scope[:i18n_real_resource_name]
             o = @scope[:scope_level_resource]
             @scope[:scope_level_resource] = @scope[:i18n_scope_level_resource]
-      
+
             pname = @scope[:path_names] || {}
             i = 1
             while i < args.size and (String === args[i] or Symbol === args[i])
@@ -285,18 +285,18 @@ module I18nRouting
             @scope[:scope_level_resource] = o
             return
           end
-      
+
           send(rfname, *args, &block)
         end
-      
+
         mod.send :alias_method_chain, m, :i18n_routing
       end
     end
-    
+
     def resource_with_i18n_routing(*resources, &block)
       create_globalized_resources(:resource, *resources, &block)
     end
-    
+
     def resources_with_i18n_routing(*resources, &block)
       create_globalized_resources(:resources, *resources, &block)
     end
@@ -313,11 +313,12 @@ module I18nRouting
       # try to get translated path :
       I18n.locale = locale
       ts = @path.gsub(/^\//, '')
+      append_format = ts =~ /\(\.:format\)/
       ts.gsub!('(.:format)', '')
-      
-      tp = @options[:as] && I18nRouting.translation_for(@options[:as], :named_routes) || 
+
+      tp = @options[:as] && I18nRouting.translation_for(@options[:as], :named_routes) ||
           !ts.blank? && I18nRouting.translation_for(ts, :named_routes_path) || ts
-      
+
       localized_scope = I18nRouting.translation_for(@scope[:path].gsub(/\//, ''), :scopes) if @scope[:path]
       path = localized_scope ? '/' << localized_scope : @scope[:path]
       @localized_path = File.join((path || ''), tp).gsub(/\/$/, '')
@@ -327,6 +328,7 @@ module I18nRouting
         #@options[:controller] ||= @options[:as]
         @options[:as] = "#{I18nRouting.locale_escaped(locale)}_#{@options[:as]}"
         @path = @localized_path
+        @path = "#{@path}(.:format)" if append_format
         @options[:constraints] = @options[:constraints] ? @options[:constraints].dup : {}
         @options[:constraints][:i18n_locale] = locale.to_s
         @options[:anchor] = true

data/lib/i18n_routing_rails32.rb

@@ -7,7 +7,7 @@ module I18nRouting
   module Mapper
 
     private
-    
+
     # Just create a Mapper:Resource with given parameters
     def resource_from_params(type, *resources)
       res = resources.clone
@@ -17,7 +17,7 @@ module I18nRouting
 
       type == :resource ? ActionDispatch::Routing::Mapper::SingletonResource.new(r, options.dup) : ActionDispatch::Routing::Mapper::Resource.new(r, options.dup)
     end
-    
+
     # Localize a resources or a resource
     def localized_resources(type = :resources, *resources, &block)
       localizable_route = nil
@@ -42,7 +42,7 @@ module I18nRouting
             opts = options.dup
             opts[:path] = localized_path
             opts[:controller] ||= r.to_s.pluralize
-            
+
             resource = resource_from_params(type, r, opts.dup)
 
             res = ["#{I18nRouting.locale_escaped(locale)}_#{r}".to_sym, opts]
@@ -53,7 +53,7 @@ module I18nRouting
             scope(:constraints => constraints, :path_names => I18nRouting.path_names(resource.name, @scope)) do
               localized_branch(locale) do
                 send(type, *res) do
-                  
+
                   # In the resource(s) block, we need to keep and restore some context :
                   if block
                     old_name = @scope[:i18n_real_resource_name]
@@ -92,7 +92,7 @@ module I18nRouting
     # If yes, localizable is a name, or a Mapper::Resource
     # Can take a block, if so, save the current context, set the new
     # Call the block, then restore the old context and return the block return
-    def set_localizable_route(localizable)      
+    def set_localizable_route(localizable)
       if block_given?
         old = @set.named_routes.localizable
         @set.named_routes.set_localizable_route(localizable)
@@ -103,11 +103,11 @@ module I18nRouting
         @set.named_routes.set_localizable_route(localizable)
       end
     end
-    
+
     def localizable_route
       @set.named_routes.localizable
     end
-    
+
     # Return the aproximate deep in scope level
     def nested_deep
       (@scope and Array === @scope[:nested_deep] and @scope[:scope_level]) ? @scope[:nested_deep].size : 0
@@ -155,7 +155,7 @@ module I18nRouting
         I18n.load_path = (I18n.load_path << Dir[Rails.root.join('config', 'locales', '*.yml')]).flatten.uniq
         @i18n_routing_path_set = true
       end
-      
+
       old_value = @locales
       @locales = locales
       @i18n_verbose ||= opts.delete(:verbose)
@@ -163,7 +163,7 @@ module I18nRouting
     ensure
       @locales = old_value
     end
-    
+
     # Create a branch for create routes in the specified locale
     def localized_branch(locale)
       set_localizable_route(nil) do
@@ -175,7 +175,7 @@ module I18nRouting
         @localized_branch = old
       end
     end
-    
+
     # Set we do not want to localize next resource
     def skip_localization
       old = @skip_localization
@@ -226,7 +226,7 @@ module I18nRouting
 
       super
     end
-    
+
     def create_globalized_resources(type, *resources, &block)
       #puts "#{' ' * nested_deep}Call #{type} : #{resources.inspect} (#{@locales.inspect}) (#{@localized_branch}) (#{@skip_localization})"
 
@@ -253,16 +253,16 @@ module I18nRouting
           send("#{type}_without_i18n_routing".to_sym, *resources, &block)
         end
       end
-      
+
       @scope[:nested_deep].pop
     end
-    
+
     # Alias methods in order to handle i18n routes
     def self.included(mod)
       mod.send :alias_method_chain, :initialize, :i18n_routing
       mod.send :alias_method_chain, :resource, :i18n_routing
       mod.send :alias_method_chain, :resources, :i18n_routing
-      
+
       # Here we redefine some methods, in order to handle
       # correct path_names translation on the fly
       [:map_method, :member, :collection].each do |m|
@@ -271,7 +271,7 @@ module I18nRouting
           if @localized_branch and @scope[:i18n_scope_level_resource] and @scope[:i18n_real_resource_name]
             o = @scope[:scope_level_resource]
             @scope[:scope_level_resource] = @scope[:i18n_scope_level_resource]
-      
+
             pname = @scope[:path_names] || {}
             i = 1
             while i < args.size and (String === args[i] or Symbol === args[i])
@@ -284,18 +284,18 @@ module I18nRouting
             @scope[:scope_level_resource] = o
             return
           end
-      
+
           send(rfname, *args, &block)
         end
-      
+
         mod.send :alias_method_chain, m, :i18n_routing
       end
     end
-    
+
     def resource_with_i18n_routing(*resources, &block)
       create_globalized_resources(:resource, *resources, &block)
     end
-    
+
     def resources_with_i18n_routing(*resources, &block)
       create_globalized_resources(:resources, *resources, &block)
     end
@@ -312,11 +312,12 @@ module I18nRouting
       # try to get translated path :
       I18n.locale = locale
       ts = @path.gsub(/^\//, '')
+      append_format = ts =~ /\(\.:format\)/
       ts.gsub!('(.:format)', '')
-      
-      tp = @options[:as] && I18nRouting.translation_for(@options[:as], :named_routes) || 
+
+      tp = @options[:as] && I18nRouting.translation_for(@options[:as], :named_routes) ||
           !ts.blank? && I18nRouting.translation_for(ts, :named_routes_path) || ts
-      
+
       localized_scope = I18nRouting.translation_for(@scope[:path].gsub(/\//, ''), :scopes) if @scope[:path]
       path = localized_scope ? '/' << localized_scope : @scope[:path]
       @localized_path = File.join((path || ''), tp).gsub(/\/$/, '')
@@ -326,6 +327,7 @@ module I18nRouting
         #@options[:controller] ||= @options[:as]
         @options[:as] = "#{I18nRouting.locale_escaped(locale)}_#{@options[:as]}"
         @path = @localized_path
+        @path = "#{@path}(.:format)" if append_format
         @options[:constraints] = @options[:constraints] ? @options[:constraints].dup : {}
         @options[:constraints][:i18n_locale] = locale.to_s
         @options[:anchor] = true

data/spec/i18n_routing/i18n_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe :localized_routes do
 
   $r = nil # Global routes in order to speed up testing
-  
+
   before(:all) do
 
     if !$r
@@ -18,23 +18,23 @@ describe :localized_routes do
             map.about 'about', :controller => 'about', :action => :show
             map.welcome 'welcome/to/our/page', :controller => :welcome, :action => :index
             map.empty 'empty', :controller => 'empty', :action => :show
-            
+
             map.resources :users, :member => {:level => :get, :one => :get, :two => :get}, :collection => {:groups => :get}
             map.resource  :contact
-            
+
             map.resources :authors do |m|
               m.resources :books
             end
-            
+
             map.resources :empty_resources
-            
+
             map.resource :foo do |m|
               m.resources :bars
               m.resource :foofoo do |mm|
                 mm.resources :bars
               end
             end
-            
+
             map.resources :universes do |m|
               m.resources :galaxies do |mm|
                 mm.resources :planets do |mmm|
@@ -42,20 +42,20 @@ describe :localized_routes do
                 end
               end
             end
-            
+
             map.with_options :path_prefix => ':locale' do |l|
               l.localized_root '/', :controller => "about", :action => "show"
               l.about_with_locale 'about', :controller => "about", :action => "show"
               l.about_with_locale_with_sep 'about', :controller => "about", :action => "show"
               l.resources :empty__resources
             end
-            
+
             map.resources :drones, :path_prefix => 'doubledrones/unimatrix/zero'
           end
         end
-      
+
         $r = ActionController::Routing::Routes
-      
+
         class UrlTester
           include ActionController::UrlWriter
         end
@@ -127,7 +127,7 @@ describe :localized_routes do
 
           end
         end
-           
+
         class UrlTester; end
         UrlTester.send :include, $r.url_helpers
 
@@ -201,11 +201,11 @@ describe :localized_routes do
       routes.send(:universe_galaxies_path, 1).should == "/universes/1/galaxies"
       routes.send(:universe_galaxy_planets_path, 1, 1).should == "/universes/1/galaxies/1/planets"
     end
-    
+
     it "single resource should have by default the pluralized controller" do
       nested_routes[:foo].defaults[:controller].should == 'foos'
     end
-    
+
     it "scope with parameters should be respected" do
       routes.send(:localized_root_path, I18n.locale).should == "/#{I18n.locale}"
     end
@@ -222,7 +222,7 @@ describe :localized_routes do
     before do
       I18n.locale = :fr
     end
-    
+
     it "scope with parameters should be respected" do
       routes.send(:localized_root_path, I18n.locale).should == "/#{I18n.locale}"
     end
@@ -243,14 +243,14 @@ describe :localized_routes do
 
     it "named_route generated route from actual route name" do
       I18n.locale = :en
-      routes.send(:welcome_path).should == "/#{I18n.t :welcome, :scope => :named_routes}"        
+      routes.send(:welcome_path).should == "/#{I18n.t :welcome, :scope => :named_routes}"
       I18n.locale = :fr
     end
-    
+
     it "named_route generates route from route path when route name  not available" do
       routes.send(:welcome_path).should == "/#{I18n.t 'welcome/to/our/page', :scope => :named_routes_path}"
-    end 
-    
+    end
+
     it "doesn't translate empty route" do
       routes.send(:empty_path).should_not == "/#{I18n.t 'empty', :scope => :named_routes_path}"
       routes.send(:empty_path).should == "/empty"
@@ -289,6 +289,15 @@ describe :localized_routes do
       end
     end
 
+    it "url_for generates routes using localized values even with format specified" do
+      url_for(:controller => :users, :format => "html").should == "/#{I18n.t :as, :scope => :'routes.users'}.html"
+      url_for(:controller => :about, :action => :show, :format => "html").should == "/#{I18n.t :about, :scope => :named_routes_path}.html"
+      if rails3?
+        url_for(:controller => :about2, :action => :show, :format => "html").should == "/#{I18n.t :about2, :scope => :named_routes_path}.html"
+        url_for(:controller => :pages, :action => :home, :format => "html").should == "/#{I18n.t :home, :scope => :named_routes_path}.html"
+      end
+    end
+
     if !rails3?
       it "url_for generates routes for drones with path prefix" do
         url_for(:controller => :drones).should == "#{I18n.t :path_prefix, :scope => :'routes.drones'}/#{I18n.t :as, :scope => :'routes.drones'}"
@@ -307,24 +316,24 @@ describe :localized_routes do
     end
 
     context "with path_names" do
-      
+
       it "default translated path names" do
         routes.send(:new_universe_path).should == "/#{I18n.t :universes, :scope => :resources}/#{I18n.t :new, :scope => :path_names}"
         routes.send(:edit_universe_path, 42).should == "/#{I18n.t :universes, :scope => :resources}/42/#{I18n.t :edit, :scope => :path_names}"
       end
-      
+
       it "custom translated path names" do
         routes.send(:new_user_path).should == "/#{I18n.t :users, :scope => :resources}/#{I18n.t :new, :scope => :'routes.users.path_names'}"
         routes.send(:edit_user_path, 42).should == "/#{I18n.t :users, :scope => :resources}/42/#{I18n.t :edit, :scope => :'routes.users.path_names'}"
       end
-      
+
     end
-    
+
     context "with member and collection" do
 
       it "custom member" do
         I18n.locale = :en
-        routes.send(:level_user_path, 42).should == "/#{I18n.t :users, :scope => :resources}/42/level"        
+        routes.send(:level_user_path, 42).should == "/#{I18n.t :users, :scope => :resources}/42/level"
         I18n.locale = :fr
         routes.send(:level_user_path, 42).should == "/#{I18n.t :users, :scope => :resources}/42/#{I18n.t :level, :scope => :'routes.users.path_names'}"
         routes.send(:one_user_path, 42).should == "/#{I18n.t :users, :scope => :resources}/42/#{I18n.t :one, :scope => :'routes.users.path_names'}"
@@ -333,7 +342,7 @@ describe :localized_routes do
 
       it "custom collection" do
         I18n.locale = :en
-        routes.send(:groups_users_path).should == "/#{I18n.t :users, :scope => :resources}/groups"        
+        routes.send(:groups_users_path).should == "/#{I18n.t :users, :scope => :resources}/groups"
         I18n.locale = :fr
         routes.send(:groups_users_path).should == "/#{I18n.t :users, :scope => :resources}/#{I18n.t :groups, :scope => :'routes.users.path_names'}"
       end
@@ -396,7 +405,7 @@ describe :localized_routes do
 
     it "nested resources do not deep translate with multi helpers" do
       nested_routes.keys.should_not include(:fr_author_books) # Do not want fr_author_books
-    end    
+    end
 
   end
 
@@ -420,7 +429,7 @@ describe :localized_routes do
         #routes.send(:weshs_path).should == "/#{I18n.t :german, :scope => :scopes}/#{I18n.t :weshs, :scope => :resources}"
         #routes.send(:wesh_in_wesh_path).should == "/#{I18n.t :german, :scope => :scopes}/#{I18n.t :weshs, :scope => :resources}/#{I18n.t :in_weshs, :scope => :resources}"
       end
-    
+
     end
   end
 
@@ -433,11 +442,11 @@ describe :localized_routes do
     it 'users resources' do
       routes.send(:users_path).should == "/#{I18n.t :users, :scope => :'resources'}"
     end
-    
+
     it "routes for the singleton resource alone should be translated correctly" do
       routes.send(:foo_path).should == "/#{I18n.t :foo, :scope => :resource}"
     end
-    
+
     it "named_route generates route using localized values" do
       routes.send(:about_path).should == "/#{I18n.t :about, :scope => :named_routes_path}"
       if rails3?
@@ -445,11 +454,11 @@ describe :localized_routes do
         routes.send(:main_path).should == "/#{I18n.t :home, :scope => :named_routes_path}"
       end
     end
-    
+
     it "custom translated path names" do
       routes.send(:new_user_path).should == "/#{I18n.t :users, :scope => :resources}/#{I18n.t :new, :scope => :'path_names'}"
     end
-    
+
   end
 
   # context "just output" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n_routing
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-30 00:00:00.000000000 Z
+date: 2012-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &71984090 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -21,7 +21,12 @@ dependencies:
         version: 0.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *71984090
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: 0.3.5
 description: I18n_routing is a plugin for Ruby on Rails that lets you easily translate
   your routes trough the I18n api included in Rails since version 2.2
 email: guillaume.luccisano@gmail.com
@@ -61,7 +66,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 738454813
+      hash: -581614191
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -70,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.4
 requirements: []
 rubyforge_project: i18n_routing
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: I18n routing module for Rails 2.3.x and Rails 3. Translate your routes with