rails-translate-routes 0.0.3 → 0.0.4

data/README.rdoc

@@ -184,7 +184,6 @@ But in case you would prefer the locale to be implicit or simply because you don
 Help is welcome ;)
 
 * make basic testing
-* support for rails 3.2
 
 == Credits
 
@@ -193,6 +192,7 @@ Thanks to:
 * Contributors of the current gem:
   * Martin Carel (https://github.com/cawel)
   * Johan Gyllenspetz (https://github.com/gyllen)
+  * Nico Ritsche (https://github.com/ncri)
 
 * Main development of forked gem:
   * Raul Murciano (http://github.com/raul)

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/rails-translate-routes.rb

@@ -165,15 +165,36 @@ class RailsTranslateRoutes
 
       # save original routes and clear route set
       original_routes = route_set.routes.dup                     # Array [routeA, routeB, ...]
-      original_routes.delete_if{|r| r.path == '/assets'}
+
+      if Rails.version >= '3.2'
+        original_routes.routes.delete_if{|r| r.path.spec.to_s == '/assets'  }
+      else
+        original_routes.delete_if{|r| r.path == '/assets'}
+      end
+
       original_named_routes = route_set.named_routes.routes.dup  # Hash {:name => :route}
 
-      reset_route_set route_set
+      if Rails.version >= '3.2'
+        translated_routes = []
+        original_routes.each do |original_route|
+          translations_for(original_route).each do |translated_route_args|
+            translated_routes << translated_route_args
+          end
+        end
 
-      original_routes.each do |original_route|
-        translations_for(original_route).each do |translated_route_args|
+        reset_route_set route_set
+
+        translated_routes.each do |translated_route_args|
           route_set.add_route *translated_route_args
         end
+      else
+        reset_route_set route_set
+
+        original_routes.each do |original_route|
+          translations_for(original_route).each do |translated_route_args|
+            route_set.add_route *translated_route_args
+          end
+        end
       end
 
       original_named_routes.each_key do |route_name|
@@ -189,10 +210,16 @@ class RailsTranslateRoutes
     # Add unmodified root route to route_set
     def add_root_route root_route, route_set
       if @prefix_on_default_locale
-        root_route.conditions[:path_info] = root_route.conditions[:path_info].dup
-        route_set.set.add_route *root_route
-        route_set.named_routes[root_route.name] = root_route
-        route_set.routes << root_route
+        if Rails.version >= '3.2'
+          conditions = { :path_info => root_route.path.spec.to_s }
+          conditions[:request_method] = parse_request_methods root_route.verb if root_route.verb != //
+          route_set.add_route root_route.app, conditions, root_route.requirements, root_route.defaults, root_route.name
+        else
+          root_route.conditions[:path_info] = root_route.conditions[:path_info].dup
+          route_set.set.add_route *root_route
+          route_set.named_routes[root_route.name] = root_route
+          route_set.routes << root_route
+        end
       end
     end
 
@@ -224,10 +251,17 @@ class RailsTranslateRoutes
 
     # Generate translation for a single route for one locale
     def translate_route route, locale
-      conditions = { :path_info => translate_path(route.path, locale) }
-      conditions[:request_method] = parse_request_methods route.conditions[:request_method] if route.conditions.has_key? :request_method
+      if Rails.version >= '3.2'
+        conditions = { :path_info => translate_path(route.path.spec.to_s, locale) }
+        conditions[:request_method] = parse_request_methods route.verb if route.verb != //
+        defaults = route.defaults.merge LOCALE_PARAM_KEY => locale.dup
+      else
+        conditions = { :path_info => translate_path(route.path, locale) }
+        conditions[:request_method] = parse_request_methods route.conditions[:request_method] if route.conditions.has_key? :request_method
+        defaults = route.defaults.merge LOCALE_PARAM_KEY => locale
+      end
+
       requirements = route.requirements.merge LOCALE_PARAM_KEY => locale
-      defaults = route.defaults.merge LOCALE_PARAM_KEY => locale
       new_name = "#{route.name}_#{locale_suffix(locale)}" if route.name
 
       [route.app, conditions, requirements, defaults, new_name]

data/rails-translate-routes.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rails-translate-routes"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francesc Pla"]
-  s.date = "2012-01-19"
+  s.date = "2012-01-31"
   s.description = "Simple gem to translate routes in Rails 3.x based on translate_routes"
   s.email = "francesc@francesc.net"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-translate-routes
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-19 00:00:00.000000000 Z
+date: 2012-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70338562849500 !ruby/object:Gem::Requirement
+  requirement: &70276501525960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70338562849500
+  version_requirements: *70276501525960
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70338562848820 !ruby/object:Gem::Requirement
+  requirement: &70276501524780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70338562848820
+  version_requirements: *70276501524780
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70338562848100 !ruby/object:Gem::Requirement
+  requirement: &70276501523320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70338562848100
+  version_requirements: *70276501523320
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70338562847340 !ruby/object:Gem::Requirement
+  requirement: &70276501522360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70338562847340
+  version_requirements: *70276501522360
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70338562844740 !ruby/object:Gem::Requirement
+  requirement: &70276501521720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70338562844740
+  version_requirements: *70276501521720
 description: Simple gem to translate routes in Rails 3.x based on translate_routes
 email: francesc@francesc.net
 executables: []
@@ -101,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 958290384052730761
+      hash: -2099003059904251866
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: