comfortable_mexican_sofa 1.0.51 → 1.1.1

data/test/functional/cms_admin/sites_controller_test.rb

@@ -10,7 +10,7 @@ class CmsAdmin::SitesControllerTest < ActionController::TestCase
   end
   
   def test_get_index_with_no_sites
-    CmsSite.delete_all
+    Cms::Site.delete_all
     get :index
     assert_response :redirect
     assert_redirected_to :action => :new
@@ -42,19 +42,19 @@ class CmsAdmin::SitesControllerTest < ActionController::TestCase
   end
   
   def test_creation
-    assert_difference 'CmsSite.count' do
+    assert_difference 'Cms::Site.count' do
       post :create, :cms_site => {
         :label    => 'Test Site',
         :hostname => 'test.site.local'
       }
       assert_response :redirect
-      assert_redirected_to :action => :edit, :id => CmsSite.last
+      assert_redirected_to :action => :edit, :id => Cms::Site.last
       assert_equal 'Site created', flash[:notice]
     end
   end
   
   def test_creation_failure
-    assert_no_difference 'CmsSite.count' do
+    assert_no_difference 'Cms::Site.count' do
       post :create, :cms_site => { }
       assert_response :success
       assert_template :new
@@ -89,7 +89,7 @@ class CmsAdmin::SitesControllerTest < ActionController::TestCase
   end
   
   def test_destroy
-    assert_difference 'CmsSite.count', -1 do
+    assert_difference 'Cms::Site.count', -1 do
       delete :destroy, :id => cms_sites(:default)
       assert_response :redirect
       assert_redirected_to :action => :index

data/test/functional/cms_admin/snippets_controller_test.rb

@@ -10,7 +10,7 @@ class CmsAdmin::SnippetsControllerTest < ActionController::TestCase
   end
   
   def test_get_index_with_no_snippets
-    CmsSnippet.delete_all
+    Cms::Snippet.delete_all
     get :index
     assert_response :redirect
     assert_redirected_to :action => :new
@@ -41,22 +41,22 @@ class CmsAdmin::SnippetsControllerTest < ActionController::TestCase
   end
   
   def test_creation
-    assert_difference 'CmsSnippet.count' do
+    assert_difference 'Cms::Snippet.count' do
       post :create, :cms_snippet => {
         :label    => 'Test Snippet',
         :slug     => 'test-snippet',
         :content  => 'Test Content'
       }
       assert_response :redirect
-      snippet = CmsSnippet.last
-      assert_equal cms_sites(:default), snippet.cms_site
+      snippet = Cms::Snippet.last
+      assert_equal cms_sites(:default), snippet.site
       assert_redirected_to :action => :edit, :id => snippet
       assert_equal 'Snippet created', flash[:notice]
     end
   end
   
   def test_creation_failure
-    assert_no_difference 'CmsSnippet.count' do
+    assert_no_difference 'Cms::Snippet.count' do
       post :create, :cms_snippet => { }
       assert_response :success
       assert_template :new
@@ -91,7 +91,7 @@ class CmsAdmin::SnippetsControllerTest < ActionController::TestCase
   end
   
   def test_destroy
-    assert_difference 'CmsSnippet.count', -1 do
+    assert_difference 'Cms::Snippet.count', -1 do
       delete :destroy, :id => cms_snippets(:default)
       assert_response :redirect
       assert_redirected_to :action => :index

data/test/functional/cms_admin/uploads_controller_test.rb

@@ -3,21 +3,21 @@ require File.expand_path('../../test_helper', File.dirname(__FILE__))
 class CmsAdmin::UploadsControllerTest < ActionController::TestCase
   
   def test_create
-    assert_difference 'CmsUpload.count', 1 do
+    assert_difference 'Cms::Upload.count', 1 do
       xhr :post, :create, :file => fixture_file_upload('files/valid_image.jpg')
       assert_response :success
     end
   end
   
-  def test_create_fails
-    assert_no_difference 'CmsUpload.count' do
+  def test_create_failure
+    assert_no_difference 'Cms::Upload.count' do
       xhr :post, :create, :file => nil
       assert_response :bad_request
     end
   end
   
   def test_destroy
-    assert_difference 'CmsUpload.count', -1 do
+    assert_difference 'Cms::Upload.count', -1 do
       xhr :delete, :destroy, :id => cms_uploads(:default)
       assert_response :success
     end

data/test/functional/cms_content_controller_test.rb

@@ -32,13 +32,13 @@ class CmsContentControllerTest < ActionController::TestCase
   end
   
   def test_render_page_not_found_with_custom_404
-    page = cms_sites(:default).cms_pages.create!(
+    page = cms_sites(:default).pages.create!(
       :label          => '404',
       :slug           => '404',
       :parent_id      => cms_pages(:default).id,
-      :cms_layout_id  => cms_layouts(:default).id,
+      :layout_id      => cms_layouts(:default).id,
       :is_published   => '1',
-      :cms_blocks_attributes => [
+      :blocks_attributes => [
         { :label    => 'default_page_text',
           :type     => 'CmsTag::PageText',
           :content  => 'custom 404 page content' }
@@ -52,6 +52,22 @@ class CmsContentControllerTest < ActionController::TestCase
     assert_match /custom 404 page content/, response.body
   end
   
+  def test_render_page_with_no_site
+    Cms::Site.destroy_all
+    
+    get :render_html, :cms_path => ''
+    assert_response 404
+    assert_equal 'Site Not Found', response.body
+  end
+  
+  def test_render_page_with_no_layout
+    Cms::Layout.destroy_all
+    
+    get :render_html, :cms_path => ''
+    assert_response 404
+    assert_equal 'Layout Not Found', response.body
+  end
+  
   def test_render_page_with_redirect
     cms_pages(:child).update_attribute(:target_page, cms_pages(:default))
     assert_equal cms_pages(:default), cms_pages(:child).target_page
@@ -68,15 +84,15 @@ class CmsContentControllerTest < ActionController::TestCase
   end
   
   def test_render_page_with_irb_disabled
-    assert ComfortableMexicanSofa.config.disable_irb
+    assert_equal false, ComfortableMexicanSofa.config.allow_irb
     
-    irb_page = cms_sites(:default).cms_pages.create!(
+    irb_page = cms_sites(:default).pages.create!(
       :label          => 'irb',
       :slug           => 'irb',
       :parent_id      => cms_pages(:default).id,
-      :cms_layout_id  => cms_layouts(:default).id,
+      :layout_id      => cms_layouts(:default).id,
       :is_published   => '1',
-      :cms_blocks_attributes => [
+      :blocks_attributes => [
         { :label    => 'default_page_text',
           :content  => 'text <%= 2 + 2 %> text' }
       ]
@@ -87,15 +103,15 @@ class CmsContentControllerTest < ActionController::TestCase
   end
   
   def test_render_page_with_irb_enabled
-    ComfortableMexicanSofa.config.disable_irb = false
+    ComfortableMexicanSofa.config.allow_irb = true
     
-    irb_page = cms_sites(:default).cms_pages.create!(
+    irb_page = cms_sites(:default).pages.create!(
       :label          => 'irb',
       :slug           => 'irb',
       :parent_id      => cms_pages(:default).id,
-      :cms_layout_id  => cms_layouts(:default).id,
+      :layout_id  => cms_layouts(:default).id,
       :is_published   => '1',
-      :cms_blocks_attributes => [
+      :blocks_attributes => [
         { :label    => 'default_page_text',
           :content  => 'text <%= 2 + 2 %> text' }
       ]

data/test/integration/fixtures_test.rb

@@ -0,0 +1,43 @@
+require File.expand_path('../test_helper', File.dirname(__FILE__))
+
+class FixturesTest < ActionDispatch::IntegrationTest
+  
+  def setup
+    host! 'example.com'
+    cms_sites(:default).update_attribute(:hostname, 'example.com')
+  end
+  
+  def test_fixtures_disabled
+    assert_no_difference ['Cms::Layout.count', 'Cms::Page.count', 'Cms::Snippet.count'] do
+      get '/'
+      assert_response :success
+      
+      assert_equal 'Default Page', Cms::Page.root.label
+      assert_equal 'Default Layout', Cms::Layout.find_by_slug('default').label
+      assert_equal 'Default Snippet', Cms::Snippet.find_by_slug('default').label
+    end
+  end
+  
+  def test_fixtures_enabled
+    ComfortableMexicanSofa.config.enable_fixtures = true
+    Cms::Layout.destroy_all
+    Cms::Page.destroy_all
+    Cms::Snippet.destroy_all
+    
+    assert_difference 'Cms::Page.count', 2 do
+      assert_difference 'Cms::Layout.count', 2 do
+        assert_difference 'Cms::Snippet.count', 1 do
+          get '/'
+          assert_response :success
+          
+          assert_equal 'Home Fixture Page', Cms::Page.root.label
+          assert_equal 'Default Fixture Layout', Cms::Layout.find_by_slug('default').label
+          assert_equal 'Default Fixture Snippet', Cms::Snippet.find_by_slug('default').label
+          
+          assert_equal "<html>\n  <body>\n    Home Page Fixture Content\nFixture Content for Default Snippet\n  </body>\n</html>", response.body
+        end
+      end
+    end
+  end
+  
+end

data/test/integration/sites_test.rb

@@ -8,12 +8,12 @@ class SitesTest < ActionDispatch::IntegrationTest
   end
   
   def test_get_admin_with_no_site
-    CmsSite.delete_all
-    assert_difference 'CmsSite.count' do
+    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 = CmsSite.first
+      site = Cms::Site.first
       assert_equal 'test.host', site.hostname
       assert_equal 'Default Site', site.label
     end
@@ -22,7 +22,7 @@ class SitesTest < ActionDispatch::IntegrationTest
   def test_get_admin_with_wrong_site
     site = cms_sites(:default)
     site.update_attribute(:hostname, 'remote.host')
-    assert_no_difference 'CmsSite.count' do
+    assert_no_difference 'Cms::Site.count' do
       http_auth :get, cms_admin_pages_path
       assert_response :success
       site.reload
@@ -31,10 +31,11 @@ class SitesTest < ActionDispatch::IntegrationTest
   end
   
   def test_get_admin_with_two_wrong_sites
-    CmsSite.delete_all
-    CmsSite.create!(:label => 'Site1', :hostname => 'site1.host')
-    CmsSite.create!(:label => 'Site2', :hostname => 'site2.host')
-    assert_no_difference 'CmsSite.count' do
+    ComfortableMexicanSofa.config.enable_multiple_sites = true
+    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
@@ -42,10 +43,10 @@ class SitesTest < ActionDispatch::IntegrationTest
     end
   end
   
-  def test_get_admin_with_no_site_and_no_auto_manage
-    ComfortableMexicanSofa.config.auto_manage_sites = false
-    CmsSite.delete_all
-    assert_no_difference 'CmsSite.count' do
+  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
@@ -53,7 +54,16 @@ class SitesTest < ActionDispatch::IntegrationTest
     end
   end
   
-  def test_get_public_page_for_non_existent_site
+  def test_get_public_page_for_wrong_host_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_public_page_for_wrong_host_with_mutiple_sites
+    ComfortableMexicanSofa.config.enable_multiple_sites = true
     host! 'bogus.host'
     get '/'
     assert_response 404

data/test/test_helper.rb

@@ -14,14 +14,15 @@ class ActiveSupport::TestCase
   # resetting default configuration
   def reset_config
     ComfortableMexicanSofa.configure do |config|
-      config.cms_title            = 'ComfortableMexicanSofa MicroCMS'
-      config.authentication       = 'ComfortableMexicanSofa::HttpAuth'
-      config.seed_data_path       = nil
-      config.admin_route_prefix   = 'cms-admin'
-      config.admin_route_redirect = "/cms-admin/pages"
-      config.auto_manage_sites    = true
-      config.disable_irb          = true
-      config.enable_caching       = true
+      config.cms_title              = 'ComfortableMexicanSofa MicroCMS'
+      config.authentication         = 'ComfortableMexicanSofa::HttpAuth'
+      config.admin_route_prefix     = 'cms-admin'
+      config.admin_route_redirect   = "/cms-admin/pages"
+      config.enable_multiple_sites  = false
+      config.allow_irb              = false
+      config.enable_caching         = true
+      config.enable_fixtures        = false
+      config.fixtures_path          = File.expand_path('db/cms_fixtures', Rails.root)
     end
     ComfortableMexicanSofa::HttpAuth.username = 'username'
     ComfortableMexicanSofa::HttpAuth.password = 'password'

data/test/unit/{cms_configuration_test.rb → configuration_test.rb}

@@ -1,16 +1,18 @@
 require File.expand_path('../test_helper', File.dirname(__FILE__))
 
-class CmsConfigurationTest < ActiveSupport::TestCase
+class ConfigurationTest < ActiveSupport::TestCase
   
   def test_configuration_presense
     assert config = ComfortableMexicanSofa.configuration
     assert_equal 'ComfortableMexicanSofa MicroCMS', config.cms_title
     assert_equal 'ComfortableMexicanSofa::HttpAuth', config.authentication
-    assert_equal nil, config.seed_data_path
     assert_equal 'cms-admin', config.admin_route_prefix
     assert_equal '/cms-admin/pages', config.admin_route_redirect
-    assert_equal true, config.disable_irb
+    assert_equal false, config.enable_multiple_sites
+    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
   end
   
   def test_initialization_overrides

data/test/unit/fixtures_test.rb

@@ -0,0 +1,198 @@
+require File.expand_path('../test_helper', File.dirname(__FILE__))
+
+class ViewMethodsTest < ActiveSupport::TestCase
+  
+  def setup
+    @site = cms_sites(:default)
+    @site.update_attribute(:hostname, 'example.com')
+  end
+  
+  def test_sync_layouts_creating
+    Cms::Layout.delete_all
+    
+    assert_difference 'Cms::Layout.count', 2 do
+      ComfortableMexicanSofa::Fixtures.sync_layouts(@site)
+      assert layout = Cms::Layout.find_by_slug('default')
+      assert_equal 'Default Fixture Layout', layout.label
+      assert_equal "<html>\n  <body>\n    {{ cms:page:content }}\n  </body>\n</html>", layout.content
+      assert_equal 'body{color: red}', layout.css
+      assert_equal '// default js', layout.js
+      
+      assert nested_layout = Cms::Layout.find_by_slug('nested')
+      assert_equal layout, nested_layout.parent
+      assert_equal 'Default Fixture Nested Layout', nested_layout.label
+      assert_equal "<div class='left'> {{ cms:page:left }} </div>\n<div class='right'> {{ cms:page:right }} </div>", nested_layout.content
+      assert_equal 'div{float:left}', nested_layout.css
+      assert_equal '// nested js', nested_layout.js
+    end
+  end
+  
+  def test_sync_layouts_updating_and_deleting
+    
+    layout        = cms_layouts(:default)
+    nested_layout = cms_layouts(:nested)
+    child_layout  = cms_layouts(:child)
+    layout.update_attribute(:updated_at, 10.years.ago)
+    nested_layout.update_attribute(:updated_at, 10.years.ago)
+    child_layout.update_attribute(:updated_at, 10.years.ago)
+    
+    assert_difference 'Cms::Layout.count', -1 do
+      ComfortableMexicanSofa::Fixtures.sync_layouts(@site)
+      
+      layout.reload
+      assert_equal 'Default Fixture Layout', layout.label
+      assert_equal "<html>\n  <body>\n    {{ cms:page:content }}\n  </body>\n</html>", layout.content
+      assert_equal 'body{color: red}', layout.css
+      assert_equal '// default js', layout.js
+      
+      nested_layout.reload
+      assert_equal layout, nested_layout.parent
+      assert_equal 'Default Fixture Nested Layout', nested_layout.label
+      assert_equal "<div class='left'> {{ cms:page:left }} </div>\n<div class='right'> {{ cms:page:right }} </div>", nested_layout.content
+      assert_equal 'div{float:left}', nested_layout.css
+      assert_equal '// nested js', nested_layout.js
+      
+      assert_nil Cms::Layout.find_by_slug('child')
+    end
+  end
+  
+  def test_sync_layouts_ignoring
+    layout = cms_layouts(:default)
+    layout_path       = File.join(ComfortableMexicanSofa.config.fixtures_path, @site.hostname, 'layouts', 'default')
+    attr_file_path    = File.join(layout_path, '_default.yml')
+    content_file_path = File.join(layout_path, 'content.html')
+    css_file_path     = File.join(layout_path, 'css.css')
+    js_file_path      = File.join(layout_path, 'js.js')
+    
+    assert layout.updated_at >= File.mtime(attr_file_path)
+    assert layout.updated_at >= File.mtime(content_file_path)
+    assert layout.updated_at >= File.mtime(css_file_path)
+    assert layout.updated_at >= File.mtime(js_file_path)
+    
+    ComfortableMexicanSofa::Fixtures.sync_layouts(@site)
+    layout.reload
+    assert_equal 'default', layout.slug
+    assert_equal 'Default Layout', layout.label
+    assert_equal "{{cms:field:default_field_text:text}}\nlayout_content_a\n{{cms:page:default_page_text:text}}\nlayout_content_b\n{{cms:snippet:default}}\nlayout_content_c", layout.content
+    assert_equal 'default_css', layout.css
+    assert_equal 'default_js', layout.js
+  end
+  
+  def test_sync_pages_creating
+    Cms::Page.delete_all
+    
+    layout = cms_layouts(:default)
+    layout.update_attribute(:content, '<html>{{cms:page:content}}</html>')
+    
+    nested = cms_layouts(:nested)
+    nested.update_attribute(:content, '<html>{{cms:page:left}}<br/>{{cms:page:right}}</html>')
+    
+    assert_difference 'Cms::Page.count', 2 do
+      ComfortableMexicanSofa::Fixtures.sync_pages(@site)
+      
+      assert page = Cms::Page.find_by_full_path('/')
+      assert_equal 'index', page.slug
+      assert_equal "<html>Home Page Fixture Content\ndefault_snippet_content</html>", page.content
+      assert page.is_published?
+      
+      assert child_page = Cms::Page.find_by_full_path('/child')
+      assert_equal page, child_page.parent
+      assert_equal 'child', child_page.slug
+      assert_equal '<html>Child Page Left Fixture Content<br/>Child Page Right Fixture Content</html>', child_page.content
+    end
+  end
+  
+  def test_sync_pages_updating_and_deleting
+    page = cms_pages(:default)
+    page.update_attribute(:updated_at, 10.years.ago)
+    assert_equal 'Default Page', page.label
+    
+    child = cms_pages(:child)
+    child.update_attribute(:slug, 'old')
+    
+    assert_no_difference 'Cms::Page.count' do
+      ComfortableMexicanSofa::Fixtures.sync_pages(@site)
+      
+      page.reload
+      assert_equal 'Home Fixture Page', page.label
+      
+      assert_nil Cms::Page.find_by_slug('old')
+    end
+  end
+  
+  def test_sync_pages_ignoring
+    page = cms_pages(:default)
+    page_path         = File.join(ComfortableMexicanSofa.config.fixtures_path, @site.hostname, 'pages', 'index')
+    attr_file_path    = File.join(page_path, '_index.yml')
+    content_file_path = File.join(page_path, 'content.html')
+    
+    assert page.updated_at >= File.mtime(attr_file_path)
+    assert page.updated_at >= File.mtime(content_file_path)
+    
+    ComfortableMexicanSofa::Fixtures.sync_pages(@site)
+    page.reload
+    assert_equal nil, page.slug
+    assert_equal 'Default Page', page.label
+    assert_equal "\nlayout_content_a\ndefault_page_text_content_a\ndefault_snippet_content\ndefault_page_text_content_b\nlayout_content_b\ndefault_snippet_content\nlayout_content_c", page.content
+  end
+  
+  def test_sync_snippets_creating
+    Cms::Snippet.delete_all
+    
+    assert_difference 'Cms::Snippet.count' do
+      ComfortableMexicanSofa::Fixtures.sync_snippets(@site)
+      assert snippet = Cms::Snippet.last
+      assert_equal 'default', snippet.slug
+      assert_equal 'Default Fixture Snippet', snippet.label
+      assert_equal 'Fixture Content for Default Snippet', snippet.content
+    end
+  end
+  
+  def test_sync_snippets_updating
+    snippet = cms_snippets(:default)
+    snippet.update_attribute(:updated_at, 10.years.ago)
+    assert_equal 'default', snippet.slug
+    assert_equal 'Default Snippet', snippet.label
+    assert_equal 'default_snippet_content', snippet.content
+    
+    assert_no_difference 'Cms::Snippet.count' do
+      ComfortableMexicanSofa::Fixtures.sync_snippets(@site)
+      snippet.reload
+      assert_equal 'default', snippet.slug
+      assert_equal 'Default Fixture Snippet', snippet.label
+      assert_equal 'Fixture Content for Default Snippet', snippet.content
+    end
+  end
+  
+  def test_sync_snippets_deleting
+    snippet = cms_snippets(:default)
+    snippet.update_attribute(:slug, 'old')
+    
+    assert_no_difference 'Cms::Snippet.count' do
+      ComfortableMexicanSofa::Fixtures.sync_snippets(@site)
+      assert snippet = Cms::Snippet.last
+      assert_equal 'default', snippet.slug
+      assert_equal 'Default Fixture Snippet', snippet.label
+      assert_equal 'Fixture Content for Default Snippet', snippet.content
+      
+      assert_nil Cms::Snippet.find_by_slug('old')
+    end
+  end
+  
+  def test_sync_snippets_ignoring
+    snippet = cms_snippets(:default)
+    snippet_path      = File.join(ComfortableMexicanSofa.config.fixtures_path, @site.hostname, 'snippets', 'default')
+    attr_file_path    = File.join(snippet_path, '_default.yml')
+    content_file_path = File.join(snippet_path, 'content.html')
+    
+    assert snippet.updated_at >= File.mtime(attr_file_path)
+    assert snippet.updated_at >= File.mtime(content_file_path)
+    
+    ComfortableMexicanSofa::Fixtures.sync_snippets(@site)
+    snippet.reload
+    assert_equal 'default', snippet.slug
+    assert_equal 'Default Snippet', snippet.label
+    assert_equal 'default_snippet_content', snippet.content
+  end
+  
+end