i18n_routing 0.4.7 → 0.4.8

data/Gemfile

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

data/Gemfile.lock

@@ -1,65 +1,76 @@
 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)
+    actionmailer (3.1.0.rc4)
+      actionpack (= 3.1.0.rc4)
+      mail (~> 2.3.0)
+    actionpack (3.1.0.rc4)
+      activemodel (= 3.1.0.rc4)
+      activesupport (= 3.1.0.rc4)
+      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)
+      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)
+      multi_json (~> 1.0)
+    arel (2.1.3)
+    bcrypt-ruby (2.1.4)
+    builder (3.0.0)
     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)
+    erubis (2.7.0)
+    hike (1.1.0)
+    i18n (0.6.0)
+    mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
+    multi_json (1.0.3)
     polyglot (0.3.1)
-    rack (1.2.2)
-    rack-mount (0.6.14)
+    rack (1.3.0)
+    rack-cache (1.0.2)
+      rack (>= 0.4)
+    rack-mount (0.8.1)
       rack (>= 1.0.0)
-    rack-test (0.5.7)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.0)
       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)
+    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)
       bundler (~> 1.0)
-      railties (= 3.0.6)
-    railties (3.0.6)
-      actionpack (= 3.0.6)
-      activesupport (= 3.0.6)
+      railties (= 3.1.0.rc4)
+    railties (3.1.0.rc4)
+      actionpack (= 3.1.0.rc4)
+      activesupport (= 3.1.0.rc4)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
-      thor (~> 0.14.4)
-    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)
@@ -68,14 +79,19 @@ GEM
     rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.5.0)
+    sprockets (2.0.0.beta.10)
+      hike (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
     thor (0.14.6)
+    tilt (1.3.2)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.26)
+    tzinfo (0.3.29)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  rails (= 3.0.6)
+  rails (= 3.1.0rc4)
   rspec (>= 2.5.0)

data/lib/i18n_routing_rails3.rb

@@ -115,8 +115,8 @@ module I18nRouting
 
     # On Routing::Mapper initialization (when doing Application.routes.draw do ...)
     # prepare routing system to be i18n ready
-    def initialize(*args)
-      super
+    def initialize_with_i18n_routing(*args)
+      initialize_without_i18n_routing(*args)
 
       # 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 }
@@ -238,6 +238,7 @@ module I18nRouting
     
     # Alias methods in order to handle i18n routes
     def self.included(mod)
+      mod.send :alias_method_chain, :initialize, :i18n_routing
       mod.send :alias_method_chain, :resource, :i18n_routing
       mod.send :alias_method_chain, :resources, :i18n_routing
       
@@ -294,7 +295,9 @@ module I18nRouting
       tp = @options[:as] && I18nRouting.translation_for(@options[:as], :named_routes) || 
           !ts.blank? && I18nRouting.translation_for(ts, :named_routes_path) || ts
       
-      @localized_path = File.join((@scope[:path] || ''), tp).gsub(/\/$/, '')
+      localized_scope = I18nRouting.translation_for(@scope[:path].gsub(/\//, ''), :scopes) if @scope[:path]
+      path = localized_scope ? '/' << localized_scope : @scope[:path]
+      @localized_path = File.join((path || ''), tp).gsub(/\/$/, '')
 
       # If a translated path exists, set localized infos
       if !@localized_path.blank? and @localized_path != @path
@@ -370,7 +373,13 @@ module I18nRouting
     # During route initialization, if a condition i18n_locale is present
     # Delete it, and store it in @locale
     def initialize_with_i18n_routing(app, conditions, defaults, name)
-      @locale = conditions[:i18n_locale] ? conditions.delete(:i18n_locale).source.to_sym : nil
+      @locale = if conditions.key?(:i18n_locale)
+        c = conditions.delete(:i18n_locale)
+        # In rails 3.0 it's a regexp otherwise it's a string, so we need to call source on the regexp
+        (c.respond_to?(:source) ? c.source : c).to_sym
+      else
+        nil
+      end
       initialize_without_i18n_routing(app, conditions, defaults, name)
     end
 

data/spec/i18n_routing/i18n_spec.rb

@@ -101,6 +101,13 @@ describe :localized_routes do
               end
             end
 
+            scope "german" do
+              match "/sausage" => "meal#show", :as => :german_sausage
+              resources :weshs do
+                resources :in_weshs
+              end
+            end
+
             resources :universes do
               resources :galaxies do
                 resources :planets do
@@ -362,6 +369,30 @@ describe :localized_routes do
 
   end
 
+  if rails3?
+    context 'routes with scope' do
+
+      before do
+        I18n.locale = 'de'
+      end
+
+      it "should translate the scope too" do
+        routes.send(:german_sausage_path).should == "/#{I18n.t :german, :scope => :scopes}/#{I18n.t :sausage, :scope => :named_routes_path}"
+        # Scoping is not yet supported on resources ...
+        #routes.send(:weshs_path).should == "/#{I18n.t :german, :scope => :scopes}/weshs"
+      end
+
+      it "should translate the scope too and even in french!" do
+        I18n.locale = 'fr'
+        routes.send(:german_sausage_path).should == "/#{I18n.t :german, :scope => :scopes}/#{I18n.t :sausage, :scope => :named_routes_path}"
+        # Scoping is not yet supported on resources ...
+        #routes.send(:weshs_path).should == "/#{I18n.t :german, :scope => :scopes}/#{I18n.t :weshs, :scope => :resources}"
+        #routes.send(:wesh_in_wesh_path).should == "/#{I18n.t :german, :scope => :scopes}/#{I18n.t :weshs, :scope => :resources}/#{I18n.t :in_weshs, :scope => :resources}"
+      end
+    
+    end
+  end
+
   context 'locale with a dash (pt-br)' do
 
     before do

data/spec/locales/de.yml

@@ -0,0 +1,5 @@
+de:
+  scopes:
+    german: 'deutsche'
+  named_routes_path:
+    sausage: 'bratwurst'

data/spec/locales/fr.yml

@@ -23,14 +23,19 @@ fr:
     bars: bars_fr
     empty_resources: ''
     empty__resources: ''
+    weshs: 'fr_weshs'
+    in_weshs: 'fr_in_weshs'
   resource:
     foo: foo_fr
     foofoo: froufrou
     contact: 'contactez-nous'
+  scopes:
+    german: 'allemand'
   named_routes_path:
     about: 'a-propos'
     'welcome/to/our/page': 'bienvenue/sur/notre/site' # no idea about french translation ;-) --R
     empty: ''
+    sausage: 'saucisse'
   path_names:
     new: 'nouveau'
     edit: 'edition'

metadata

@@ -2,7 +2,7 @@
 name: i18n_routing
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors: 
 - Guillaume Luccisano
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-17 00:00:00 -07:00
+date: 2011-07-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,6 +38,7 @@ files:
 - lib/i18n_routing_rails2.rb
 - lib/i18n_routing_rails3.rb
 - spec/i18n_routing/i18n_spec.rb
+- spec/locales/de.yml
 - spec/locales/en.yml
 - spec/locales/fr.yml
 - spec/locales/pt-br.yml
@@ -73,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: i18n_routing
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: I18n routing module for Rails 2.3.x and Rails 3. Translate your routes with ease !