comfortable_mexican_sofa 1.12.4 → 1.12.5

data/app/assets/stylesheets/comfy/admin/cms/redactor_overrides.sass

@@ -0,0 +1,20 @@
+.redactor-box
+  margin-bottom: 0px
+
+#redactor-modal
+  header.ui-draggable-handle
+    padding: 20px
+
+  #redactor-modal-body
+    section
+      padding: 0 20px 20px 20px
+
+      #redactor-droparea-placeholder
+        input[type=file]
+          display: inline
+      #redactor-image-manager-box
+        img
+          border: 1px solid #ddd
+          margin: 0 5px 5px 0
+        img:hover
+          border-color: #fff

data/app/controllers/comfy/admin/cms/base_controller.rb

@@ -46,8 +46,9 @@ protected
 
   def load_fixtures
     return unless ComfortableMexicanSofa.config.enable_fixtures
-    controllers = %w(comfy/admin/cms/layouts comfy/admin/cms/pages comfy/admin/cms/snippets)
-    if controllers.member?(params[:controller])
+
+    controllers = %w(layouts pages snippets files).collect{|c| 'comfy/admin/cms/' + c}
+    if controllers.member?(params[:controller]) && params[:action] == 'index'
       ComfortableMexicanSofa::Fixture::Importer.new(@site.identifier).import!
       flash.now[:danger] = I18n.t('comfy.admin.cms.base.fixtures_enabled')
     end

data/app/controllers/comfy/admin/cms/files_controller.rb

@@ -1,17 +1,38 @@
 class Comfy::Admin::Cms::FilesController < Comfy::Admin::Cms::BaseController
 
-  skip_before_action :load_fixtures
+  include ActionView::Helpers::NumberHelper
 
   before_action :build_file,  :only => [:new, :create]
   before_action :load_file,   :only => [:edit, :update, :destroy]
   before_action :authorize
 
   def index
-    files_scope = @site.files.not_page_file
-      .includes(:categories)
-      .for_category(params[:category])
-      .order('comfy_cms_files.position')
-    @files = comfy_paginate(files_scope, 50)
+    case params[:source]
+    when 'redactor'
+      file_scope  = @site.files.limit(100).order('created_at DESC')
+      file_hashes = case params[:type]
+      when 'image'
+        file_scope.images.collect do |image|
+          { :thumb => image.file.url(:cms_thumb),
+            :image => image.file.url,
+            :title => image.label }
+        end
+      else
+        file_scope.collect do |file|
+          { :title  => file.label,
+            :name   => file.file_file_name,
+            :link   => file.file.url,
+            :size   => number_to_human_size(file.file_file_size) }
+        end
+      end
+      render :json => file_hashes
+    else
+      files_scope = @site.files.not_page_file
+        .includes(:categories)
+        .for_category(params[:category])
+        .order('comfy_cms_files.position')
+      @files = comfy_paginate(files_scope, 50)
+    end
   end
 
   def new
@@ -19,24 +40,27 @@ class Comfy::Admin::Cms::FilesController < Comfy::Admin::Cms::BaseController
   end
 
   def create
-    respond_to do |format|
-      if @file.save
-        format.html do
-          flash[:success] = I18n.t('comfy.admin.cms.files.created')
-          redirect_to :action => :edit, :id => @file
-        end
-        format.plupload do
-          render :text => render_to_string(:partial => 'file', :object => @file, :formats => [:html])
-        end
-      else
-        format.html do
-          flash.now[:danger] = I18n.t('comfy.admin.cms.files.creation_failure')
-          render :action => :new
-        end
-        format.plupload do
-          render :text => @file.errors.full_messages.to_sentence, :status => :unprocessable_entity
-        end
-      end
+    @file.save!
+
+    case params[:source]
+    when 'plupload'
+      render :text => render_to_string(:partial => 'file', :object => @file)
+    when 'redactor'
+      render :json => {:filelink => @file.file.url, :filename => @file.label}
+    else
+      flash[:success] = I18n.t('comfy.admin.cms.files.created')
+      redirect_to :action => :edit, :id => @file
+    end
+
+  rescue ActiveRecord::RecordInvalid
+    case params[:source]
+    when 'plupload'
+      render :text => @file.errors.full_messages.to_sentence, :status => :unprocessable_entity
+    when 'redactor'
+      render :nothing => true, :status => :unprocessable_entity
+    else
+      flash.now[:danger] = I18n.t('comfy.admin.cms.files.creation_failure')
+      render :action => :new
     end
   end
 
@@ -84,6 +108,10 @@ protected
   end
 
   def file_params
+    unless (file = params[:file]).is_a?(Hash)
+      params[:file] = { }
+      params[:file][:file] = file
+    end
     params.fetch(:file, {}).permit!
   end
 end

data/app/helpers/comfy/cms_helper.rb

@@ -73,6 +73,7 @@ module Comfy::CmsHelper
 
   # Wrapper to deal with Kaminari vs WillPaginate
   def comfy_paginate(collection)
+    return unless collection
     if defined?(WillPaginate)
       will_paginate collection
     elsif defined?(Kaminari)

data/app/models/comfy/cms/file.rb

@@ -12,7 +12,7 @@ class Comfy::Cms::File < ActiveRecord::Base
     :styles => lambda { |f|
       if f.respond_to?(:instance) && f.instance.respond_to?(:dimensions)
         (f.instance.dimensions.blank?? { } : { :original => f.instance.dimensions }).merge(
-          :cms_thumb => '80x60#'
+          :cms_thumb => '100x75#'
         ).merge(ComfortableMexicanSofa.config.upload_file_options[:styles] || {})
       end
     }

data/app/views/comfy/admin/cms/files/_page_form.html.haml

@@ -5,5 +5,5 @@
     - files.each do |file|
       .file{:class => dom_id(file)}
         = link_to file.file_file_name, file.file.url, :target => '_blank'
-        = link_to comfy_admin_cms_site_file_path(@site, file), :method => :delete, :remote => true, :confirm => t('.are_you_sure'), :class => 'delete' do
+        = link_to comfy_admin_cms_site_file_path(@site, file), :method => :delete, :remote => true, :data => {:confirm => t('.are_you_sure')}, :class => 'delete' do
           %i.glyphicon.glyphicon-remove-circle

data/app/views/comfy/admin/cms/files/index.html.haml

@@ -24,7 +24,7 @@
 :javascript
   $(function(){
     window.CMS.uploader($("#cms-uploader"), {
-      url: '#{comfy_admin_cms_site_files_path(@site)}',
+      url: '#{comfy_admin_cms_site_files_path(@site, :source => :plupload)}',
       multipart_params: {
         '#{request_forgery_protection_token}': '#{form_authenticity_token}',
         '#{Rails.application.config.session_options[:key]}': '#{request.session_options[:id]}'

data/app/views/layouts/comfy/admin/cms/_head.html.haml

@@ -1,13 +1,16 @@
 %head
-  %meta{'http-equiv' => "Content-type", :content => "text/html; charset=utf-8"}
+  %meta{'http-equiv' => 'Content-type', :content => 'text/html; charset=utf-8'}
   %title= ComfortableMexicanSofa.config.cms_title
   = csrf_meta_tag
-  
-  = stylesheet_link_tag 'comfortable_mexican_sofa/application'
-  = stylesheet_link_tag 'comfortable_mexican_sofa/admin/application'
-  = javascript_include_tag 'comfortable_mexican_sofa/application'
-  = javascript_include_tag 'comfortable_mexican_sofa/admin/application'
-  
+
+  = stylesheet_link_tag     'comfy/admin/cms/application', 'data-turbolinks-track' => true
+  = javascript_include_tag  'comfy/admin/cms/application', 'data-turbolinks-track' => true
+
+  - if @site && @site.persisted?
+    :javascript
+      CMS.file_upload_path  = '#{comfy_admin_cms_site_files_path(@site)}';
+      CMS.locale            = '#{I18n.locale}';
+
   = yield :head
-  
+
   = render 'comfy/admin/cms/partials/html_head'

data/comfortable_mexican_sofa.gemspec

@@ -31,7 +31,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'sass-rails',        '>= 4.0.3'
   s.add_dependency 'coffee-rails',      '>= 3.1.0'
   s.add_dependency 'codemirror-rails',  '>= 3.0.0'
-  s.add_dependency 'tinymce-rails',     '>= 4.0.0'
   s.add_dependency 'bootstrap-sass',    '>= 3.2.0'
   s.add_dependency 'plupload-rails',    '>= 1.2.1'
 end

data/lib/comfortable_mexican_sofa/engine.rb

@@ -12,7 +12,6 @@ require 'haml-rails'
 require 'sass-rails'
 require 'coffee-rails'
 require 'codemirror-rails'
-require 'tinymce-rails'
 require 'bootstrap-sass'
 require 'plupload-rails'
 

data/lib/comfortable_mexican_sofa/version.rb

@@ -1,3 +1,3 @@
 module ComfortableMexicanSofa
-  VERSION = "1.12.4"
+  VERSION = "1.12.5"
 end

data/lib/generators/comfy/cms/assets_generator.rb

@@ -5,9 +5,9 @@ module Comfy
         source_root File.expand_path(File.join(File.dirname(__FILE__), '../../../../app/assets'))
 
         def generate_assets
-          directory 'images/comfortable_mexican_sofa',      'app/assets/images/comfortable_mexican_sofa'
-          directory 'javascripts/comfortable_mexican_sofa', 'app/assets/javascripts/comfortable_mexican_sofa'
-          directory 'stylesheets/comfortable_mexican_sofa', 'app/assets/stylesheets/comfortable_mexican_sofa'
+          directory 'images/comfy/admin/cms',      'app/assets/images/comfy/admin/cms'
+          directory 'javascripts/comfy/admin/cms', 'app/assets/javascripts/comfy/admin/cms'
+          directory 'stylesheets/comfy/admin/cms', 'app/assets/stylesheets/comfy/admin/cms'
         end
       end
     end

data/lib/generators/comfy/cms/cms_generator.rb

@@ -26,13 +26,6 @@ module Comfy
           'config/initializers/comfortable_mexican_sofa.rb'
       end
 
-      def generate_mime_types
-        create_file 'config/initializers/mime_types.rb'
-        append_to_file 'config/initializers/mime_types.rb' do
-          "Mime::Type.register 'text/plupload', :plupload unless Mime::Type.lookup_by_extension(:plupload)"
-        end
-      end
-
       def generate_routing
         route_string  = "  comfy_route :cms_admin, :path => '/admin'\n\n"
         route_string << "  # Make sure this routeset is defined last\n"
@@ -45,10 +38,10 @@ module Comfy
       end
 
       def generate_assets
-        directory 'app/assets/javascripts/comfortable_mexican_sofa/admin',
-          'app/assets/javascripts/comfortable_mexican_sofa/admin'
-        directory 'app/assets/stylesheets/comfortable_mexican_sofa/admin',
-          'app/assets/stylesheets/comfortable_mexican_sofa/admin'
+        copy_file 'app/assets/javascripts/comfy/admin/cms/custom.js.coffee',
+          'app/assets/javascripts/comfy/admin/cms/custom.js.coffee'
+        copy_file 'app/assets/stylesheets/comfy/admin/cms/custom.sass',
+          'app/assets/stylesheets/comfy/admin/cms/custom.sass'
       end
 
       def show_readme

data/test/controllers/comfy/admin/cms/files_controller_test.rb

@@ -2,15 +2,20 @@ require_relative '../../../../test_helper'
 
 class Comfy::Admin::Cms::FilesControllerTest < ActionController::TestCase
 
+  def setup
+    @site = comfy_cms_sites(:default)
+    @file = comfy_cms_files(:default)
+  end
+
   def test_get_index
-    get :index, :site_id => comfy_cms_sites(:default)
+    get :index, :site_id => @site
     assert_response :success
     assert assigns(:files)
     assert_template :index
   end
 
   def test_get_index_with_category
-    get :index, :site_id => comfy_cms_sites(:default), :category => comfy_cms_categories(:default).label
+    get :index, :site_id => @site, :category => comfy_cms_categories(:default).label
     assert_response :success
     assert assigns(:files)
     assert_equal 1, assigns(:files).count
@@ -18,7 +23,7 @@ class Comfy::Admin::Cms::FilesControllerTest < ActionController::TestCase
   end
 
   def test_get_index_with_category_invalid
-    get :index, :site_id => comfy_cms_sites(:default), :category => 'invalid'
+    get :index, :site_id => @site, :category => 'invalid'
     assert_response :success
     assert assigns(:files)
     assert_equal 0, assigns(:files).count
@@ -27,31 +32,56 @@ class Comfy::Admin::Cms::FilesControllerTest < ActionController::TestCase
   def test_get_index_with_page_files
     file = comfy_cms_files(:default)
     file.update_column(:block_id, comfy_cms_blocks(:default_field_text).id)
-    get :index, :site_id => comfy_cms_sites(:default)
+    get :index, :site_id => @site
     assert_response :success
     assert_equal 0, assigns(:files).count
   end
 
+  def test_get_index_with_redactor_images
+    file = comfy_cms_files(:default)
+
+    get :index, :site_id => @site, :source => 'redactor', :type => 'image'
+    assert_response :success
+
+    assert_equal [{
+      'thumb' => file.file.url(:cms_thumb),
+      'image' => file.file.url,
+      'title' => file.label
+    }], JSON.parse(response.body)
+  end
+
+  def test_get_index_with_redactor_files
+    file = comfy_cms_files(:default)
+
+    get :index, :site_id => @site, :source => 'redactor', :type => 'file'
+    assert_response :success
+
+    assert_equal [{
+      'title' => file.label,
+      'name'  => file.file_file_name,
+      'link'  => file.file.url,
+      'size'  => '19.6 KB'
+    }], JSON.parse(response.body)
+  end
+
   def test_get_new
-    site = comfy_cms_sites(:default)
-    get :new, :site_id => site
+    get :new, :site_id => @site
     assert_response :success
     assert assigns(:file)
     assert_template :new
-    assert_select "form[action='/admin/sites/#{site.id}/files'][enctype='multipart/form-data']"
+    assert_select "form[action='/admin/sites/#{@site.id}/files'][enctype='multipart/form-data']"
   end
 
   def test_get_edit
-    file = comfy_cms_files(:default)
-    get :edit, :site_id => file.site, :id => file
+    get :edit, :site_id => @site, :id => @file
     assert_response :success
     assert assigns(:file)
     assert_template :edit
-    assert_select "form[action='/admin/sites/#{file.site.id}/files/#{file.id}']"
+    assert_select "form[action='/admin/sites/#{@site.id}/files/#{@file.id}']"
   end
 
   def test_get_edit_failure
-    get :edit, :site_id => comfy_cms_sites(:default), :id => 'not_found'
+    get :edit, :site_id => @site, :id => 'not_found'
     assert_response :redirect
     assert_redirected_to :action => :index
     assert_equal 'File not found', flash[:danger]
@@ -59,7 +89,7 @@ class Comfy::Admin::Cms::FilesControllerTest < ActionController::TestCase
 
   def test_create
     assert_difference ['Comfy::Cms::File.count', 'Comfy::Cms::Categorization.count'] do
-      post :create, :site_id => comfy_cms_sites(:default), :file => {
+      post :create, :site_id => @site, :file => {
         :label        => 'Test File',
         :description  => 'Test Description',
         :file         => fixture_file_upload('files/image.jpg', 'image/jpeg'),
@@ -77,7 +107,7 @@ class Comfy::Admin::Cms::FilesControllerTest < ActionController::TestCase
 
   def test_create_failure
     assert_no_difference 'Comfy::Cms::File.count' do
-      post :create, :site_id => comfy_cms_sites(:default), :file => { }
+      post :create, :site_id => @site, :file => { }
       assert_response :success
       assert_template :new
       assert_equal 'Failed to upload files', flash[:danger]
@@ -87,8 +117,8 @@ class Comfy::Admin::Cms::FilesControllerTest < ActionController::TestCase
   def test_create_as_plupload
     assert_difference 'Comfy::Cms::File.count' do
       post :create,
-        :format   => :plupload,
-        :site_id  => comfy_cms_sites(:default),
+        :source   => 'plupload',
+        :site_id  => @site,
         :file     => {
           :file => fixture_file_upload('files/image.jpg', 'image/jpeg')
         }
@@ -100,41 +130,63 @@ class Comfy::Admin::Cms::FilesControllerTest < ActionController::TestCase
 
   def test_create_as_plupload_failure
     assert_no_difference 'Comfy::Cms::File.count' do
-      post :create, :format => :plupload, :site_id => comfy_cms_sites(:default), :file => { }
+      post :create, :source => 'plupload', :site_id => @site, :file => { }
+      assert_response :unprocessable_entity
+    end
+  end
+
+  def test_create_as_redactor
+    assert_difference 'Comfy::Cms::File.count' do
+      post :create,
+        :source   => 'redactor',
+        :site_id  => @site,
+        :file     => fixture_file_upload('files/image.jpg', 'image/jpeg')
+      assert_response :success
+
+      file = Comfy::Cms::File.last
+      assert_equal ({
+        'filelink' => file.file.url,
+        'filename' => file.label
+      }), JSON.parse(response.body)
+    end
+  end
+
+  def test_create_as_redactor_failure
+    assert_no_difference 'Comfy::Cms::File.count' do
+      post :create, :source => 'redactor', :site_id => @site, :file => { }
       assert_response :unprocessable_entity
     end
   end
 
   def test_update
-    file = comfy_cms_files(:default)
-    put :update, :site_id => file.site, :id => file, :file => {
+    put :update, :site_id => @site, :id => @file, :file => {
       :label        => 'New File',
       :description  => 'New Description',
       :file         => fixture_file_upload('files/image.jpg', 'image/jpeg')
     }
     assert_response :redirect
-    assert_redirected_to :action => :edit, :site_id => file.site, :id => file
+    assert_redirected_to :action => :edit, :site_id => @site, :id => @file
     assert_equal 'File updated', flash[:success]
-    file.reload
-    assert_equal 'New File', file.label
-    assert_equal 'New Description', file.description
+    @file.reload
+    assert_equal 'New File', @file.label
+    assert_equal 'New Description', @file.description
   end
 
   def test_update_failure
     file = comfy_cms_files(:default)
-    put :update, :site_id => file.site, :id => file, :file => {
+    put :update, :site_id => @site, :id => @file, :file => {
       :file => nil
     }
     assert_response :success
     assert_template :edit
-    file.reload
-    assert_not_equal nil, file.file
+    @file.reload
+    assert_not_equal nil, @file.file
     assert_equal 'Failed to update file', flash[:danger]
   end
 
   def test_destroy
     assert_difference 'Comfy::Cms::File.count', -1 do
-      delete :destroy, :site_id => comfy_cms_sites(:default), :id => comfy_cms_files(:default)
+      delete :destroy, :site_id => @site, :id => @file
       assert_response :redirect
       assert_redirected_to :action => :index
       assert_equal 'File deleted', flash[:success]
@@ -143,20 +195,20 @@ class Comfy::Admin::Cms::FilesControllerTest < ActionController::TestCase
 
   def test_destroy_as_xhr
     assert_difference 'Comfy::Cms::File.count', -1 do
-      xhr :delete, :destroy, :site_id => comfy_cms_sites(:default), :id => comfy_cms_files(:default)
+      xhr :delete, :destroy, :site_id => @site, :id => @file
       assert_response :success
     end
   end
 
   def test_reorder
-    file_one = comfy_cms_files(:default)
-    file_two = comfy_cms_sites(:default).files.create(
-      :file => fixture_file_upload('files/image.jpg', "image/jpeg")
+    file_one = @file
+    file_two = @site.files.create(
+      :file => fixture_file_upload('files/image.jpg', 'image/jpeg')
     )
     assert_equal 0, file_one.position
     assert_equal 1, file_two.position
 
-    put :reorder, :site_id => comfy_cms_sites(:default), :comfy_cms_file => [file_two.id, file_one.id]
+    put :reorder, :site_id => @site, :comfy_cms_file => [file_two.id, file_one.id]
     assert_response :success
     file_one.reload
     file_two.reload