domain_switcher 0.1.5 → 0.1.6

data/lib/domain_switcher/scanner.rb

@@ -12,7 +12,26 @@ module DomainSwitcher
     end
 
     def scan_domain(host)
-      @@domain_cache[host]
+      @@domain_cache[host] || deep_scan(host)
+    end
+    
+    # Will not match exactly the domain but will try to match the closest one
+    # For example => fr.staging.domain.com will match staging.domain.com if declared
+    def deep_scan(host)
+      return nil if !host
+
+      dom = nil
+      nbdot = nil
+      @domains.each do |domain|
+        if dot = host.rindex(domain.domain)
+          if !nbdot or dot < nbdot
+            nbdot = dot
+            dom = domain
+          end
+        end
+      end
+      @@domain_cache[host] = dom if dom
+      return dom
     end
     
   end

data/spec/config/websites.yml

@@ -23,6 +23,7 @@ website2:
     - www.website2.com:
         default: true
     - fr.website2.com
+    - staging.website2.com
   lang: fr
   false_meth: false
   env_var: 'test'

data/spec/domain_switcher/config_spec.rb

@@ -46,8 +46,8 @@ describe :config_loader do
     end
     
     it "load correctly all domains" do
-      @config.domains.size.should == 6
-      @config.domains.collect(&:domain).uniq.size.should == 6
+      @config.domains.size.should == 7
+      @config.domains.collect(&:domain).uniq.size.should == 7
       @config.domains.first.domain.should == 'www.website1.com'
     end
 

data/spec/domain_switcher/scanner_spec.rb

@@ -11,6 +11,11 @@ describe :scanner do
     @scanner.scan_domain(nil).should == nil
     @scanner.scan_domain('something_not_existing').should == nil
   end
+  
+  it "handle deep scanning" do
+    @scanner.scan_domain('staging.website2.com').domain.should == 'staging.website2.com'
+    @scanner.scan_domain('fr.staging.website2.com').domain.should == 'staging.website2.com'
+  end
 
   it "return correct domain when existing" do
     @scanner.scan_domain('www.website2.com').should_not be_nil

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: domain_switcher
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Guillaume Luccisano