Rails 4 Compatibility

.gitignore

@@ -1,4 +1,5 @@
 *.gem
 .loadpath
-.project
+.project
+.DS_Store
 *~

lib/i18n_routing.rb

@@ -3,6 +3,8 @@
 
 if Rails.version < '3'
   require 'i18n_routing_rails2'
+elsif Rails.version >= '4'
+  require 'i18n_routing_rails4'
 elsif Rails.version >= '3.2'
   require 'i18n_routing_rails32'
 else

lib/i18n_routing_common.rb

@@ -5,7 +5,7 @@ module I18nRouting
   def self.locale_escaped(locale)
     locale.to_s.downcase.gsub('-', '_')
   end
-  
+
   # 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
@@ -16,7 +16,7 @@ def self.translation_for(name, type = :resources, option = nil)
     else
       default = "{name}Noi18nRoutingTranslation"
 
-      # Try to get the translation in routes namescope first      
+      # Try to get the translation in routes namescope first
       t = I18n.t(:as, :scope => "routes.#{name}", :default => default)
 
       return t if t and t != default
@@ -32,12 +32,12 @@ def self.translation_for(name, type = :resources, option = nil)
   # Return path names hash for given resource
   def self.path_names(name, options)
     h = (options[:path_names] || {}).dup
-    
+
     path_names = DefaultPathNames
     PathNamesKeys.each do |v|
       path_names += options[v].keys if options[v] and Hash === options[v]
     end
-    
+
     path_names.each do |pn|
       n = translation_for(name, :path_names, pn)
       n = nil if n == pn.to_s

lib/i18n_routing_rails32.rb

@@ -417,4 +417,4 @@ def score_with_i18n_routing constraints
 end
 
 ActionDispatch::Routing::Mapper.send  :include, I18nRouting::Mapper
-Journey::Route.send                   :include, I18nRouting::JourneyRoute
+Journey::Route.send                   :include, I18nRouting::JourneyRoute