comfortable_mexican_sofa 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b44e849fc5e9ae2bf75d22a0976d8852f30e1606
-  data.tar.gz: 7a26fcd671fb42318a968aa3f6ede11d67d233ba
+  metadata.gz: fb5f504ed7a73ffd87abc1a6a22559c08a03b64b
+  data.tar.gz: 14f3121059d919b4c612cfef5a28ec76e540f1b3
 SHA512:
-  metadata.gz: 2c102b76ac471fda8769a9dfbfb29289c1133c3c963ebddc3cbe4d5b69714fa7a294c30979e3a2634c5ebdf26ec9efe983f860b2bb860608c97d84abbabef39d
-  data.tar.gz: 7d704fc6e99d1fead6caaa51ff00f033a4a20941aa29f079b227a143bf97251830382dcf708296cf7ee8f89e5de29bbc4364298d536e9d37fc5d2f8bc19c212f
+  metadata.gz: c688307b159cc80dea239cc9ea2892ecdd0cc5452313c109ccb30dc110c79db26ed534d208ee61396840e85379191c83ef5dda135cfaff6af04d1f6ad83a1839
+  data.tar.gz: ba27c94a808feb48b9763eecf0e7ae2353d22c97218c237285db00b00ec48c70147aca696a3e78278a51b5a2612da81cd8930332a5a209558000f7b58a07ac89

data/.rubocop.yml

@@ -1,5 +1,96 @@
-inherit_from:
-  - .rubocop_todo.yml
-
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.2
+  Exclude:
+    - bin/*
+    - db/schema.rb
+    - db/migrate/**/*
+    - test/fixtures/**/*
+    - tmp/**/*
+
+# -- Performance ---------------------------------------------------------------
+Performance/Casecmp:
+  Enabled: false
+
+# -- Metrics -------------------------------------------------------------------
+Metrics/PerceivedComplexity:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/ParameterLists:
+  Enabled: false
+
+Metrics/LineLength:
+  Max: 120
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/BlockLength:
+  Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false
+
+# -- Layout --------------------------------------------------------------------
+Layout/MultilineOperationIndentation:
+  Enabled: false
+
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+
+Layout/MultilineHashBraceLayout:
+  Enabled: false
+
+Layout/IndentArray:
+  EnforcedStyle: consistent
+
+Layout/EmptyLinesAroundModuleBody:
+  EnforcedStyle: empty_lines_except_namespace
+
+Layout/EmptyLinesAroundExceptionHandlingKeywords:
+  Enabled: false
+
+Layout/EmptyLinesAroundClassBody:
+  EnforcedStyle: empty_lines_except_namespace
+
+Layout/AlignParameters:
+  Enabled: false
+
+Layout/AccessModifierIndentation:
+  EnforcedStyle: outdent
+
+# -- Style ---------------------------------------------------------------------
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+Style/RegexpLiteral:
+  EnforcedStyle: percent_r
+
+Style/Lambda:
+  EnforcedStyle: literal
+
+Style/IfUnlessModifier:
+  Enabled: false
+
+Style/GuardClause:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/DateTime:
+  Enabled: false
+
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+Style/AsciiComments:
+  Enabled: false

data/.travis.yml

@@ -4,7 +4,8 @@ before_install:
 before_script:
   - rake db:migrate
 script:
-  - rake test
+  - bundle exec rake test
+  - bundle exec rubocop
 rvm:
   - 2.2.7
   - 2.3.5

data/CONTRIBUTING.md

@@ -1,4 +1,5 @@
 # Contributing
+
 Contribute your code to ComfortableMexicanSofa in 5 easy steps:
 
 ### 1. Fork it
@@ -8,8 +9,9 @@ Fork the project. Optionally, create a branch you want to work on.
 ### 2. Get it running locally
 
 - Install gem dependencies with `bundle install`
-- There's nothing to configure, by default database is SQLite so it will be created for you
-- Make sure that existing tests are passing by running `rake test:all`
+- There's nothing to configure, by default database is SQLite so it will be created for you.
+  Just run `rake db:migrate`
+- Make sure that existing tests are passing by running `rake test`
 - You should be able to start the app via `rails s` and navigate to http://localhost:3000/admin
 
 ### 3. Hack away
@@ -18,12 +20,13 @@ Fork the project. Optionally, create a branch you want to work on.
 - When adding new code just make sure it follows the same slyle as the existing code.
 - Avoid adding 3rd party dependencies if you can.
 - Tests please, but nothing complicated. UnitTest / Fixtures all the way. Make sure all tests pass.
+- Run `bundle exec rubocop` and fix any issues raised.
 
 ### 4. Make a pull request
 
-If you never done it before read this: https://help.github.com/articles/using-pull-requests
+- If you never done it before read this: https://help.github.com/articles/using-pull-requests
+- When PR is submitted check if TravisCI ran all tests successfully and Rubocop didn't raise any issues
 
 ### 5. Done!
 
-If everything is good your changes will be merged into master branch. Eventually a new version of gem will be cut.
-
+If everything is good your changes will be merged into master branch. Eventually a new version of gem will be published.

data/Gemfile

@@ -1,21 +1,21 @@
-source 'http://rubygems.org'
+source "http://rubygems.org"
 
 gemspec
 
 # apps can also use will_paginate so there's no dependency in gemspec
-gem 'kaminari'
+gem "kaminari"
 
 group :development do
+  gem "awesome_print"
+  gem "better_errors"
+  gem "binding_of_caller"
   gem "listen"
-  gem 'awesome_print'
-  gem 'better_errors'
-  gem 'binding_of_caller'
   gem "rubocop", "~> 0.51.0", require: false
 end
 
 group :test do
-  gem 'rails-controller-testing'
-  gem 'sqlite3'
-  gem 'mocha',      require: false
-  gem 'coveralls',  require: false
+  gem "coveralls",  require: false
+  gem "mocha",      require: false
+  gem "rails-controller-testing"
+  gem "sqlite3"
 end

data/Rakefile

@@ -1,3 +1,3 @@
-require_relative 'config/application'
+require_relative "config/application"
 
 Rails.application.load_tasks

data/app/assets/javascripts/comfy/admin/cms/base.js.coffee

@@ -99,6 +99,7 @@ window.CMS.codemirror = ->
   $('textarea[data-cms-cm-mode]').each (i, element) ->
     cm = CodeMirror.fromTextArea element,
       mode:           $(element).data('cms-cm-mode')
+      tabSize:        2
       lineWrapping:   true
       autoCloseTags:  true
       lineNumbers:    true

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

@@ -104,7 +104,7 @@ body#comfy
 
     .box
       padding: 1rem
-      margin: 0.5rem 0
+      margin-bottom: 1rem
       background-color: $white
       border: 1px solid $gray-200
     .box.translations
@@ -154,6 +154,8 @@ body#comfy
       padding: 0
       li
         list-style: none
+        ul
+          padding-left: 0
         .row
           background-color: $gray-100
           margin-bottom: 5px
@@ -161,9 +163,9 @@ body#comfy
           .item
             display: flex
             .item-controls
-              width: 30px
               padding: 2px 0
               .dragger, .toggle
+                margin-right: 15px
                 display: block
                 color: $gray-500
                 &:hover
@@ -194,8 +196,6 @@ body#comfy
             background-color: $white
         .row:hover
           background-color: $white
-        ul.list
-          padding-left: 2rem
 
   // -- Pages ------------------------------------------------------------------
   &.c-comfy-admin-cms-pages
@@ -227,6 +227,16 @@ body#comfy
         img
           width: 100%
 
+    .cms-uploader-drag-drop-target-active
+      position: fixed !important
+      z-index: 9999
+      top: 0
+      left: 0
+      width: 100%
+      height: 100%
+      border: dotted #ccc 1px
+      background-color: rgba(255, 255, 255, 0.7)
+
   // -- Revisions --------------------------------------------------------------
   &[class*="c-comfy-admin-cms-revisions-"], &[class*="c-comfy-admin-blog-revisions-"]
     .label

data/app/controllers/application_controller.rb

@@ -1,5 +1,5 @@
 class ApplicationController < ActionController::Base
-  
+
   protect_from_forgery
-  
+
 end

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

@@ -15,6 +15,6 @@ class Comfy::Admin::BaseController < ComfortableMexicanSofa.config.base_controll
 
   before_action :authenticate
 
-  layout 'comfy/admin/cms'
+  layout "comfy/admin/cms"
 
 end

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

@@ -6,7 +6,7 @@ class Comfy::Admin::Cms::BaseController < Comfy::Admin::BaseController
                 except: :jump
 
   if ComfortableMexicanSofa.config.admin_cache_sweeper.present?
-    cache_sweeper *ComfortableMexicanSofa.config.admin_cache_sweeper
+    cache_sweeper(*ComfortableMexicanSofa.config.admin_cache_sweeper)
   end
 
   def jump
@@ -20,11 +20,11 @@ protected
 
   def load_admin_site
     id_param = params[:site_id] || session[:site_id]
-    if @site = ::Comfy::Cms::Site.find_by(id: id_param) || ::Comfy::Cms::Site.first
+    if (@site = ::Comfy::Cms::Site.find_by(id: id_param) || ::Comfy::Cms::Site.first)
       session[:site_id] = @site.id
     else
       I18n.locale = ComfortableMexicanSofa.config.admin_locale || I18n.default_locale
-      flash[:danger] = I18n.t('comfy.admin.cms.base.site_not_found')
+      flash[:danger] = I18n.t("comfy.admin.cms.base.site_not_found")
       return redirect_to(new_comfy_admin_cms_site_path)
     end
   end
@@ -37,10 +37,11 @@ protected
   def load_seeds
     return unless ComfortableMexicanSofa.config.enable_seeds
 
-    controllers = %w(layouts pages snippets files).collect{|c| 'comfy/admin/cms/' + c}
-    if controllers.member?(params[:controller]) && params[:action] == 'index'
+    controllers = %w[layouts pages snippets files].collect { |c| "comfy/admin/cms/" + c }
+    if controllers.member?(params[:controller]) && params[:action] == "index"
       ComfortableMexicanSofa::Seeds::Importer.new(@site.identifier).import!
-      flash.now[:warning] = I18n.t('comfy.admin.cms.base.seeds_enabled')
+      flash.now[:warning] = I18n.t("comfy.admin.cms.base.seeds_enabled")
     end
   end
+
 end

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

@@ -1,6 +1,6 @@
 class Comfy::Admin::Cms::CategoriesController < Comfy::Admin::Cms::BaseController
 
-  before_action :load_category, only: [:edit, :update, :destroy]
+  before_action :load_category, only: %i[edit update destroy]
   before_action :authorize
 
   def edit
@@ -34,4 +34,5 @@ protected
   def category_params
     params.fetch(:category, {}).permit!
   end
+
 end

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

@@ -2,8 +2,8 @@ class Comfy::Admin::Cms::FilesController < Comfy::Admin::Cms::BaseController
 
   include ActionView::Helpers::NumberHelper
 
-  before_action :build_file,  only: [:new, :create]
-  before_action :load_file,   only: [:edit, :update, :destroy]
+  before_action :build_file,  only: %i[new create]
+  before_action :load_file,   only: %i[edit update destroy]
   before_action :authorize
 
   def index
@@ -12,23 +12,25 @@ class Comfy::Admin::Cms::FilesController < Comfy::Admin::Cms::BaseController
     case params[:source]
 
     # Integration with Redactor 1.0 Wysiwyg
-    when 'redactor'
+    when "redactor"
       file_scope  = files_scope.limit(100).order(:position)
-      file_hashes = case params[:type]
-      when 'image'
-        file_scope.with_images.collect do |file|
-          { thumb: url_for(file.attachment.variant(Comfy::Cms::File::VARIANT_SIZE[:redactor])),
-            image: url_for(file.attachment),
-            title: file.label }
-        end
-      else
-        file_scope.collect do |file|
-          { title:  file.label,
-            name:   file.attachment.filename,
-            link:   url_for(file.attachment),
-            size:   number_to_human_size(file.attachment.byte_size) }
+      file_hashes =
+        case params[:type]
+        when "image"
+          file_scope.with_images.collect do |file|
+            { thumb: url_for(file.attachment.variant(Comfy::Cms::File::VARIANT_SIZE[:redactor])),
+              image: url_for(file.attachment),
+              title: file.label }
+          end
+        else
+          file_scope.collect do |file|
+            { title:  file.label,
+              name:   file.attachment.filename,
+              link:   url_for(file.attachment),
+              size:   number_to_human_size(file.attachment.byte_size) }
+          end
         end
-      end
+
       render json: file_hashes
 
     else
@@ -46,10 +48,10 @@ class Comfy::Admin::Cms::FilesController < Comfy::Admin::Cms::BaseController
 
   def create
     if params[:category]
-      ids = @site.categories.of_type('Comfy::Cms::File')
+      ids = @site.categories.of_type("Comfy::Cms::File")
         .where(label: params[:category])
-        .each_with_object({}){|c, h| h[c.id] = 1}
-        @file.category_ids = ids
+        .each_with_object({}) { |c, h| h[c.id] = 1 }
+      @file.category_ids = ids
     end
 
     # Automatically tagging upload if it's done through redactor
@@ -70,18 +72,18 @@ class Comfy::Admin::Cms::FilesController < Comfy::Admin::Cms::BaseController
         filename: @file.attachment.filename
       }
     else
-      flash[:success] = I18n.t('comfy.admin.cms.files.created')
+      flash[:success] = I18n.t("comfy.admin.cms.files.created")
       redirect_to action: :edit, id: @file
     end
 
   rescue ActiveRecord::RecordInvalid
     case params[:source]
-    when 'plupload'
+    when "plupload"
       render body: @file.errors.full_messages.to_sentence, status: :unprocessable_entity
-    when 'redactor'
+    when "redactor"
       render body: nil, status: :unprocessable_entity
     else
-      flash.now[:danger] = I18n.t('comfy.admin.cms.files.creation_failure')
+      flash.now[:danger] = I18n.t("comfy.admin.cms.files.creation_failure")
       render action: :new
     end
   end
@@ -92,10 +94,10 @@ class Comfy::Admin::Cms::FilesController < Comfy::Admin::Cms::BaseController
 
   def update
     if @file.update(file_params)
-      flash[:success] = I18n.t('comfy.admin.cms.files.updated')
+      flash[:success] = I18n.t("comfy.admin.cms.files.updated")
       redirect_to action: :edit, id: @file
     else
-      flash.now[:danger] = I18n.t('comfy.admin.cms.files.update_failure')
+      flash.now[:danger] = I18n.t("comfy.admin.cms.files.update_failure")
       render action: :edit
     end
   end
@@ -105,7 +107,7 @@ class Comfy::Admin::Cms::FilesController < Comfy::Admin::Cms::BaseController
     respond_to do |format|
       format.js
       format.html do
-        flash[:success] = I18n.t('comfy.admin.cms.files.deleted')
+        flash[:success] = I18n.t("comfy.admin.cms.files.deleted")
         redirect_to action: :index
       end
     end
@@ -129,16 +131,17 @@ protected
   def load_file
     @file = @site.files.find(params[:id])
   rescue ActiveRecord::RecordNotFound
-    flash[:danger] = I18n.t('comfy.admin.cms.files.not_found')
+    flash[:danger] = I18n.t("comfy.admin.cms.files.not_found")
     redirect_to action: :index
   end
 
   def file_params
     file = params[:file]
     unless file.is_a?(Hash) || file.respond_to?(:to_unsafe_hash)
-      params[:file] = { }
+      params[:file] = {}
       params[:file][:file] = file
     end
     params.fetch(:file, {}).permit!
   end
+
 end

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

@@ -1,11 +1,11 @@
 class Comfy::Admin::Cms::LayoutsController < Comfy::Admin::Cms::BaseController
 
-  before_action :build_layout,  only: [:new, :create]
-  before_action :load_layout,   only: [:edit, :update, :destroy]
+  before_action :build_layout,  only: %i[new create]
+  before_action :load_layout,   only: %i[edit update destroy]
   before_action :authorize
 
   def index
-    return redirect_to action: :new if @site.layouts.count == 0
+    return redirect_to action: :new if @site.layouts.count.zero?
     @layouts = @site.layouts.roots.order(:position)
   end
 
@@ -19,25 +19,25 @@ class Comfy::Admin::Cms::LayoutsController < Comfy::Admin::Cms::BaseController
 
   def create
     @layout.save!
-    flash[:success] = I18n.t('comfy.admin.cms.layouts.created')
+    flash[:success] = I18n.t("comfy.admin.cms.layouts.created")
     redirect_to action: :edit, id: @layout
   rescue ActiveRecord::RecordInvalid
-    flash.now[:danger] = I18n.t('comfy.admin.cms.layouts.creation_failure')
+    flash.now[:danger] = I18n.t("comfy.admin.cms.layouts.creation_failure")
     render action: :new
   end
 
   def update
     @layout.update_attributes!(layout_params)
-    flash[:success] = I18n.t('comfy.admin.cms.layouts.updated')
+    flash[:success] = I18n.t("comfy.admin.cms.layouts.updated")
     redirect_to action: :edit, id: @layout
   rescue ActiveRecord::RecordInvalid
-    flash.now[:danger] = I18n.t('comfy.admin.cms.layouts.update_failure')
+    flash.now[:danger] = I18n.t("comfy.admin.cms.layouts.update_failure")
     render action: :edit
   end
 
   def destroy
     @layout.destroy
-    flash[:success] = I18n.t('comfy.admin.cms.layouts.deleted')
+    flash[:success] = I18n.t("comfy.admin.cms.layouts.deleted")
     redirect_to action: :index
   end
 
@@ -60,11 +60,12 @@ protected
   def load_layout
     @layout = @site.layouts.find(params[:id])
   rescue ActiveRecord::RecordNotFound
-    flash[:danger] = I18n.t('comfy.admin.cms.layouts.not_found')
+    flash[:danger] = I18n.t("comfy.admin.cms.layouts.not_found")
     redirect_to action: :index
   end
 
   def layout_params
     params.fetch(:layout, {}).permit!
   end
+
 end

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

@@ -1,23 +1,26 @@
 class Comfy::Admin::Cms::PagesController < Comfy::Admin::Cms::BaseController
 
-  before_action :check_for_layouts, only: [:new, :edit]
-  before_action :build_page,        only: [:new, :create]
-  before_action :load_page,         only: [:edit, :update, :destroy]
+  before_action :check_for_layouts, only: %i[new edit]
+  before_action :build_page,        only: %i[new create]
+  before_action :load_page,         only: %i[edit update destroy]
+
   before_action :authorize
-  before_action :preview_page,      only: [:create, :update]
+
+  before_action :preview_page, only: %i[create update]
 
   def index
     return redirect_to action: :new if site_has_no_pages?
 
-    return index_for_redactor if params[:source] == 'redactor'
+    return index_for_redactor if params[:source] == "redactor"
 
     @pages_by_parent = pages_grouped_by_parent
 
-    @pages = if params[:categories].present?
-      @site.pages.includes(:categories).for_category(params[:categories]).order(:label)
-    else
-      [@site.pages.root].compact
-    end
+    @pages =
+      if params[:categories].present?
+        @site.pages.includes(:categories).for_category(params[:categories]).order(:label)
+      else
+        [@site.pages.root].compact
+      end
   end
 
   def new
@@ -30,25 +33,25 @@ class Comfy::Admin::Cms::PagesController < Comfy::Admin::Cms::BaseController
 
   def create
     @page.save!
-    flash[:success] = I18n.t('comfy.admin.cms.pages.created')
+    flash[:success] = I18n.t("comfy.admin.cms.pages.created")
     redirect_to action: :edit, id: @page
   rescue ActiveRecord::RecordInvalid
-    flash.now[:danger] = I18n.t('comfy.admin.cms.pages.creation_failure')
+    flash.now[:danger] = I18n.t("comfy.admin.cms.pages.creation_failure")
     render action: :new
   end
 
   def update
     @page.save!
-    flash[:success] = I18n.t('comfy.admin.cms.pages.updated')
+    flash[:success] = I18n.t("comfy.admin.cms.pages.updated")
     redirect_to action: :edit, id: @page
   rescue ActiveRecord::RecordInvalid
-    flash.now[:danger] = I18n.t('comfy.admin.cms.pages.update_failure')
+    flash.now[:danger] = I18n.t("comfy.admin.cms.pages.update_failure")
     render action: :edit
   end
 
   def destroy
     @page.destroy
-    flash[:success] = I18n.t('comfy.admin.cms.pages.deleted')
+    flash[:success] = I18n.t("comfy.admin.cms.pages.deleted")
     redirect_to action: :index
   end
 
@@ -64,7 +67,7 @@ class Comfy::Admin::Cms::PagesController < Comfy::Admin::Cms::BaseController
     id  = @page.id.to_s
     s.member?(id) ? s.delete(id) : s << id
   rescue ActiveRecord::RecordNotFound
-    # do nothing
+    render nothing: true
   end
 
   def reorder
@@ -80,23 +83,23 @@ protected
     tree_walker = ->(page, list, offset) do
       return unless page.present?
       label = "#{'. . ' * offset}#{page.label}"
-      list << {name: label, url: page.url(relative: true)}
+      list << { name: label, url: page.url(relative: true) }
       page.children.each do |child_page|
-        tree_walker.(child_page, list, offset + 1)
+        tree_walker.call(child_page, list, offset + 1)
       end
       list
     end
 
     page_select_options = [{
-      name: I18n.t('comfy.admin.cms.pages.form.choose_link'),
+      name: I18n.t("comfy.admin.cms.pages.form.choose_link"),
       url: false
-    }] + tree_walker.(@site.pages.root, [ ], 0)
+    }] + tree_walker.call(@site.pages.root, [], 0)
 
     render json: page_select_options
   end
 
   def site_has_no_pages?
-    @site.pages.count == 0
+    @site.pages.count.zero?
   end
 
   def pages_grouped_by_parent
@@ -104,8 +107,8 @@ protected
   end
 
   def check_for_layouts
-    if @site.layouts.count == 0
-      flash[:danger] = I18n.t('comfy.admin.cms.pages.layout_not_found')
+    if @site.layouts.count.zero?
+      flash[:danger] = I18n.t("comfy.admin.cms.pages.layout_not_found")
       redirect_to new_comfy_admin_cms_site_layout_path(@site)
     end
   end
@@ -120,13 +123,13 @@ protected
     @page = @site.pages.find(params[:id])
     @page.attributes = page_params
   rescue ActiveRecord::RecordNotFound
-    flash[:danger] = I18n.t('comfy.admin.cms.pages.not_found')
+    flash[:danger] = I18n.t("comfy.admin.cms.pages.not_found")
     redirect_to action: :index
   end
 
   def preview_page
     if params[:preview]
-      layout = @page.layout.app_layout.blank?? false : @page.layout.app_layout
+      layout = @page.layout.app_layout.blank? ? false : @page.layout.app_layout
       @cms_site   = @page.site
       @cms_layout = @page.layout
       @cms_page   = @page
@@ -136,13 +139,14 @@ protected
       I18n.locale = @cms_site.locale
 
       # Chrome chokes on content with iframes. Issue #434
-      response.headers['X-XSS-Protection'] = '0'
+      response.headers["X-XSS-Protection"] = "0"
 
-      render inline: @page.render, layout: layout, content_type: 'text/html'
+      render inline: @page.render, layout: layout, content_type: "text/html"
     end
   end
 
   def page_params
     params.fetch(:page, {}).permit!
   end
+
 end