i18n_routing 0.4.8 → 0.5.0

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+0.5.0 (September 13, 2011)
+
+* Fixed a bug where i18n_routing was not restoring the default locale at boot (fishman)
+* Handling of the rails3 alternative match syntax (toXXlc)
+
 0.4.7 (February 14, 2011)
 
 * Fix bug in empty translation handling

data/Gemfile

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

data/Gemfile.lock

@@ -1,42 +1,41 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.0.rc4)
-      actionpack (= 3.1.0.rc4)
+    actionmailer (3.1.0)
+      actionpack (= 3.1.0)
       mail (~> 2.3.0)
-    actionpack (3.1.0.rc4)
-      activemodel (= 3.1.0.rc4)
-      activesupport (= 3.1.0.rc4)
+    actionpack (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6)
-      rack (~> 1.3.0)
-      rack-cache (~> 1.0.1)
-      rack-mount (~> 0.8.1)
-      rack-test (~> 0.6.0)
-      sprockets (~> 2.0.0.beta.10)
-      tzinfo (~> 0.3.27)
-    activemodel (3.1.0.rc4)
-      activesupport (= 3.1.0.rc4)
-      bcrypt-ruby (~> 2.1.4)
+      rack (~> 1.3.2)
+      rack-cache (~> 1.0.3)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.0)
+    activemodel (3.1.0)
+      activesupport (= 3.1.0)
+      bcrypt-ruby (~> 3.0.0)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activerecord (3.1.0.rc4)
-      activemodel (= 3.1.0.rc4)
-      activesupport (= 3.1.0.rc4)
-      arel (~> 2.1.1)
-      tzinfo (~> 0.3.27)
-    activeresource (3.1.0.rc4)
-      activemodel (= 3.1.0.rc4)
-      activesupport (= 3.1.0.rc4)
-    activesupport (3.1.0.rc4)
+    activerecord (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+    activesupport (3.1.0)
       multi_json (~> 1.0)
-    arel (2.1.3)
-    bcrypt-ruby (2.1.4)
+    arel (2.2.1)
+    bcrypt-ruby (3.0.1)
     builder (3.0.0)
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     erubis (2.7.0)
-    hike (1.1.0)
+    hike (1.2.1)
     i18n (0.6.0)
     mail (2.3.0)
       i18n (>= 0.4.0)
@@ -44,48 +43,49 @@ GEM
       treetop (~> 1.4.8)
     mime-types (1.16)
     multi_json (1.0.3)
-    polyglot (0.3.1)
-    rack (1.3.0)
-    rack-cache (1.0.2)
+    polyglot (0.3.2)
+    rack (1.3.2)
+    rack-cache (1.0.3)
       rack (>= 0.4)
-    rack-mount (0.8.1)
+    rack-mount (0.8.3)
       rack (>= 1.0.0)
     rack-ssl (1.3.2)
       rack
-    rack-test (0.6.0)
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.0.rc4)
-      actionmailer (= 3.1.0.rc4)
-      actionpack (= 3.1.0.rc4)
-      activerecord (= 3.1.0.rc4)
-      activeresource (= 3.1.0.rc4)
-      activesupport (= 3.1.0.rc4)
+    rails (3.1.0)
+      actionmailer (= 3.1.0)
+      actionpack (= 3.1.0)
+      activerecord (= 3.1.0)
+      activeresource (= 3.1.0)
+      activesupport (= 3.1.0)
       bundler (~> 1.0)
-      railties (= 3.1.0.rc4)
-    railties (3.1.0.rc4)
-      actionpack (= 3.1.0.rc4)
-      activesupport (= 3.1.0.rc4)
+      railties (= 3.1.0)
+    railties (3.1.0)
+      actionpack (= 3.1.0)
+      activesupport (= 3.1.0)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
     rake (0.9.2)
-    rdoc (3.8)
-    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)
+    rdoc (3.9.4)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    sprockets (2.0.0.beta.10)
-      hike (~> 1.0)
+    rspec-mocks (2.6.0)
+    sprockets (2.0.0)
+      hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     thor (0.14.6)
-    tilt (1.3.2)
-    treetop (1.4.9)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.29)
 
@@ -93,5 +93,5 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  rails (= 3.1.0rc4)
+  rails (= 3.1.0)
   rspec (>= 2.5.0)

data/README.rdoc

@@ -6,10 +6,9 @@ All necessary informations are available on the wiki: http://wiki.github.com/kwi
 
 For any question, use the i18_routing google group: http://groups.google.com/group/i18n-routing
 
-Works with Rails 2.3 and Rails 3.0
-=> Rails3 beta and RC versions are no longer supported !
+Works with Rails 2.3, 3.0 and 3.1
 
-== TODO for next releases (written the 9th of June)
+== TODO for next releases (written the 9th of June 2010)
 
 * Handle multiple translations for same resources name (Example: nested and not nested resources)
 * Handle namespace translation (and path_prefix on Rails3)
@@ -28,5 +27,7 @@ Furthermore, if the i18n gem is present on your system, Rails will load it and s
 * fwalch
 * doubledrones: h13ronim (Marcin Michałowski)
 * rudionrails (Rudolf Schmidt)
+* fishman (Reza Jelveh)
+* toXXIc
 
-Copyright (c) 2010 Guillaume Luccisano - g-mai|: guillaume.luccisano, released under the MIT license
+Copyright (c) 2010-2011 Guillaume Luccisano - g-mai|: guillaume.luccisano, released under the MIT license

data/lib/i18n_routing_rails2.rb

@@ -91,6 +91,7 @@ module ActionController
           # Here, try to translate standard named routes
           name = name.to_s
 
+          stored_locale = I18n.locale
           @locales.each do |l|
             I18n.locale = l
             nt = "#{I18nRouting.locale_escaped(l)}_#{name}"
@@ -100,6 +101,7 @@ module ActionController
               puts("[I18n] > localize %-10s: %40s (%s) => %s" % ['route', name, l, t]) if @i18n_verbose
             end
           end
+          I18n.locale = stored_locale
 
           old_v = Thread.current[:globalized]
           Thread.current[:globalized] = true
@@ -160,6 +162,7 @@ module ActionController
 
         locales = @set.locales
         localized(nil) do
+          stored_locale = I18n.locale
           locales.each do |l|
             I18n.locale = l
             nt = "#{I18nRouting.locale_escaped(l)}_#{name}"
@@ -180,6 +183,8 @@ module ActionController
               puts("[I18n] > localize %-10s: %40s (%s) => %s" % [namespace, nt, l, t]) if @set.i18n_verbose
             end
           end
+          I18n.locale = stored_locale
+
 
           if Thread.current[:i18n_nested_deep] < 2
             switch_no_named_localization(nil) do

data/lib/i18n_routing_rails3.rb

@@ -31,6 +31,7 @@ module I18nRouting
         resource = resource_from_params(type, r, options.dup)
 
         # Check for translated resource
+        stored_locale = I18n.locale
         @locales.each do |locale|
           I18n.locale = locale
           localized_path = I18nRouting.translation_for(resource.name, type)
@@ -82,6 +83,7 @@ module I18nRouting
             localizable_route = resource
           end
         end
+        I18n.locale = stored_locale
       end
       return localizable_route
     end
@@ -182,24 +184,44 @@ module I18nRouting
       yield
       @skip_localization = old
     end
-    
+
+
+
+    # Overrides match method
+    # Two variants of match are supported now
+    #   match 'about' => 'pages#about', :as => 'about'
+    #   match 'about', :to => 'pages#about'
+    #   match 'home', :to => 'pages#home', :as => 'main' # Route name overridden to 'main'
     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)) # 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)
-          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)
-          end
+      if @locales and (args.size >= 1) and !parent_resource and
+             args.last.is_a?(Hash) # In both variants Hash should be present as last parameter
+
+        # Make deep copy of last argument (Hash)
+        options = Marshal.load(Marshal.dump(args.last)) # Dump is dirty but how to make deep cloning easily ? :/
+
+        # Now handle parameters
+        if (args.first.is_a?(Hash))
+          path, to = options.find { |name, value| name.is_a?(String) }
+          options.merge!(:to => to).delete(path)
+        else
+          path = args[0]
+          options[:as] ||= path
         end
-      
-        # Now, create the real match :
-        return set_localizable_route(args.first[:as]) do
-          super
+
+        if (options[:as])
+          @locales.each do |locale|
+            mapping = LocalizedMapping.new(locale, @set, @scope, path, options)
+            if mapping.localizable?
+              puts("[I18n] > localize %-10s: %40s (%s) => %s" % ['route', options[:as], locale, mapping.path]) if @i18n_verbose
+              @set.add_route(*mapping.to_route)
+            end
+          end
+
+          # Now, create the real match :
+          return set_localizable_route(options[:as]) do
+            super
+          end
         end
       end
 
@@ -286,6 +308,7 @@ module I18nRouting
 
     def initialize(locale, set, scope, path, options)
       super(set, scope, path.clone, options ? options.clone : nil)
+      stored_locale = I18n.locale
 
       # try to get translated path :
       I18n.locale = locale
@@ -312,6 +335,7 @@ module I18nRouting
       else
         @localized_path = nil
       end
+      I18n.locale = stored_locale
     end
 
     # Return true if this route is localizable

data/spec/i18n_routing/i18n_spec.rb

@@ -65,12 +65,19 @@ describe :localized_routes do
         $r = ActionDispatch::Routing::RouteSet.new
         $r.draw do
           match 'not_about' => "not_about#show", :as => :not_about
+          match 'not_about2', :to => "not_about2#show"
+          match 'not_home', :to => 'not_pages#home', :as => 'not_main'
+
           resources :not_users
           resources :empty_resources
           resource  :not_contact
 
           localized(I18n.available_locales, :verbose => true) do
             match 'about' => "about#show", :as => :about
+            match 'about2', :to => "about2#show"
+            match 'home', :to => 'pages#home', :as => 'main'
+
+
             match 'welcome/to/our/page' => "welcome#index", :as => :welcome
             match 'empty' => 'empty#show', :as => :empty
 
@@ -142,6 +149,12 @@ describe :localized_routes do
       routes.send(:not_about_path).should == "/not_about"
     end
 
+    if rails3?
+      it "of named_routes (another format)" do
+        routes.send(:not_about2_path).should == "/not_about2"
+      end
+    end
+
     it "of a singular resource" do
       routes.send(:not_contact_path).should == "/not_contact"
     end
@@ -160,6 +173,10 @@ describe :localized_routes do
 
     it "named_route uses default values" do
       routes.send(:about_path).should == "/about"
+      if rails3?
+        routes.send(:about2_path).should == "/about2"
+        routes.send(:main_path).should == "/home"
+      end
       routes.send(:welcome_path).should == '/welcome/to/our/page'
     end
 
@@ -217,8 +234,13 @@ describe :localized_routes do
 
     it "named_route generates route using localized values" do
       routes.send(:about_path).should == "/#{I18n.t :about, :scope => :named_routes_path}"
+      if rails3?
+        routes.send(:about2_path).should == "/#{I18n.t :about2, :scope => :named_routes_path}"
+        routes.send(:main_path).should == "/#{I18n.t :home, :scope => :named_routes_path}"
+      end
     end
-    
+
+
     it "named_route generated route from actual route name" do
       I18n.locale = :en
       routes.send(:welcome_path).should == "/#{I18n.t :welcome, :scope => :named_routes}"        
@@ -242,9 +264,14 @@ describe :localized_routes do
       o = I18n.locale
       I18n.locale = "fr"
       routes.send(:about_path).should == "/#{I18n.t :about, :scope => :named_routes_path}"
+      if rails3?
+        routes.send(:about2_path).should == "/#{I18n.t :about2, :scope => :named_routes_path}"
+        routes.send(:main_path).should == "/#{I18n.t :home, :scope => :named_routes_path}"
+      end
       I18n.locale = o
     end
 
+
     it "resource generates routes using localized values" do
       routes.send(:contact_path).should == "/#{I18n.t :contact, :scope => :resource}"
     end
@@ -256,6 +283,10 @@ describe :localized_routes do
     it "url_for generates routes using localized values" do
       url_for(:controller => :users).should == "/#{I18n.t :as, :scope => :'routes.users'}"
       url_for(:controller => :about, :action => :show).should == "/#{I18n.t :about, :scope => :named_routes_path}"
+      if rails3?
+        url_for(:controller => :about2, :action => :show).should == "/#{I18n.t :about2, :scope => :named_routes_path}"
+        url_for(:controller => :pages, :action => :home).should == "/#{I18n.t :home, :scope => :named_routes_path}"
+      end
     end
 
     if !rails3?
@@ -409,6 +440,10 @@ describe :localized_routes do
     
     it "named_route generates route using localized values" do
       routes.send(:about_path).should == "/#{I18n.t :about, :scope => :named_routes_path}"
+      if rails3?
+        routes.send(:about2_path).should == "/#{I18n.t :about2, :scope => :named_routes_path}"
+        routes.send(:main_path).should == "/#{I18n.t :home, :scope => :named_routes_path}"
+      end
     end
     
     it "custom translated path names" do

data/spec/locales/en.yml

@@ -11,5 +11,7 @@ en:
     contact: 'contact-us'
   named_routes_path:
     about: 'about-our-company'
+    about2: 'about-our-company2'
+    home: 'home'
   named_routes:
     welcome: 'welcome-to-our-page'

data/spec/locales/fr.yml

@@ -33,6 +33,8 @@ fr:
     german: 'allemand'
   named_routes_path:
     about: 'a-propos'
+    about2: 'a-propos2'
+    home: 'accueil'
     'welcome/to/our/page': 'bienvenue/sur/notre/site' # no idea about french translation ;-) --R
     empty: ''
     sausage: 'saucisse'

data/spec/locales/pt-br.yml

@@ -5,5 +5,7 @@ pt-BR:
     foo: foo_fr-pt-br
   named_routes_path:
     about: 'a-propos-pt-br'
+    about2: 'a-propos-pt-br2'
+    home: 'casa'
   path_names:
     new: 'nouveau-pt-br'

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: i18n_routing
 version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: 
-  version: 0.4.8
+  segments: 
+  - 0
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Guillaume Luccisano
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-13 00:00:00 -07:00
+date: 2011-09-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +26,11 @@ dependencies:
     requirements: 
     - - ">"
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 3
+        - 5
         version: 0.3.5
   type: :runtime
   version_requirements: *id001
@@ -64,17 +74,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 19
+      segments: 
+      - 1
+      - 3
+      - 4
       version: 1.3.4
 requirements: []
 
 rubyforge_project: i18n_routing
-rubygems_version: 1.6.2
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: I18n routing module for Rails 2.3.x and Rails 3. Translate your routes with ease !