rails-translate-routes-na 1.0.0 → 2.0.0

data/VERSION

@@ -1 +1 @@
-1.0.0
+2.0.0

data/lib/rails-translate-routes.rb

@@ -265,23 +265,23 @@ class RailsTranslateRoutes
 
         ROUTE_HELPER_CONTAINER.each do |helper_container|
           helper_container.send :define_method, new_helper_name do |*args|
-            send "#{old_name}_#{locale_suffix(I18n.locale)}_#{suffix}", *args
+            send "#{old_name}_#{locale_suffix(args.select{|arg| arg.is_a?(Hash)}.first.try(:[], :locale) || I18n.locale)}_#{suffix}", *args
           end
-          
+
           # !!! very dirty hack to ensure it works inside Engines
-          # 
-          helper_container.send :define_method, :method_missing do |*args|
-            metod = args.shift
-            if metod[/_path/] || metod[/_url/] and self.class != helper_container
-              self.class.send :define_method, metod do |*arguments|
-                locale = arguments.collect{|arg| arg.is_a?(Hash)}.first.try(:[], :locale)
-                send metod.to_s.gsub(/path$/, "#{locale || I18n.locale}_path").gsub(/url$/, "#{locale || I18n.locale}_url"), *arguments
-              end
-              send *args.unshift(metod)
-            else
-              super *args.unshift(metod)
-            end
-          end
+          #
+          # helper_container.send :define_method, :method_missing do |*args|
+          #   metod = args.shift
+          #   if metod[/_path/] || metod[/_url/] and self.class != helper_container and !metod[/\w{2}(_path|_url)/]
+          #     self.class.send :define_method, metod do |*arguments|
+          #       locale = arguments.select{|arg| arg.is_a?(Hash)}.first.try(:[], :locale)
+          #       send metod.to_s.gsub(/path$/, "#{locale || I18n.locale}_path").gsub(/url$/, "#{locale || I18n.locale}_url"), *arguments
+          #     end
+          #     send *args.unshift(metod)
+          #   else
+          #     super *args.unshift(metod)
+          #   end
+          # end
         end
 
         new_helper_name.to_sym
@@ -302,6 +302,7 @@ class RailsTranslateRoutes
 
     # Generate translation for a single route for one locale
     def translate_route route, locale
+      locale = locale.to_s
       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 != //
@@ -359,7 +360,7 @@ class RailsTranslateRoutes
       new_path = '/' if new_path.blank?
       new_path
     end
-    
+
     def split_translate_join(segment, locale, separators, translate = true)
       separator = separators[0]
       final_optional_segments = segment[Regexp.new("(#{'\\' + separator })$")] || ""

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-translate-routes-na
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70364424245020 !ruby/object:Gem::Requirement
+  requirement: &70129682100320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70364424245020
+  version_requirements: *70129682100320
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70364424243760 !ruby/object:Gem::Requirement
+  requirement: &70129682099820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70364424243760
+  version_requirements: *70129682099820
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70364424258160 !ruby/object:Gem::Requirement
+  requirement: &70129682099220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70364424258160
+  version_requirements: *70129682099220
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70364424255200 !ruby/object:Gem::Requirement
+  requirement: &70129682098640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70364424255200
+  version_requirements: *70129682098640
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70364424267680 !ruby/object:Gem::Requirement
+  requirement: &70129682098120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70364424267680
+  version_requirements: *70129682098120
 description: Simple gem to translate routes in Rails 3.x based on translate_routes
 email: francesc@francesc.net
 executables: []