i18n_routing 0.3.3 → 0.3.4

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+0.3.4 (June 3, 2010)
+
+* Fix Rails3 issue with nested single resource again and pluralize controller name as it should be
+
 0.3.3 (June 2, 2010)
 
 * Fix Rails3 issue with nested single resource

data/lib/i18n_routing_rails2.rb

@@ -173,7 +173,7 @@ module ActionController
               nt = "#{l}_#{name}"
               opts[:as] = t
               opts[:glang] = l
-              opts[:controller] ||= name
+              opts[:controller] ||= name.to_s.pluralize
               opts[:real_path] = opts[:singular] || name
               opts[:path_names] = I18nRouting.path_names(name, options)
 

data/lib/i18n_routing_rails3.rb

@@ -40,7 +40,7 @@ module I18nRouting
             puts("[I18n] > localize %-10s: %40s (%s) => /%s" % [type, resource.name, locale, localized_path]) if @i18n_verbose
             opts = options.dup
             opts[:path] = localized_path.to_sym
-            opts[:controller] ||= r
+            opts[:controller] ||= r.to_s.pluralize
 
             res = ["#{locale}_#{r}".to_sym, opts]
 
@@ -59,10 +59,10 @@ module I18nRouting
                     @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)
+                      @scope[:name_prefix] = @scope[:name_prefix].gsub(Regexp.new("#{old.name}$"), resource.name)
                     end
 
                     block.call if block

data/spec/i18n_routing/i18n_spec.rb

@@ -152,6 +152,10 @@ 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
 
   end
 
@@ -165,7 +169,7 @@ describe :localized_routes do
       routes.send(:about_path).should == "/#{I18n.t :about, :scope => :named_routes_path}"
     end
 
-    it "resource generates routes using localized valuess" do
+    it "resource generates routes using localized values" do
       routes.send(:contact_path).should == "/#{I18n.t :contact, :scope => :resource}"
     end
 
@@ -239,20 +243,23 @@ describe :localized_routes do
 
     context "when nested inside a singleton resource" do
 
-      it "named routes should have corretly locale placed" do
+      it "named routes should have locale placed at correct position" 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
+      it "routes for the singleton resource alone should be translated correctly" do
+        routes.send(:foo_path).should == "/#{I18n.t :foo, :scope => :resource}"
+      end
+
+      it "routes should be translated correctly" 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
+      it "routes should be translated correctly 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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Guillaume Luccisano
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-02 00:00:00 +02:00
+date: 2010-06-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency