i18n_routing 0.4.1 → 0.4.2

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+0.4.2 (September 20, 2010)
+
+* Fix a Rails3 bug, enabling again to do things like that: get :one, :two, :three
+
 0.4.1 (September 11, 2010)
 
 * Fix a Rails3 bug for named routes and prefixed path

data/lib/i18n_routing_rails3.rb

@@ -246,24 +246,28 @@ module I18nRouting
       [:map_method, :member, :collection].each do |m|
         rfname = "#{m}_without_i18n_routing".to_sym
         mod.send :define_method, "#{m}_with_i18n_routing".to_sym do |*args, &block|
-          
+      
           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] || {}
-            pname[args[1]] = args[1]
+            i = 1
+            while i < args.size and (String === args[i] or Symbol === args[i])
+              pname[args[i]] = args[i]
+              i += 1
+            end
             scope(:path_names => I18nRouting.path_names(@scope[:i18n_real_resource_name], {:path_names => pname})) do
               send(rfname, *args, &block)
             end
             @scope[:scope_level_resource] = o
             return
           end
-
+      
           send(rfname, *args, &block)
           
         end
-
+      
         mod.send :alias_method_chain, m, :i18n_routing
       end
     end

data/spec/i18n_routing/i18n_spec.rb

@@ -17,7 +17,7 @@ describe :localized_routes do
           map.localized(I18n.available_locales, :verbose => false) do
             map.about 'about', :controller => 'about', :action => :show
             
-            map.resources :users, :member => {:level => :get}, :collection => {:groups => :get}
+            map.resources :users, :member => {:level => :get, :one => :get, :two => :get}, :collection => {:groups => :get}
             map.resource  :contact
             
             map.resources :authors do |m|
@@ -68,6 +68,7 @@ describe :localized_routes do
             resources :users do
               member do
                 get :level
+                get :one, :two
               end
               get :groups, :on => :collection
             end
@@ -238,6 +239,8 @@ describe :localized_routes do
         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'}"
+        routes.send(:two_user_path, 42).should == "/#{I18n.t :users, :scope => :resources}/42/#{I18n.t :two, :scope => :'routes.users.path_names'}"
       end
 
       it "custom collection" do

data/spec/locales/fr.yml

@@ -7,6 +7,8 @@ fr:
         groups: 'groupe'
         new: 'nouvel_utilisateur'
         edit: 'edition_utilisateur'
+        one: 'un'
+        two: 'deux'
     drones:
       as: senord
       path_prefix: '/senordelbuod/xirtaminu/orez'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Guillaume Luccisano
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-11 00:00:00 +02:00
+date: 2010-09-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency