added option for site_aliases

Olli Huotari committed Mar 18, 2012

commit ba12622c815f8701f4d7633a39b8b16d6f37cdd0

app/models/cms/site.rb +11 -2

@@	@@ -37,7 +37,7 @@ class Cms::Site < ActiveRecord::Base
	def self.find_site(host, path = nil)
	return Cms::Site.first if Cms::Site.count == 1
	cms_site = nil
-	Cms::Site.find_all_by_hostname(host).each do \|site\|
+	Cms::Site.find_all_by_hostname(real_host_from_aliases(host)).each do \|site\|
	if site.path.blank?
	cms_site = site
	elsif "#{path}/".match /^\/#{Regexp.escape(site.path.to_s)}\//
@@	@@ -47,7 +47,16 @@ class Cms::Site < ActiveRecord::Base
	end
	return cms_site
	end
-
+
+	def self.real_host_from_aliases(host)
+	if ComfortableMexicanSofa.config.site_aliases
+	ComfortableMexicanSofa.config.site_aliases.each_with_index do \|array, index\|
+	return ComfortableMexicanSofa.config.site_aliases[index].first if array.include?(host)
+	end
+	end
+	host
+	end
+
	protected

	def assign_identifier

comfortable_mexican_sofa/configuration.rb b/lib/comfortable_mexican_sofa/configuration.rb +7 -0

@@	@@ -64,6 +64,12 @@ class ComfortableMexicanSofa::Configuration
	# Whitelist of partials paths that can be used via {{cms:partial}} tag. All partials
	# are accessible by default. Empty array will prevent rendering of all partials.
	attr_accessor :allowed_partials
+
+	# Site aliases, if you want to have aliases for your site, All find_site calls
+	# are converted to the first one on array. Good for harmozing production env with dev/testing envs.
+	# e.g. site_aliases = [['domain.com', 'domain.inv'], ['seconddomain.com', 'desconddomain.lvh.me']]
+	# Default is nil (not used)
+	attr_accessor :site_aliases

	# Configuration defaults
	def initialize
@@	@@ -91,6 +97,7 @@ class ComfortableMexicanSofa::Configuration
	@allow_irb = false
	@allowed_helpers = nil
	@allowed_partials = nil
+	@site_aliases = nil
	end

	end

test/unit/models/site_test.rb +6 -0

@@	@@ -119,6 +119,12 @@ class CmsSiteTest < ActiveSupport::TestCase

	assert_equal site_c, Cms::Site.find_site('test2.host', '/fr')
	assert_equal site_c, Cms::Site.find_site('test2.host', '/fr/some/path')
+
+	site_aliases_org = ComfortableMexicanSofa.config.site_aliases
+	ComfortableMexicanSofa.config.site_aliases=[['test.host', 'test99.host']]
+	assert_equal site_a, Cms::Site.find_site('test99.host', '/some/path')
+	ComfortableMexicanSofa.config.site_aliases = site_aliases_org
+
	end

	end
	\ No newline at end of file