i18n_routing 0.4.6 → 0.4.7

data/CHANGELOG.rdoc

@@ -1,3 +1,10 @@
+0.4.7 (February 14, 2011)
+
+* Fix bug in empty translation handling
+* Hack Rack::Mount to handle :locale constraints in top of i18n_locale
+* Fix requirements bug introduced by Rails 3.0.4
+* Add Gemfile with bundler for easy spec on different rails versions
+
 0.4.6 (February 14, 2011)
 
 * Handle empty translation

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+gem "rails", '3.0.6'
+gem 'rspec', '>=2.5.0'

data/Gemfile.lock

@@ -0,0 +1,81 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.6)
+      actionpack (= 3.0.6)
+      mail (~> 2.2.15)
+    actionpack (3.0.6)
+      activemodel (= 3.0.6)
+      activesupport (= 3.0.6)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.6)
+      activesupport (= 3.0.6)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.6)
+      activemodel (= 3.0.6)
+      activesupport (= 3.0.6)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.6)
+      activemodel (= 3.0.6)
+      activesupport (= 3.0.6)
+    activesupport (3.0.6)
+    arel (2.0.9)
+    builder (2.1.2)
+    diff-lcs (1.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    i18n (0.5.0)
+    mail (2.2.16)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    polyglot (0.3.1)
+    rack (1.2.2)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.6)
+      actionmailer (= 3.0.6)
+      actionpack (= 3.0.6)
+      activerecord (= 3.0.6)
+      activeresource (= 3.0.6)
+      activesupport (= 3.0.6)
+      bundler (~> 1.0)
+      railties (= 3.0.6)
+    railties (3.0.6)
+      actionpack (= 3.0.6)
+      activesupport (= 3.0.6)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
+    rake (0.8.7)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.5.0)
+    thor (0.14.6)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.26)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rails (= 3.0.6)
+  rspec (>= 2.5.0)

data/lib/i18n_routing_common.rb

@@ -8,7 +8,6 @@ module I18nRouting
   
   # Return the correct translation for given values
   def self.translation_for(name, type = :resources, option = nil)
-
     # First, if an option is given, try to get the translation in the routes scope
     if option
       default = "{option}Noi18nRoutingTranslation"
@@ -50,5 +49,4 @@ module I18nRouting
 
     return h
   end
-
 end

data/lib/i18n_routing_rails2.rb

@@ -8,7 +8,6 @@
 module ActionController
   module Routing
     class Route #:nodoc:
-
       alias_method :mkd_initialize, :initialize
       def initialize(segments = [], requirements = {}, conditions = {})
         @glang = requirements.delete(:glang)
@@ -33,7 +32,6 @@ end
 module ActionController
   module Routing
     class RouteSet #:nodoc:
-
       attr :locales, true
       attr :i18n_verbose, true
 
@@ -46,11 +44,9 @@ module ActionController
         ensure
           @set.locales = old_value
         end
-
       end
 
       class NamedRouteCollection #:nodoc:
-
         alias_method :mkd_define_url_helper, :define_url_helper
         def define_url_helper(route, name, kind, options)
           gl = Thread.current[:globalized]
@@ -85,7 +81,6 @@ module ActionController
               end
               protected :gl#{selector}
             end_eval
-
           end
         end
       end
@@ -115,7 +110,6 @@ module ActionController
 
         gl_add_named_route(name, path, options)
       end
-
     end
   end
 end
@@ -155,7 +149,6 @@ module ActionController
     end
 
     def create_globalized_resources(type, namespace, *entities, &block)
-
       Thread.current[:i18n_nested_deep] ||= 0
       Thread.current[:i18n_nested_deep] += 1
 

data/lib/i18n_routing_rails3.rb

@@ -36,7 +36,7 @@ module I18nRouting
           localized_path = I18nRouting.translation_for(resource.name, type)
 
           # A translated route exists :
-          if localized_path and String === localized_path
+          if !localized_path.blank? and String === localized_path
             puts("[I18n] > localize %-10s: %40s (%s) => /%s" % [type, resource.name, locale, localized_path]) if @i18n_verbose
             opts = options.dup
             opts[:path] = localized_path
@@ -118,10 +118,12 @@ module I18nRouting
     def initialize(*args)
       super
 
-      # Add i18n as valid conditions for Rack::Mount
+      # Add i18n_locale as valid conditions for Rack::Mount / And add also :locale, as Rails 3.0.4 removed it ...
       @valid_conditions = @set.instance_eval { @set }.instance_eval { @valid_conditions }
-      @valid_conditions << :i18n_locale if !@valid_conditions.include?(:i18n_locale)
-      @set.valid_conditions << :i18n_locale if !@set.valid_conditions.include?(:i18n_locale)
+      [:i18n_locale, :locale].each do |k|
+        @valid_conditions << k if !@valid_conditions.include?(k)
+        @set.valid_conditions << k if !@set.valid_conditions.include?(k)
+      end
 
       # Extends the current RouteSet in order to define localized helper for named routes
       # When calling define_url_helper, it calls define_localized_url_helper too.
@@ -153,7 +155,6 @@ module I18nRouting
         @i18n_routing_path_set = true
       end
       
-      
       old_value = @locales
       @locales = locales
       @i18n_verbose ||= opts.delete(:verbose)
@@ -233,7 +234,6 @@ module I18nRouting
       end
       
       @scope[:nested_deep].pop
-
     end
     
     # Alias methods in order to handle i18n routes
@@ -246,7 +246,6 @@ 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]
@@ -265,7 +264,6 @@ module I18nRouting
           end
       
           send(rfname, *args, &block)
-          
         end
       
         mod.send :alias_method_chain, m, :i18n_routing
@@ -279,12 +277,10 @@ module I18nRouting
     def resources_with_i18n_routing(*resources, &block)
       create_globalized_resources(:resources, *resources, &block)
     end
-
   end
 
   # Used for localize simple named routes
   class LocalizedMapping < ActionDispatch::Routing::Mapper::Mapping
-
     attr_reader :path
 
     def initialize(locale, set, scope, path, options)
@@ -308,21 +304,20 @@ module I18nRouting
         @options[:constraints] = @options[:constraints] ? @options[:constraints].dup : {}
         @options[:constraints][:i18n_locale] = locale.to_s
         @options[:anchor] = true
+        # Force the recomputation of the requirements with the new values
+        @requirements = nil
       else
         @localized_path = nil
       end
-
     end
 
     # Return true if this route is localizable
     def localizable?
       @localized_path != nil
     end
-
   end
 
   module NamedRouteCollection
-
     attr_reader :localizable
 
     def set_localizable_route(localizable)
@@ -366,7 +361,6 @@ module I18nRouting
   # Rack::Mount::Route module
   # Exists in order to use apropriate localized route when using url_for
   module RackMountRoute
-    
     # Alias methods in order to handle i18n routes
     def self.included(mod)
       mod.send :alias_method_chain, :generate, :i18n_routing
@@ -387,7 +381,6 @@ module I18nRouting
       return nil if @locale and @locale != I18n.locale.to_sym
       generate_without_i18n_routing(method, params, recall, options)
     end
-
   end
 end
 

data/spec/i18n_routing/i18n_spec.rb

@@ -47,6 +47,7 @@ describe :localized_routes do
               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"
+              l.resources :empty__resources
             end
             
             map.resources :drones, :path_prefix => 'doubledrones/unimatrix/zero'
@@ -73,10 +74,11 @@ describe :localized_routes do
             match 'welcome/to/our/page' => "welcome#index", :as => :welcome
             match 'empty' => 'empty#show', :as => :empty
 
-            scope '/:locale' do #, :constraints => { :locale => /[a-z]{2}/ } do ### Commented => this constraint fail on rails 3.0.4 ??
+            scope '/:locale', :constraints => { :locale => /[a-z]{2}/ } do ### this constraint fail on rails 3.0.4, so I had to hack a turn around
               match '/' => "about#show", :as => :localized_root
               match 'about' => "about#show", :as => :about_with_locale
               match '/about' => "about#show", :as => :about_with_locale_with_sep
+              resources :empty__resources
             end
 
             resources :users do
@@ -225,6 +227,8 @@ describe :localized_routes do
       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"
+      nested_routes.keys.include?(:fr_empty__resources).should == false # Because translation is empty
+      nested_routes.keys.include?('fr_empty__resources').should == false # Because translation is empty
     end
 
     it "named_route generates route using localized values and I18n.locale as a string" do

data/spec/locales/fr.yml

@@ -22,6 +22,7 @@ fr:
     countries: 'pays'
     bars: bars_fr
     empty_resources: ''
+    empty__resources: ''
   resource:
     foo: foo_fr
     foofoo: froufrou

data/spec/spec_helper.rb

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

metadata

@@ -2,7 +2,7 @@
 name: i18n_routing
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors: 
 - Guillaume Luccisano
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-14 00:00:00 -08:00
+date: 2011-04-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,6 +43,8 @@ files:
 - spec/locales/pt-br.yml
 - spec/spec_helper.rb
 - CHANGELOG.rdoc
+- Gemfile
+- Gemfile.lock
 - MIT-LICENSE
 - Rakefile
 - README.rdoc