i18n_routing 0.3.7 → 0.3.8

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+0.3.8 (August 30, 2010)
+
+* Support the first Rails3 official release (but nested resources is still broken)
+
 0.3.7 (August 26, 2010)
 
 * Support Rails3 RC2 thanks to fwalch / Rails3 final will probably require a new version of i18n_routing

data/README.rdoc

@@ -6,12 +6,13 @@ All necessary informations are available on the wiki: http://wiki.github.com/kwi
 
 For any question, use the i18_routing google group: http://groups.google.com/group/i18n-routing
 
-Works with Rails 2.3 and Rails3 RC2 ! (nested resources currently do not work on Rails3 RC2, will be fixed when Rails3 is released)
+Works with Rails 2.3 and Rails 3.0 ! (nested resources currently do not work on Rails3, will be fixed when Rails3 is released)
+=> Rails3 beta and RC versions are no longer supported !
 
 == TODO for next releases (written the 9th of June)
 
 * Handle multiple translations for same resources name (Example: nested and not nested resources)
-* Handle namespace translation
+* Handle namespace translation (and path_prefix on Rails3)
 
 == I18n gem version warning
 
@@ -25,5 +26,6 @@ Furthermore, if the i18n gem is present on your system, Rails will load it and s
 * bigtiger (Jim Remsik)
 * mixr (Reiner Dieterich)
 * fwalch
+* doubledrones: h13ronim (Marcin Michałowski)
 
 Copyright (c) 2010 Guillaume Luccisano - g-mai|: guillaume.luccisano, released under the MIT license

data/lib/i18n_routing_rails2.rb

@@ -176,6 +176,8 @@ module ActionController
               opts[:controller] ||= name.to_s.pluralize
               opts[:real_path] = opts[:singular] || name
               opts[:path_names] = I18nRouting.path_names(name, options)
+              path_prefix_t = I18n.t(:path_prefix, :scope => :"routes.#{name}", :default => "NoPathPrefixTranslation")
+              opts[:path_prefix] = path_prefix_t unless path_prefix_t == "NoPathPrefixTranslation"
 
               localized([l]) do
                 switch_no_named_localization(true) do

data/lib/i18n_routing_rails3.rb

@@ -182,15 +182,18 @@ module I18nRouting
     
     def match(*args)
       # Localize simple match only if there is no resource scope.
-      if args.size == 1 and @locales and !parent_resource and args.first[:as]
+      if args.size == 1 and @locales and !parent_resource and args.last.is_a?(Hash) and args.first[:as]
+        options = Marshal.load(Marshal.dump(args.first))
+        path, to = options.find { |name, value| name.is_a?(String) }
+        options.merge!(:to => to).delete(path)        
         @locales.each do |locale|
-          mapping = LocalizedMapping.new(locale, @set, @scope, Marshal.load(Marshal.dump(args))) # Dump is dirty but how to make deep cloning easily ? :/
+          mapping = LocalizedMapping.new(locale, @set, @scope, path, options) # Dump is dirty but how to make deep cloning easily ? :/
           if mapping.localizable?
             puts("[I18n] > localize %-10s: %40s (%s) => %s" % ['route', args.first[:as], locale, mapping.path]) if @i18n_verbose
             @set.add_route(*mapping.to_route)
           end
         end
-
+      
         # Now, create the real match :
         return set_localizable_route(args.first[:as]) do
           super
@@ -274,12 +277,13 @@ module I18nRouting
 
     attr_reader :path
 
-    def initialize(locale, set, scope, args)
-      super(set, scope, args.clone)
+    def initialize(locale, set, scope, path, options)
+      super(set, scope, path.clone, options ? options.clone : nil)
 
       # try to get translated path :
       I18n.locale = locale
       ts = @path.gsub(/^\//, '')
+      ts.gsub!('(.:format)', '')
       @localized_path = '/' + (I18nRouting.translation_for(ts, :named_routes_path) || ts)
 
       # If a translated path exists, set localized infos
@@ -373,5 +377,5 @@ module I18nRouting
   end
 end
 
-ActionDispatch::Routing::Mapper.send  :include, I18nRouting::Mapper
-Rack::Mount::Route.send               :include, I18nRouting::RackMountRoute
+ActionDispatch::Routing::Mapper.send    :include, I18nRouting::Mapper
+Rack::Mount::Route.send                 :include, I18nRouting::RackMountRoute

data/spec/i18n_routing/i18n_spec.rb

@@ -38,6 +38,8 @@ describe :localized_routes do
                 end
               end
             end
+
+            map.resources :drones, :path_prefix => 'doubledrones/unimatrix/zero'
           end
         end
       
@@ -189,6 +191,12 @@ describe :localized_routes do
       url_for(:controller => :about, :action => :show).should == "/#{I18n.t :about, :scope => :named_routes_path}"
     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'}"
+      end
+    end
+
     it "nested resources generate routes using localized values" do
       routes.send(:author_books_path, 1).should == "/#{I18n.t :authors, :scope => :resources}/1/#{I18n.t :books, :scope => :resources}"
     end

data/spec/locales/fr.yml

@@ -7,6 +7,9 @@ fr:
         groups: 'groupe'
         new: 'nouvel_utilisateur'
         edit: 'edition_utilisateur'
+    drones:
+      as: senord
+      path_prefix: '/senordelbuod/xirtaminu/orez'
   resources:
     users: utilisateurs
     authors: 'auteurs'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 7
-  version: 0.3.7
+  - 8
+  version: 0.3.8
 platform: ruby
 authors: 
 - Guillaume Luccisano
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-26 00:00:00 +02:00
+date: 2010-08-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency