localized 0.0.6 → 0.0.7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    localized (0.0.5)
+    localized (0.0.6)
       bitfields (>= 0.4.0)
       rails (>= 3.0)
 

data/lib/localized/helper.rb

@@ -16,7 +16,7 @@ module Localized::Helper
   end
 
   def url_for(options = nil)
-    if options.kind_of?(Hash)
+    if options.kind_of?(Hash) and not ip?(request.host)
       options[:host] = with_locale(options.delete(:site))
     end
     super options
@@ -24,6 +24,10 @@ module Localized::Helper
 
   protected
 
+  def ip?(hostname)
+    /\A[\d]{1,3}\.[\d]{1,3}\.[\d]{1,3}\.[\d]{1,3}\Z/.match(hostname).present?
+  end
+
   def with_locale(site = nil)
     current_site =  Localized::Config.locale_to_site_map[I18n.locale]
     site = if site.blank? and current_site != Localized::Config.default_site

data/localized.gemspec

@@ -2,7 +2,7 @@ Gem::Specification.new do |s|
   s.name        = 'localized'
   s.author      = 'Paul Hepworth'
   s.email       = 'paul<dot>hepworth<at>peppyheppy<dot>com'
-  s.version     = '0.0.6'
+  s.version     = '0.0.7'
   s.homepage    = 'https://github.com/peppyheppy/localized'
   s.date        = '2011-07-09'
   s.summary     = "A ruby on rails gem that provides locale setting support through the subdomain (in a box)"

data/spec/lib/localized/helper_spec.rb

@@ -19,7 +19,7 @@ describe FoobarController , "locale specific routes", :type => :controller do
     end
 
     it "should error if site is not supported" do
-      expect { 
+      expect {
         root_url(:site => 'cz')
       }.to raise_error(ArgumentError)
     end
@@ -37,6 +37,20 @@ describe FoobarController , "locale specific routes", :type => :controller do
 
   end
 
+  describe "when host is an ip address" do
+    it "should not override the hostname if the ip address is local" do
+      @request.host = '127.0.0.1'
+      get :test
+      root_url.should == 'http://127.0.0.1/'
+    end
+
+    it "should not override the hostname if the ip address is local" do
+      @request.host = '64.24.234.234'
+      get :test
+      root_url.should == 'http://64.24.234.234/'
+    end
+  end
+
   describe "subdomain locale" do
 
     it "should set the current locale to that of the subdomain" do

metadata

@@ -2,7 +2,7 @@
 name: localized
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Paul Hepworth
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-09 00:00:00 -04:00
+date: 2011-07-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency