domain_switcher 0.1.4 → 0.1.5

data/lib/domain_switcher/cache.rb

@@ -19,7 +19,7 @@ module DomainSwitcher
               Rails.logger.info "DomainSwitcher: Use existing cache => namespace is the same: #{namespace}"
               RAILS_CACHE
             else
-              c.class.new(d.class.new(instance_variable_get('@servers'), d.instance_variable_get('@options').merge(:namespace => namespace, :prefix_key => namespace)))
+              c.class.new(d.class.new(d.instance_variable_get('@servers'), d.instance_variable_get('@options').merge(:namespace => namespace, :prefix_key => namespace)))
             end
           elsif c.is_a? ActiveSupport::Cache::FileStore
             c.class.new("tmp/cache/#{namespace}")

data/lib/domain_switcher/config_loader.rb

@@ -17,6 +17,7 @@ module DomainSwitcher
       @env = env
       @websites = []
       @domains = []
+      @websites_hash = {}
       parse_conf!
     end
     
@@ -36,7 +37,7 @@ module DomainSwitcher
             website << Domain.new(website, d, conf.merge(conf))
           else # It's an hash like this: {"www.website1.com"=>{"name"=>"Website 1 override", "width"=>900}}
             raise "DomainSwitcher: Bad indentation in the config file" if d.size != 1
-            website << Domain.new(website, d.first.first, d.first.last.merge(conf))
+            website << Domain.new(website, d.first.first, conf.merge(d.first.last))
           end
         end
 
@@ -45,6 +46,7 @@ module DomainSwitcher
 
         # Collect websites and domains
         @websites << website
+        @websites_hash[website.symbol.to_sym] = website
         @domains += website.domains
       end      
     end
@@ -56,6 +58,11 @@ module DomainSwitcher
 
     def default_domain
       @default_domain ||= @domains.find { |d| d.default? } || @domains.first
-    end    
+    end
+    
+    # Retrieve a website by symbol
+    def [](website_symbol)
+      @websites_hash[website_symbol]
+    end
   end
 end

data/lib/domain_switcher/website.rb

@@ -11,12 +11,19 @@ module DomainSwitcher
       @name = name
       @symbol = symbol
       @domains = domains
+      @domains_hash = {}
       build_config!(conf)
     end
     
     def <<(domain)
+      @domains_hash[domain.domain] = domain
       @domains << domain
     end
+    
+    # Retrieve a domain by the domain
+    def [](domain)
+      @domains_hash[domain]
+    end
 
   end
 end

data/spec/domain_switcher/config_spec.rb

@@ -81,6 +81,10 @@ describe :config_loader do
     it "cookie domain can be overrided" do
       @config.default_domain.cookie_domain.should == 'website2cookie.com'
     end
+
+    it "stuff should be overriden in domain" do
+      @config[:website1]['www.website1.com'].name.should == 'Website 1 override'
+    end
     
     it "handle properly environments" do
       c = DomainSwitcher::ConfigLoader.new(File.join(File.dirname(__FILE__), '../config/websites.yml'))

data/spec/spec_helper.rb

@@ -24,11 +24,18 @@ module ActiveSupport
   module Cache
     class MemCacheStore
       def initialize(*args)
-        @data = Memcached.new(*args)
+        if args.first.respond_to? :prefix_key
+          @data = args.first
+        else
+          @data = Memcached.new(*args)
+        end
       end
     end
     
-    class Memcached  
+    class Memcached
+      attr_reader :servers
+      attr_reader :options
+      
       def initialize(servers, options = {})
         @servers = servers
         @options = options

metadata

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