i18n_routing 0.4.5 → 0.4.6

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+0.4.6 (February 14, 2011)
+
+* Handle empty translation
+
 0.4.5 (November 04, 2010)
 
 * Fixing Rails 3 scope bug with missing / and no translations

data/Rakefile

@@ -1,16 +1,16 @@
 require 'rubygems'
 require 'rake'
-require 'spec/rake/spectask'
-
-spec_files = Rake::FileList["spec/**/*_spec.rb"]
+require 'rspec/core/rake_task'
 
+# Now using RSpec 2
 
 desc "Run specs for current Rails version"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = spec_files
-  t.spec_opts = lambda {
-    @rails_spec_version ? ["-c --format specdoc -- rails_spec_version=#{@rails_spec_version}"] : ["-c --format specdoc"]
-  }
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = "spec/**/*_spec.rb"
+  t.verbose = true
+  # t.ruby_opts = lambda {
+  #   @rails_spec_version ? ["-c --format specdoc -- rails_spec_version=#{@rails_spec_version}"] : ["-c --format specdoc"]
+  # }
 end
 
 task :default => :spec

data/lib/i18n_routing_rails2.rb

@@ -100,7 +100,7 @@ module ActionController
             I18n.locale = l
             nt = "#{I18nRouting.locale_escaped(l)}_#{name}"
             t = I18nRouting.translation_for(name, :named_routes) || I18nRouting.translation_for(path, :named_routes_path)
-            if nt != name and t
+            if nt != name and !t.blank?
               gl_add_named_route(nt, t, options.merge(:glang => l))
               puts("[I18n] > localize %-10s: %40s (%s) => %s" % ['route', name, l, t]) if @i18n_verbose
             end
@@ -170,7 +170,7 @@ module ActionController
           locales.each do |l|
             I18n.locale = l
             nt = "#{I18nRouting.locale_escaped(l)}_#{name}"
-            if nt != name and (t = I18nRouting.translation_for(name, namespace))
+            if nt != name and !(t = I18nRouting.translation_for(name, namespace)).blank?
               opts[:as] = t
               opts[:glang] = l
               opts[:controller] ||= name.to_s.pluralize

data/lib/i18n_routing_rails3.rb

@@ -185,11 +185,11 @@ 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.last.is_a?(Hash) and args.first[:as]
-        options = Marshal.load(Marshal.dump(args.first))
+        options = Marshal.load(Marshal.dump(args.first)) # Dump is dirty but how to make deep cloning easily ? :/
         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, path, options) # Dump is dirty but how to make deep cloning easily ? :/
+          mapping = LocalizedMapping.new(locale, @set, @scope, path, options)
           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)
@@ -301,7 +301,7 @@ module I18nRouting
       @localized_path = File.join((@scope[:path] || ''), tp).gsub(/\/$/, '')
 
       # If a translated path exists, set localized infos
-      if @localized_path and @localized_path != @path
+      if !@localized_path.blank? and @localized_path != @path
         #@options[:controller] ||= @options[:as]
         @options[:as] = "#{I18nRouting.locale_escaped(locale)}_#{@options[:as]}"
         @path = @localized_path

data/spec/i18n_routing/i18n_spec.rb

@@ -17,6 +17,7 @@ describe :localized_routes do
           map.localized(I18n.available_locales, :verbose => false) do
             map.about 'about', :controller => 'about', :action => :show
             map.welcome 'welcome/to/our/page', :controller => :welcome, :action => :index
+            map.empty 'empty', :controller => 'empty', :action => :show
             
             map.resources :users, :member => {:level => :get, :one => :get, :two => :get}, :collection => {:groups => :get}
             map.resource  :contact
@@ -25,6 +26,8 @@ describe :localized_routes do
               m.resources :books
             end
             
+            map.resources :empty_resources
+            
             map.resource :foo do |m|
               m.resources :bars
               m.resource :foofoo do |mm|
@@ -62,13 +65,15 @@ describe :localized_routes do
         $r.draw do
           match 'not_about' => "not_about#show", :as => :not_about
           resources :not_users
+          resources :empty_resources
           resource  :not_contact
 
-          localized(I18n.available_locales, :verbose => false) do
+          localized(I18n.available_locales, :verbose => true) do
             match 'about' => "about#show", :as => :about
             match 'welcome/to/our/page' => "welcome#index", :as => :welcome
+            match 'empty' => 'empty#show', :as => :empty
 
-            scope '/:locale', :constraints => { :locale => /[a-z]{2}/ } do
+            scope '/:locale' do #, :constraints => { :locale => /[a-z]{2}/ } do ### Commented => this constraint fail on rails 3.0.4 ??
               match '/' => "about#show", :as => :localized_root
               match 'about' => "about#show", :as => :about_with_locale
               match '/about' => "about#show", :as => :about_with_locale_with_sep
@@ -214,6 +219,13 @@ describe :localized_routes do
     it "named_route generates route from route path when route name  not available" do
       routes.send(:welcome_path).should == "/#{I18n.t 'welcome/to/our/page', :scope => :named_routes_path}"
     end 
+    
+    it "doesn't translate empty route" do
+      routes.send(:empty_path).should_not == "/#{I18n.t 'empty', :scope => :named_routes_path}"
+      routes.send(:empty_path).should == "/empty"
+      routes.send(:empty_resources_path).should_not == "/#{I18n.t 'empty', :scope => :named_routes_path}"
+      routes.send(:empty_resources_path).should == "/empty_resources"
+    end
 
     it "named_route generates route using localized values and I18n.locale as a string" do
       o = I18n.locale

data/spec/locales/fr.yml

@@ -21,6 +21,7 @@ fr:
     universes: 'univers'
     countries: 'pays'
     bars: bars_fr
+    empty_resources: ''
   resource:
     foo: foo_fr
     foofoo: froufrou
@@ -28,6 +29,7 @@ fr:
   named_routes_path:
     about: 'a-propos'
     'welcome/to/our/page': 'bienvenue/sur/notre/site' # no idea about french translation ;-) --R
+    empty: ''
   path_names:
     new: 'nouveau'
     edit: 'edition'

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'spec'
+require 'rspec'
 
 $rails_version = ARGV.find { |e| e =~ /rails_spec_version=.*/ }.split('=').last.to_i rescue nil
 

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: i18n_routing
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 5
-  version: 0.4.5
+  prerelease: 
+  version: 0.4.6
 platform: ruby
 authors: 
 - Guillaume Luccisano
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-04 00:00:00 -07:00
+date: 2011-02-14 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,10 +21,6 @@ dependencies:
     requirements: 
     - - ">"
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 5
         version: 0.3.5
   type: :runtime
   version_requirements: *id001
@@ -69,23 +61,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 4
       version: 1.3.4
 requirements: []
 
 rubyforge_project: i18n_routing
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: I18n routing module for Rails 2.3.x and Rails 3. Translate your routes with ease !