comfortable_mexican_sofa 1.6.16 → 1.6.17

data/VERSION

@@ -1 +1 @@
-1.6.16
+1.6.17

data/app/controllers/cms_content_controller.rb

@@ -14,7 +14,7 @@ class CmsContentController < ApplicationController
   def render_html(status = 200)
     if @cms_layout = @cms_page.layout
       app_layout = (@cms_layout.app_layout.blank? || request.xhr?) ? false : @cms_layout.app_layout
-      render :inline => @cms_page.content, :layout => app_layout, :status => status
+      render :inline => @cms_page.content, :layout => app_layout, :status => status, :content_type => 'text/html'
     else
       render :text => I18n.t('cms.content.layout_not_found'), :status => 404
     end

data/app/models/cms/site.rb

@@ -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,8 +47,17 @@ class Cms::Site < ActiveRecord::Base
     end
     return cms_site
   end
-  
+
 protected
+  
+  def self.real_host_from_aliases(host)
+    if aliases = ComfortableMexicanSofa.config.hostname_aliases
+      aliases.each do |alias_host, aliases|
+        return alias_host if aliases.include?(host)
+      end
+    end
+    host
+  end
 
   def assign_identifier
     self.identifier = self.identifier.blank?? self.hostname.try(:idify) : self.identifier

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "comfortable_mexican_sofa"
-  s.version = "1.6.16"
+  s.version = "1.6.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov", "The Working Group Inc"]
-  s.date = "2012-03-15"
+  s.date = "2012-03-24"
   s.description = ""
   s.email = "oleg@theworkinggroup.ca"
   s.extra_rdoc_files = [

data/config/initializers/comfortable_mexican_sofa.rb

@@ -26,6 +26,10 @@ ComfortableMexicanSofa.configure do |config|
   # If you want to include the routes manually set this to false
   #   config.use_default_routes = true
   
+  # /sitemap.xml that is used by search engines for indexing. It's enabled by
+  # default, but you may turn it off.
+  #   config.enable_sitemap = true
+  
   # File uploads use Paperclip and can support filesystem or s3 uploads.  Override
   # the upload method and appropriate settings based on Paperclip.  For S3 see:
   # http://rdoc.info/gems/paperclip/2.3.8/Paperclip/Storage/S3, and for 
@@ -87,6 +91,12 @@ ComfortableMexicanSofa.configure do |config|
   # are accessible by default. Empty array will prevent rendering of all partials.
   #   config.allowed_partials = nil
   
+  # Site aliases, if you want to have aliases for your site. Good for harmonizing 
+  # production env with dev/testing envs.
+  # e.g. config.site_aliases = {'host.com' => 'host.inv', 'host_a.com' => ['host.lvh.me', 'host.dev']}
+  # Default is nil (not used)
+  #   config.hostname_aliases = nil
+  
 end
 
 # Default credentials for ComfortableMexicanSofa::HttpAuth

data/config/routes.rb

@@ -34,10 +34,14 @@ Rails.application.routes.draw do
   scope :controller => :cms_content do
     get 'cms-css/:site_id/:identifier' => :render_css,  :as => 'cms_css'
     get 'cms-js/:site_id/:identifier'  => :render_js,   :as => 'cms_js'
-    get '(:cms_path)/sitemap' => :render_sitemap,
-      :as           => 'cms_sitemap',
-      :constraints  => {:format => /xml/},
-      :format       => :xml
+    
+    if ComfortableMexicanSofa.config.enable_sitemap
+      get '(:cms_path)/sitemap' => :render_sitemap,
+        :as           => 'cms_sitemap',
+        :constraints  => {:format => /xml/},
+        :format       => :xml
+    end
+    
     get '/' => :render_html,  :as => 'cms_html',  :path => "(*cms_path)"
   end
   

data/lib/comfortable_mexican_sofa/configuration.rb

@@ -23,6 +23,10 @@ class ComfortableMexicanSofa::Configuration
   # If you want to include the routes manually set this to false
   attr_accessor :use_default_routes
   
+  # /sitemap.xml that is used by search engines for indexing. It's enabled by
+  # default, but you may turn it off.
+  attr_accessor :enable_sitemap
+  
   # Upload settings
   attr_accessor :upload_file_options
   
@@ -64,6 +68,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. Good for harmonizing 
+  # production env with dev/testing envs.
+  # e.g. config.site_aliases = {'host.com' => 'host.inv', 'host_a.com' => ['host.lvh.me', 'host.dev']}
+  # Default is nil (not used)
+  attr_accessor :hostname_aliases
   
   # Configuration defaults
   def initialize
@@ -74,6 +84,7 @@ class ComfortableMexicanSofa::Configuration
     @admin_route_prefix   = 'cms-admin'
     @admin_route_redirect = ''
     @use_default_routes   = true
+    @enable_sitemap       = true
     @upload_file_options  = { :url => '/system/:class/:id/:attachment/:style/:filename' }
     @enable_fixtures      = false
     @fixtures_path        = File.expand_path('db/cms_fixtures', Rails.root)
@@ -91,6 +102,7 @@ class ComfortableMexicanSofa::Configuration
     @allow_irb            = false
     @allowed_helpers      = nil
     @allowed_partials     = nil
+    @hostname_aliases     = nil
   end
   
 end

data/lib/comfortable_mexican_sofa/form_builder.rb

@@ -2,7 +2,7 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
   
   helpers = field_helpers -
     %w(hidden_field fields_for) +
-    %w(select)
+    %w(select collection_select)
     
   helpers.each do |name|
     class_eval %Q^

data/test/functional/cms_content_controller_test.rb

@@ -19,10 +19,11 @@ class CmsContentControllerTest < ActionController::TestCase
       default_snippet_content
       layout_content_c'
     ), response.body
+    assert_equal 'text/html', response.content_type
   end
   
   def test_render_page_with_app_layout
-    cms_layouts(:default).update_attribute(:app_layout, 'cms_admin.html.erb')
+    cms_layouts(:default).update_attribute(:app_layout, 'cms_admin')
     get :render_html, :cms_path => ''
     assert_response :success
     assert assigns(:cms_page)
@@ -30,7 +31,7 @@ class CmsContentControllerTest < ActionController::TestCase
   end
   
   def test_render_page_with_xhr
-    cms_layouts(:default).update_attribute(:app_layout, 'cms_admin.html.erb')
+    cms_layouts(:default).update_attribute(:app_layout, 'cms_admin')
     xhr :get, :render_html, :cms_path => ''
     assert_response :success
     assert assigns(:cms_page)
@@ -137,7 +138,7 @@ class CmsContentControllerTest < ActionController::TestCase
   def test_render_css
     get :render_css, :site_id => cms_sites(:default).id, :identifier => cms_layouts(:default).identifier
     assert_response :success
-    assert_match %r{text\/css}, response.headers["Content-Type"]
+    assert_match 'text/css', response.content_type
     assert_equal cms_layouts(:default).css, response.body
   end
   
@@ -149,7 +150,7 @@ class CmsContentControllerTest < ActionController::TestCase
   def test_render_js
     get :render_js, :site_id => cms_sites(:default).id, :identifier => cms_layouts(:default).identifier
     assert_response :success
-    assert_match %r{text\/javascript}, response.headers["Content-Type"]
+    assert_equal 'text/javascript', response.content_type
     assert_equal cms_layouts(:default).js, response.body
   end
   

data/test/integration/routing_extensions_test.rb

@@ -46,4 +46,16 @@ class RoutingExtensionsTest < ActionDispatch::IntegrationTest
     end
   end
   
+  def test_get_sitemap
+    get '/sitemap', :format => 'xml'
+    assert_response :success
+    
+    ComfortableMexicanSofa.config.enable_sitemap = false
+    Rails.application.reload_routes!
+    
+    assert_exception_raised ActionController::RoutingError, 'Page Not Found' do
+      get '/sitemap', :format => 'xml'
+    end
+  end
+  
 end

data/test/test_helper.rb

@@ -24,6 +24,7 @@ class ActiveSupport::TestCase
       config.admin_route_prefix   = 'cms-admin'
       config.admin_route_redirect = ''
       config.use_default_routes   = true
+      config.enable_sitemap       = true
       config.enable_fixtures      = false
       config.fixtures_path        = File.expand_path('db/cms_fixtures', Rails.root)
       config.revisions_limit      = 25
@@ -39,6 +40,7 @@ class ActiveSupport::TestCase
       config.allow_irb            = false
       config.allowed_helpers      = nil
       config.allowed_partials     = nil
+      config.hostname_aliases     = nil
     end
     ComfortableMexicanSofa::HttpAuth.username = 'username'
     ComfortableMexicanSofa::HttpAuth.password = 'password'

data/test/unit/configuration_test.rb

@@ -11,8 +11,8 @@ class ConfigurationTest < ActiveSupport::TestCase
     assert_equal 'ComfortableMexicanSofa::DummyAuth', config.public_auth
     assert_equal 'cms-admin', config.admin_route_prefix
     assert_equal true, config.use_default_routes
+    assert_equal true, config.enable_sitemap
     assert_equal '', config.admin_route_redirect
-    
     assert_equal false, config.enable_fixtures
     assert_equal File.expand_path('db/cms_fixtures', Rails.root), config.fixtures_path
     assert_equal 25, config.revisions_limit
@@ -31,6 +31,7 @@ class ConfigurationTest < ActiveSupport::TestCase
     assert_equal false, config.allow_irb
     assert_equal nil, config.allowed_helpers
     assert_equal nil, config.allowed_partials
+    assert_equal nil, config.hostname_aliases
   end
   
   def test_initialization_overrides

data/test/unit/models/site_test.rb

@@ -121,4 +121,18 @@ class CmsSiteTest < ActiveSupport::TestCase
     assert_equal site_c,  Cms::Site.find_site('test2.host', '/fr/some/path')
   end
   
+  def test_find_site_with_site_alias
+    site_a = cms_sites(:default)
+    site_b = Cms::Site.create!(:identifier => 'site_b', :hostname => 'test2.host')
+    
+    ComfortableMexicanSofa.config.hostname_aliases = {
+      'test.host'   => 'alias_a.host',
+      'test2.host'  => %w(alias_b.host alias_c.host)
+    }
+    
+    assert_equal site_a, Cms::Site.find_site('alias_a.host')
+    assert_equal site_b, Cms::Site.find_site('alias_b.host')
+    assert_equal site_b, Cms::Site.find_site('alias_c.host')
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.6.16
+  version: 1.6.17
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-15 00:00:00.000000000Z
+date: 2012-03-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70113298842700 !ruby/object:Gem::Requirement
+  requirement: &70157649574360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70113298842700
+  version_requirements: *70157649574360
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70113298842040 !ruby/object:Gem::Requirement
+  requirement: &70157649573440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70113298842040
+  version_requirements: *70157649573440
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70113298841120 !ruby/object:Gem::Requirement
+  requirement: &70157649572060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70113298841120
+  version_requirements: *70157649572060
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -369,7 +369,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1361783085271841730
+      hash: -1640044306951500333
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: