i18n_routing 0.3.2 → 0.3.3

data/CHANGELOG.rdoc

@@ -1,3 +1,11 @@
+0.3.3 (June 2, 2010)
+
+* Fix Rails3 issue with nested single resource
+
+0.3.2 (June 2, 2010)
+
+* Add automatically config/locales/*.yml in the i18n load path in order to fix Rails3 issue
+
 0.3.1 (May 27, 2010)
 
 * Add a small Rails3 verification

data/README.rdoc

@@ -16,5 +16,6 @@ Furthermore, if the i18n gem is present on your system, Rails will load it and s
 
 * kwi (Guillaume Luccisano)
 * bigtiger (Jim Remsik)
+* mixr (Reiner Dieterich)
 
 Copyright (c) 2010 Guillaume Luccisano - g-mai|: guillaume.luccisano, released under the MIT license

data/lib/i18n_routing_rails3.rb

@@ -52,19 +52,27 @@ module I18nRouting
                 send(type, *res) do
                   # In the resource(s) block, we need to keep and restore some context :
 
-                  old_name = @scope[:i18n_real_resource_name]
-                  old = @scope[:scope_level_resource]
-                  old_i = @scope[:i18n_scope_level_resource]
+                  if block
+                    old_name = @scope[:i18n_real_resource_name]
+                    old = @scope[:scope_level_resource]
 
-                  @scope[:i18n_real_resource_name] = resource.name
-                  @scope[:i18n_scope_level_resource] = old
-                  @scope[:scope_level_resource] = resource
+                    @scope[:i18n_real_resource_name] = resource.name
+                    @scope[:i18n_scope_level_resource] = old
+                    @scope[:scope_level_resource] = resource
+                  
+                    if type == :resource and @scope[:name_prefix]
+                      # Need to fake name_prefix for singleton resource
+                      @scope[:name_prefix].gsub!(Regexp.new("#{old.name}$"), resource.name)
+                    end
 
-                  block.call if block
+                    block.call if block
+
+                    @scope[:scope_level_resource] = old
+                    @scope[:i18n_real_resource_name] = old_name
+                  end
 
                   @scope[:i18n_scope_level_resource] = nil
-                  @scope[:scope_level_resource] = old
-                  @scope[:i18n_real_resource_name] = old_name
+
                 end
               end
             end
@@ -229,7 +237,7 @@ module I18nRouting
         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]
+          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]
 

data/spec/i18n_routing/i18n_spec.rb

@@ -23,6 +23,13 @@ describe :localized_routes do
             map.resources :authors do |m|
               m.resources :books
             end
+            
+            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|
@@ -62,7 +69,14 @@ describe :localized_routes do
             resources :authors do
               resources :books
             end
-            
+
+            resource :foo do
+              resources :bars
+              resource :foofoo do
+                resources :bars
+              end
+            end
+
             resources :universes do
               resources :galaxies do
                 resources :planets do
@@ -223,6 +237,24 @@ describe :localized_routes do
 
     end
 
+    context "when nested inside a singleton resource" do
+
+      it "named routes should have corretly locale placed" do
+        nested_routes[:fr_foo_fr_bars].should be_nil
+        nested_routes[:foo_fr_bars].should_not be_nil
+      end
+
+      it "routes should be translated corretly" do
+        routes.send(:foo_bars_path).should == "/#{I18n.t :foo, :scope => :resource}/#{I18n.t :bars, :scope => :resources}"
+      end
+
+      it "routes should be translated corretly also with deep nested singleton resource" do
+        routes.send(:foo_foofoo_bars_path).should == "/#{I18n.t :foo, :scope => :resource}/#{I18n.t :foofoo, :scope => :resource}/#{I18n.t :bars, :scope => :resources}"
+      end
+
+
+    end
+
     context "when deeply nested" do
 
       it "named routes should not be nil" do

data/spec/locales/en.yml

@@ -5,7 +5,9 @@ en:
     galaxies: 'galaxies-en'
     planets: 'planets-en'
     universes: 'universes-en'
+    bars: bars_en
   resource:
+    foo: foo_en
     contact: 'contact-us'
   named_routes_path:
     about: 'about-our-company'

data/spec/locales/fr.yml

@@ -15,7 +15,10 @@ fr:
     planets: 'planetes'
     universes: 'univers'
     countries: 'pays'
+    bars: bars_fr
   resource:
+    foo: foo_fr
+    foofoo: froufrou
     contact: 'contactez-nous'
   named_routes_path:
     about: 'a-propos'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Guillaume Luccisano