comfortable_mexican_sofa 1.4.22 → 1.5.0

data/.travis.yml

@@ -6,8 +6,8 @@ rvm:
   - ree
   # - jruby
 gemfile:
-  - gemfiles/Gemfile.rails-3.0.x
-  - gemfiles/Gemfile.rails-3.1.x
+  - test/gemfiles/Gemfile.rails-3.0.x
+  - test/gemfiles/Gemfile.rails-3.1.x
 notifications:
   recipients:
     - oleg@twg.ca

data/Gemfile

@@ -1,14 +1,10 @@
 source 'http://rubygems.org'
 
 gem 'rails',          '>=3.0.0'
-gem 'active_link_to', '>=1.0.0'
-gem 'paperclip',      '>=2.3.14'
-
-group :development do
-  # gem 'sqlite3'
-end
+gem 'active_link_to', '~>1.0.0'
+gem 'paperclip',      '~>2.4.2'
 
 group :test do
   gem 'sqlite3'
-  gem 'jeweler', '>=1.4.0'
+  gem 'jeweler'
 end

data/VERSION

@@ -1 +1 @@
-1.4.22
+1.5.0

data/app/assets/stylesheets/comfortable_mexican_sofa/form.css

@@ -67,6 +67,46 @@
 #cms_body #form_blocks .no_tags code {
   color: #B85042;
 }
+#cms_body #form_blocks .files {
+  overflow: hidden;
+  margin-top: 5px;
+  background-color: #252525;
+  padding: 5px 5px 0px 10px;
+  border-radius: 5px;
+  color: #fff;
+  min-height: 20px;
+}
+#cms_body #form_blocks .files .file {
+  float: left;
+  overflow: hidden;
+  background-color: #484848;
+  border-radius: 3px;
+  color: #fff;
+  height: 9px;
+  padding: 3px 5px;
+  margin: 0px 5px 5px 0px;
+}
+#cms_body #form_blocks .files .file a {
+  float: left;
+  color: #a3a3a3;
+  font: 9px/9px Arial, serif;
+  text-transform: uppercase;
+}
+#cms_body #form_blocks .files .file a:hover {
+  color: #fff;
+}
+#cms_body #form_blocks .files .file a.delete {
+  float: right;
+  margin-left: 5px;
+  background-color: #b7b7b7;
+  color: #000;
+  font: bold 7px/7px Arial, sans-serif;
+  padding: 1px 3px;
+  border-radius: 4px;
+}
+#cms_body #form_blocks .files .file a.delete:hover {
+  background-color: #fff;
+}
 #cms_body .form_element.field_date_time .label,
 #cms_body .form_element.field_integer .label,
 #cms_body .form_element.field_string .label,
@@ -77,7 +117,10 @@
 #cms_body .form_element.page_integer .label,
 #cms_body .form_element.page_string .label,
 #cms_body .form_element.page_text .label,
-#cms_body .form_element.page_rich_text .label {
+#cms_body .form_element.page_rich_text .label,
+#cms_body .form_element.collection .label,
+#cms_body .form_element.page_file .label,
+#cms_body .form_element.page_files .label {
   border-color: #3F7300;
 }
 #cms_body .form_error {

data/app/controllers/cms_admin/files_controller.rb

@@ -6,7 +6,7 @@ class CmsAdmin::FilesController < CmsAdmin::BaseController
   
   def index
     return redirect_to :action => :new if @site.files.count == 0
-    @files = @site.files.for_category(params[:category]).all(:order => 'cms_files.label')
+    @files = @site.files.includes(:categories).for_category(params[:category]).all(:order => 'cms_files.label')
   end
   
   def new
@@ -73,6 +73,15 @@ class CmsAdmin::FilesController < CmsAdmin::BaseController
     end
   end
   
+  def reorder
+    (params[:cms_file] || []).each_with_index do |id, index|
+      if (cms_file = Cms::File.find_by_id(id))
+        cms_file.update_attribute(:position, index)
+      end
+    end
+    render :nothing => true
+  end
+  
 protected
   
   def load_file

data/app/controllers/cms_admin/layouts_controller.rb

@@ -39,6 +39,15 @@ class CmsAdmin::LayoutsController < CmsAdmin::BaseController
     flash[:notice] = I18n.t('cms.layouts.deleted')
     redirect_to :action => :index
   end
+  
+  def reorder
+    (params[:cms_layout] || []).each_with_index do |id, index|
+      if (cms_layout = Cms::Layout.find_by_id(id))
+        cms_layout.update_attribute(:position, index)
+      end
+    end
+    render :nothing => true
+  end
 
 protected
 

data/app/controllers/cms_admin/pages_controller.rb

@@ -9,7 +9,7 @@ class CmsAdmin::PagesController < CmsAdmin::BaseController
   def index
     return redirect_to :action => :new if @site.pages.count == 0
     if params[:category].present?
-      @pages = @site.pages.for_category(params[:category]).all(:order => 'label')
+      @pages = @site.pages.includes(:categories).for_category(params[:category]).all(:order => 'label')
     else
       @pages = [@site.pages.root].compact
     end

data/app/controllers/cms_admin/snippets_controller.rb

@@ -5,7 +5,7 @@ class CmsAdmin::SnippetsController < CmsAdmin::BaseController
 
   def index
     return redirect_to :action => :new if @site.snippets.count == 0
-    @snippets = @site.snippets.for_category(params[:category]).all(:order => 'label')
+    @snippets = @site.snippets.includes(:categories).for_category(params[:category])
   end
 
   def new
@@ -39,6 +39,15 @@ class CmsAdmin::SnippetsController < CmsAdmin::BaseController
     flash[:notice] = I18n.t('cms.snippets.deleted')
     redirect_to :action => :index
   end
+  
+  def reorder
+    (params[:cms_snippet] || []).each_with_index do |id, index|
+      if (cms_snippet = Cms::Snippet.find_by_id(id))
+        cms_snippet.update_attribute(:position, index)
+      end
+    end
+    render :nothing => true
+  end
 
 protected
 

data/app/models/cms/block.rb

@@ -6,10 +6,39 @@ class Cms::Block < ActiveRecord::Base
   
   # -- Relationships --------------------------------------------------------
   belongs_to :page
+  has_many :files,
+    :autosave   => true,
+    :dependent  => :destroy
+  
+  # -- Callbacks ------------------------------------------------------------
+  before_save :prepare_files
   
   # -- Validations ----------------------------------------------------------
   validates :label,
     :presence   => true,
     :uniqueness => { :scope => :page_id }
+    
+  # -- Instance Methods -----------------------------------------------------
+  # Tag object that is using this block
+  def tag
+    page.tags(true).detect{|t| t.is_cms_block? && t.label == label}
+  end
+    
+protected
   
+  def prepare_files
+    temp_files = [self.content].flatten.select do |f|
+      %w(ActionDispatch::Http::UploadedFile Rack::Test::UploadedFile).member?(f.class.name)
+    end
+    
+    # only accepting one file if it's PageFile. PageFiles will take all
+    single_file = self.tag.is_a?(ComfortableMexicanSofa::Tag::PageFile)
+    temp_files = [temp_files.first].compact if single_file
+    
+    temp_files.each do |file|
+      self.files.collect{|f| f.mark_for_destruction } if single_file
+      self.files.build(:site => self.page.site, :file => file)
+    end
+    self.content = nil unless self.content.is_a?(String)
+  end
 end

data/app/models/cms/file.rb

@@ -6,26 +6,23 @@ class Cms::File < ActiveRecord::Base
   
   cms_is_categorized
   
-  attr_accessor :layout_id,
-                :page_id,
-                :snippet_id
-  
   # -- AR Extensions --------------------------------------------------------
   has_attached_file :file, ComfortableMexicanSofa.config.upload_file_options
   
   # -- Relationships --------------------------------------------------------
   belongs_to :site
+  belongs_to :block
   
   # -- Validations ----------------------------------------------------------
   validates :site_id, :presence => true
   validates_attachment_presence :file
   
-  validates_uniqueness_of :file_file_name,
-    :scope => :site_id
-  
   # -- Callbacks ------------------------------------------------------------
-  before_save :assign_label,
-              :categorize_file
+  before_save :assign_label
+  before_create :assign_position
+  
+  # -- Scopes ---------------------------------------------------------------
+  default_scope order(:position)
   
 protected
   
@@ -33,16 +30,9 @@ protected
     self.label = self.label.blank?? self.file_file_name.gsub(/\.[^\.]*?$/, '').titleize : self.label
   end
   
-  def categorize_file
-    return unless ComfortableMexicanSofa.config.auto_file_categorization
-    category = if layout_id && layout = site.layouts.find_by_id(layout_id)
-      Cms::Category.find_or_create_by_label_and_categorized_type("[layout] #{layout.slug}", 'Cms::File')
-    elsif page_id && page = site.pages.find_by_id(page_id)
-      Cms::Category.find_or_create_by_label_and_categorized_type("[page] #{page.full_path}", 'Cms::File')
-    elsif snippet_id && snippet = site.snippets.find_by_id(snippet_id)
-      Cms::Category.find_or_create_by_label_and_categorized_type("[snippet] #{snippet.slug}", 'Cms::File')
-    end
-    self.category_ids = { category.id => 1 } if category
+  def assign_position
+    max = Cms::File.maximum(:position)
+    self.position = max ? max + 1 : 0
   end
   
 end

data/app/models/cms/layout.rb

@@ -14,6 +14,7 @@ class Cms::Layout < ActiveRecord::Base
   
   # -- Callbacks ------------------------------------------------------------
   before_validation :assign_label
+  before_create :assign_position
   after_save    :clear_cached_page_content
   after_destroy :clear_cached_page_content
   
@@ -27,6 +28,9 @@ class Cms::Layout < ActiveRecord::Base
     :uniqueness => { :scope => :site_id },
     :format     => { :with => /^\w[a-z0-9_-]*$/i }
     
+  # -- Scopes ---------------------------------------------------------------
+  default_scope order(:position)
+  
   # -- Class Methods --------------------------------------------------------
   # Tree-like structure for layouts
   def self.options_for_select(site, layout = nil, current_layout = nil, depth = 0, spacer = '. . ')
@@ -72,6 +76,11 @@ protected
     self.label = self.label.blank?? self.slug.try(:titleize) : self.label
   end
   
+  def assign_position
+    max = self.site.layouts.where(:parent_id => self.parent_id).maximum(:position)
+    self.position = max ? max + 1 : 0
+  end
+  
   # Forcing page content reload
   def clear_cached_page_content
     self.pages.each{ |page| page.save! }

data/app/models/cms/page.rb

@@ -25,8 +25,7 @@ class Cms::Page < ActiveRecord::Base
   before_validation :assigns_label,
                     :assign_parent,
                     :assign_full_path
-  before_validation :assign_position,
-                    :on => :create
+  before_create :assign_position
   before_save :set_cached_content
   after_save  :sync_child_pages
   
@@ -85,6 +84,7 @@ class Cms::Page < ActiveRecord::Base
   #     { :label => 'block_2', :content => 'block content' }
   #   ]
   def blocks_attributes=(block_hashes = [])
+    block_hashes = block_hashes.values if block_hashes.is_a?(Hash)
     block_hashes.each do |block_hash|
       block_hash.symbolize_keys! unless block_hash.is_a?(HashWithIndifferentAccess)
       block = self.blocks.detect{|b| b.label == block_hash[:label]} || self.blocks.build(:label => block_hash[:label])
@@ -96,8 +96,7 @@ 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 = read_attribute(:content)
-    @content = nil if force_reload
+    @content = force_reload ? nil : read_attribute(:content)
     @content ||= begin
       self.tags = [] # resetting
       if layout

data/app/models/cms/snippet.rb

@@ -13,6 +13,7 @@ class Cms::Snippet < ActiveRecord::Base
   
   # -- Callbacks ------------------------------------------------------------
   before_validation :assign_label
+  before_create :assign_position
   after_save    :clear_cached_page_content
   after_destroy :clear_cached_page_content
   
@@ -25,6 +26,9 @@ class Cms::Snippet < ActiveRecord::Base
     :presence   => true,
     :uniqueness => { :scope => :site_id },
     :format     => { :with => /^\w[a-z0-9_-]*$/i }
+    
+  # -- Scopes ---------------------------------------------------------------
+  default_scope order(:position)
   
 protected
   
@@ -39,4 +43,9 @@ protected
     site.pages.all.each{ |page| page.save }
   end
   
+  def assign_position
+    max = self.site.snippets.maximum(:position)
+    self.position = max ? max + 1 : 0
+  end
+  
 end

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

@@ -1,4 +1,4 @@
-<div class='file' id='<%= dom_id(file) %>'>
+<div class='file <%= dom_id(file) %>'>
   <%  file_name = file.file_file_name 
       file_ext  = file.file_file_name.split('.').last
       if (file_name.size - file_ext.size) > 30

data/app/views/cms_admin/files/_index.html.erb

@@ -1,17 +1,6 @@
 <div id='file_uploads' class='box'>
   
-  <%
-    key, id = if @layout && !@layout.new_record?
-      [:layout_id, @layout.id]
-    elsif @page && !@page.new_record?
-      [:page_id, @page.id]
-    elsif @snippet && !@snippet.new_record?
-      [:snippet_id, @snippet.id]
-    end
-    url_param = key.present?? "?file[#{key}]=#{id}" : ''
-  %>
-  
-  <%= form_for :file, :url => cms_admin_site_files_path(@site) + url_param, :html => {:multipart => true} do |form| %>
+  <%= form_for :file, :url => cms_admin_site_files_path(@site), :html => {:multipart => true} do |form| %>
     <a id='uploader_button' href='#' class='big button'><%= t('.button') %></a>
     <%= form.file_field :file, :multiple => true %>
   <% end %>

data/app/views/cms_admin/files/_page_form.html.erb

@@ -0,0 +1,12 @@
+<% block ||= page_form %>
+
+<% if (files = block.files).present? %>
+  <div class='files'>
+    <% files.each do |file| %>
+      <div class='file <%= dom_id(file) %>'>
+        <%= link_to file.file_file_name, file.file.url, :target => '_blank' %>
+        <%= link_to 'x', cms_admin_site_file_path(@site, file), :method => :delete, :remote => true, :confirm => t('.are_you_sure'), :class => 'delete' %>
+      </div>
+    <% end %>
+  </div>
+<% end %>

data/app/views/cms_admin/files/destroy.js.erb

@@ -1,3 +1,3 @@
-$(".file#<%= dom_id(@file) %>").fadeOut('slow', function(){
+$(".file.<%= dom_id(@file) %>").fadeOut('slow', function(){
   $(this).remove()
 })

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

@@ -3,11 +3,15 @@
 
 <%= render :partial => 'cms_admin/categories/index', :object => 'Cms::File' %>
 
-<ul class='list'>
+<ul class='list sortable'>
   <% @files.each do |file| %>
     <li id='<%= dom_id(file) %>'>
       <div class='item'>
-        <div class='icon'></div>
+        <div class='icon'>
+          <% if !params[:category].present? %>
+            <div class='dragger'><span><%= t('cms.views.pages.drag') %></span></div>
+          <% end %>
+        </div>
         <div class='action_links'>
           <%= link_to t('.edit'), edit_cms_admin_site_file_path(@site, file) %>
           <%= link_to t('.delete'), cms_admin_site_file_path(@site, file), :method => :delete, :confirm => t('.are_you_sure') %>

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

@@ -2,7 +2,11 @@
 
 <li id='cms_layout_<%= layout.id %>'>
   <div class='item'>
-    <div class='icon'></div>
+    <div class='icon'>
+      <% if !params[:category].present? %>
+        <div class='dragger'><span><%= t('cms.views.pages.drag') %></span></div>
+      <% end %>
+    </div>
     <div class='action_links'>
       <%= link_to t('.add_child_layout'), new_cms_admin_site_layout_path(@site, :parent_id => layout.id) %>
       <%= link_to t('.edit'), edit_cms_admin_site_layout_path(@site, layout) %>

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

@@ -5,6 +5,6 @@
   <%= render :partial => 'cms_admin/sites/mirrors' %>
 <% end %>
 
-<ul class='list'>
+<ul class='list sortable'>
   <%= render :partial => 'index_branch', :collection => @layouts %>
 </ul>

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

@@ -8,8 +8,8 @@
     </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)%>
+      <% block_tags.each_with_index do |tag, index| %>
+        <%= cms_blocks.send(tag.class.to_s.demodulize.underscore, tag, index) rescue nil %>
       <% end %>
     <% end %>
   <% end %>