comfortable_mexican_sofa 1.2.3 → 1.2.4

data/test/unit/mirrors_test.rb

@@ -0,0 +1,153 @@
+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')
+  end
+  
+  def test_layout_creation
+    assert_difference 'Cms::Layout.count', 2 do
+      layout = @site_a.layouts.create!(:slug => 'test')
+      assert_equal 1, layout.mirrors.size
+      assert_equal 'test', layout.mirrors.first.slug
+    end
+  end
+  
+  def test_page_creation
+    layout = @site_a.layouts.create!(:slug => 'test')
+    
+    assert_difference 'Cms::Page.count', 2 do
+      page = @site_a.pages.create!(
+        :layout => layout,
+        :label  => 'Root'
+      )
+      assert_equal 1, page.mirrors.size
+      assert_equal '/', page.mirrors.first.full_path
+    end
+  end
+  
+  def test_snippet_creation
+    assert_difference 'Cms::Snippet.count', 2 do
+      snippet = @site_a.snippets.create(:slug => 'test')
+      assert_equal 1, snippet.mirrors.size
+      assert_equal 'test', snippet.mirrors.first.slug
+    end
+  end
+  
+  def test_layout_update
+    layout_1a = @site_a.layouts.create!(:slug => 'test_a')
+    layout_1b = @site_a.layouts.create!(:slug => 'test_b')
+    layout_1c = @site_a.layouts.create!(:slug => 'nested', :parent => layout_1a)
+    
+    assert layout_2a = layout_1a.mirrors.first
+    assert layout_2b = layout_1b.mirrors.first
+    assert layout_2c = layout_1c.mirrors.first
+    assert_equal layout_2a, layout_2c.parent
+    
+    layout_1c.update_attributes!(
+      :slug     => 'updated',
+      :parent   => layout_1b,
+      :content  => 'updated content'
+    )
+    layout_2c.reload
+    assert_equal 'updated', layout_2c.slug
+    assert_equal layout_2b, layout_2c.parent
+    assert_not_equal 'updated content', layout_2c
+  end
+  
+  def test_page_update
+    layout_1a = @site_a.layouts.create!(:slug => 'test_a')
+    layout_1b = @site_a.layouts.create!(:slug => 'test_b')
+    
+    page_1r = @site_a.pages.create!(:slug => 'root', :layout => layout_1a)
+    page_1a = @site_a.pages.create!(:slug => 'test_a', :layout => layout_1a)
+    page_1b = @site_a.pages.create!(:slug => 'test_b', :layout => layout_1a)
+    assert_equal page_1r, page_1b.parent
+    
+    assert layout_2b = layout_1b.mirrors.first
+    assert page_2a = page_1a.mirrors.first
+    assert page_2b = page_1b.mirrors.first
+    
+    page_1b.update_attributes!(
+      :slug => 'updated',
+      :parent => page_1a,
+      :layout => layout_1b
+    )
+    page_2b.reload
+    assert_equal 'updated', page_2b.slug
+    assert_equal page_2a, page_2b.parent
+    assert_equal '/test_a/updated', page_2b.full_path
+    assert_equal layout_2b, page_2b.layout
+  end
+  
+  def test_snippet_update
+    snippet_1 = @site_a.snippets.create(:slug => 'test')
+    assert snippet_2 = snippet_1.mirrors.first
+    snippet_1.update_attributes!(
+      :slug     => 'updated',
+      :content  => 'updated content'
+    )
+    snippet_2.reload
+    assert_equal 'updated', snippet_2.slug
+    assert_not_equal 'updated content', snippet_2.content
+  end
+  
+  def test_layout_destroy
+    layout_1a = @site_a.layouts.create!(:slug => 'test_a')
+    layout_1b = @site_a.layouts.create!(:slug => 'test_b')
+    layout_1c = @site_a.layouts.create!(:slug => 'nested', :parent => layout_1b)
+    
+    assert layout_2a = layout_1a.mirrors.first
+    assert layout_2b = layout_1b.mirrors.first
+    assert layout_2c = layout_1c.mirrors.first
+    
+    assert_difference ['@site_a.layouts.count', '@site_b.layouts.count'], -1 do
+      layout_1a.destroy
+      assert_nil Cms::Layout.find_by_id(layout_2a.id)
+    end
+    
+    assert_difference ['@site_a.layouts.count', '@site_b.layouts.count'], -2 do
+      layout_1b.destroy
+      assert_nil Cms::Layout.find_by_id(layout_2b.id)
+    end
+  end
+  
+  def test_page_destroy
+    layout = @site_a.layouts.create!(:slug => 'test')
+    page_1r = @site_a.pages.create!(:slug => 'root', :layout => layout)
+    page_1a = @site_a.pages.create!(:slug => 'test_a', :layout => layout)
+    page_1b = @site_a.pages.create!(:slug => 'test_b', :layout => layout)
+    
+    assert page_2r = page_1r.mirrors.first
+    assert page_2a = page_1a.mirrors.first
+    assert page_2b = page_1b.mirrors.first
+    
+    assert_difference ['@site_a.pages.count', '@site_b.pages.count'], -1 do
+      page_1a.destroy
+      assert_nil Cms::Page.find_by_id(page_2a.id)
+    end
+    
+    assert_difference ['@site_a.pages.count', '@site_b.pages.count'], -2 do
+      page_1r.destroy
+      assert_nil Cms::Page.find_by_id(page_2r.id)
+    end
+  end
+  
+  def test_snippet_destroy
+    snippet_1 = @site_a.snippets.create(:slug => 'test')
+    assert snippet_2 = snippet_1.mirrors.first
+    
+    assert_difference ['@site_a.snippets.count', '@site_b.snippets.count'], -1 do
+      snippet_1.destroy
+      assert_nil Cms::Snippet.find_by_id(snippet_2.id)
+    end
+  end
+  
+end

data/test/unit/models/layout_test.rb

@@ -11,29 +11,13 @@ class CmsLayoutTest < ActiveSupport::TestCase
   def test_validations
     layout = cms_sites(:default).layouts.create
     assert layout.errors.present?
-    assert_has_errors_on layout, [:label, :slug, :content]
+    assert_has_errors_on layout, [:label, :slug]
   end
   
-  def test_validation_of_tag_presence
-    layout = cms_sites(:default).layouts.create(:content => 'some text')
-    assert_has_errors_on layout, :content
-    
-    layout = cms_sites(:default).layouts.create(:content => '{cms:snippet:blah}')
-    assert_has_errors_on layout, :content
-    
-    layout = cms_sites(:default).layouts.new(
-      :label    => 'test',
-      :slug     => 'test',
-      :content  => '{{cms:page:blah}}'
-    )
-    assert layout.valid?
-    
-    layout = cms_sites(:default).layouts.new(
-      :label    => 'test',
-      :slug     => 'test',
-      :content  => '{{cms:field:blah}}'
-    )
+  def test_label_assignment
+    layout = cms_sites(:default).layouts.new(:slug => 'test', :content => '{{cms:page:content}}')
     assert layout.valid?
+    assert_equal 'Test', layout.label
   end
   
   def test_creation

data/test/unit/models/page_test.rb

@@ -44,13 +44,23 @@ class CmsPageTest < ActiveSupport::TestCase
     assert_has_errors_on page, :target_page_id
   end
   
+  def test_label_assignment
+    page = cms_sites(:default).pages.new(
+      :slug   => 'test',
+      :parent => cms_pages(:default),
+      :layout => cms_layouts(:default)
+    )
+    assert page.valid?
+    assert_equal 'Test', page.label
+  end
+  
   def test_creation
     assert_difference ['Cms::Page.count', 'Cms::Block.count'] do
       page = cms_sites(:default).pages.create!(
-        :label      => 'test',
-        :slug       => 'test',
-        :parent_id  => cms_pages(:default).id,
-        :layout_id  => cms_layouts(:default).id,
+        :label  => 'test',
+        :slug   => 'test',
+        :parent => cms_pages(:default),
+        :layout => cms_layouts(:default),
         :blocks_attributes => [
           { :label    => 'default_page_text',
             :content  => 'test' }

data/test/unit/models/site_test.rb

@@ -13,14 +13,20 @@ class CmsSiteTest < ActiveSupport::TestCase
     assert site.invalid?
     assert_has_errors_on site, [:label, :hostname]
     
-    site = Cms::Site.new(:label => 'My Site', :hostname => 'http://mysite.com')
+    site = Cms::Site.new(:label => 'My Site', :hostname => 'http://my-site.host')
     assert site.invalid?
     assert_has_errors_on site, :hostname
     
-    site = Cms::Site.new(:label => 'My Site', :hostname => 'mysite.com')
+    site = Cms::Site.new(:label => 'My Site', :hostname => 'my-site.host')
     assert site.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_cascading_destroy
     assert_difference 'Cms::Site.count', -1 do
       assert_difference 'Cms::Layout.count', -3 do

data/test/unit/models/snippet_test.rb

@@ -15,6 +15,14 @@ class CmsSnippetTest < ActiveSupport::TestCase
     assert_has_errors_on snippet, [:label, :slug]
   end
   
+  def test_label_assignment
+    snippet = cms_sites(:default).snippets.new(
+      :slug   => 'test'
+    )
+    assert snippet.valid?
+    assert_equal 'Test', snippet.label
+  end
+  
   def test_update_forces_page_content_reload
     snippet = cms_snippets(:default)
     page = cms_pages(:default)

metadata

@@ -2,7 +2,7 @@
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors: 
 - Oleg Khabarov
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-16 00:00:00 Z
+date: 2011-05-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -104,6 +104,7 @@ files:
 - app/views/cms_admin/pages/toggle_branch.js.erb
 - app/views/cms_admin/revisions/show.html.erb
 - app/views/cms_admin/sites/_form.html.erb
+- app/views/cms_admin/sites/_mirrors.html.erb
 - app/views/cms_admin/sites/edit.html.erb
 - app/views/cms_admin/sites/index.html.erb
 - app/views/cms_admin/sites/new.html.erb
@@ -163,6 +164,7 @@ files:
 - lib/comfortable_mexican_sofa/form_builder.rb
 - lib/comfortable_mexican_sofa/has_revisions.rb
 - lib/comfortable_mexican_sofa/http_auth.rb
+- lib/comfortable_mexican_sofa/is_mirrored.rb
 - lib/comfortable_mexican_sofa/rails_extensions.rb
 - lib/comfortable_mexican_sofa/tag.rb
 - lib/comfortable_mexican_sofa/tags/field_datetime.rb
@@ -280,6 +282,7 @@ files:
 - test/functional/cms_content_controller_test.rb
 - test/integration/authentication_test.rb
 - test/integration/fixtures_test.rb
+- test/integration/mirrors_test.rb
 - test/integration/render_cms_test.rb
 - test/integration/routing_extensions_test.rb
 - test/integration/sites_test.rb
@@ -287,6 +290,7 @@ files:
 - test/test_helper.rb
 - test/unit/configuration_test.rb
 - test/unit/fixtures_test.rb
+- test/unit/mirrors_test.rb
 - test/unit/models/block_test.rb
 - test/unit/models/layout_test.rb
 - test/unit/models/page_test.rb
@@ -321,7 +325,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4254881136775173761
+      hash: 1078846512726975166
       segments: 
       - 0
       version: "0"