comfortable_mexican_sofa 1.2.3 → 1.2.4

data/VERSION

@@ -1 +1 @@
-1.2.3
+1.2.4

data/app/controllers/cms_admin/base_controller.rb

@@ -35,7 +35,7 @@ protected
   
   def load_fixtures
     return unless ComfortableMexicanSofa.config.enable_fixtures
-    ComfortableMexicanSofa::Fixtures.sync(@cms_site)
+    ComfortableMexicanSofa::Fixtures.import_all(@cms_site.hostname)
     flash.now[:error] = 'CMS Fixtures are enabled. All changes done here will be discarded.'
   end
 end

data/app/controllers/cms_admin/snippets_controller.rb

@@ -17,6 +17,7 @@ class CmsAdmin::SnippetsController < CmsAdmin::BaseController
   end
 
   def create
+    # raise @cms_snippet.to_yaml
     @cms_snippet.save!
     flash[:notice] = 'Snippet created'
     redirect_to :action => :edit, :id => @cms_snippet

data/app/controllers/cms_content_controller.rb

@@ -28,7 +28,7 @@ protected
   
   def load_fixtures
     return unless ComfortableMexicanSofa.config.enable_fixtures
-    ComfortableMexicanSofa::Fixtures.sync(@cms_site)
+    ComfortableMexicanSofa::Fixtures.import_all(@cms_site.hostname)
   end
   
   def load_cms_site

data/app/models/cms/layout.rb

@@ -3,7 +3,7 @@ class Cms::Layout < ActiveRecord::Base
   set_table_name :cms_layouts
   
   acts_as_tree
-  
+  is_mirrored
   has_revisions_for :content, :css, :js
   
   # -- Relationships --------------------------------------------------------
@@ -11,6 +11,7 @@ class Cms::Layout < ActiveRecord::Base
   has_many :pages, :dependent => :nullify
   
   # -- Callbacks ------------------------------------------------------------
+  before_validation :assign_label
   after_save    :clear_cache, :clear_cached_page_content
   after_destroy :clear_cache, :clear_cached_page_content
   
@@ -23,9 +24,6 @@ class Cms::Layout < ActiveRecord::Base
     :presence   => true,
     :uniqueness => { :scope => :site_id },
     :format     => { :with => /^\w[a-z0-9_-]*$/i }
-  validates :content,
-    :presence   => true
-  validate :check_content_tag_presence
     
   # -- Class Methods --------------------------------------------------------
   # Tree-like structure for layouts
@@ -58,7 +56,7 @@ class Cms::Layout < ActiveRecord::Base
     if parent
       regex = /\{\{\s*cms:page:content:?(?:(?::text)|(?::rich_text))?\s*\}\}/
       if parent.merged_content.match(regex)
-        parent.merged_content.gsub(regex, content)
+        parent.merged_content.gsub(regex, content.to_s)
       else
         content
       end
@@ -69,11 +67,8 @@ class Cms::Layout < ActiveRecord::Base
   
 protected
   
-  def check_content_tag_presence
-    ComfortableMexicanSofa::Tag.process_content((test_page = site.pages.new), content)
-    if test_page.tags.select{|t| t.is_cms_block?}.blank?
-      self.errors.add(:content, 'No cms page tags defined')
-    end
+  def assign_label
+    self.label = self.label.blank?? self.slug.try(:titleize) : self.label
   end
   
   # After saving need to make sure that cached pages for css and js for this
@@ -86,7 +81,7 @@ protected
   # Forcing page content reload
   def clear_cached_page_content
     self.pages.each{ |page| page.save! }
-    self.children.each{ |child_layout| child_layout.save! }
+    self.children.each{ |child_layout| child_layout.clear_cached_page_content }
   end
   
 end

data/app/models/cms/page.rb

@@ -3,7 +3,7 @@ class Cms::Page < ActiveRecord::Base
   set_table_name :cms_pages
   
   acts_as_tree :counter_cache => :children_count
-  
+  is_mirrored
   has_revisions_for :blocks_attributes
   
   attr_accessor :tags,
@@ -19,7 +19,8 @@ class Cms::Page < ActiveRecord::Base
     :autosave   => true
   
   # -- Callbacks ------------------------------------------------------------
-  before_validation :assign_parent,
+  before_validation :assigns_label,
+                    :assign_parent,
                     :assign_full_path
   before_validation :assign_position,
                     :on => :create
@@ -34,7 +35,7 @@ class Cms::Page < ActiveRecord::Base
   validates :slug,
     :presence   => true,
     :format     => /^\w[a-z0-9_-]*$/i,
-    :unless     => lambda{ |p| p == Cms::Page.root || p.site && p.site.pages.count == 0 }
+    :unless     => lambda{ |p| p.site && (p.site.pages.count == 0 || p.site.pages.root == self) }
   validates :layout,
     :presence   => true
   validates :full_path,
@@ -119,6 +120,10 @@ class Cms::Page < ActiveRecord::Base
   
 protected
   
+  def assigns_label
+    self.label = self.label.blank?? self.slug.try(:titleize) : self.label
+  end
+  
   def assign_parent
     return unless site
     self.parent ||= site.pages.root unless self == site.pages.root || site.pages.count == 0

data/app/models/cms/site.rb

@@ -8,10 +8,12 @@ class Cms::Site < ActiveRecord::Base
   has_many :snippets, :dependent => :destroy
   has_many :uploads,  :dependent => :destroy
   
+  # -- Callbacks ------------------------------------------------------------
+  before_validation :assign_label
+  
   # -- Validations ----------------------------------------------------------
   validates :label,
-    :presence   => true,
-    :uniqueness => true
+    :presence   => true
   validates :hostname,
     :presence   => true,
     :uniqueness => true,
@@ -22,4 +24,10 @@ class Cms::Site < ActiveRecord::Base
     Cms::Site.all.collect{|s| ["#{s.label} (#{s.hostname})", s.id]}
   end
   
+protected
+
+  def assign_label
+    self.label = self.label.blank?? self.hostname : self.label
+  end
+  
 end

data/app/models/cms/snippet.rb

@@ -1,13 +1,14 @@
 class Cms::Snippet < ActiveRecord::Base
   
   set_table_name :cms_snippets
-  
+  is_mirrored
   has_revisions_for :content
   
   # -- Relationships --------------------------------------------------------
   belongs_to :site
   
   # -- Callbacks ------------------------------------------------------------
+  before_validation :assign_label
   after_save    :clear_cached_page_content
   after_destroy :clear_cached_page_content
   
@@ -23,11 +24,15 @@ class Cms::Snippet < ActiveRecord::Base
   
 protected
   
+  def assign_label
+    self.label = self.label.blank?? self.slug.try(:titleize) : self.label
+  end
+  
   # Note: This might be slow. We have no idea where the snippet is used, so
   # gotta reload every single page. Kinda sucks, but might be ok unless there
   # are hundreds of pages.
   def clear_cached_page_content
-    site.pages.all.each{ |page| page.save! }
+    site.pages.all.each{ |page| page.save }
   end
   
 end

data/app/views/cms_admin/layouts/edit.html.erb

@@ -1,6 +1,10 @@
 <%= link_to span_tag(pluralize(@cms_layout.revisions.count, 'revision')), cms_admin_layout_revisions_path(@cms_layout), :class => 'big button' %>
 <h1> Editing Layout </h1>
 
+<% content_for :right_column do %>
+  <%= render :partial => 'cms_admin/sites/mirrors', :object => @cms_layout %>
+<% end %>
+
 <%= cms_form_for @cms_layout, :url => {:action => :update} do |form| %>
   <%= render :partial => 'form', :object => form %>
 <% end %>

data/app/views/cms_admin/layouts/index.html.erb

@@ -1,6 +1,10 @@
 <%= link_to span_tag('Create New Layout'), new_cms_admin_layout_path, :class => 'big button' %>
 <h1>Layouts</h1>
 
+<% content_for :right_column do %>
+  <%= render :partial => 'cms_admin/sites/mirrors' %>
+<% end %>
+
 <ul class='list'>
   <%= render :partial => 'index_branch', :collection => @cms_layouts %>
 </ul>

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

@@ -1,7 +1,17 @@
+<% block_tags = @cms_page.tags(true).select{ |t| t.is_cms_block? } %>
+
 <div id='form_blocks'>
-  <%= fields_for :blocks, nil, :builder => ComfortableMexicanSofa::FormBuilder do |cms_blocks| %>
-    <% @cms_page.tags(true).select{|t| t.is_cms_block?}.each do |tag| %>
-      <%= cms_blocks.send(tag.class.to_s.demodulize.underscore, tag)%>
+  <% if block_tags.empty? %>
+    <div class='no_tags'>
+      <%= link_to @cms_page.layout.label, edit_cms_admin_layout_path(@cms_page.layout) %>
+      Layout has no content tags defined. <br/>
+      Edit the content to include a page or field tag, for example: <code>{{cms:page:content}}</code>
+    </div>
+  <% else %>
+    <%= fields_for :blocks, nil, :builder => ComfortableMexicanSofa::FormBuilder do |cms_blocks| %>
+      <% block_tags.each do |tag| %>
+        <%= cms_blocks.send(tag.class.to_s.demodulize.underscore, tag)%>
+      <% end %>
     <% end %>
   <% end %>
 </div>

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

@@ -1,6 +1,10 @@
 <%= link_to span_tag(pluralize(@cms_page.revisions.count, 'revision')), cms_admin_page_revisions_path(@cms_page), :class => 'big button' %>
 <h1> Editing Page </h1>
 
+<% content_for :right_column do %>
+  <%= render :partial => 'cms_admin/sites/mirrors', :object => @cms_page %>
+<% end %>
+
 <%= cms_form_for @cms_page, :url => {:action => :update} do |form| %>
   <%= render :partial => 'form', :object => form %>
 <% end %>

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

@@ -1,6 +1,10 @@
 <%= link_to span_tag('Create New Page'), new_cms_admin_page_path, :class => 'big button' %>
 <h1>Pages</h1>
 
+<% content_for :right_column do %>
+  <%= render :partial => 'cms_admin/sites/mirrors' %>
+<% end %>
+
 <ul class='list sortable'>
   <%= render :partial => 'index_branch', :collection => @cms_pages %>
 </ul>

data/app/views/cms_admin/sites/_mirrors.html.erb

@@ -0,0 +1,20 @@
+<%
+  return unless ComfortableMexicanSofa.config.enable_mirror_sites
+  object ||= mirrors
+  
+  options = case object
+  when Cms::Layout
+    object.mirrors.collect{|m| [m.site.label, edit_cms_admin_layout_url(m, :host => m.site.hostname)]}
+  when Cms::Page
+    object.mirrors.collect{|m| [m.site.label, edit_cms_admin_page_url(m, :host => m.site.hostname)]}
+  when Cms::Snippet
+    object.mirrors.collect{|m| [m.site.label, edit_cms_admin_snippet_url(m, :host => m.site.hostname)]}
+  else
+    (Cms::Site.all - [@cms_site]).collect{|s| [s.label, url_for(:host => s.hostname)]}
+  end
+  options = [[@cms_site.label, request.fullpath]] + options
+%>
+
+<div id='mirrors' class='box'>
+  <%= select_tag :mirror, options_for_select(options) %>
+</div>

data/app/views/cms_admin/snippets/edit.html.erb

@@ -1,6 +1,10 @@
 <%= link_to span_tag(pluralize(@cms_snippet.revisions.count, 'revision')), cms_admin_snippet_revisions_path(@cms_snippet), :class => 'big button' %>
 <h1> Editing Snippet </h1>
 
+<% content_for :right_column do %>
+  <%= render :partial => 'cms_admin/sites/mirrors', :object => @cms_snippet %>
+<% end %>
+
 <%= cms_form_for @cms_snippet, :url => {:action => :update} do |form| %>
   <%= render :partial => 'form', :object => form %>
 <% end %>

data/app/views/cms_admin/snippets/index.html.erb

@@ -1,6 +1,10 @@
 <%= link_to span_tag('Create New Snippet'), new_cms_admin_snippet_path, :class => 'big button' %>
 <h1>Snippets</h1>
 
+<% content_for :right_column do %>
+  <%= render :partial => 'cms_admin/sites/mirrors' %>
+<% end %>
+
 <ul class='list'>
   <% @cms_snippets.each do |cms_snippet| %>
     <li id='cms_snippet_<%= cms_snippet.id %>'>

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.2.3"
+  s.version = "1.2.4"
 
   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 = %q{2011-05-16}
+  s.date = %q{2011-05-19}
   s.description = %q{}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [
@@ -54,6 +54,7 @@ Gem::Specification.new do |s|
     "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",
@@ -113,6 +114,7 @@ Gem::Specification.new do |s|
     "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",
@@ -230,6 +232,7 @@ Gem::Specification.new do |s|
     "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",
@@ -237,6 +240,7 @@ Gem::Specification.new do |s|
     "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",

data/config/initializers/comfortable_mexican_sofa.rb

@@ -21,7 +21,12 @@ ComfortableMexicanSofa.configure do |config|
   
   # If you enable this setting you'll be able to serve completely different set
   # of sites with their own layouts and pages.
-  #   config.enable_multiple_sites = false
+  #   config.enable_multiple_sites = true
+  
+  # In cases when you need sites with identical page tree structure, like different
+  # language versions. This will automatically create/destroy resources across all sites and
+  # will keep slugs/paths synced.
+  #   config.enable_mirror_sites = true
   
   # By default you cannot have irb code inside your layouts/pages/snippets.
   # Generally this is to prevent putting something like this:

data/lib/comfortable_mexican_sofa.rb

@@ -13,6 +13,7 @@ end
   'comfortable_mexican_sofa/form_builder',
   'comfortable_mexican_sofa/acts_as_tree',
   'comfortable_mexican_sofa/has_revisions',
+  'comfortable_mexican_sofa/is_mirrored',
   'comfortable_mexican_sofa/tag',
   'comfortable_mexican_sofa/fixtures'
 ].each do |path|

data/lib/comfortable_mexican_sofa/configuration.rb

@@ -21,6 +21,9 @@ class ComfortableMexicanSofa::Configuration
   # Are you running multiple sites from single install? Default assumption is 'No'
   attr_accessor :enable_multiple_sites
   
+  # All resources across sites are kept in sync
+  attr_accessor :enable_mirror_sites
+  
   # Not allowing irb code to be run inside page content. False by default.
   attr_accessor :allow_irb
   
@@ -49,6 +52,7 @@ class ComfortableMexicanSofa::Configuration
     @admin_route_redirect   = 'pages'
     @content_route_prefix   = ''
     @enable_multiple_sites  = false
+    @enable_mirror_sites    = false
     @allow_irb              = false
     @enable_caching         = true
     @upload_file_options    = {}

data/lib/comfortable_mexican_sofa/fixtures.rb

@@ -1,13 +1,20 @@
 module ComfortableMexicanSofa::Fixtures
   
-  def self.sync(site)
-    sync_layouts(site)
-    sync_pages(site)
-    sync_snippets(site)
+  def self.import_all(to_hostname, from_hostname = nil)
+    import_layouts  to_hostname, from_hostname
+    import_pages    to_hostname, from_hostname
+    import_snippets to_hostname, from_hostname
   end
   
-  def self.sync_layouts(site, path = nil, root = true, parent = nil, layout_ids = [])
-    return unless path ||= find_path(site, 'layouts')
+  def self.export_all(from_hostname, to_hostname = nil)
+    export_layouts  from_hostname, to_hostname
+    export_pages    from_hostname, to_hostname
+    export_snippets from_hostname, to_hostname
+  end
+  
+  def self.import_layouts(to_hostname, from_hostname = nil, path = nil, root = true, parent = nil, layout_ids = [])
+    return unless site = Cms::Site.find_by_hostname(to_hostname)
+    return unless path ||= find_fixtures_path((from_hostname || to_hostname), 'layouts')
     
     Dir.glob("#{path}/*").select{|f| File.directory?(f)}.each do |path|
       slug = path.split('/').last
@@ -48,7 +55,7 @@ module ComfortableMexicanSofa::Fixtures
       layout_ids << layout.id
       
       # checking for nested fixtures
-      layout_ids += sync_layouts(site, path, false, layout, layout_ids)
+      layout_ids += import_layouts(to_hostname, from_hostname, path, false, layout, layout_ids)
     end
     
     # removing all db entries that are not in fixtures
@@ -58,8 +65,9 @@ module ComfortableMexicanSofa::Fixtures
     layout_ids
   end
   
-  def self.sync_pages(site, path = nil, root = true, parent = nil, page_ids = [])
-    return unless path ||= find_path(site, 'pages')
+  def self.import_pages(to_hostname, from_hostname = nil, path = nil, root = true, parent = nil, page_ids = [])
+    return unless site = Cms::Site.find_by_hostname(to_hostname)
+    return unless path ||= find_fixtures_path((from_hostname || to_hostname), 'pages')
     
     Dir.glob("#{path}/*").select{|f| File.directory?(f)}.each do |path|
       slug = path.split('/').last
@@ -101,7 +109,7 @@ module ComfortableMexicanSofa::Fixtures
       page_ids << page.id
       
       # checking for nested fixtures
-      page_ids += sync_pages(site, path, false, page, page_ids)
+      page_ids += import_pages(to_hostname, from_hostname, path, false, page, page_ids)
     end
     
     # removing all db entries that are not in fixtures
@@ -111,8 +119,9 @@ module ComfortableMexicanSofa::Fixtures
     page_ids
   end
   
-  def self.sync_snippets(site)
-    return unless path = find_path(site, 'snippets')
+  def self.import_snippets(to_hostname, from_hostname = nil)
+    return unless site = Cms::Site.find_by_hostname(to_hostname)
+    return unless path = find_fixtures_path((from_hostname || to_hostname), 'snippets')
     
     snippet_ids = []
     Dir.glob("#{path}/*").select{|f| File.directory?(f)}.each do |path|
@@ -145,12 +154,85 @@ module ComfortableMexicanSofa::Fixtures
     site.snippets.where('id NOT IN (?)', snippet_ids).each{ |s| s.destroy }
   end
   
-  def self.find_path(site, dir)
-    path = nil
-    File.exists?(path = File.join(ComfortableMexicanSofa.config.fixtures_path, site.hostname, dir)) ||
-    !ComfortableMexicanSofa.config.enable_multiple_sites &&
-    File.exists?(path = File.join(ComfortableMexicanSofa.config.fixtures_path, dir))
-    return path
+  def self.export_layouts(from_hostname, to_hostname = nil)
+    return unless site = Cms::Site.find_by_hostname(from_hostname)
+    path = File.join(ComfortableMexicanSofa.config.fixtures_path, (to_hostname || site.hostname), 'layouts')
+    FileUtils.rm_rf(path)
+    FileUtils.mkdir_p(path)
+    
+    site.layouts.each do |layout|
+      layout_path = File.join(path, layout.ancestors.reverse.collect{|l| l.slug}, layout.slug)
+      FileUtils.mkdir_p(layout_path)
+      
+      open(File.join(layout_path, "_#{layout.slug}.yml"), 'w') do |f|
+        f.write({
+          'label'       => layout.label,
+          'app_layout'  => layout.app_layout,
+          'parent'      => layout.parent.try(:slug)
+        }.to_yaml)
+      end
+      open(File.join(layout_path, 'content.html'), 'w') do |f|
+        f.write(layout.content)
+      end
+      open(File.join(layout_path, 'css.css'), 'w') do |f|
+        f.write(layout.css)
+      end
+      open(File.join(layout_path, 'js.js'), 'w') do |f|
+        f.write(layout.js)
+      end
+    end
+  end
+  
+  def self.export_pages(from_hostname, to_hostname = nil)
+    return unless site = Cms::Site.find_by_hostname(from_hostname)
+    path = File.join(ComfortableMexicanSofa.config.fixtures_path, (to_hostname || site.hostname), 'pages')
+    FileUtils.rm_rf(path)
+    FileUtils.mkdir_p(path)
+    
+    site.pages.each do |page|
+      page.slug = 'index' if page.slug.blank?
+      page_path = File.join(path, page.ancestors.reverse.collect{|p| p.slug.blank?? 'index' : p.slug}, page.slug)
+      FileUtils.mkdir_p(page_path)
+      
+      open(File.join(page_path, "_#{page.slug}.yml"), 'w') do |f|
+        f.write({
+          'label'         => page.label,
+          'layout'        => page.layout.try(:slug),
+          'parent'        => page.parent && (page.parent.slug.present?? page.parent.slug : 'index'),
+          'target_page'   => page.target_page.try(:slug),
+          'is_published'  => page.is_published
+        }.to_yaml)
+      end
+      page.blocks_attributes.each do |block|
+        open(File.join(page_path, "#{block[:label]}.html"), 'w') do |f|
+          f.write(block[:content])
+        end
+      end
+    end
+  end
+  
+  def self.export_snippets(from_hostname, to_hostname = nil)
+    return unless site = Cms::Site.find_by_hostname(from_hostname)
+    path = File.join(ComfortableMexicanSofa.config.fixtures_path, (to_hostname || site.hostname), 'snippets')
+    FileUtils.rm_rf(path)
+    FileUtils.mkdir_p(path)
+    
+    site.snippets.each do |snippet|
+      FileUtils.mkdir_p(snippet_path = File.join(path, snippet.slug))
+      open(File.join(snippet_path, "_#{snippet.slug}.yml"), 'w') do |f|
+        f.write({'label' => snippet.label}.to_yaml)
+      end
+      open(File.join(snippet_path, 'content.html'), 'w') do |f|
+        f.write(snippet.content)
+      end
+    end
+  end
+  
+protected
+  
+  def self.find_fixtures_path(hostname, dir)
+    path = File.join(ComfortableMexicanSofa.config.fixtures_path, hostname, dir)
+    File.exists?(path) ? path : nil
   end
   
 end