comfortable_mexican_sofa 1.8.5 → 1.9.0

data/.gitignore

@@ -13,4 +13,4 @@ Gemfile.lock
 .rvmrc
 .ruby-version
 /.sass-cache
-coverage/
+coverage/

data/.travis.yml

@@ -2,14 +2,14 @@ language: ruby
 before_install:
   - gem update --system
   - gem --version
+script:
+  - rake db:migrate
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - jruby-19mode
 gemfile:
-  - test/gemfiles/Gemfile.rails.3.1
-  - test/gemfiles/Gemfile.rails.3.2
+  - test/gemfiles/Gemfile.rails.4.0
 notifications:
   recipients:
     - oleg@khabarov.ca

data/README.md

@@ -1,11 +1,11 @@
-# ComfortableMexicanSofa (Rails 3 CMS Engine)
+# ComfortableMexicanSofa
 [![Gem Version](https://badge.fury.io/rb/comfortable_mexican_sofa.png)](http://rubygems.org/gems/comfortable_mexican_sofa) [![Build Status](https://travis-ci.org/comfy/comfortable-mexican-sofa.png?branch=master)](https://travis-ci.org/comfy/comfortable-mexican-sofa) [![Dependency Status](https://gemnasium.com/comfy/comfortable-mexican-sofa.png)](https://gemnasium.com/comfy/comfortable-mexican-sofa) [![Code Climate](https://codeclimate.com/github/comfy/comfortable-mexican-sofa.png)](https://codeclimate.com/github/comfy/comfortable-mexican-sofa) [![Coverage Status](https://coveralls.io/repos/comfy/comfortable-mexican-sofa/badge.png?branch=master)](https://coveralls.io/r/comfy/comfortable-mexican-sofa)
 
-ComfortableMexicanSofa is a powerful CMS Engine for your Rails 3 applications.
+ComfortableMexicanSofa is a powerful CMS Engine for your Rails 4 applications.
 
 Features
 --------
-* Simple integration with Rails 3 apps. Supports Rails 3.1, 3.2 running Ruby 1.9.2, 1.9.3 or 2.0.0
+* Simple integration with Rails 4 apps
 * Build your application in Rails, not in CMS
 * Powerful page templating capability using [Tags](https://github.com/comfy/comfortable-mexican-sofa/wiki/Tags)
 * [Multiple Sites](https://github.com/comfy/comfortable-mexican-sofa/wiki/Sites) from a single installation
@@ -14,21 +14,11 @@ Features
 * [Revision History](https://github.com/comfy/comfortable-mexican-sofa/wiki/Revisions)
 * [Great extendable admin interface](https://github.com/comfy/comfortable-mexican-sofa/wiki/Reusing-sofa%27s-admin-area) built with [Bootstrap](http://twitter.github.com/bootstrap/), [CodeMirror](http://codemirror.net/) and [WYSIHTML5](http://xing.github.com/wysihtml5/)
 
-Installation for Rails 4
-------------------------
-For Rails 4 apps feel free to use [2.0.0.beta1](https://github.com/comfy/comfortable-mexican-sofa/tree/1.9) release.
-
-    gem 'comfortable_mexican_sofa', '~> 2.0.0.beta1'
-    
-Or even better work with the latest 1.9 branch:
-
-    gem 'comfortable_mexican_sofa', :github => 'comfy/comfortable-mexican-sofa', :branch => '1.9'
-
 Installation
 ------------
 Add gem definition to your Gemfile:
     
-    gem 'comfortable_mexican_sofa'
+    gem 'comfortable_mexican_sofa', '~> 1.9.0'
     
 Then from the Rails project's root run:
     
@@ -44,6 +34,12 @@ ComfortableMexicanSofa::Routing.content :path => '/', :sitemap => false
 ```
 
 When upgrading from the older version please take a look at [Upgrading ComfortableMexicanSofa](https://github.com/comfy/comfortable-mexican-sofa/wiki/Upgrading-ComfortableMexicanSofa)
+
+Installation for Rails 3
+------------------------
+For Rails 3 apps feel free to use [1.8 release](https://github.com/comfy/comfortable-mexican-sofa/tree/1.8)
+    
+    gem 'comfortable_mexican_sofa', '~> 1.8.0'
     
 Quick Start Guide
 -----------------

data/Rakefile

@@ -1,5 +1,3 @@
 require File.expand_path('../config/application', __FILE__)
-require 'rubygems'
-require 'rake'
 
 ComfortableMexicanSofa::Application.load_tasks

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

@@ -150,8 +150,7 @@ window.CMS.uploader = ->
       raw_string  = d.body.innerHTML
       json_string = raw_string.match(/\{(.|\n)*\}/)[0]
       json = $.parseJSON(json_string)
-      files = $($('<div/>').html(json.view).text()).hide()
+      files = $('<div/>').html(json.view).hide()
       $('.uploaded-files').prepend(files)
       files.map ->
         $(this).fadeIn()
-  

data/app/controllers/cms_admin/base_controller.rb

@@ -5,7 +5,7 @@ class CmsAdmin::BaseController < ApplicationController
   # Authentication module must have #authenticate method
   include ComfortableMexicanSofa.config.admin_auth.to_s.constantize
 
-  before_filter :authenticate,
+  before_action :authenticate,
                 :load_admin_site,
                 :set_locale,
                 :load_fixtures,

data/app/controllers/cms_admin/categories_controller.rb

@@ -1,20 +1,20 @@
 class CmsAdmin::CategoriesController < CmsAdmin::BaseController
   
-  before_filter :load_category,  :only => [:edit, :update, :destroy]
+  before_action :load_category,  :only => [:edit, :update, :destroy]
   
   def edit
     render
   end
   
   def create
-    @category = @site.categories.create!(params[:category])
+    @category = @site.categories.create!(category_params)
   rescue ActiveRecord::RecordInvalid
     logger.detailed_error($!)
     render :nothing => true
   end
   
   def update
-    @category.update_attributes!(params[:category])
+    @category.update_attributes!(category_params)
   rescue ActiveRecord::RecordInvalid
     logger.detailed_error($!)
     render :nothing => true
@@ -32,4 +32,8 @@ protected
     render :nothing => true
   end
   
+  def category_params
+    params.fetch(:category, {}).permit!
+  end
+  
 end

data/app/controllers/cms_admin/files_controller.rb

@@ -1,25 +1,17 @@
 class CmsAdmin::FilesController < CmsAdmin::BaseController
   
-  skip_before_filter :load_fixtures
+  skip_before_action :load_fixtures
   
-  before_filter :build_file,  :only => [:new, :create]
-  before_filter :load_file,   :only => [:edit, :update, :destroy]
+  before_action :build_file,  :only => [:new, :create]
+  before_action :load_file,   :only => [:edit, :update, :destroy]
   
   def index
     @files = @site.files.includes(:categories).for_category(params[:category]).order('cms_files.position')
     
     if params[:ajax]
-      if params[:not_images]
-        files = @files.not_images.collect do |file|
-          { :label    => file.label,
-            :filename => file.file_file_name,
-            :url      => file.file.url }
-        end
-      else
-        files = @files.images.collect do |file|
-          { :thumb  => file.file.url(:cms_thumb),
-            :image  => file.file.url }
-        end
+      files = @files.images.collect do |file|
+        { :thumb => file.file.url(:cms_thumb),
+          :image => file.file.url }
       end
       render :json => files
     else
@@ -34,28 +26,22 @@ class CmsAdmin::FilesController < CmsAdmin::BaseController
   def create
     @files = []
     
-    # Sometimes params[:file] comes in as a single file object
-    unless params[:file].is_a?(Hash)
-      uploaded_file = params[:file]
-      params[:file] = { }
-      params[:file][:file] = [uploaded_file]
-    end
-    
-    file_array  = params[:file][:file] || [nil]
-    label       = params[:file][:label]
-        
-    file_array.each_with_index do |file, i|
-      file_params = params[:file].merge(:file => file)
-      if file_array.size > 1 && file_params[:label].present?
-        label = file_params[:label] + " #{i + 1}"
-      end
-      @file = @site.files.create!(file_params.merge(:label => label))
+    files = [file_params[:file]].flatten
+    files.each_with_index do |file, i|
+      label = (files.size > 1 && file_params[:label].present?) ? 
+        "#{file_params[:label]} #{i + 1}" :
+        file_params[:label]
+      @file = @site.files.create!(
+        :file         => file, 
+        :label        => label,
+        :description  => file_params[:description]
+      )
       @files << @file
     end
     
     if params[:ajax]
       view = render_to_string(:partial => 'cms_admin/files/file', :collection => @files, :layout => false)
-      render :json => {:filelink => @file.file.url, :filename => @file.file_file_name, :view => view.gsub("\n", '')}
+      render :json => {:filelink => @file.file.url, :view => view.gsub("\n", '')}
     else
       flash[:success] = I18n.t('cms.files.created')
       redirect_to :action => :edit, :id => @file
@@ -72,7 +58,7 @@ class CmsAdmin::FilesController < CmsAdmin::BaseController
   end
   
   def update
-    @file.update_attributes!(params[:file])
+    @file.update_attributes!(file_params)
     flash[:success] = I18n.t('cms.files.updated')
     redirect_to :action => :edit, :id => @file
   rescue ActiveRecord::RecordInvalid
@@ -113,4 +99,14 @@ protected
     flash[:error] = I18n.t('cms.files.not_found')
     redirect_to :action => :index
   end
+  
+  def file_params
+    # single file upload
+    unless (file = params[:file]).is_a?(Hash)
+      params[:file] = { }
+      params[:file][:file] = [file]
+    end
+    params.fetch(:file, {}).permit!
+  end
+  
 end

data/app/controllers/cms_admin/layouts_controller.rb

@@ -1,7 +1,7 @@
 class CmsAdmin::LayoutsController < CmsAdmin::BaseController
 
-  before_filter :build_layout,  :only => [:new, :create]
-  before_filter :load_layout,   :only => [:edit, :update, :destroy]
+  before_action :build_layout,  :only => [:new, :create]
+  before_action :load_layout,   :only => [:edit, :update, :destroy]
 
   def index
     return redirect_to :action => :new if @site.layouts.count == 0
@@ -27,7 +27,7 @@ class CmsAdmin::LayoutsController < CmsAdmin::BaseController
   end
 
   def update
-    @layout.update_attributes!(params[:layout])
+    @layout.update_attributes!(layout_params)
     flash[:success] = I18n.t('cms.layouts.updated')
     redirect_to :action => :edit, :id => @layout
   rescue ActiveRecord::RecordInvalid
@@ -52,9 +52,10 @@ class CmsAdmin::LayoutsController < CmsAdmin::BaseController
 protected
 
   def build_layout
-    @layout = @site.layouts.new(params[:layout])
-    @layout.parent  ||= Cms::Layout.find_by_id(params[:parent_id])
-    @layout.content ||= '{{ cms:page:content:text }}'
+    @layout = @site.layouts.new(layout_params)
+    @layout.parent      ||= Cms::Layout.find_by_id(params[:parent_id])
+    @layout.app_layout  ||= @layout.parent.try(:app_layout)
+    @layout.content     ||= '{{ cms:page:content:text }}'
   end
 
   def load_layout
@@ -63,5 +64,9 @@ protected
     flash[:error] = I18n.t('cms.layouts.not_found')
     redirect_to :action => :index
   end
-
+  
+  def layout_params
+    params.fetch(:layout, {}).permit!
+  end
+  
 end

data/app/controllers/cms_admin/pages_controller.rb

@@ -1,16 +1,16 @@
 class CmsAdmin::PagesController < CmsAdmin::BaseController
 
-  before_filter :check_for_layouts, :only => [:new, :edit]
-  before_filter :build_cms_page,    :only => [:new, :create]
-  before_filter :load_cms_page,     :only => [:edit, :update, :destroy]
-  before_filter :preview_cms_page,  :only => [:create, :update]
-  before_filter :build_file,        :only => [:new, :edit]
+  before_action :check_for_layouts, :only => [:new, :edit]
+  before_action :build_cms_page,    :only => [:new, :create]
+  before_action :load_cms_page,     :only => [:edit, :update, :destroy]
+  before_action :preview_cms_page,  :only => [:create, :update]
+  before_action :build_file,        :only => [:new, :edit]
 
   def index
     return redirect_to :action => :new if @site.pages.count == 0
-    @pages_by_parent = @site.pages.includes(:categories).all.group_by(&:parent_id)
+    @pages_by_parent = @site.pages.includes(:categories).group_by(&:parent_id)
     if params[:category].present?
-      @pages = @site.pages.includes(:categories).for_category(params[:category]).all(:order => 'label')
+      @pages = @site.pages.includes(:categories).for_category(params[:category]).order('label')
     else
       @pages = [@site.pages.root].compact
     end
@@ -56,7 +56,7 @@ class CmsAdmin::PagesController < CmsAdmin::BaseController
   end
 
   def toggle_branch
-    @pages_by_parent = @site.pages.includes(:categories).all.group_by(&:parent_id)
+    @pages_by_parent = @site.pages.includes(:categories).group_by(&:parent_id)
     @page = @site.pages.find(params[:id])
     s   = (session[:cms_page_tree] ||= [])
     id  = @page.id.to_s
@@ -82,7 +82,7 @@ protected
   end
 
   def build_cms_page
-    @page = @site.pages.new(params[:page])
+    @page = @site.pages.new(page_params)
     @page.parent ||= (@site.pages.find_by_id(params[:parent_id]) || @site.pages.root)
     @page.layout ||= (@page.parent && @page.parent.layout || @site.layouts.first)
   end
@@ -93,7 +93,7 @@ protected
 
   def load_cms_page
     @page = @site.pages.find(params[:id])
-    @page.attributes = params[:page]
+    @page.attributes = page_params
     @page.layout ||= (@page.parent && @page.parent.layout || @site.layouts.first)
   rescue ActiveRecord::RecordNotFound
     flash[:error] = I18n.t('cms.pages.not_found')
@@ -109,4 +109,8 @@ protected
       render :inline => @page.content(true), :layout => layout, :content_type => 'text/html'
     end
   end
+  
+  def page_params
+    params.fetch(:page, {}).permit!
+  end
 end

data/app/controllers/cms_admin/revisions_controller.rb

@@ -1,7 +1,7 @@
 class CmsAdmin::RevisionsController < CmsAdmin::BaseController
   
-  before_filter :load_record
-  before_filter :load_revision, :except => :index
+  before_action :load_record
+  before_action :load_revision, :except => :index
   
   def index
     redirect_to :action => :show, :id => @record.revisions.first.try(:id) || 0

data/app/controllers/cms_admin/sites_controller.rb

@@ -1,10 +1,10 @@
 class CmsAdmin::SitesController < CmsAdmin::BaseController
 
-  skip_before_filter  :load_admin_site,
+  skip_before_action  :load_admin_site,
                       :load_fixtures
 
-  before_filter :build_site,  :only => [:new, :create]
-  before_filter :load_site,   :only => [:edit, :update, :destroy]
+  before_action :build_site,  :only => [:new, :create]
+  before_action :load_site,   :only => [:edit, :update, :destroy]
 
   def index
     return redirect_to :action => :new if Cms::Site.count == 0
@@ -31,7 +31,7 @@ class CmsAdmin::SitesController < CmsAdmin::BaseController
   end
 
   def update
-    @site.update_attributes!(params[:site])
+    @site.update_attributes!(site_params)
     flash[:success] = I18n.t('cms.sites.updated')
     redirect_to :action => :edit, :id => @site
   rescue ActiveRecord::RecordInvalid
@@ -49,7 +49,7 @@ class CmsAdmin::SitesController < CmsAdmin::BaseController
 protected
 
   def build_site
-    @site = Cms::Site.new(params[:site])
+    @site = Cms::Site.new(site_params)
     @site.hostname ||= request.host.downcase
   end
 
@@ -60,5 +60,9 @@ protected
     flash[:error] = I18n.t('cms.sites.not_found')
     redirect_to :action => :index
   end
+  
+  def site_params
+    params.fetch(:site, {}).permit!
+  end
 
 end

data/app/controllers/cms_admin/snippets_controller.rb

@@ -1,7 +1,7 @@
 class CmsAdmin::SnippetsController < CmsAdmin::BaseController
 
-  before_filter :build_snippet, :only => [:new, :create]
-  before_filter :load_snippet,  :only => [:edit, :update, :destroy]
+  before_action :build_snippet, :only => [:new, :create]
+  before_action :load_snippet,  :only => [:edit, :update, :destroy]
 
   def index
     return redirect_to :action => :new if @site.snippets.count == 0
@@ -27,7 +27,7 @@ class CmsAdmin::SnippetsController < CmsAdmin::BaseController
   end
 
   def update
-    @snippet.update_attributes!(params[:snippet])
+    @snippet.update_attributes!(snippet_params)
     flash[:success] = I18n.t('cms.snippets.updated')
     redirect_to :action => :edit, :id => @snippet
   rescue ActiveRecord::RecordInvalid
@@ -52,7 +52,7 @@ class CmsAdmin::SnippetsController < CmsAdmin::BaseController
 protected
 
   def build_snippet
-    @snippet = @site.snippets.new(params[:snippet])
+    @snippet = @site.snippets.new(snippet_params)
   end
 
   def load_snippet
@@ -61,4 +61,8 @@ protected
     flash[:error] = I18n.t('cms.snippets.not_found')
     redirect_to :action => :index
   end
+  
+  def snippet_params
+    params.fetch(:snippet, {}).permit!
+  end
 end

data/app/controllers/cms_content_controller.rb

@@ -3,13 +3,13 @@ class CmsContentController < ApplicationController
   # Authentication module must have #authenticate method
   include ComfortableMexicanSofa.config.public_auth.to_s.constantize
   
-  before_filter :load_cms_site,
+  before_action :load_cms_site,
                 :load_fixtures
-  before_filter :load_cms_page,
+  before_action :load_cms_page,
                 :authenticate,
-    :only => :render_html
-  before_filter :load_cms_layout,
-    :only => [:render_css, :render_js]
+                :only => :render_html
+  before_action :load_cms_layout,
+                :only => [:render_css, :render_js]
   
   def render_html(status = 200)
     if @cms_layout = @cms_page.layout

data/app/models/cms/block.rb

@@ -4,9 +4,6 @@ class Cms::Block < ActiveRecord::Base
   
   self.table_name = 'cms_blocks'
   
-  attr_accessible :identifier,
-                  :content
-  
   # -- Relationships --------------------------------------------------------
   belongs_to :page
   has_many :files,