comfortable_mexican_sofa 1.6.12 → 1.6.13

data/VERSION

@@ -1 +1 @@
-1.6.12
+1.6.13

data/app/models/cms/site.rb

@@ -5,16 +5,17 @@ class Cms::Site < ActiveRecord::Base
   self.table_name = 'cms_sites'
   
   # -- Relationships --------------------------------------------------------
-  has_many :layouts,    :dependent => :destroy
-  has_many :pages,      :dependent => :destroy
-  has_many :snippets,   :dependent => :destroy
+  has_many :layouts,    :dependent => :delete_all
+  has_many :pages,      :dependent => :delete_all
+  has_many :snippets,   :dependent => :delete_all
   has_many :files,      :dependent => :destroy
-  has_many :categories, :dependent => :destroy
+  has_many :categories, :dependent => :delete_all
   
   # -- Callbacks ------------------------------------------------------------
   before_validation :assign_identifier,
                     :assign_label
   before_save :clean_path
+  after_save  :sync_mirrors
   
   # -- Validations ----------------------------------------------------------
   validates :identifier,
@@ -63,4 +64,16 @@ protected
     self.path.gsub!(/\/$/, '')
   end
   
+  # When site is marked as a mirror we need to sync its structure
+  # with other mirrors.
+  def sync_mirrors
+    return unless is_mirrored_changed? && is_mirrored?
+    
+    [self, Cms::Site.mirrored.where("id != #{id}").first].compact.each do |site|
+      (site.layouts(:reload).roots + site.layouts.roots.map(&:descendants)).flatten.map(&:sync_mirror)
+      (site.pages(:reload).roots + site.pages.roots.map(&:descendants)).flatten.map(&:sync_mirror)
+      site.snippets(:reload).map(&:sync_mirror)
+    end
+  end
+  
 end

data/app/views/cms_admin/pages/_index_branch.html.erb

@@ -29,7 +29,7 @@
       <%= link_to page.label, edit_cms_admin_site_page_path(@site, page) %>
       <%= render :partial => '/cms_admin/categories/categories', :object => page %>
       <div class='sublabel'>
-        <%= link_to page.url, page.full_path, :target => '_blank' %>
+        <%= link_to page.url, page.url, :target => '_blank' %>
       </div>
     </div>
   </div>

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "comfortable_mexican_sofa"
-  s.version = "1.6.12"
+  s.version = "1.6.13"
 
   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-02-21"
+  s.date = "2012-02-23"
   s.description = ""
   s.email = "oleg@theworkinggroup.ca"
   s.extra_rdoc_files = [

data/lib/comfortable_mexican_sofa/extensions/acts_as_tree.rb

@@ -46,8 +46,8 @@ module ComfortableMexicanSofa::ActsAsTree
             end
           end
         end
-        
       EOV
+      
     end
   end
   

data/lib/comfortable_mexican_sofa/extensions/is_mirrored.rb

@@ -33,7 +33,7 @@ module ComfortableMexicanSofa::IsMirrored
     # but content is unique. When updating need to grab mirrors based on
     # self.slug_was, new objects will use self.slug.
     def sync_mirror
-      return if self.is_mirrored
+      return if self.is_mirrored || !self.site.is_mirrored?
       
       (Cms::Site.mirrored - [self.site]).each do |site|
         mirror = case self
@@ -68,7 +68,7 @@ module ComfortableMexicanSofa::IsMirrored
     
     # Mirrors should be destroyed
     def destroy_mirror
-      return if self.is_mirrored
+      return if self.is_mirrored || !self.site.is_mirrored?
       mirrors.each do |mirror|
         mirror.is_mirrored = true
         mirror.destroy

data/lib/comfortable_mexican_sofa/fixtures.rb

@@ -16,7 +16,7 @@ module ComfortableMexicanSofa::Fixtures
     site = Cms::Site.find_or_create_by_hostname(to_hostname)
     unless path ||= find_fixtures_path((from_hostname || to_hostname), 'layouts')
       ComfortableMexicanSofa.logger.warn('Cannot find Layout fixtures')
-      return
+      return []
     end
     
     Dir.glob("#{path}/*").select{|f| File.directory?(f)}.each do |path|
@@ -60,7 +60,7 @@ module ComfortableMexicanSofa::Fixtures
           ComfortableMexicanSofa.logger.warn("[Fixtures] Saved Layout {#{layout.identifier}}")
         else
           ComfortableMexicanSofa.logger.error("[Fixtures] Failed to save Layout {#{layout.errors.inspect}}")
-          return
+          next
         end
       end
       layout_ids << layout.id
@@ -83,7 +83,7 @@ module ComfortableMexicanSofa::Fixtures
     site = Cms::Site.find_or_create_by_hostname(to_hostname)
     unless path ||= find_fixtures_path((from_hostname || to_hostname), 'pages')
       ComfortableMexicanSofa.logger.warn('Cannot find Page fixtures')
-      return
+      return []
     end
     
     Dir.glob("#{path}/*").select{|f| File.directory?(f)}.each do |path|
@@ -138,7 +138,7 @@ module ComfortableMexicanSofa::Fixtures
           ComfortableMexicanSofa.logger.warn("[Fixtures] Saved Page {#{page.full_path}}")
         else
           ComfortableMexicanSofa.logger.warn("[Fixtures] Failed to save Page {#{page.errors.inspect}}")
-          return
+          next
         end
       end
       page_ids << page.id
@@ -161,7 +161,7 @@ module ComfortableMexicanSofa::Fixtures
     site = Cms::Site.find_or_create_by_hostname(to_hostname)
     unless path = find_fixtures_path((from_hostname || to_hostname), 'snippets')
       ComfortableMexicanSofa.logger.warn('Cannot find Snippet fixtures')
-      return
+      return []
     end
     
     snippet_ids = []
@@ -192,7 +192,7 @@ module ComfortableMexicanSofa::Fixtures
           ComfortableMexicanSofa.logger.warn("[Fixtures] Saved Snippet {#{snippet.identifier}}")
         else
           ComfortableMexicanSofa.logger.warn("[Fixtures] Failed to save Snippet {#{snippet.errors.inspect}}")
-          return
+          next
         end
       end
       snippet_ids << snippet.id

data/test/unit/mirrors_test.rb

@@ -2,13 +2,8 @@ require File.expand_path('../test_helper', File.dirname(__FILE__))
 
 class MirrorsTest < ActiveSupport::TestCase
   
-  def setup
-    Cms::Site.delete_all
-    @site_a = Cms::Site.create!(:identifier => 'site_a', :hostname => 'site-a.host', :is_mirrored => true)
-    @site_b = Cms::Site.create!(:identifier => 'site_b', :hostname => 'site-b.host', :is_mirrored => true)
-  end
-  
   def test_layout_creation
+    setup_sites
     assert_difference 'Cms::Layout.count', 2 do
       layout = @site_a.layouts.create!(:identifier => 'test')
       assert_equal 1, layout.mirrors.size
@@ -17,6 +12,7 @@ class MirrorsTest < ActiveSupport::TestCase
   end
   
   def test_page_creation
+    setup_sites
     layout = @site_a.layouts.create!(:identifier => 'test')
     
     assert_difference 'Cms::Page.count', 2 do
@@ -30,6 +26,7 @@ class MirrorsTest < ActiveSupport::TestCase
   end
   
   def test_snippet_creation
+    setup_sites
     assert_difference 'Cms::Snippet.count', 2 do
       snippet = @site_a.snippets.create(:identifier => 'test')
       assert_equal 1, snippet.mirrors.size
@@ -38,6 +35,7 @@ class MirrorsTest < ActiveSupport::TestCase
   end
   
   def test_layout_update
+    setup_sites
     layout_1a = @site_a.layouts.create!(:identifier => 'test_a')
     layout_1b = @site_a.layouts.create!(:identifier => 'test_b')
     layout_1c = @site_a.layouts.create!(:identifier => 'nested', :parent => layout_1a)
@@ -59,6 +57,7 @@ class MirrorsTest < ActiveSupport::TestCase
   end
   
   def test_page_update
+    setup_sites
     layout_1a = @site_a.layouts.create!(:identifier => 'test_a')
     layout_1b = @site_a.layouts.create!(:identifier => 'test_b')
     
@@ -84,6 +83,7 @@ class MirrorsTest < ActiveSupport::TestCase
   end
   
   def test_snippet_update
+    setup_sites
     snippet_1 = @site_a.snippets.create(:identifier => 'test')
     assert snippet_2 = snippet_1.mirrors.first
     snippet_1.update_attributes!(
@@ -96,6 +96,7 @@ class MirrorsTest < ActiveSupport::TestCase
   end
   
   def test_layout_destroy
+    setup_sites
     layout_1a = @site_a.layouts.create!(:identifier => 'test_a')
     layout_1b = @site_a.layouts.create!(:identifier => 'test_b')
     layout_1c = @site_a.layouts.create!(:identifier => 'nested', :parent => layout_1b)
@@ -116,6 +117,7 @@ class MirrorsTest < ActiveSupport::TestCase
   end
   
   def test_page_destroy
+    setup_sites
     layout = @site_a.layouts.create!(:identifier => 'test')
     page_1r = @site_a.pages.create!(:slug => 'root', :layout => layout)
     page_1a = @site_a.pages.create!(:slug => 'test_a', :layout => layout)
@@ -137,6 +139,7 @@ class MirrorsTest < ActiveSupport::TestCase
   end
   
   def test_snippet_destroy
+    setup_sites
     snippet_1 = @site_a.snippets.create(:identifier => 'test')
     assert snippet_2 = snippet_1.mirrors.first
     
@@ -146,4 +149,94 @@ class MirrorsTest < ActiveSupport::TestCase
     end
   end
   
+  def test_site_creation_as_mirror
+    site = cms_sites(:default)
+    Cms::Site.update_all(:is_mirrored => true) # bypassing callbacks
+    
+    assert_difference 'Cms::Site.count' do
+      assert_difference 'Cms::Layout.count', site.layouts.count do
+        assert_difference 'Cms::Page.count', site.pages.count do
+          assert_difference 'Cms::Snippet.count', site.snippets.count do
+            mirror = Cms::Site.create!(
+              :identifier   => 'mirror',
+              :hostname     => 'mirror.host',
+              :is_mirrored  => true
+            )
+          end
+        end
+      end
+    end
+  end
+  
+  def test_site_update_to_mirror
+    site = cms_sites(:default)
+    Cms::Site.update_all(:is_mirrored => true) # bypassing callbacks
+    
+    mirror = Cms::Site.create!(
+      :identifier => 'mirror',
+      :hostname   => 'mirror.host'
+    )
+    layout = mirror.layouts.create!(
+      :identifier => 'mirror_layout'
+    )
+    home_page = mirror.pages.create!(
+      :label  => 'mirror home',
+      :layout => layout
+    )
+    child_page = mirror.pages.create!(
+      :label  => 'mirror child',
+      :layout => layout,
+      :slug   => 'mirror-child',
+      :parent => home_page
+    )
+    snippet = mirror.snippets.create!(
+      :identifier => 'mirror_snippet'
+    )
+    
+    assert_difference ['site.layouts.count', 'site.pages.count', 'site.snippets.count'], 1 do
+      assert_difference 'mirror.layouts.count', 3 do
+        assert_difference 'mirror.pages.count', 1 do
+          assert_difference 'mirror.snippets.count', 1 do
+            
+            mirror.update_attribute(:is_mirrored, true)
+            
+            site.reload
+            assert site.layouts.where(:identifier => 'mirror_layout').present?
+            assert site.pages.where(:slug => 'mirror-child').present?
+            assert site.snippets.where(:identifier => 'mirror_snippet').present?
+            
+            mirror.reload
+            assert mirror.layouts.where(:identifier => 'default').present?
+            assert mirror.pages.where(:slug => 'child-page').present?
+            assert mirror.snippets.where(:identifier => 'default').present?
+          end
+        end
+      end
+    end
+  end
+  
+  def test_site_destruction
+    site = cms_sites(:default)
+    Cms::Site.update_all(:is_mirrored => true) # bypassing callbacks
+    
+    mirror = Cms::Site.create!(
+      :identifier   => 'mirror',
+      :hostname     => 'mirror.host',
+      :is_mirrored  => true
+    )
+    mirror.reload
+    
+    assert_no_difference ['site.layouts.count', 'site.pages.count', 'site.snippets.count'] do
+      mirror.destroy
+    end
+  end
+  
+protected
+  
+  def setup_sites
+    Cms::Site.delete_all
+    @site_a = Cms::Site.create!(:identifier => 'site_a', :hostname => 'site-a.host', :is_mirrored => true)
+    @site_b = Cms::Site.create!(:identifier => 'site_b', :hostname => 'site-b.host', :is_mirrored => true)
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.6.12
+  version: 1.6.13
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-21 00:00:00.000000000Z
+date: 2012-02-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70366229980420 !ruby/object:Gem::Requirement
+  requirement: &70242361677380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70366229980420
+  version_requirements: *70242361677380
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70366229978160 !ruby/object:Gem::Requirement
+  requirement: &70242361676880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70366229978160
+  version_requirements: *70242361676880
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70366229976420 !ruby/object:Gem::Requirement
+  requirement: &70242361676360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70366229976420
+  version_requirements: *70242361676360
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -366,7 +366,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4596160239397252587
+      hash: -3226353458440503437
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: