comfortable_mexican_sofa 1.2.8 → 1.3.0

data/test/integration/sites_test.rb

@@ -2,72 +2,91 @@ require File.expand_path('../test_helper', File.dirname(__FILE__))
 
 class SitesTest < ActionDispatch::IntegrationTest
   
-  def test_get_admin
-    http_auth :get, cms_admin_pages_path
-    assert_response :success
+  def test_get_admin_with_single_site
+    http_auth :get, cms_admin_path
+    assert assigns(:site)
+    assert_equal cms_sites(:default), assigns(:site)
+    assert_response :redirect
+    assert_redirected_to cms_admin_site_pages_path(assigns(:site))
   end
   
   def test_get_admin_with_no_site
     Cms::Site.delete_all
-    assert_difference 'Cms::Site.count' do
-      http_auth :get, cms_admin_pages_path
-      assert_response :redirect
-      assert_redirected_to new_cms_admin_page_path
-      site = Cms::Site.first
-      assert_equal 'test.host', site.hostname
-      assert_equal 'Default Site', site.label
-    end
+    http_auth :get, cms_admin_path
+    assert_response :redirect
+    assert_redirected_to new_cms_admin_site_path
+    assert_equal 'Site not found', flash[:error]
   end
   
-  def test_get_admin_with_wrong_site
-    site = cms_sites(:default)
-    site.update_attribute(:hostname, 'remote.host')
-    assert_no_difference 'Cms::Site.count' do
-      http_auth :get, cms_admin_pages_path
-      assert_response :success
-      site.reload
-      assert_equal 'test.host', site.hostname
-    end
+  def test_get_public_page_with_single_site
+    host! 'bogus.host'
+    get '/'
+    assert_response :success
+    assert assigns(:cms_site)
+    assert_equal 'test.host', assigns(:cms_site).hostname
   end
   
-  def test_get_admin_with_two_wrong_sites
-    ComfortableMexicanSofa.config.enable_multiple_sites = true
+  def test_get_public_page_with_sites_with_different_paths
     Cms::Site.delete_all
-    Cms::Site.create!(:label => 'Site1', :hostname => 'site1.host')
-    Cms::Site.create!(:label => 'Site2', :hostname => 'site2.host')
-    assert_no_difference 'Cms::Site.count' do
-      http_auth :get, cms_admin_pages_path
-      assert_response :redirect
-      assert_redirected_to cms_admin_sites_path
-      assert_equal 'No Site defined for this hostname. Create it now.', flash[:error]
+    site_a = Cms::Site.create!(:label => 'Site A', :hostname => 'test.host', :path => '')
+    site_b = Cms::Site.create!(:label => 'Site B', :hostname => 'test.host', :path => 'path-b')
+    site_c = Cms::Site.create!(:label => 'Site C', :hostname => 'test.host', :path => 'path-c/child')
+    
+    %w(/ /path-a /path-a/child /path-c).each do |path|
+      get path
+      assert_response 404
+      assert assigns(:cms_site), path
+      assert_equal site_a, assigns(:cms_site)
+      assert_equal path.gsub(/^\//, ''), @controller.params[:cms_path].to_s
     end
-  end
-  
-  def test_get_admin_with_no_site_and_multiple_sites_enabled
-    ComfortableMexicanSofa.config.enable_multiple_sites = true
-    Cms::Site.delete_all
-    assert_no_difference 'Cms::Site.count' do
-      http_auth :get, cms_admin_pages_path
-      assert_response :redirect
-      assert_redirected_to cms_admin_sites_path
-      assert_equal 'No Site defined for this hostname. Create it now.', flash[:error]
+    
+    %w(/path-b /path-b/child).each do |path|
+      get path
+      assert_response 404
+      assert assigns(:cms_site), path
+      assert_equal site_b, assigns(:cms_site)
+      assert_equal path.gsub(/^\/path-b/, '').gsub(/^\//, ''), @controller.params[:cms_path].to_s
+    end
+    
+    %w(/path-c/child /path-c/child/child).each do |path|
+      get path
+      assert_response 404
+      assert assigns(:cms_site), path
+      assert_equal site_c, assigns(:cms_site)
+      assert_equal path.gsub(/^\/path-c\/child/, '').gsub(/^\//, ''), @controller.params[:cms_path].to_s
     end
   end
   
-  def test_get_public_page_for_wrong_host_with_single_site
-    host! 'bogus.host'
+  def test_get_public_with_locale
     get '/'
     assert_response :success
     assert assigns(:cms_site)
-    assert_equal 'test.host', assigns(:cms_site).hostname
+    assert_equal :en, I18n.locale
+    
+    cms_sites(:default).update_attribute(:locale, 'fr')
+    get '/'
+    assert_response :success
+    assert assigns(:cms_site)
+    assert_equal :fr, I18n.locale
   end
   
-  def test_get_public_page_for_wrong_host_with_mutiple_sites
-    ComfortableMexicanSofa.config.enable_multiple_sites = true
-    host! 'bogus.host'
-    get '/'
-    assert_response 404
-    assert_equal 'Site Not Found', response.body
+  def test_get_admin_with_locale
+    http_auth :get, cms_admin_site_pages_path(cms_sites(:default))
+    assert_response :success
+    assert_equal :en, I18n.locale
+    
+    cms_sites(:default).update_attribute(:locale, 'fr')
+    http_auth :get, cms_admin_site_pages_path(cms_sites(:default))
+    assert_response :success
+    assert_equal :fr, I18n.locale
+  end
+  
+  def test_get_admin_with_forced_locale
+    ComfortableMexicanSofa.config.admin_locale = :en
+    cms_sites(:default).update_attribute(:locale, 'fr')
+    http_auth :get, cms_admin_site_pages_path(cms_sites(:default))
+    assert_response :success
+    assert_equal :en, I18n.locale
   end
   
 end

data/test/test_helper.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 ENV['RAILS_ENV'] = 'test'
 require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
@@ -17,15 +19,13 @@ class ActiveSupport::TestCase
       config.cms_title              = 'ComfortableMexicanSofa MicroCMS'
       config.authentication         = 'ComfortableMexicanSofa::HttpAuth'
       config.admin_route_prefix     = 'cms-admin'
-      config.content_route_prefix   = ''
-      config.admin_route_redirect   = 'pages'
-      config.enable_multiple_sites  = false
-      config.enable_mirror_sites    = false
+      config.admin_route_redirect   = ''
       config.allow_irb              = false
-      config.enable_caching         = true
       config.enable_fixtures        = false
       config.fixtures_path          = File.expand_path('db/cms_fixtures', Rails.root)
       config.revisions_limit        = 25
+      config.locales                = { :en => 'English', :es => 'Español' }
+      config.admin_locale           = nil
     end
     ComfortableMexicanSofa::HttpAuth.username = 'username'
     ComfortableMexicanSofa::HttpAuth.password = 'password'
@@ -66,11 +66,31 @@ class ActiveSupport::TestCase
       flunk 'Exception was not raised'
     end
   end
-  
+
+  def assert_no_select(selector, value = nil)
+    assert_select(selector, :text => value, :count => 0)
+  end
+
   # Small method that allows for better formatting in tests
   def rendered_content_formatter(string)
     string.gsub(/^[ ]+/, '')
   end
+
+  # Example usage:
+  #   with_translations(:en, :sections => { :products => "Our Products" }) do
+  #     assert_equal I18n.translate('products', :scope => 'sections'), "Our Products"
+  #     assert_equal I18n.translate('sections'), { :products => "Our Products" }
+  #   end
+  def with_translations(locale, translations, &block)
+    begin
+      I18n.backend.store_translations locale, translations
+      I18n.locale = locale
+      yield
+    ensure
+      I18n.reload!
+    end
+  end
+
 end
 
 class ActionController::TestCase

data/test/unit/configuration_test.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.expand_path('../test_helper', File.dirname(__FILE__))
 
 class ConfigurationTest < ActiveSupport::TestCase
@@ -7,15 +9,13 @@ class ConfigurationTest < ActiveSupport::TestCase
     assert_equal 'ComfortableMexicanSofa MicroCMS', config.cms_title
     assert_equal 'ComfortableMexicanSofa::HttpAuth', config.authentication
     assert_equal 'cms-admin', config.admin_route_prefix
-    assert_equal '', config.content_route_prefix
-    assert_equal 'pages', config.admin_route_redirect
-    assert_equal false, config.enable_multiple_sites
-    assert_equal false, config.enable_mirror_sites
+    assert_equal '', config.admin_route_redirect
     assert_equal false, config.allow_irb
-    assert_equal true, config.enable_caching
     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
+    assert_equal ({:en => 'English', :es => 'Español'}), config.locales
+    assert_equal nil, config.admin_locale
   end
   
   def test_initialization_overrides

data/test/unit/form_builder_test.rb

@@ -0,0 +1,69 @@
+require File.expand_path('../test_helper', File.dirname(__FILE__))
+
+class FormBuilderTest < ActionView::TestCase
+  include ComfortableMexicanSofa::ViewMethods
+  
+  def test_form_render_basic
+    concat( cms_form_for(cms_pages(:child), :url => '#') do |f|
+      f.text_area(:label) +
+      f.text_field(:slug) +
+      f.select(:parent_id, [['1', 'Parent']])
+    end )
+    
+    assert_select 'form' do
+      assert_select 'div.form_element.text_area_element' do
+        assert_select 'label[for="cms_page_label"]', 'Label'
+        assert_select 'textarea#cms_page_label'
+      end
+      assert_select 'div.form_element.text_field_element' do
+        assert_select 'label[for="cms_page_slug"]', 'Slug'
+        assert_select 'input#cms_page_slug'
+      end
+      assert_select 'div.form_element.select_element' do
+        assert_select 'select#cms_page_parent_id'
+        assert_select 'label', 'Parent'
+      end
+    end
+  end
+  
+  def test_form_render_with_custom_ids
+    concat( cms_form_for(cms_pages(:child), :url => '#') do |f|
+      f.text_field(:label, :id => 'slugify') +
+      f.text_field(:slug)
+    end )
+    
+    assert_no_select 'label#slugify'
+    assert_select 'label[for="slugify"]', 'Label'
+    assert_select "input#slugify[name='cms_page[label]']"
+  end
+  
+  def test_form_label_with_html_safe_labels
+    cms_form_for(cms_pages(:child), :url => '#') do |f|
+      assert f.label_for(:is_published).html_safe?
+    end
+  end
+  
+  def test_form_label_custom_override
+    concat( cms_form_for(cms_pages(:child), :url => '#') do |f|
+      f.text_field(:slug, :label => 'Custom')
+    end )
+    assert_select 'label[for="cms_page_slug"]', 'Custom'
+  end
+  
+  def test_form_label_translations
+    with_translations :test_lang, {
+      :attributes => { :slug => "Gulsty" },
+      :activerecord => { :attributes => { :'cms/page' => { :label => 'Titlumtimpin' } } }
+    } do
+      concat( cms_form_for(cms_pages(:child), :url => '#') do |f|
+        f.text_field(:label) +
+        f.text_field(:slug) +
+        f.text_field(:parent_id)
+      end )
+      assert_select 'label[for="cms_page_label"]',     'Titlumtimpin'
+      assert_select 'label[for="cms_page_slug"]',      'Gulsty'
+      assert_select 'label[for="cms_page_parent_id"]', 'Parent'
+    end
+  end
+  
+end

data/test/unit/mirrors_test.rb

@@ -3,13 +3,9 @@ require File.expand_path('../test_helper', File.dirname(__FILE__))
 class MirrorsTest < ActiveSupport::TestCase
   
   def setup
-    ComfortableMexicanSofa.config.enable_mirror_sites = true
-    load(File.expand_path('app/models/cms/layout.rb', Rails.root))
-    load(File.expand_path('app/models/cms/page.rb', Rails.root))
-    load(File.expand_path('app/models/cms/snippet.rb', Rails.root))
     Cms::Site.delete_all
-    @site_a = Cms::Site.create!(:label => 'Site A', :hostname => 'site-a.host')
-    @site_b = Cms::Site.create!(:label => 'Site B', :hostname => 'site-b.host')
+    @site_a = Cms::Site.create!(:label => 'Site A', :hostname => 'site-a.host', :is_mirrored => true)
+    @site_b = Cms::Site.create!(:label => 'Site B', :hostname => 'site-b.host', :is_mirrored => true)
   end
   
   def test_layout_creation

data/test/unit/models/site_test.rb

@@ -21,12 +21,36 @@ class CmsSiteTest < ActiveSupport::TestCase
     assert site.valid?
   end
   
+  def test_validation_path_uniqueness
+    s1 = cms_sites(:default)
+    s2 = Cms::Site.new(
+      :hostname => s1.hostname,
+      :path     => s1.path
+    )
+    assert s2.invalid?
+    assert_has_errors_on s2, :hostname
+    
+    s2 = Cms::Site.new(
+      :hostname => s1.hostname,
+      :path     => '/en'
+    )
+    assert s2.valid?
+  end
+  
   def test_label_assignment
     site = Cms::Site.new(:hostname => 'my-site.host')
     assert site.valid?
     assert_equal 'my-site.host', site.label
   end
   
+  def test_clean_path
+    site = Cms::Site.create!(:hostname => 'test.host', :path => '/en///test//')
+    assert_equal '/en/test', site.path
+    
+    site = Cms::Site.create!(:hostname => 'my-site.host', :path => '/')
+    assert_equal '', site.path
+  end
+  
   def test_cascading_destroy
     assert_difference 'Cms::Site.count', -1 do
       assert_difference 'Cms::Layout.count', -3 do
@@ -39,9 +63,12 @@ class CmsSiteTest < ActiveSupport::TestCase
     end
   end
   
-  def test_options_for_select
-    assert_equal 1, Cms::Site.options_for_select.size
-    assert_equal 'Default Site (test.host)', Cms::Site.options_for_select[0][0]
+  def test_scope_mirrored
+    site = cms_sites(:default)
+    assert !site.is_mirrored
+    assert_equal 0, Cms::Site.mirrored.count
+    site.update_attribute(:is_mirrored, true)
+    assert_equal 1, Cms::Site.mirrored.count
   end
   
 end

metadata

@@ -1,72 +1,70 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.3.0
   prerelease: 
-  version: 1.2.8
 platform: ruby
-authors: 
+authors:
 - Oleg Khabarov
 - The Working Group Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-07-03 00:00:00.000000000 -04:00
+default_executable: 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2154496160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2154496160
+- !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2154495460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.0.7
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2154495460
+- !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &2154494760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.11
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2154494760
+- !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &2154494060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id004
-description: ""
+  version_requirements: *2154494060
+description: ''
 email: oleg@theworkinggroup.ca
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.md
-files: 
+files:
 - .gemtest
 - Gemfile
 - LICENSE
@@ -193,6 +191,7 @@ files:
 - config/initializers/comfortable_mexican_sofa.rb
 - config/initializers/paperclip.rb
 - config/locales/en.yml
+- config/locales/es.yml
 - config/routes.rb
 - db/cms_fixtures/example.com/layouts/default/_default.yml
 - db/cms_fixtures/example.com/layouts/default/content.html
@@ -212,6 +211,7 @@ files:
 - db/migrate/01_create_cms.rb
 - db/migrate/upgrades/02_upgrade_to_1_1_0.rb
 - db/migrate/upgrades/03_upgrade_to_1_2_0.rb
+- db/migrate/upgrades/04_upgrade_to_1_3_0.rb
 - db/seeds.rb
 - doc/page_editing.png
 - doc/sofa.png
@@ -264,6 +264,7 @@ files:
 - test/fixtures/files/valid_image.jpg
 - test/fixtures/views/_nav_hook.html.erb
 - test/fixtures/views/_nav_hook_2.html.erb
+- test/functional/cms_admin/base_controller_test.rb
 - test/functional/cms_admin/layouts_controller_test.rb
 - test/functional/cms_admin/pages_controller_test.rb
 - test/functional/cms_admin/revisions_controller_test.rb
@@ -281,6 +282,7 @@ files:
 - test/test_helper.rb
 - test/unit/configuration_test.rb
 - test/unit/fixtures_test.rb
+- test/unit/form_builder_test.rb
 - test/unit/mirrors_test.rb
 - test/unit/models/block_test.rb
 - test/unit/models/layout_test.rb
@@ -305,35 +307,32 @@ files:
 - test/unit/tags/snippet_test.rb
 - test/unit/tags/upload_test.rb
 - test/unit/view_methods_test.rb
+has_rdoc: true
 homepage: http://github.com/twg/comfortable-mexican-sofa
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -2002714519629523177
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 422969780907158311
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: ComfortableMexicanSofa is a powerful micro CMS for Ruby on Rails 3 applications
 test_files: []
-