pboling-subdomain-fu 0.5.3 → 0.6.0

data/CHANGELOG

@@ -1,3 +1,9 @@
+== 2009-09-16
+
+* Added has_domain? method
+* Protect current_domain from IP access
+* Added more tests
+
 == 2009-09-13
 
 * Added current_domain method

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 5
-:patch: 3
+:minor: 6
+:patch: 0
 :major: 0

data/lib/subdomain-fu.rb

@@ -33,6 +33,10 @@ module SubdomainFu
     tld_sizes[RAILS_ENV.to_sym] = value
   end
 
+  def self.has_domain?(host)
+    !host.blank? && !(/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/.match(host))
+  end
+  
   # Is the current subdomain either nil or not a mirror?
   def self.has_subdomain?(subdomain)
     subdomain != false && !subdomain.blank? && !SubdomainFu.mirrors.include?(subdomain)
@@ -49,7 +53,7 @@ module SubdomainFu
 
   # Gets the subdomain from the host based on the TLD size
   def self.subdomain_from(host)
-    return nil if host.nil? || /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/.match(host)
+    return nil unless has_domain?(host)
     parts = host.split('.')
     sub = parts[0..-(SubdomainFu.tld_size+2)].join(".")
     sub.blank? ? nil : sub
@@ -128,6 +132,7 @@ module SubdomainFu
       !same_subdomain?(subdomain, host)
   end
 
+  #returns nil or the subdomain(s)
   def self.current_subdomain(request)
     subdomain = request.subdomains(SubdomainFu.tld_size).join(".")
     if has_subdomain?(subdomain)
@@ -137,8 +142,10 @@ module SubdomainFu
     end
   end
 
+  #returns nil or the domain or ip
   #Enables subdomain-fu to more completely replace DHH's account_location plugin
   def self.current_domain(request)
+    return request.domain unless has_domain?(request.domain)
     domain = ""
     domain << request.subdomains[1..-1].join(".") + "." if request.subdomains.length > 1
     domain << request.domain + request.port_string

data/spec/subdomain_fu_spec.rb

@@ -31,6 +31,32 @@ describe "SubdomainFu" do
     end
   end
 
+  describe "#has_domain?" do
+    it "should be true for domains with tld" do
+      SubdomainFu.has_domain?("my.example.com").should be_true
+      SubdomainFu.has_domain?("bonkers.example.net").should be_true
+    end
+
+    it "should be false for IP addresses" do
+      SubdomainFu.has_domain?("192.168.100.252").should be_false
+      SubdomainFu.has_domain?("127.0.0.1").should be_false
+      SubdomainFu.has_domain?("4.2.2.2").should be_false
+    end
+
+    it "should be true for localhost" do
+      SubdomainFu.has_domain?("localhost:3000").should be_true
+      SubdomainFu.has_domain?("www.localhost").should be_true
+      SubdomainFu.has_domain?("www.localhost:3000").should be_true
+      SubdomainFu.has_domain?("localhost").should be_true
+    end
+
+    it "shoud be false for a nil or blank subdomain" do
+      SubdomainFu.has_domain?("").should be_false
+      SubdomainFu.has_domain?(nil).should be_false
+      SubdomainFu.has_domain?(false).should be_false
+    end
+  end
+
   describe "#has_subdomain?" do
     it "should be true for non-mirrored subdomains" do
       SubdomainFu.has_subdomain?("awesome").should be_true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pboling-subdomain-fu
 version: !ruby/object:Gem::Version 
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors: 
 - Michael Bleigh