domain_switcher 0.1.2 → 0.1.3

data/lib/domain_switcher/config_loader.rb

@@ -6,7 +6,7 @@ module DomainSwitcher
     attr_reader :websites
     attr_reader :domains
 
-    def initialize(config_file = 'config/websites.yml')
+    def initialize(config_file = 'config/websites.yml', env = 'development')
       begin
         @conf = YAML::load_file(config_file)
       rescue ArgumentError => e
@@ -14,9 +14,10 @@ module DomainSwitcher
       end
       raise ArgumentError.new("DomainSwitcher: Empty config file (#{config_file})") if !@conf or @conf.size == 0
 
+      @env = env
       @websites = []
       @domains = []
-      parse_conf!      
+      parse_conf!
     end
     
   private
@@ -24,6 +25,7 @@ module DomainSwitcher
       @conf.each do |website, conf|
         domains = conf.delete('domains')
         default_domain = conf.delete('default_domain')
+        conf.merge!(conf.delete(@env)) if Hash === conf[@env] # Apply specific conf depending on the env
         raise "DomainSwitcher: Website without domain: #{website}" if !domains or domains.size == 0
         raise "DomainSwitcher: Website without default domain: #{website}" if !default_domain
         

data/lib/domain_switcher/middleware.rb

@@ -3,7 +3,7 @@ module DomainSwitcher
 
     def initialize(app, config = nil)
       @app = app
-      @config = config || DomainSwitcher::ConfigLoader.new
+      @config = config || DomainSwitcher::ConfigLoader.new(Rails.root.join('config/websites.yml'), Rails.env)
       @scanner = DomainSwitcher::Scanner.new(@config.domains)
       
       DomainSwitcher::Cache.init

data/spec/config/websites.yml

@@ -24,4 +24,9 @@ website2:
         default: true
     - fr.website2.com
   lang: fr
-  false_meth: false
+  false_meth: false
+  env_var: 'test'
+  development:
+    env_var: 'dev'
+  production:
+    env_var: 'prod'

data/spec/domain_switcher/config_spec.rb

@@ -81,6 +81,15 @@ describe :config_loader do
     it "cookie domain can be overrided" do
       @config.default_domain.cookie_domain.should == 'website2cookie.com'
     end
+    
+    it "handle properly environments" do
+      c = DomainSwitcher::ConfigLoader.new(File.join(File.dirname(__FILE__), '../config/websites.yml'))
+      c.default_website.env_var.should == 'dev'
+      c = DomainSwitcher::ConfigLoader.new(File.join(File.dirname(__FILE__), '../config/websites.yml'), 'production')
+      c.default_website.env_var.should == 'prod'
+      c = DomainSwitcher::ConfigLoader.new(File.join(File.dirname(__FILE__), '../config/websites.yml'), 'test')
+      c.default_website.env_var.should == 'test'
+    end
 
   end
 end

data/spec/domain_switcher/domain_switcher_spec.rb

@@ -6,6 +6,10 @@ describe :domain_switcher do
     @conf = DomainSwitcher::ConfigLoader.new(File.join(File.dirname(__FILE__), '../config/websites.yml'))
     @app = DomainSwitcher::Middleware.new(Proc.new {|b| [200, 'OK']}, @conf)
   end
+  
+  before :each do
+    Thread.current[:domain_switcher_domain] = nil # reset
+  end
 
   it "not create a new memcache connection if namespace is the same" do
     @app.call({'HTTP_HOST' => 'www.website1.com', 'rack.session.options' => {:domain => :test, :something => true}})
@@ -14,7 +18,7 @@ describe :domain_switcher do
   
   it "switch on default when nothing is found" do
     @app.call({'HTTP_HOST' => 'nothing', 'rack.session.options' => {:domain => :test, :something => true}})
-    Thread.current[:domain_switcher_domain].should == @conf.default_domain
+    Thread.current[:domain_switcher_domain].should == @conf.default_website.default_domain
     Thread.current[:domain_switcher_website].should == @conf.default_website
   end
 

data/spec/domain_switcher/helper_spec.rb

@@ -6,6 +6,10 @@ describe :helper do
     @conf = DomainSwitcher::ConfigLoader.new(File.join(File.dirname(__FILE__), '../config/websites.yml'))
     @app = DomainSwitcher::Middleware.new(Proc.new {|b| [200, 'OK']}, @conf)
   end
+  
+  before :each do
+    Thread.current[:domain_switcher_domain] = nil # reset
+  end
 
   it "Check helper" do
     @app.call({'HTTP_HOST' => 'www.website1.com', 'rack.session.options' => {:domain => :test, :something => true}})

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: domain_switcher
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Guillaume Luccisano
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-25 00:00:00 -08:00
+date: 2011-03-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency