comfortable_mexican_sofa 1.9.2 → 1.9.3

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2011 Oleg Khabarov, The Working Group Inc
+Copyright (c) 2010-2013 Oleg Khabarov, The Working Group Inc
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/app/assets/javascripts/comfortable_mexican_sofa/application.js.coffee

@@ -26,6 +26,7 @@ window.CMS =
     CMS.page_update_publish()
     CMS.categories()
     CMS.uploader()
+    CMS.uploaded_files()
 
 
 window.CMS.slugify = ->
@@ -154,3 +155,7 @@ window.CMS.uploader = ->
       $('.uploaded-files').prepend(files)
       files.map ->
         $(this).fadeIn()
+
+window.CMS.uploaded_files = ->
+  $('.uploaded-files').on 'click', 'input', ->
+    $(this).select()

data/app/assets/stylesheets/comfortable_mexican_sofa/base.css.sass

@@ -128,6 +128,9 @@ body#comfy
               margin: 0
               font-size: 11px
               width: 100%
+              line-height: 12px
+              &:hover
+                cursor: default
     iframe#file-upload-frame
       display: none
     
@@ -164,6 +167,14 @@ body#comfy
   .item-meta
     font-size: 11px
     line-height: 14px
+    
+  .cms-partial
+    background-color: #252525
+    color: #ccc
+    outline: 1px dotted #666
+    font-size: 9px
+    padding: 0 5px
+    margin: 2px
   
   // -- Sofa Version --------------------------------------------------------
   .center-column .body-footer

data/app/controllers/cms_admin/pages_controller.rb

@@ -106,7 +106,7 @@ protected
       @cms_site   = @page.site
       @cms_layout = @page.layout
       @cms_page   = @page
-      render :inline => @page.content(true), :layout => layout, :content_type => 'text/html'
+      render :inline => @page.render, :layout => layout, :content_type => 'text/html'
     end
   end
   

data/app/models/cms/block.rb

@@ -1,8 +1,5 @@
 class Cms::Block < ActiveRecord::Base
-  
-  ComfortableMexicanSofa.establish_connection(self)
-  
-  self.table_name = 'cms_blocks'
+  include Cms::Base
   
   # -- Relationships --------------------------------------------------------
   belongs_to :page

data/app/models/cms/categorization.rb

@@ -1,8 +1,5 @@
 class Cms::Categorization < ActiveRecord::Base
-  
-  ComfortableMexicanSofa.establish_connection(self)
-  
-  self.table_name = 'cms_categorizations'
+  include Cms::Base
   
   # -- Relationships --------------------------------------------------------
   belongs_to :category

data/app/models/cms/category.rb

@@ -1,8 +1,5 @@
 class Cms::Category < ActiveRecord::Base
-  
-  ComfortableMexicanSofa.establish_connection(self)
-  
-  self.table_name = 'cms_categories'
+  include Cms::Base
   
   # -- Relationships --------------------------------------------------------
   belongs_to :site

data/app/models/cms/file.rb

@@ -1,11 +1,8 @@
 class Cms::File < ActiveRecord::Base
+  include Cms::Base
   
   IMAGE_MIMETYPES = %w(gif jpeg pjpeg png svg+xml tiff).collect{|subtype| "image/#{subtype}"}
   
-  ComfortableMexicanSofa.establish_connection(self)
-    
-  self.table_name = 'cms_files'
-  
   cms_is_categorized
   
   attr_accessor :dimensions
@@ -64,7 +61,7 @@ protected
   def reload_page_cache
     return unless self.block
     p = self.block.page
-    Cms::Page.where(:id => p.id).update_all(:content => p.content(true))
+    Cms::Page.where(:id => p.id).update_all(:content => nil)
   end
   
 end

data/app/models/cms/layout.rb

@@ -1,8 +1,5 @@
 class Cms::Layout < ActiveRecord::Base
-  
-  ComfortableMexicanSofa.establish_connection(self)
-    
-  self.table_name = 'cms_layouts'
+  include Cms::Base
   
   cms_acts_as_tree
   cms_is_mirrored
@@ -84,7 +81,7 @@ protected
   
   # Forcing page content reload
   def clear_cached_page_content
-    self.pages.each{ |page| page.save! }
+    self.pages.each{ |page| page.clear_cached_content! }
     self.children.each{ |child_layout| child_layout.clear_cached_page_content }
   end
   

data/app/models/cms/page.rb

@@ -1,10 +1,7 @@
 # encoding: utf-8
 
 class Cms::Page < ActiveRecord::Base
-  
-  ComfortableMexicanSofa.establish_connection(self)
-    
-  self.table_name = 'cms_pages'
+  include Cms::Base
   
   cms_acts_as_tree :counter_cache => :children_count
   cms_is_categorized
@@ -12,6 +9,7 @@ class Cms::Page < ActiveRecord::Base
   cms_has_revisions_for :blocks_attributes
   
   attr_accessor :tags,
+                :cached_content,
                 :blocks_attributes_changed
   
   # -- Relationships --------------------------------------------------------
@@ -30,7 +28,7 @@ class Cms::Page < ActiveRecord::Base
                     :assign_full_path
   before_create     :assign_position
   before_save       :set_cached_content
-  after_save        :sync_child_pages
+  after_save        :sync_child_full_paths!
   after_find        :unescape_slug_and_path
   
   # -- Validations ----------------------------------------------------------
@@ -59,8 +57,8 @@ class Cms::Page < ActiveRecord::Base
     out << [ "#{spacer*depth}#{current_page.label}", current_page.id ] unless current_page == page
     current_page.children.each do |child|
       out += options_for_select(site, page, child, depth + 1, exclude_self, spacer)
-    end
-    return out.compact
+    end if current_page.children_count.nonzero?
+    return out.compact 
   end
   
   # -- Instance Methods -----------------------------------------------------
@@ -100,31 +98,38 @@ class Cms::Page < ActiveRecord::Base
   
   # Processing content will return rendered content and will populate 
   # self.cms_tags with instances of CmsTag
-  def content(force_reload = false)
-    @content = force_reload ? nil : read_attribute(:content)
-    @content ||= begin
-      self.tags = [] # resetting
-      if layout
-        ComfortableMexicanSofa::Tag.process_content(
-          self,
-          ComfortableMexicanSofa::Tag.sanitize_irb(layout.merged_content)
-        )
-      else
-        ''
-      end
+  def render
+    @tags = [] # resetting
+    return '' unless layout
+    
+    ComfortableMexicanSofa::Tag.process_content(
+      self, ComfortableMexicanSofa::Tag.sanitize_irb(layout.merged_content)
+    )
+  end
+  
+  # Cached content accessor
+  def content
+    if (@cached_content = read_attribute(:content)).nil?
+      @cached_content = self.render
+      update_column(:content, @cached_content) unless self.new_record?
     end
+    @cached_content
+  end
+  
+  def clear_cached_content!
+    self.update_column(:content, nil)
   end
   
   # Array of cms_tags for a page. Content generation is called if forced.
   # These also include initialized cms_blocks if present
   def tags(force_reload = false)
-    self.content(true) if force_reload
+    self.render if force_reload
     @tags ||= []
   end
   
   # Full url for a page
   def url
-    "http://" + "#{self.site.hostname}/#{self.site.path}/#{self.full_path}".squeeze("/")
+    "//" + "#{self.site.hostname}/#{self.site.path}/#{self.full_path}".squeeze("/")
   end
   
   # Method to collect prevous state of blocks for revisions
@@ -168,14 +173,18 @@ protected
     errors.add(:slug, :invalid) unless unescaped_slug =~ /^\p{Alnum}[\.\p{Alnum}\p{Mark}_-]*$/i
   end
   
-  # NOTE: This can create 'phantom' page blocks as they are defined in the layout. This is normal.
   def set_cached_content
-    write_attribute(:content, self.content(true))
+    @cached_content = self.render
+    write_attribute(:content, self.cached_content)
   end
   
   # Forcing re-saves for child pages so they can update full_paths
-  def sync_child_pages
-    children.each{ |p| p.save! } if full_path_changed?
+  def sync_child_full_paths!
+    return unless full_path_changed?
+    children.each do |p|
+      p.update_column(:full_path, p.send(:assign_full_path))
+      p.send(:sync_child_full_paths!)
+    end
   end
 
   # Escape slug unless it's nonexistent (root)

data/app/models/cms/revision.rb

@@ -1,8 +1,5 @@
 class Cms::Revision < ActiveRecord::Base
-  
-  ComfortableMexicanSofa.establish_connection(self)
-  
-  self.table_name = 'cms_revisions'
+  include Cms::Base
   
   serialize :data
   

data/app/models/cms/site.rb

@@ -1,8 +1,5 @@
 class Cms::Site < ActiveRecord::Base
-  
-  ComfortableMexicanSofa.establish_connection(self)
-  
-  self.table_name = 'cms_sites'
+  include Cms::Base
   
   # -- Relationships --------------------------------------------------------
   with_options :dependent => :destroy do |site|

data/app/models/cms/snippet.rb

@@ -1,8 +1,5 @@
 class Cms::Snippet < ActiveRecord::Base
-  
-  ComfortableMexicanSofa.establish_connection(self)
-  
-  self.table_name = 'cms_snippets'
+  include Cms::Base
   
   cms_is_categorized
   cms_is_mirrored
@@ -36,12 +33,9 @@ protected
     self.label = self.label.blank?? self.identifier.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.each do |p|
-      Cms::Page.where(:id => p.id).update_all(:content => p.content(true))
+      Cms::Page.where(:id => p.id).update_all(:content => nil)
     end
   end
   

data/app/models/concerns/cms/base.rb

@@ -0,0 +1,17 @@
+module Cms::Base
+  extend ActiveSupport::Concern
+  
+  included do 
+    # Establishing database connection if custom one is defined
+    if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
+      establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
+    end
+  end
+  
+  module ClassMethods
+    def table_name_prefix
+      'cms_'
+    end
+  end
+  
+end

data/app/views/cms_admin/files/_file.html.haml

@@ -8,6 +8,6 @@
     .thumb
       = image_tag file.file.url(:cms_thumb) if file.is_image?
     .details
-      %input{:type => 'text', :value => file.file.url}
+      %input{:type => 'text', :value => file.file.url, :readonly => 'readonly'}
       .file-type= file.file_content_type
       .file-size= number_to_human_size(file.file_file_size, :locale => :en)

data/app/views/cms_admin/files/_form.html.haml

@@ -1,3 +1,5 @@
+= render 'cms_admin/partials/file_form_before', :object => form
+
 = form.text_field :label
 = form.file_field :file, :multiple => @file.new_record?
 
@@ -10,5 +12,7 @@
 
 = render :partial => 'cms_admin/categories/form', :object => form
 
+= render 'cms_admin/partials/file_form_after', :object => form
+
 .form-actions
   = form.submit t(@file.new_record?? '.create' : '.update'), :class => 'btn btn-primary'

data/app/views/cms_admin/files/index.html.haml

@@ -1,6 +1,8 @@
 .page-header
   = link_to t('.new_link'), new_cms_admin_site_file_path(@site), :class => 'btn pull-right'
   %h2= t('.title')
+  
+= render 'cms_admin/partials/files_before'
 
 = render :partial => 'cms_admin/categories/index', :object => 'Cms::File'
 
@@ -26,3 +28,6 @@
           .btn-group
             = link_to t('.edit'), edit_cms_admin_site_file_path(@site, file), :class => 'btn btn-small'
             = link_to t('.delete'), cms_admin_site_file_path(@site, file), :method => :delete, :data => {:confirm => t('.are_you_sure')}, :class => 'btn btn-small btn-danger'
+
+
+= render 'cms_admin/partials/files_after'

data/app/views/cms_admin/layouts/_form.html.haml

@@ -1,5 +1,7 @@
 - content_for :right_column do
   = render :partial => 'cms_admin/files/index'
+  
+= render 'cms_admin/partials/layout_form_before', :object => form
 
 = form.text_field :label, :data => {:slugify => @layout.new_record?}
 = form.text_field :identifier, :data => {:slug => true}
@@ -13,5 +15,7 @@
 = form.text_area :css, :data => {:cm_mode => 'css'}
 = form.text_area :js, :data => {:cm_mode => 'javascript'}
 
+= render 'cms_admin/partials/layout_form_after', :object => form
+
 .form-actions
   = form.submit t(@layout.new_record?? '.create' : '.update'), :class => 'btn btn-primary'

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

@@ -5,5 +5,9 @@
 - content_for :right_column do
   = render :partial => 'cms_admin/sites/mirrors'
 
+= render 'cms_admin/partials/layouts_before'
+
 %ul.list.sortable
   = render :partial => 'index_branch', :collection => @layouts
+
+= render 'cms_admin/partials/layouts_after'

data/app/views/cms_admin/pages/_form.html.haml

@@ -6,6 +6,8 @@
     %button.btn.btn-small.btn-primary.pull-right
   = render :partial => 'cms_admin/files/index'
 
+= render 'cms_admin/partials/page_form_before', :object => form
+
 = form.text_field :label, :data => {:slugify => @page.new_record?}
 
 - unless @site.pages.count == 0 || @site.pages.root == @page
@@ -22,7 +24,7 @@
 - if (options = Cms::Page.options_for_select(@site, @page, nil, 0, false)).present?
   = form.select :target_page_id, [["---- #{t('.select_target_page')} ----", nil]] + options
 
-= cms_hook :page_form, :object => form
+= render 'cms_admin/partials/page_form_inner', :object => form
 
 = render :partial => 'cms_admin/categories/form', :object => form
 
@@ -30,6 +32,8 @@
 
 = form.check_box :is_published, :label => t('.is_published')
 
+= render 'cms_admin/partials/page_form_after', :object => form
+
 .form-actions
   = form.submit t('.preview'), :name => 'preview', :id => nil, :class => 'btn'
   = form.submit t(@page.new_record?? '.create' : '.update'), :class => 'btn btn-primary'

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

@@ -5,7 +5,11 @@
 - content_for :right_column do
   = render :partial => 'cms_admin/sites/mirrors'
 
+= render 'cms_admin/partials/pages_before'
+
 = render :partial => 'cms_admin/categories/index', :object => 'Cms::Page'
 
 %ul.list.sortable
   = render :partial => 'index_branch', :collection => @pages
+
+= render 'cms_admin/partials/pages_after'

data/app/views/cms_admin/partials/_body_before.html.haml

@@ -0,0 +1,3 @@
+- if ComfortableMexicanSofa.config.reveal_cms_partials
+  .cms-partial
+    cms_admin/partials/body_before

data/app/views/cms_admin/partials/_file_form_after.html.haml

@@ -0,0 +1,3 @@
+- if ComfortableMexicanSofa.config.reveal_cms_partials
+  .cms-partial
+    cms_admin/partials/file_form_after

data/app/views/cms_admin/partials/_file_form_before.html.haml

@@ -0,0 +1,3 @@
+- if ComfortableMexicanSofa.config.reveal_cms_partials
+  .cms-partial
+    cms_admin/partials/file_form_before

data/app/views/cms_admin/partials/_files_after.html.haml

@@ -0,0 +1,3 @@
+- if ComfortableMexicanSofa.config.reveal_cms_partials
+  .cms-partial
+    cms_admin/partials/snippets_after

data/app/views/cms_admin/partials/_files_before.html.haml

@@ -0,0 +1,3 @@
+- if ComfortableMexicanSofa.config.reveal_cms_partials
+  .cms-partial
+    cms_admin/partials/snippets_before

data/app/views/cms_admin/partials/_html_footer.html.haml

@@ -0,0 +1,2 @@
+- if ComfortableMexicanSofa.config.reveal_cms_partials
+  / /cms_admin/partials/html_footer

data/app/views/cms_admin/partials/_html_head.html.haml

@@ -0,0 +1,2 @@
+- if ComfortableMexicanSofa.config.reveal_cms_partials
+  / /cms_admin/partials/html_head

data/app/views/cms_admin/partials/_layout_form_after.html.haml

@@ -0,0 +1,3 @@
+- if ComfortableMexicanSofa.config.reveal_cms_partials
+  .cms-partial
+    cms_admin/partials/layout_form_after

data/app/views/cms_admin/partials/_layout_form_before.html.haml

@@ -0,0 +1,3 @@
+- if ComfortableMexicanSofa.config.reveal_cms_partials
+  .cms-partial
+    cms_admin/partials/layout_form_before

data/app/views/cms_admin/partials/_layouts_after.html.haml

@@ -0,0 +1,3 @@
+- if ComfortableMexicanSofa.config.reveal_cms_partials
+  .cms-partial
+    cms_admin/partials/layouts_after

data/app/views/cms_admin/partials/_layouts_before.html.haml

@@ -0,0 +1,3 @@
+- if ComfortableMexicanSofa.config.reveal_cms_partials
+  .cms-partial
+    cms_admin/partials/layouts_before

data/app/views/cms_admin/partials/_navigation_after.html.haml

@@ -0,0 +1,3 @@
+- if ComfortableMexicanSofa.config.reveal_cms_partials
+  .cms-partial
+    cms_admin/partials/navigation_after

data/app/views/cms_admin/partials/_navigation_before.html.haml

@@ -0,0 +1,3 @@
+- if ComfortableMexicanSofa.config.reveal_cms_partials
+  .cms-partial
+    cms_admin/partials/navigation_before

data/app/views/cms_admin/partials/_navigation_inner.html.haml

@@ -0,0 +1,3 @@
+- if ComfortableMexicanSofa.config.reveal_cms_partials
+  %li.cms-partial
+    cms_admin/partials/navigation_inner

data/app/views/cms_admin/partials/_page_form_after.html.haml

@@ -0,0 +1,3 @@
+- if ComfortableMexicanSofa.config.reveal_cms_partials
+  .cms-partial
+    cms_admin/partials/page_form_after

data/app/views/cms_admin/partials/_page_form_before.html.haml

@@ -0,0 +1,3 @@
+- if ComfortableMexicanSofa.config.reveal_cms_partials
+  .cms-partial
+    cms_admin/partials/page_form_before

data/app/views/cms_admin/partials/_page_form_inner.html.haml

@@ -0,0 +1,3 @@
+- if ComfortableMexicanSofa.config.reveal_cms_partials
+  .cms-partial
+    cms_admin/partials/page_form_inner

data/app/views/cms_admin/partials/_pages_after.html.haml

@@ -0,0 +1,3 @@
+- if ComfortableMexicanSofa.config.reveal_cms_partials
+  .cms-partial
+    cms_admin/partials/pages_after

data/app/views/cms_admin/partials/_pages_before.html.haml

@@ -0,0 +1,3 @@
+- if ComfortableMexicanSofa.config.reveal_cms_partials
+  .cms-partial
+    cms_admin/partials/pages_before

data/app/views/cms_admin/partials/_right_column_after.html.haml

@@ -0,0 +1,3 @@
+- if ComfortableMexicanSofa.config.reveal_cms_partials
+  .cms-partial
+    cms_admin/partials/right_column_after

data/app/views/cms_admin/partials/_right_column_before.html.haml

@@ -0,0 +1,3 @@
+- if ComfortableMexicanSofa.config.reveal_cms_partials
+  .cms-partial
+    cms_admin/partials/right_column_before

data/app/views/cms_admin/partials/_site_form_after.html.haml

@@ -0,0 +1,3 @@
+- if ComfortableMexicanSofa.config.reveal_cms_partials
+  .cms-partial
+    cms_admin/partials/site_form_after

data/app/views/cms_admin/partials/_site_form_before.html.haml

@@ -0,0 +1,3 @@
+- if ComfortableMexicanSofa.config.reveal_cms_partials
+  .cms-partial
+    cms_admin/partials/site_form_before

data/app/views/cms_admin/partials/_sites_after.html.haml

@@ -0,0 +1,3 @@
+- if ComfortableMexicanSofa.config.reveal_cms_partials
+  .cms-partial
+    cms_admin/partials/sites_after

data/app/views/cms_admin/partials/_sites_before.html.haml

@@ -0,0 +1,3 @@
+- if ComfortableMexicanSofa.config.reveal_cms_partials
+  .cms-partial
+    cms_admin/partials/sites_before

data/app/views/cms_admin/partials/_snippet_form_after.html.haml

@@ -0,0 +1,3 @@
+- if ComfortableMexicanSofa.config.reveal_cms_partials
+  .cms-partial
+    cms_admin/partials/snippet_form_after

data/app/views/cms_admin/partials/_snippet_form_before.html.haml

@@ -0,0 +1,3 @@
+- if ComfortableMexicanSofa.config.reveal_cms_partials
+  .cms-partial
+    cms_admin/partials/snippet_form_before

data/app/views/cms_admin/partials/_snippets_after.html.haml

@@ -0,0 +1,3 @@
+- if ComfortableMexicanSofa.config.reveal_cms_partials
+  .cms-partial
+    cms_admin/partials/sites_after

data/app/views/cms_admin/partials/_snippets_before.html.haml

@@ -0,0 +1,3 @@
+- if ComfortableMexicanSofa.config.reveal_cms_partials
+  .cms-partial
+    cms_admin/partials/snippets_before

data/app/views/cms_admin/sites/_form.html.haml

@@ -1,3 +1,5 @@
+= render 'cms_admin/partials/site_form_before', :object => form
+
 = form.text_field :label, :data => {:slugify => @site.new_record?}
 = form.text_field :identifier, :data => {:slug => true}
 = form.text_field :hostname
@@ -5,6 +7,8 @@
 = form.select :locale, ComfortableMexicanSofa.config.locales.to_a.collect{|l| [l[1], l[0]]}
 = form.check_box :is_mirrored, :label => t('.is_mirrored')
 
+= render 'cms_admin/partials/site_form_after', :object => form
+
 .form-actions
   = form.submit t(@site.new_record?? '.create' : '.update'), :class => 'btn btn-primary'
 

data/app/views/cms_admin/sites/index.html.haml

@@ -2,6 +2,8 @@
   = link_to t('.new_link'), new_cms_admin_site_path, :class => 'btn pull-right'
   %h2= t('.title')
 
+= render 'cms_admin/partials/sites_before'
+
 %table.table.table-hover.table-bordered
   - @sites.each do |site|
     %tr
@@ -21,4 +23,6 @@
         .btn-group
           = link_to t('.select'),  cms_admin_site_pages_path(site), :class => 'btn btn-small'
           = link_to t('.edit'), edit_cms_admin_site_path(site), :class => 'btn btn-small'
-          = link_to t('.delete'), cms_admin_site_path(site), :method => :delete, :data => {:confirm => t('.are_you_sure')}, :class => 'btn btn-small btn-danger'
+          = link_to t('.delete'), cms_admin_site_path(site), :method => :delete, :data => {:confirm => t('.are_you_sure')}, :class => 'btn btn-small btn-danger'
+          
+= render 'cms_admin/partials/sites_after'

data/app/views/cms_admin/snippets/_form.html.haml

@@ -1,11 +1,15 @@
 - content_for :right_column do
   = render :partial => 'cms_admin/files/index'
 
+= render 'cms_admin/partials/snippet_form_before', :object => form
+
 = form.text_field :label, :data => {:slugify => @snippet.new_record?}
 = form.text_field :identifier, :data => {:slug => true}
 = form.text_area :content, :data => {:cm_mode => 'text/html'}
 
 = render :partial => 'cms_admin/categories/form', :object => form
 
+= render 'cms_admin/partials/snippet_form_after', :object => form
+
 .form-actions
-  = form.submit t(@snippet.new_record?? '.create' : '.update'), :class => 'btn btn-primary'
+  = form.submit t(@snippet.new_record?? '.create' : '.update'), :class => 'btn btn-primary'

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

@@ -5,6 +5,8 @@
 - content_for :right_column do
   = render :partial => 'cms_admin/sites/mirrors'
 
+= render 'cms_admin/partials/snippets_before'
+
 = render :partial => 'cms_admin/categories/index', :object => 'Cms::Snippet'
 
 %table.table.table-hover.table-bordered
@@ -26,3 +28,5 @@
           .btn-group
             = link_to t('.edit'), edit_cms_admin_site_snippet_path(@site, snippet), :class => 'btn btn-small'
             = link_to t('.delete'), cms_admin_site_snippet_path(@site, snippet), :method => :delete, :data => {:confirm => t('.are_you_sure')}, :class => 'btn btn-small btn-danger'
+            
+= render 'cms_admin/partials/snippets_after'

data/app/views/layouts/cms_admin/_body.html.haml

@@ -1,5 +1,6 @@
 %body#comfy{:class => "c-#{params[:controller].slugify} a-#{params[:action].slugify}"}
-  = cms_hook :header
+
+  = render 'cms_admin/partials/body_before'
 
   .body-wrapper
     .left-column

data/app/views/layouts/cms_admin/_footer_js.html.haml

@@ -1,3 +1,5 @@
+= render 'cms_admin/partials/html_footer'
+
 - if content_for(:javascript)
   :javascript
     #{yield :javascript}

data/app/views/layouts/cms_admin/_head.html.haml

@@ -9,4 +9,5 @@
   = javascript_include_tag 'comfortable_mexican_sofa/admin/application'
   
   = yield :head
-  = cms_hook :html_head
+  
+  = render 'cms_admin/partials/html_head'

data/app/views/layouts/cms_admin/_left.html.haml

@@ -1,3 +1,5 @@
+= render '/cms_admin/partials/navigation_before'
+
 %ul.navigation
   %li= active_link_to t('cms_admin.base.sites'), cms_admin_sites_path, :active => ['cms_admin/sites']
   
@@ -8,3 +10,7 @@
     %li= active_link_to t('cms_admin.base.files'), cms_admin_site_files_path(@site)
     
   = cms_hook :navigation
+    
+  = render '/cms_admin/partials/navigation_inner'
+    
+= render '/cms_admin/partials/navigation_after'

data/app/views/layouts/cms_admin/_right.html.haml

@@ -1 +1,5 @@
-= yield :right_column
+= render 'cms_admin/partials/right_column_before'
+
+= yield :right_column
+
+= render 'cms_admin/partials/right_column_after'

data/comfortable_mexican_sofa.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
   s.homepage      = "http://github.com/comfy/comfortable-mexican-sofa"
   s.summary       = "CMS Engine for Rails 4 apps"
   s.description   = "ComfortableMexicanSofa is a powerful CMS Engine for Ruby on Rails applications"
+  s.license       = 'MIT'
   
   s.files         = `git ls-files`.split("\n")
   s.platform      = Gem::Platform::RUBY

data/config/initializers/comfortable_mexican_sofa.rb

@@ -87,6 +87,10 @@ ComfortableMexicanSofa.configure do |config|
   # e.g. config.hostname_aliases = {'host.com' => 'host.inv', 'host_a.com' => ['host.lvh.me', 'host.dev']}
   # Default is nil (not used)
   #   config.hostname_aliases = nil
+  
+  # Reveal partials that can be overwritten in the admin area.
+  # Default is false.
+  #   config.reveal_cms_partials = false
 
 end
 
@@ -94,10 +98,3 @@ end
 # YOU REALLY WANT TO CHANGE THIS BEFORE PUTTING YOUR SITE LIVE
 ComfortableMexicanSofa::HttpAuth.username = 'username'
 ComfortableMexicanSofa::HttpAuth.password = 'password'
-
-# If you need to inject some html in cms admin views you can define what partial
-# should be rendered into the following areas:
-#   ComfortableMexicanSofa::ViewHooks.add(:header, '/layouts/admin/header')
-#   ComfortableMexicanSofa::ViewHooks.add(:navigation, '/layouts/admin/navigation')
-#   ComfortableMexicanSofa::ViewHooks.add(:html_head, '/layouts/admin/html_head')
-#   ComfortableMexicanSofa::ViewHooks.add(:page_form, '/layouts/admin/page_form')

data/lib/comfortable_mexican_sofa.rb

@@ -47,13 +47,6 @@ module ComfortableMexicanSofa
       @configuration ||= Configuration.new
     end
     alias :config :configuration
-    
-    # Establishing database connection if custom one is defined
-    def establish_connection(klass)
-      if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
-        klass.establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
-      end
-    end
 
     def logger=(new_logger)
       @logger = new_logger

data/lib/comfortable_mexican_sofa/configuration.rb

@@ -71,6 +71,10 @@ class ComfortableMexicanSofa::Configuration
   # Default is nil (not used)
   attr_accessor :hostname_aliases
   
+  # Reveal partials that can be overwritten in the admin area.
+  # Default is false.
+  attr_accessor :reveal_cms_partials
+  
   # Configuration defaults
   def initialize
     @cms_title            = 'ComfortableMexicanSofa CMS Engine'
@@ -103,6 +107,7 @@ class ComfortableMexicanSofa::Configuration
     @allowed_helpers      = nil
     @allowed_partials     = nil
     @hostname_aliases     = nil
+    @reveal_cms_partials  = false
   end
 
 end

data/lib/comfortable_mexican_sofa/fixture/page.rb

@@ -47,12 +47,8 @@ module ComfortableMexicanSofa::Fixture::Page
           end
         end
         
-        blocks_to_clear.each do |identifier|
-          blocks_attributes << {
-            :identifier => identifier,
-            :content    => nil
-          }
-        end
+        # deleting removed blocks
+        page.blocks.where(:identifier => blocks_to_clear).destroy_all
         
         page.blocks_attributes = blocks_attributes if blocks_attributes.present?
         

data/lib/comfortable_mexican_sofa/render_methods.rb

@@ -44,6 +44,8 @@ module ComfortableMexicanSofa::RenderMethods
       
       if options.is_a?(Hash) && path = options.delete(:cms_page)
         @cms_site ||= Cms::Site.find_site(request.host.downcase, request.fullpath)
+        path.gsub!(/^\/#{@cms_site.path}/, '') if @cms_site && @cms_site.path.present?
+        
         if @cms_page = @cms_site && @cms_site.pages.find_by_full_path(path)
           @cms_layout = @cms_page.layout
           cms_app_layout = @cms_layout.try(:app_layout)
@@ -69,7 +71,7 @@ module ComfortableMexicanSofa::RenderMethods
             cms_page.blocks.build(:identifier => identifier.to_s, :content => content)
           end
           options[:layout] ||= cms_app_layout.blank?? nil : cms_app_layout
-          options[:inline] = cms_page.content(true)
+          options[:inline] = cms_page.content
           super(options, locals, &block)
         else
           raise ComfortableMexicanSofa::MissingLayout.new(identifier)

data/lib/comfortable_mexican_sofa/version.rb

@@ -1,3 +1,3 @@
 module ComfortableMexicanSofa
-  VERSION = "1.9.2"
+  VERSION = "1.9.3"
 end

data/test/controllers/cms_content_controller_test.rb

@@ -85,7 +85,7 @@ class CmsContentControllerTest < ActionController::TestCase
     assert_equal cms_pages(:default), cms_pages(:child).target_page
     get :render_html, :cms_path => 'child-page'
     assert_response :redirect
-    assert_redirected_to '/'
+    assert_redirected_to cms_pages(:default).url
   end
   
   def test_render_page_unpublished

data/test/integration/fixtures_test.rb

@@ -30,7 +30,7 @@ class FixturesIntergrationTest < ActionDispatch::IntegrationTest
         assert_difference 'Cms::Snippet.count', 1 do
           get '/'
           assert_response :redirect
-          assert_redirected_to 'http://test.host/child'
+          assert_redirected_to '//test.host/child'
           follow_redirect!
           
           assert_equal 'Home Fixture Page', Cms::Page.root.label

data/test/integration/render_cms_test.rb

@@ -5,9 +5,10 @@ class RenderCmsIntergrationTest < ActionDispatch::IntegrationTest
   def setup
     super
     Rails.application.routes.draw do
-      get '/render-basic'   => 'render_test#render_basic'
-      get '/render-page'    => 'render_test#render_page'
-      get '/render-layout'  => 'render_test#render_layout'
+      get '/render-basic'           => 'render_test#render_basic'
+      get '/render-page'            => 'render_test#render_page'
+      get '/site-path/render-page'  => 'render_test#render_page'
+      get '/render-layout'          => 'render_test#render_layout'
     end
     cms_layouts(:default).update_columns(:content => '{{cms:page:content}}')
     cms_pages(:child).update_attributes(:blocks_attributes => [
@@ -117,6 +118,14 @@ class RenderCmsIntergrationTest < ActionDispatch::IntegrationTest
     assert_equal 'TestBlockContent', response.body
   end
   
+  def test_implicit_cms_page_with_site_path
+    cms_sites(:default).update_column(:path, 'site-path')
+    cms_pages(:child).update_attributes(:slug => 'render-page')
+    get '/site-path/render-page?type=page_implicit'
+    assert_response :success
+    assert_equal 'TestBlockContent', response.body
+  end
+  
   def test_explicit_cms_page
     page = cms_pages(:child)
     page.update_attributes(slug: 'test-page')

data/test/models/cms/page_test.rb

@@ -7,7 +7,7 @@ class CmsPageTest < ActiveSupport::TestCase
   def test_fixtures_validity
     Cms::Page.all.each do |page|
       assert page.valid?, page.errors.full_messages.to_s
-      assert_equal page.read_attribute(:content), page.content(true)
+      assert_equal page.content, page.render
     end
   end
   
@@ -195,13 +195,13 @@ class CmsPageTest < ActiveSupport::TestCase
   
   def test_content_caching
     page = cms_pages(:default)
-    assert_equal page.read_attribute(:content), page.content
-    assert_equal page.read_attribute(:content), page.content(true)
+    assert_equal page.content, page.render
     
-    page.update_attributes(:content => 'changed')
-    assert_equal page.read_attribute(:content), page.content
-    assert_equal page.read_attribute(:content), page.content(true)
-    assert_not_equal 'changed', page.read_attribute(:content)
+    page.update_columns(:content => 'Old Content')
+    refute_equal page.content, page.render
+    
+    page.clear_cached_content!
+    assert_equal page.content, page.render
   end
   
   def test_scope_published
@@ -218,15 +218,15 @@ class CmsPageTest < ActiveSupport::TestCase
   def test_url
     site = cms_sites(:default)
     
-    assert_equal 'http://test.host/', cms_pages(:default).url
-    assert_equal 'http://test.host/child-page', cms_pages(:child).url
+    assert_equal '//test.host/', cms_pages(:default).url
+    assert_equal '//test.host/child-page', cms_pages(:child).url
     
     site.update_columns(:path => '/en/site')
     cms_pages(:default).reload
     cms_pages(:child).reload
     
-    assert_equal 'http://test.host/en/site/', cms_pages(:default).url
-    assert_equal 'http://test.host/en/site/child-page', cms_pages(:child).url
+    assert_equal '//test.host/en/site/', cms_pages(:default).url
+    assert_equal '//test.host/en/site/child-page', cms_pages(:child).url
   end
 
   def test_unicode_slug_escaping

data/test/models/fixtures/pages_test.rb

@@ -106,8 +106,7 @@ class FixturePagesTest < ActiveSupport::TestCase
     block = page.blocks.where(:identifier => 'content').first
     assert_equal "Home Page Fixture Contént\n{{ cms:snippet:default }}", block.content
     
-    block = page.blocks.where(:identifier => 'to_delete').first
-    assert_equal nil, block.content
+    assert !page.blocks.where(:identifier => 'to_delete').first
   end
   
   def test_export

data/test/models/tag_test.rb

@@ -78,7 +78,7 @@ class TagTest < ActiveSupport::TestCase
       layout_content_b
       default_snippet_content
       layout_content_c'
-    ), page.content(true)
+    ), page.render
     
     assert_equal 4, page.tags.size
     assert_equal 'field_text_default_field_text', page.tags[0].id
@@ -107,7 +107,7 @@ class TagTest < ActiveSupport::TestCase
       layout_content_b
       default_snippet_content
       layout_content_c'
-    ), page.content
+    ), page.render
     
     assert_equal 3, page.tags.size
     assert_equal 'field_text_default_field_text', page.tags[0].id
@@ -140,7 +140,7 @@ class TagTest < ActiveSupport::TestCase
       layout_content_b
       default_snippet_content
       layout_content_c'
-    ), page.content
+    ), page.render
     
     assert_equal 4, page.tags.size
     assert_equal 'field_text_default_field_text', page.tags[0].id
@@ -167,7 +167,7 @@ class TagTest < ActiveSupport::TestCase
       default_page_text_content_a
       default_snippet_content
       default_page_text_content_b'
-    ), page.content(true)
+    ), page.render
     
     assert_equal 6, page.tags.size
     assert_equal 'field_text_default_field_text', page.tags[0].id
@@ -193,7 +193,7 @@ class TagTest < ActiveSupport::TestCase
       layout_content_b
       infinite  loop
       layout_content_c'
-    ), page.content(true)
+    ), page.render
     assert_equal 6, page.tags.size
   end
   
@@ -265,10 +265,11 @@ class TagTest < ActiveSupport::TestCase
         { :identifier => 'content',
           :content    => 'text {{ cms:snippet:irb-snippet }} {{ cms:partial:path/to }} {{ cms:helper:method }} text' },
         { :identifier => 'snippet',
-          :content    => snippet.id }
+          :content    => snippet.id.to_s }
       ]
     )
-    assert_equal "<% 1 + 1 %> text <% 2 + 2 %> snippet <%= 2 + 2 %> <%= render :partial => 'path/to' %> <%= method() %> text <%= render :partial => 'partials/cms/snippets', :locals => {:model => 'Cms::Snippet', :identifier => '#{snippet.id}'} %> <%= 1 + 1 %>", page.content
+    
+    assert_equal "<% 1 + 1 %> text <% 2 + 2 %> snippet <%= 2 + 2 %> <%= render :partial => 'path/to' %> <%= method() %> text <%= render :partial => 'partials/cms/snippets', :locals => {:model => 'Cms::Snippet', :identifier => '#{snippet.id}'} %> <%= 1 + 1 %>", page.render
   end
   
   def test_escaping_of_parameters

data/test/test_helper.rb

@@ -17,6 +17,7 @@ class ActiveSupport::TestCase
   
   def setup
     reset_config
+    stub_paperclip
   end
   
   # resetting default configuration
@@ -87,6 +88,12 @@ class ActiveSupport::TestCase
     string.gsub(/^[ ]+/, '')
   end
   
+  def stub_paperclip
+    Cms::Block.any_instance.stubs(:save_attached_files).returns(true)
+    Cms::Block.any_instance.stubs(:delete_attached_files).returns(true)
+    Paperclip::Attachment.any_instance.stubs(:post_process).returns(true)
+  end
+  
 end
 
 class ActionController::TestCase
@@ -100,6 +107,7 @@ class ActionDispatch::IntegrationTest
   def setup
     host! 'test.host'
     reset_config
+    stub_paperclip
   end
   
   # Attaching http_auth stuff with request. Example use:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.9.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -234,6 +234,7 @@ files:
 - app/models/cms/revision.rb
 - app/models/cms/site.rb
 - app/models/cms/snippet.rb
+- app/models/concerns/cms/base.rb
 - app/views/cms_admin/categories/_categories.html.haml
 - app/views/cms_admin/categories/_edit.html.haml
 - app/views/cms_admin/categories/_form.html.haml
@@ -264,6 +265,35 @@ files:
 - app/views/cms_admin/pages/index.html.haml
 - app/views/cms_admin/pages/new.html.haml
 - app/views/cms_admin/pages/toggle_branch.js.erb
+- app/views/cms_admin/partials/_body_before.html.haml
+- app/views/cms_admin/partials/_file_form_after.html.haml
+- app/views/cms_admin/partials/_file_form_before.html.haml
+- app/views/cms_admin/partials/_files_after.html.haml
+- app/views/cms_admin/partials/_files_before.html.haml
+- app/views/cms_admin/partials/_html_footer.html.haml
+- app/views/cms_admin/partials/_html_head.html.haml
+- app/views/cms_admin/partials/_layout_form_after.html.haml
+- app/views/cms_admin/partials/_layout_form_before.html.haml
+- app/views/cms_admin/partials/_layouts_after.html.haml
+- app/views/cms_admin/partials/_layouts_before.html.haml
+- app/views/cms_admin/partials/_navigation_after.html.haml
+- app/views/cms_admin/partials/_navigation_before.html.haml
+- app/views/cms_admin/partials/_navigation_inner.html.haml
+- app/views/cms_admin/partials/_page_form_after.html.haml
+- app/views/cms_admin/partials/_page_form_before.html.haml
+- app/views/cms_admin/partials/_page_form_inner.html.haml
+- app/views/cms_admin/partials/_pages_after.html.haml
+- app/views/cms_admin/partials/_pages_before.html.haml
+- app/views/cms_admin/partials/_right_column_after.html.haml
+- app/views/cms_admin/partials/_right_column_before.html.haml
+- app/views/cms_admin/partials/_site_form_after.html.haml
+- app/views/cms_admin/partials/_site_form_before.html.haml
+- app/views/cms_admin/partials/_sites_after.html.haml
+- app/views/cms_admin/partials/_sites_before.html.haml
+- app/views/cms_admin/partials/_snippet_form_after.html.haml
+- app/views/cms_admin/partials/_snippet_form_before.html.haml
+- app/views/cms_admin/partials/_snippets_after.html.haml
+- app/views/cms_admin/partials/_snippets_before.html.haml
 - app/views/cms_admin/revisions/show.html.haml
 - app/views/cms_admin/sites/_form.html.haml
 - app/views/cms_admin/sites/_mirrors.html.haml
@@ -458,7 +488,8 @@ files:
 - test/models/view_methods_test.rb
 - test/test_helper.rb
 homepage: http://github.com/comfy/comfortable-mexican-sofa
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths: