comfortable_mexican_sofa 1.9.3 → 1.10.0

data/.travis.yml

@@ -1,18 +1,14 @@
 language: ruby
-before_install:
-  - gem update --system
-  - gem --version
 before_script:
   - rake db:migrate
+script:
+  - rake test:all
 rvm:
   - 1.9.3
   - 2.0.0
   - jruby-19mode
 gemfile:
   - test/gemfiles/Gemfile.rails.4.0
-notifications:
-  recipients:
-    - oleg@khabarov.ca
 branches:
   only:
     - master

data/README.md

@@ -19,7 +19,7 @@ Installation
 Add gem definition to your Gemfile:
     
 ```ruby
-gem 'comfortable_mexican_sofa', '~> 1.9.0'
+gem 'comfortable_mexican_sofa', '~> 1.10.0'
 ``` 
 
 Then from the Rails project's root run:
@@ -31,7 +31,7 @@ Then from the Rails project's root run:
 Now take a look inside your `config/routes.rb` file. You'll see where routes attach for the admin area and content serving. Make sure that content serving route appears as a very last item.
 
 ```ruby
-ComfortableMexicanSofa::Routing.admin   :path => '/cms-admin'
+ComfortableMexicanSofa::Routing.admin   :path => '/admin'
 ComfortableMexicanSofa::Routing.content :path => '/', :sitemap => false
 ```
 

data/Rakefile

@@ -1,3 +1,24 @@
-require File.expand_path('../config/application', __FILE__)
+require_relative 'config/application'
 
-ComfortableMexicanSofa::Application.load_tasks
+ComfortableMexicanSofa::Application.load_tasks
+
+namespace :test do
+  
+  Rake::TestTask.new(:lib) do |t|
+    t.libs << 'test'
+    t.pattern = 'test/lib/**/*_test.rb'
+    t.verbose = true
+  end
+  
+  Rake::TestTask.new(:generators) do |t|
+    t.libs << 'test'
+    t.pattern = 'test/generators/**/*_test.rb'
+    t.verbose = true
+  end
+  
+end
+
+Rake::Task[:test].enhance do
+  Rake::Task['test:lib'].invoke
+  Rake::Task['test:generators'].invoke
+end

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

@@ -1,8 +1,14 @@
 #= require jquery
 #= require jquery_ujs
 #= require jquery.ui.all
+#= require codemirror
+#= require codemirror/modes/css
+#= require codemirror/modes/htmlmixed
+#= require codemirror/modes/javascript
+#= require codemirror/modes/markdown
+#= require codemirror/modes/xml
+#= require codemirror/addons/edit/closetag
 #= require comfortable_mexican_sofa/lib/bootstrap
-#= require comfortable_mexican_sofa/lib/codemirror
 #= require comfortable_mexican_sofa/lib/wysihtml5
 #= require comfortable_mexican_sofa/lib/bootstrap-wysihtml5
 #= require comfortable_mexican_sofa/lib/bootstrap-datetimepicker

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

@@ -1,6 +1,6 @@
 //= require jquery.ui.all
+//= require codemirror
 //= require comfortable_mexican_sofa/lib/bootstrap
-//= require comfortable_mexican_sofa/lib/codemirror
 //= require comfortable_mexican_sofa/lib/bootstrap-wysihtml5
 //= require comfortable_mexican_sofa/lib/bootstrap-datetimepicker
 //= require comfortable_mexican_sofa/bootstrap_overrides

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

@@ -170,11 +170,14 @@ body#comfy
     
   .cms-partial
     background-color: #252525
-    color: #ccc
-    outline: 1px dotted #666
+    color: #fff
+    outline: 1px dotted #444
     font-size: 9px
-    padding: 0 5px
-    margin: 2px
+    line-height: 11px
+    padding: 5px
+    margin: 3px
+    background-image: linear-gradient(-45deg, rgba(255, 255, 255, .05) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .05) 50%, rgba(255, 255, 255, .05) 75%, transparent 75%, transparent)
+    background-size: 50px 50px
   
   // -- Sofa Version --------------------------------------------------------
   .center-column .body-footer

data/app/controllers/{cms_admin → admin/cms}/base_controller.rb

@@ -1,4 +1,4 @@
-class CmsAdmin::BaseController < ComfortableMexicanSofa.config.base_controller.to_s.constantize
+class Admin::Cms::BaseController < ComfortableMexicanSofa.config.base_controller.to_s.constantize
 
   protect_from_forgery
 
@@ -11,7 +11,7 @@ class CmsAdmin::BaseController < ComfortableMexicanSofa.config.base_controller.t
                 :load_fixtures,
                 :except => :jump
   
-  layout 'cms_admin'
+  layout 'admin/cms'
   
   if ComfortableMexicanSofa.config.admin_cache_sweeper.present?
     cache_sweeper *ComfortableMexicanSofa.config.admin_cache_sweeper
@@ -21,18 +21,18 @@ class CmsAdmin::BaseController < ComfortableMexicanSofa.config.base_controller.t
     path = ComfortableMexicanSofa.config.admin_route_redirect
     return redirect_to(path) unless path.blank?
     load_admin_site
-    redirect_to cms_admin_site_pages_path(@site) if @site
+    redirect_to admin_cms_site_pages_path(@site) if @site
   end
   
 protected
   
   def load_admin_site
-    if @site = Cms::Site.find_by_id(params[:site_id] || session[:site_id]) || Cms::Site.first
+    if @site = ::Cms::Site.find_by_id(params[:site_id] || session[:site_id]) || ::Cms::Site.first
       session[:site_id] = @site.id
     else
       I18n.locale = ComfortableMexicanSofa.config.admin_locale || I18n.default_locale
       flash[:error] = I18n.t('cms.base.site_not_found')
-      return redirect_to(new_cms_admin_site_path)
+      return redirect_to(new_admin_cms_site_path)
     end
   end
 
@@ -43,7 +43,7 @@ protected
 
   def load_fixtures
     return unless ComfortableMexicanSofa.config.enable_fixtures
-    if %w(cms_admin/layouts cms_admin/pages cms_admin/snippets).member?(params[:controller])
+    if %w(admin/cms/layouts admin/cms/pages admin/cms/snippets).member?(params[:controller])
       ComfortableMexicanSofa::Fixture::Importer.new(@site.identifier).import!
       flash.now[:error] = I18n.t('cms.base.fixtures_enabled')
     end

data/app/controllers/{cms_admin → admin/cms}/categories_controller.rb

@@ -1,4 +1,4 @@
-class CmsAdmin::CategoriesController < CmsAdmin::BaseController
+class Admin::Cms::CategoriesController < Admin::Cms::BaseController
   
   before_action :load_category,  :only => [:edit, :update, :destroy]
   

data/app/controllers/{cms_admin → admin/cms}/files_controller.rb

@@ -1,4 +1,4 @@
-class CmsAdmin::FilesController < CmsAdmin::BaseController
+class Admin::Cms::FilesController < Admin::Cms::BaseController
   
   skip_before_action :load_fixtures
   
@@ -48,7 +48,7 @@ class CmsAdmin::FilesController < CmsAdmin::BaseController
     end
     
     if params[:ajax]
-      view = render_to_string(:partial => 'cms_admin/files/file', :collection => @files, :layout => false)
+      view = render_to_string(:partial => 'admin/cms/files/file', :collection => @files, :layout => false)
       render :json => {:filelink => @file.file.url, :filename => @file.file_file_name, :view => view.gsub("\n", '')}
     else
       flash[:success] = I18n.t('cms.files.created')
@@ -88,8 +88,8 @@ class CmsAdmin::FilesController < CmsAdmin::BaseController
   
   def reorder
     (params[:cms_file] || []).each_with_index do |id, index|
-      if (cms_file = Cms::File.find_by_id(id))
-        cms_file.update_attributes(:position => index)
+      if (cms_file = ::Cms::File.find_by_id(id))
+        cms_file.update_column(:position, index)
       end
     end
     render :nothing => true

data/app/controllers/{cms_admin → admin/cms}/layouts_controller.rb

@@ -1,4 +1,4 @@
-class CmsAdmin::LayoutsController < CmsAdmin::BaseController
+class Admin::Cms::LayoutsController < Admin::Cms::BaseController
 
   before_action :build_layout,  :only => [:new, :create]
   before_action :load_layout,   :only => [:edit, :update, :destroy]
@@ -44,7 +44,7 @@ class CmsAdmin::LayoutsController < CmsAdmin::BaseController
   
   def reorder
     (params[:cms_layout] || []).each_with_index do |id, index|
-      Cms::Layout.where(:id => id).update_all(:position => index)
+      ::Cms::Layout.where(:id => id).update_all(:position => index)
     end
     render :nothing => true
   end
@@ -53,7 +53,7 @@ protected
 
   def build_layout
     @layout = @site.layouts.new(layout_params)
-    @layout.parent      ||= Cms::Layout.find_by_id(params[:parent_id])
+    @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

data/app/controllers/{cms_admin → admin/cms}/pages_controller.rb

@@ -1,4 +1,4 @@
-class CmsAdmin::PagesController < CmsAdmin::BaseController
+class Admin::Cms::PagesController < Admin::Cms::BaseController
 
   before_action :check_for_layouts, :only => [:new, :edit]
   before_action :build_cms_page,    :only => [:new, :create]
@@ -67,7 +67,7 @@ class CmsAdmin::PagesController < CmsAdmin::BaseController
 
   def reorder
     (params[:cms_page] || []).each_with_index do |id, index|
-      Cms::Page.where(:id => id).update_all(:position => index)
+      ::Cms::Page.where(:id => id).update_all(:position => index)
     end
     render :nothing => true
   end
@@ -77,7 +77,7 @@ protected
   def check_for_layouts
     if @site.layouts.count == 0
       flash[:error] = I18n.t('cms.pages.layout_not_found')
-      redirect_to new_cms_admin_site_layout_path(@site)
+      redirect_to new_admin_cms_site_layout_path(@site)
     end
   end
 

data/app/controllers/{cms_admin → admin/cms}/revisions_controller.rb

@@ -1,4 +1,4 @@
-class CmsAdmin::RevisionsController < CmsAdmin::BaseController
+class Admin::Cms::RevisionsController < Admin::Cms::BaseController
   
   before_action :load_record
   before_action :load_revision, :except => :index
@@ -28,15 +28,15 @@ protected
   
   def load_record
     @record = if params[:layout_id]
-      Cms::Layout.find(params[:layout_id])
+      ::Cms::Layout.find(params[:layout_id])
     elsif params[:page_id]
-      Cms::Page.find(params[:page_id])
+      ::Cms::Page.find(params[:page_id])
     elsif params[:snippet_id]
-      Cms::Snippet.find(params[:snippet_id])
+      ::Cms::Snippet.find(params[:snippet_id])
     end
   rescue ActiveRecord::RecordNotFound
     flash[:error] = I18n.t('cms.revisions.record_not_found')
-    redirect_to cms_admin_path
+    redirect_to admin_cms_path
   end
   
   def load_revision
@@ -48,9 +48,9 @@ protected
   
   def redirect_to_record
     redirect_to case @record
-      when Cms::Layout  then edit_cms_admin_site_layout_path(@site, @record)
-      when Cms::Page    then edit_cms_admin_site_page_path(@site, @record)
-      when Cms::Snippet then edit_cms_admin_site_snippet_path(@site, @record)
+      when ::Cms::Layout  then edit_admin_cms_site_layout_path(@site, @record)
+      when ::Cms::Page    then edit_admin_cms_site_page_path(@site, @record)
+      when ::Cms::Snippet then edit_admin_cms_site_snippet_path(@site, @record)
     end
   end
   

data/app/controllers/{cms_admin → admin/cms}/sites_controller.rb

@@ -1,4 +1,4 @@
-class CmsAdmin::SitesController < CmsAdmin::BaseController
+class Admin::Cms::SitesController < Admin::Cms::BaseController
 
   skip_before_action  :load_admin_site,
                       :load_fixtures
@@ -7,9 +7,9 @@ class CmsAdmin::SitesController < CmsAdmin::BaseController
   before_action :load_site,   :only => [:edit, :update, :destroy]
 
   def index
-    return redirect_to :action => :new if Cms::Site.count == 0
-    @site = Cms::Site.find_by_id(session[:site_id])
-    @sites ||= Cms::Site.all
+    return redirect_to :action => :new if ::Cms::Site.count == 0
+    @site = ::Cms::Site.find_by_id(session[:site_id])
+    @sites ||= ::Cms::Site.all
   end
 
   def new
@@ -23,7 +23,7 @@ class CmsAdmin::SitesController < CmsAdmin::BaseController
   def create
     @site.save!
     flash[:success] = I18n.t('cms.sites.created')
-    redirect_to cms_admin_site_layouts_path(@site)
+    redirect_to admin_cms_site_layouts_path(@site)
   rescue ActiveRecord::RecordInvalid
     logger.detailed_error($!)
     flash.now[:error] = I18n.t('cms.sites.creation_failure')
@@ -49,12 +49,12 @@ class CmsAdmin::SitesController < CmsAdmin::BaseController
 protected
 
   def build_site
-    @site = Cms::Site.new(site_params)
+    @site = ::Cms::Site.new(site_params)
     @site.hostname ||= request.host.downcase
   end
 
   def load_site
-    @site = Cms::Site.find(params[:id])
+    @site = ::Cms::Site.find(params[:id])
     I18n.locale = ComfortableMexicanSofa.config.admin_locale || @site.locale
   rescue ActiveRecord::RecordNotFound
     flash[:error] = I18n.t('cms.sites.not_found')

data/app/controllers/{cms_admin → admin/cms}/snippets_controller.rb

@@ -1,4 +1,4 @@
-class CmsAdmin::SnippetsController < CmsAdmin::BaseController
+class Admin::Cms::SnippetsController < Admin::Cms::BaseController
 
   before_action :build_snippet, :only => [:new, :create]
   before_action :load_snippet,  :only => [:edit, :update, :destroy]
@@ -44,7 +44,7 @@ class CmsAdmin::SnippetsController < CmsAdmin::BaseController
   
   def reorder
     (params[:cms_snippet] || []).each_with_index do |id, index|
-      Cms::Snippet.where(:id => id).update_all(:position => index)
+      ::Cms::Snippet.where(:id => id).update_all(:position => index)
     end
     render :nothing => true
   end

data/app/controllers/cms/base_controller.rb

@@ -0,0 +1,30 @@
+class Cms::BaseController < ApplicationController
+  
+  before_action :load_cms_site
+  
+protected
+
+  def load_cms_site
+    @cms_site ||= if params[:site_id]
+      ::Cms::Site.find_by_id(params[:site_id])
+    else
+      ::Cms::Site.find_site(request.host_with_port.downcase, request.fullpath)
+    end
+    
+    if @cms_site
+      if @cms_site.path.present?
+        if params[:cms_path] && params[:cms_path].match(/\A#{@cms_site.path}/)
+          params[:cms_path].gsub!(/\A#{@cms_site.path}/, '')
+          params[:cms_path] && params[:cms_path].gsub!(/\A\//, '')
+        else
+          raise ActionController::RoutingError.new('Site Not Found')
+        end
+      end
+      I18n.locale = @cms_site.locale
+    else
+      I18n.locale = I18n.default_locale
+      raise ActionController::RoutingError.new('Site Not Found')
+    end
+  end
+
+end

data/app/controllers/{cms_content_controller.rb → cms/content_controller.rb}

@@ -1,10 +1,9 @@
-class CmsContentController < ApplicationController
+class Cms::ContentController < Cms::BaseController
   
   # Authentication module must have #authenticate method
   include ComfortableMexicanSofa.config.public_auth.to_s.constantize
   
-  before_action :load_cms_site,
-                :load_fixtures
+  before_action :load_fixtures
   before_action :load_cms_page,
                 :authenticate,
                 :only => :render_html
@@ -39,25 +38,6 @@ protected
     ComfortableMexicanSofa::Fixture::Importer.new(@cms_site.identifier).import!
   end
   
-  def load_cms_site
-    @cms_site ||= if params[:site_id]
-      Cms::Site.find_by_id(params[:site_id])
-    else
-      Cms::Site.find_site(request.host_with_port.downcase, request.fullpath)
-    end
-    
-    if @cms_site
-      if params[:cms_path].present?
-        params[:cms_path].gsub!(/^#{@cms_site.path}/, '')
-        params[:cms_path].to_s.gsub!(/^\//, '')
-      end
-      I18n.locale = @cms_site.locale
-    else
-      I18n.locale = I18n.default_locale
-      raise ActionController::RoutingError.new('Site Not Found')
-    end
-  end
-  
   def load_cms_page
     @cms_page = @cms_site.pages.published.find_by_full_path!("/#{params[:cms_path]}")
     return redirect_to(@cms_page.target_page.url) if @cms_page.target_page

data/app/models/cms/file.rb

@@ -1,13 +1,12 @@
 class Cms::File < ActiveRecord::Base
   include Cms::Base
   
-  IMAGE_MIMETYPES = %w(gif jpeg pjpeg png svg+xml tiff).collect{|subtype| "image/#{subtype}"}
+  IMAGE_MIMETYPES = %w(gif jpeg pjpeg png tiff).collect{|subtype| "image/#{subtype}"}
   
   cms_is_categorized
   
   attr_accessor :dimensions
   
-  # -- AR Extensions --------------------------------------------------------
   has_attached_file :file, ComfortableMexicanSofa.config.upload_file_options.merge(
     # dimensions accessor needs to be set before file assignment for this to work
     :styles => lambda { |f|
@@ -57,7 +56,6 @@ protected
     self.position = max ? max + 1 : 0
   end
   
-  # FIX: Terrible, but no way of creating cached page content overwise
   def reload_page_cache
     return unless self.block
     p = self.block.page

data/app/models/cms/layout.rb

@@ -81,7 +81,7 @@ protected
   
   # Forcing page content reload
   def clear_cached_page_content
-    self.pages.each{ |page| page.clear_cached_content! }
+    Cms::Page.where(:id => self.pages.pluck(:id)).update_all(:content => nil)
     self.children.each{ |child_layout| child_layout.clear_cached_page_content }
   end
   

data/app/models/cms/snippet.rb

@@ -34,9 +34,7 @@ protected
   end
   
   def clear_cached_page_content
-    site.pages.each do |p|
-      Cms::Page.where(:id => p.id).update_all(:content => nil)
-    end
+    Cms::Page.where(:id => site.pages.pluck(:id)).update_all(:content => nil)
   end
   
   def assign_position