i18n_routing 0.4.4 → 0.4.5

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+0.4.5 (November 04, 2010)
+
+* Fixing Rails 3 scope bug with missing / and no translations
+
 0.4.4 (November 03, 2010)
 
 * Fix bug with locale with a dash like pt-br

data/lib/i18n_routing_rails3.rb

@@ -296,10 +296,9 @@ module I18nRouting
       ts.gsub!('(.:format)', '')
       
       tp = @options[:as] && I18nRouting.translation_for(@options[:as], :named_routes) || 
-          !ts.blank? && I18nRouting.translation_for(ts, :named_routes_path) || ''
-        
+          !ts.blank? && I18nRouting.translation_for(ts, :named_routes_path) || ts
       
-      @localized_path = (@scope[:path] || '/') + tp
+      @localized_path = File.join((@scope[:path] || ''), tp).gsub(/\/$/, '')
 
       # If a translated path exists, set localized infos
       if @localized_path and @localized_path != @path

data/spec/i18n_routing/i18n_spec.rb

@@ -40,7 +40,12 @@ describe :localized_routes do
               end
             end
             
-            map.localized_root '/', :controller => "about", :action => "show", :path_prefix => ':locale'
+            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"
+            end
+            
             map.resources :drones, :path_prefix => 'doubledrones/unimatrix/zero'
           end
         end
@@ -65,6 +70,8 @@ describe :localized_routes do
 
             scope '/:locale', :constraints => { :locale => /[a-z]{2}/ } do
               match '/' => "about#show", :as => :localized_root
+              match 'about' => "about#show", :as => :about_with_locale
+              match '/about' => "about#show", :as => :about_with_locale_with_sep
             end
 
             resources :users do
@@ -167,6 +174,15 @@ describe :localized_routes do
     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
+
+    it "scope with parameters should be respected when filled" do
+      routes.send(:about_with_locale_path, I18n.locale).should == "/#{I18n.locale}/about"
+      routes.send(:about_with_locale_with_sep_path, I18n.locale).should == "/#{I18n.locale}/about"
+    end
 
   end
 
@@ -180,6 +196,11 @@ describe :localized_routes do
       routes.send(:localized_root_path, I18n.locale).should == "/#{I18n.locale}"
     end
 
+    it "scope with parameters should be respected when filled" do
+      routes.send(:about_with_locale_path, I18n.locale).should == "/#{I18n.locale}/#{I18n.t :about, :scope => :named_routes_path}"
+      routes.send(:about_with_locale_with_sep_path, I18n.locale).should == "/#{I18n.locale}/#{I18n.t :about, :scope => :named_routes_path}"
+    end
+
     it "named_route generates route using localized values" do
       routes.send(:about_path).should == "/#{I18n.t :about, :scope => :named_routes_path}"
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 4
-  version: 0.4.4
+  - 5
+  version: 0.4.5
 platform: ruby
 authors: 
 - Guillaume Luccisano
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-03 00:00:00 -07:00
+date: 2010-11-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: i18n
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">"
       - !ruby/object:Gem::Version 
@@ -64,6 +65,7 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -71,6 +73,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -82,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: i18n_routing
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: I18n routing module for Rails 2.3.x and Rails 3. Translate your routes with ease !