comfortable_mexican_sofa 1.2.8 → 1.3.0

data/lib/comfortable_mexican_sofa/is_mirrored.rb

@@ -5,16 +5,13 @@ module ComfortableMexicanSofa::IsMirrored
   end
   
   module ClassMethods
-    
     def cms_is_mirrored
-      if ComfortableMexicanSofa.config.enable_mirror_sites
-        include ComfortableMexicanSofa::IsMirrored::InstanceMethods
-        
-        attr_accessor :is_mirrored
-        
-        after_save    :sync_mirror
-        after_destroy :destroy_mirror
-      end
+      include ComfortableMexicanSofa::IsMirrored::InstanceMethods
+      
+      attr_accessor :is_mirrored
+      
+      after_save    :sync_mirror
+      after_destroy :destroy_mirror
     end
   end
   
@@ -22,7 +19,8 @@ module ComfortableMexicanSofa::IsMirrored
     
     # Mirrors of the object found on other sites
     def mirrors
-      (Cms::Site.all - [self.site]).collect do |site|
+      return [] unless self.site.is_mirrored?
+      (Cms::Site.mirrored - [self.site]).collect do |site|
         case self
           when Cms::Layout  then site.layouts.find_by_slug(self.slug)
           when Cms::Page    then site.pages.find_by_full_path(self.full_path)
@@ -37,7 +35,7 @@ module ComfortableMexicanSofa::IsMirrored
     def sync_mirror
       return if self.is_mirrored
       
-      (Cms::Site.all - [self.site]).each do |site|
+      (Cms::Site.mirrored - [self.site]).each do |site|
         mirror = case self
         when Cms::Layout
           m = site.layouts.find_by_slug(self.slug_was || self.slug) || site.layouts.new

data/lib/comfortable_mexican_sofa/tags/asset.rb

@@ -13,11 +13,11 @@ class ComfortableMexicanSofa::Tag::Asset
     
     case type
     when 'css'
-      out = "#{ComfortableMexicanSofa.config.content_route_prefix}/cms-css/#{label}.css"
+      out = "#{page.site.path}/cms-css/#{label}.css"
       out = "<link href='#{out}' media='screen' rel='stylesheet' type='text/css' />" if format == 'html_tag'
       out
     when 'js'
-      out = "#{ComfortableMexicanSofa.config.content_route_prefix}/cms-js/#{label}.js"
+      out = "#{page.site.path}/cms-js/#{label}.js"
       out = "<script src='#{out}' type='text/javascript'></script>" if format == 'html_tag'
       out
     end

data/test/fixtures/cms/sites.yml

@@ -1,3 +1,5 @@
 default:
   label: Default Site
-  hostname: test.host
+  hostname: test.host
+  path:
+  is_mirrored: false

data/test/functional/cms_admin/base_controller_test.rb

@@ -0,0 +1,18 @@
+require File.expand_path('../../test_helper', File.dirname(__FILE__))
+
+class CmsAdmin::BaseControllerTest < ActionController::TestCase
+
+  def test_get_jump
+    get :jump
+    assert_response :redirect
+    assert_redirected_to cms_admin_site_pages_path(cms_sites(:default))
+  end
+  
+  def test_get_jump_with_redirect_setting
+    ComfortableMexicanSofa.config.admin_route_redirect = '/cms-admin/sites'
+    get :jump
+    assert_response :redirect
+    assert_redirected_to '/cms-admin/sites'
+  end
+
+end

data/test/functional/cms_admin/layouts_controller_test.rb

@@ -3,39 +3,40 @@ require File.expand_path('../../test_helper', File.dirname(__FILE__))
 class CmsAdmin::LayoutsControllerTest < ActionController::TestCase
 
   def test_get_index
-    get :index
+    get :index, :site_id => cms_sites(:default)
     assert_response :success
-    assert assigns(:cms_layouts)
+    assert assigns(:layouts)
     assert_template :index
   end
 
   def test_get_index_with_no_layouts
     Cms::Layout.delete_all
-    get :index
+    get :index, :site_id => cms_sites(:default) 
     assert_response :redirect
     assert_redirected_to :action => :new
   end
 
   def test_get_new
-    get :new
+    site = cms_sites(:default)
+    get :new, :site_id => site
     assert_response :success
-    assert assigns(:cms_layout)
-    assert_equal '{{ cms:page:content:text }}', assigns(:cms_layout).content
+    assert assigns(:layout)
+    assert_equal '{{ cms:page:content:text }}', assigns(:layout).content
     assert_template :new
-    assert_select 'form[action=/cms-admin/layouts]'
+    assert_select "form[action=/cms-admin/sites/#{site.id}/layouts]"
   end
 
   def test_get_edit
     layout = cms_layouts(:default)
-    get :edit, :id => layout
+    get :edit, :site_id => cms_sites(:default), :id => layout
     assert_response :success
-    assert assigns(:cms_layout)
+    assert assigns(:layout)
     assert_template :edit
-    assert_select "form[action=/cms-admin/layouts/#{layout.id}]"
+    assert_select "form[action=/cms-admin/sites/#{layout.site.id}/layouts/#{layout.id}]"
   end
 
   def test_get_edit_failure
-    get :edit, :id => 'not_found'
+    get :edit, :site_id => cms_sites(:default), :id => 'not_found'
     assert_response :redirect
     assert_redirected_to :action => :index
     assert_equal 'Layout not found', flash[:error]
@@ -43,22 +44,22 @@ class CmsAdmin::LayoutsControllerTest < ActionController::TestCase
   
   def test_creation
     assert_difference 'Cms::Layout.count' do
-      post :create, :cms_layout => {
+      post :create, :site_id => cms_sites(:default), :layout => {
         :label    => 'Test Layout',
         :slug     => 'test',
         :content  => 'Test {{cms:page:content}}'
-      }, :commit  => 'Create Layout'
+      }
       assert_response :redirect
       layout = Cms::Layout.last
       assert_equal cms_sites(:default), layout.site
-      assert_redirected_to :action => :edit, :id => layout
+      assert_redirected_to :action => :edit, :site_id => layout.site, :id => layout
       assert_equal 'Layout created', flash[:notice]
     end
   end
   
   def test_creation_failure
     assert_no_difference 'Cms::Layout.count' do
-      post :create, :cms_layout => { }
+      post :create, :site_id => cms_sites(:default), :layout => { }
       assert_response :success
       assert_template :new
       assert_equal 'Failed to create layout', flash[:error]
@@ -67,12 +68,12 @@ class CmsAdmin::LayoutsControllerTest < ActionController::TestCase
   
   def test_update
     layout = cms_layouts(:default)
-    put :update, :id => layout, :cms_layout => {
+    put :update, :site_id => cms_sites(:default), :id => layout, :layout => {
       :label    => 'New Label',
       :content  => 'New {{cms:page:content}}'
     }
     assert_response :redirect
-    assert_redirected_to :action => :edit, :id => layout
+    assert_redirected_to :action => :edit, :site_id => layout.site, :id => layout
     assert_equal 'Layout updated', flash[:notice]
     layout.reload
     assert_equal 'New Label', layout.label
@@ -81,7 +82,7 @@ class CmsAdmin::LayoutsControllerTest < ActionController::TestCase
   
   def test_update_failure
     layout = cms_layouts(:default)
-    put :update, :id => layout, :cms_layout => {
+    put :update, :site_id => cms_sites(:default), :id => layout, :layout => {
       :slug    => ''
     }
     assert_response :success
@@ -93,7 +94,7 @@ class CmsAdmin::LayoutsControllerTest < ActionController::TestCase
   
   def test_destroy
     assert_difference 'Cms::Layout.count', -1 do
-      delete :destroy, :id => cms_layouts(:default)
+      delete :destroy, :site_id => cms_sites(:default), :id => cms_layouts(:default)
       assert_response :redirect
       assert_redirected_to :action => :index
       assert_equal 'Layout deleted', flash[:notice]

data/test/functional/cms_admin/pages_controller_test.rb

@@ -3,110 +3,111 @@ require File.expand_path('../../test_helper', File.dirname(__FILE__))
 class CmsAdmin::PagesControllerTest < ActionController::TestCase
 
   def test_get_index
-    get :index
+    get :index, :site_id => cms_sites(:default)
     assert_response :success
-    assert assigns(:cms_pages)
+    assert assigns(:pages)
     assert_template :index
   end
 
   def test_get_index_with_no_pages
     Cms::Page.delete_all
-    get :index
+    get :index, :site_id => cms_sites(:default)
     assert_response :redirect
     assert_redirected_to :action => :new
   end
 
   def test_get_new
-    get :new
+    site = cms_sites(:default)
+    get :new, :site_id => site
     assert_response :success
-    assert assigns(:cms_page)
-    assert_equal cms_layouts(:default), assigns(:cms_page).layout
+    assert assigns(:page)
+    assert_equal cms_layouts(:default), assigns(:page).layout
     assert_template :new
-    assert_select 'form[action=/cms-admin/pages]'
+    assert_select "form[action=/cms-admin/sites/#{site.id}/pages]"
   end
 
   def test_get_new_with_field_datetime
     cms_layouts(:default).update_attribute(:content, '{{cms:field:test_label:datetime}}')
-    get :new
-    assert_select "input[type='datetime'][name='cms_page[blocks_attributes][][content]']"
-    assert_select "input[type='hidden'][name='cms_page[blocks_attributes][][label]'][value='test_label']"
+    get :new, :site_id => cms_sites(:default)
+    assert_select "input[type='datetime'][name='page[blocks_attributes][][content]']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
   end
 
   def test_get_new_with_field_integer
     cms_layouts(:default).update_attribute(:content, '{{cms:field:test_label:integer}}')
-    get :new
-    assert_select "input[type='number'][name='cms_page[blocks_attributes][][content]']"
-    assert_select "input[type='hidden'][name='cms_page[blocks_attributes][][label]'][value='test_label']"
+    get :new, :site_id => cms_sites(:default)
+    assert_select "input[type='number'][name='page[blocks_attributes][][content]']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
   end
 
   def test_get_new_with_field_string
     cms_layouts(:default).update_attribute(:content, '{{cms:field:test_label}}')
-    get :new
-    assert_select "input[type='text'][name='cms_page[blocks_attributes][][content]']"
-    assert_select "input[type='hidden'][name='cms_page[blocks_attributes][][label]'][value='test_label']"
+    get :new, :site_id => cms_sites(:default)
+    assert_select "input[type='text'][name='page[blocks_attributes][][content]']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
   end
 
   def test_get_new_with_field_text
     cms_layouts(:default).update_attribute(:content, '{{cms:field:test_label:text}}')
-    get :new
-    assert_select "textarea[name='cms_page[blocks_attributes][][content]']"
-    assert_select "input[type='hidden'][name='cms_page[blocks_attributes][][label]'][value='test_label']"
+    get :new, :site_id => cms_sites(:default)
+    assert_select "textarea[name='page[blocks_attributes][][content]']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
   end
 
   def test_get_new_with_page_datetime
     cms_layouts(:default).update_attribute(:content, '{{cms:page:test_label:datetime}}')
-    get :new
-    assert_select "input[type='datetime'][name='cms_page[blocks_attributes][][content]']"
-    assert_select "input[type='hidden'][name='cms_page[blocks_attributes][][label]'][value='test_label']"
+    get :new, :site_id => cms_sites(:default)
+    assert_select "input[type='datetime'][name='page[blocks_attributes][][content]']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
   end
 
   def test_get_new_with_page_integer
     cms_layouts(:default).update_attribute(:content, '{{cms:page:test_label:integer}}')
-    get :new
-    assert_select "input[type='number'][name='cms_page[blocks_attributes][][content]']"
-    assert_select "input[type='hidden'][name='cms_page[blocks_attributes][][label]'][value='test_label']"
+    get :new, :site_id => cms_sites(:default)
+    assert_select "input[type='number'][name='page[blocks_attributes][][content]']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
   end
 
   def test_get_new_with_page_string
     cms_layouts(:default).update_attribute(:content, '{{cms:page:test_label:string}}')
-    get :new
-    assert_select "input[type='text'][name='cms_page[blocks_attributes][][content]']"
-    assert_select "input[type='hidden'][name='cms_page[blocks_attributes][][label]'][value='test_label']"
+    get :new, :site_id => cms_sites(:default)
+    assert_select "input[type='text'][name='page[blocks_attributes][][content]']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
   end
 
   def test_get_new_with_page_text
     cms_layouts(:default).update_attribute(:content, '{{cms:page:test_label}}')
-    get :new
-    assert_select "textarea[name='cms_page[blocks_attributes][][content]']"
-    assert_select "input[type='hidden'][name='cms_page[blocks_attributes][][label]'][value='test_label']"
+    get :new, :site_id => cms_sites(:default)
+    assert_select "textarea[name='page[blocks_attributes][][content]']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
   end
 
   def test_get_new_with_rich_page_text
     cms_layouts(:default).update_attribute(:content, '{{cms:page:test_label:rich_text}}')
-    get :new
-    assert_select "textarea[name='cms_page[blocks_attributes][][content]']"
-    assert_select "input[type='hidden'][name='cms_page[blocks_attributes][][label]'][value='test_label']"
+    get :new, :site_id => cms_sites(:default)
+    assert_select "textarea[name='page[blocks_attributes][][content]']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
   end
 
   def test_get_new_as_child_page
-    get :new, :parent_id => cms_pages(:default)
+    get :new, :site_id => cms_sites(:default), :parent_id => cms_pages(:default)
     assert_response :success
-    assert assigns(:cms_page)
-    assert_equal cms_pages(:default), assigns(:cms_page).parent
+    assert assigns(:page)
+    assert_equal cms_pages(:default), assigns(:page).parent
     assert_template :new
   end
 
   def test_get_edit
     page = cms_pages(:default)
-    get :edit, :id => page
+    get :edit, :site_id => page.site, :id => page
     assert_response :success
-    assert assigns(:cms_page)
+    assert assigns(:page)
     assert_template :edit
-    assert_select "form[action=/cms-admin/pages/#{page.id}]"
+    assert_select "form[action=/cms-admin/sites/#{page.site.id}/pages/#{page.id}]"
   end
 
   def test_get_edit_failure
-    get :edit, :id => 'not_found'
+    get :edit, :site_id => cms_sites(:default), :id => 'not_found'
     assert_response :redirect
     assert_redirected_to :action => :index
     assert_equal 'Page not found', flash[:error]
@@ -115,16 +116,16 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   def test_get_edit_with_blank_layout
     page = cms_pages(:default)
     page.update_attribute(:layout_id, nil)
-    get :edit, :id => page
+    get :edit, :site_id => page.site, :id => page
     assert_response :success
-    assert assigns(:cms_page)
-    assert assigns(:cms_page).layout
+    assert assigns(:page)
+    assert assigns(:page).layout
   end
   
   def test_creation
     assert_difference 'Cms::Page.count' do
       assert_difference 'Cms::Block.count', 2 do
-        post :create, :cms_page => {
+        post :create, :site_id => cms_sites(:default), :page => {
           :label          => 'Test Page',
           :slug           => 'test-page',
           :parent_id      => cms_pages(:default).id,
@@ -140,14 +141,14 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
         page = Cms::Page.last
         assert_equal cms_sites(:default), page.site
         assert_redirected_to :action => :edit, :id => page
-        assert_equal 'Page saved', flash[:notice]
+        assert_equal 'Page created', flash[:notice]
       end
     end
   end
   
   def test_creation_failure
     assert_no_difference ['Cms::Page.count', 'Cms::Block.count'] do
-      post :create, :cms_page => {
+      post :create, :site_id => cms_sites(:default), :page => {
         :layout_id => cms_layouts(:default).id,
         :blocks_attributes => [
           { :label    => 'default_page_text',
@@ -157,7 +158,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
         ]
       }
       assert_response :success
-      page = assigns(:cms_page)
+      page = assigns(:page)
       assert_equal 2, page.blocks.size
       assert_equal ['content content', 'title content'], page.blocks.collect{|b| b.content}
       assert_template :new
@@ -168,7 +169,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   def test_update
     page = cms_pages(:default)
     assert_no_difference 'Cms::Block.count' do
-      put :update, :id => page, :cms_page => {
+      put :update, :site_id => page.site, :id => page, :page => {
         :label => 'Updated Label'
       }
       page.reload
@@ -182,7 +183,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   def test_update_with_layout_change
     page = cms_pages(:default)
     assert_difference 'Cms::Block.count', 2 do
-      put :update, :id => page, :cms_page => {
+      put :update, :site_id => page.site, :id => page, :page => {
         :label      => 'Updated Label',
         :layout_id  => cms_layouts(:nested).id,
         :blocks_attributes => [
@@ -202,19 +203,19 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   end
 
   def test_update_failure
-    put :update, :id => cms_pages(:default), :cms_page => {
+    put :update, :site_id => cms_sites(:default), :id => cms_pages(:default), :page => {
       :label => ''
     }
     assert_response :success
     assert_template :edit
-    assert assigns(:cms_page)
+    assert assigns(:page)
     assert_equal 'Failed to update page', flash[:error]
   end
 
   def test_destroy
     assert_difference 'Cms::Page.count', -2 do
       assert_difference 'Cms::Block.count', -2 do
-        delete :destroy, :id => cms_pages(:default)
+        delete :destroy, :site_id => cms_sites(:default), :id => cms_pages(:default)
         assert_response :redirect
         assert_redirected_to :action => :index
         assert_equal 'Page deleted', flash[:notice]
@@ -223,30 +224,31 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   end
 
   def test_get_form_blocks
-    xhr :get, :form_blocks, :id => cms_pages(:default), :layout_id => cms_layouts(:nested).id
+    site = cms_sites(:default)
+    xhr :get, :form_blocks, :site_id => site, :id => cms_pages(:default), :layout_id => cms_layouts(:nested).id
     assert_response :success
-    assert assigns(:cms_page)
-    assert_equal 2, assigns(:cms_page).tags.size
+    assert assigns(:page)
+    assert_equal 2, assigns(:page).tags.size
     assert_template :form_blocks
 
-    xhr :get, :form_blocks, :id => cms_pages(:default), :layout_id => cms_layouts(:default).id
+    xhr :get, :form_blocks, :site_id => site, :id => cms_pages(:default), :layout_id => cms_layouts(:default).id
     assert_response :success
-    assert assigns(:cms_page)
-    assert_equal 4, assigns(:cms_page).tags.size
+    assert assigns(:page)
+    assert_equal 4, assigns(:page).tags.size
     assert_template :form_blocks
   end
 
   def test_get_form_blocks_for_new_page
-    xhr :get, :form_blocks, :id => 0, :layout_id => cms_layouts(:default).id
+    xhr :get, :form_blocks, :site_id => cms_sites(:default), :id => 0, :layout_id => cms_layouts(:default).id
     assert_response :success
-    assert assigns(:cms_page)
-    assert_equal 3, assigns(:cms_page).tags.size
+    assert assigns(:page)
+    assert_equal 3, assigns(:page).tags.size
     assert_template :form_blocks
   end
 
   def test_creation_preview
     assert_no_difference 'Cms::Page.count' do
-      post :create, :preview => 'Preview', :cms_page => {
+      post :create, :site_id => cms_sites(:default), :preview => 'Preview', :page => {
         :label      => 'Test Page',
         :slug       => 'test-page',
         :parent_id  => cms_pages(:default).id,
@@ -264,7 +266,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   def test_update_preview
     page = cms_pages(:default)
     assert_no_difference 'Cms::Page.count' do
-      put :update, :preview => 'Preview', :id => page, :cms_page => {
+      put :update, :site_id => page.site, :preview => 'Preview', :id => page, :page => {
         :label => 'Updated Label',
         :blocks_attributes => [
           { :label    => 'default_page_text',
@@ -281,28 +283,28 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
 
   def test_get_new_with_no_layout
     Cms::Layout.destroy_all
-    get :new
+    get :new, :site_id => cms_sites(:default)
     assert_response :redirect
-    assert_redirected_to new_cms_admin_layout_path
+    assert_redirected_to new_cms_admin_site_layout_path(cms_sites(:default))
     assert_equal 'No Layouts found. Please create one.', flash[:error]
   end
 
   def test_get_edit_with_no_layout
     Cms::Layout.destroy_all
     page = cms_pages(:default)
-    get :edit, :id => page
+    get :edit, :site_id => page.site, :id => page
     assert_response :redirect
-    assert_redirected_to new_cms_admin_layout_path
+    assert_redirected_to new_cms_admin_site_layout_path(page.site)
     assert_equal 'No Layouts found. Please create one.', flash[:error]
   end
 
   def test_get_toggle_branch
     page = cms_pages(:default)
-    get :toggle_branch, :id => page, :format => :js
+    get :toggle_branch, :site_id => page.site, :id => page, :format => :js
     assert_response :success
     assert_equal [page.id.to_s], session[:cms_page_tree]
 
-    get :toggle_branch, :id => page, :format => :js
+    get :toggle_branch, :site_id => page.site, :id => page, :format => :js
     assert_response :success
     assert_equal [], session[:cms_page_tree]
   end
@@ -318,7 +320,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     assert_equal 0, page_one.position
     assert_equal 1, page_two.position
 
-    post :reorder, :cms_page => [page_two.id, page_one.id]
+    post :reorder, :site_id => cms_sites(:default), :page => [page_two.id, page_one.id]
     assert_response :success
     page_one.reload
     page_two.reload