trusty-cms 4.1.2 → 4.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b4c0091419c21923c64c2b6a9848821262eb761f7ec3e6fa05c7dbc16986d5d
-  data.tar.gz: 6f7f51a3f833d71df2f0f8d3bc88a47b97303be303266d9245138182bf9a190f
+  metadata.gz: 5ec4507891ffcef07709998473113f66f350d6c17ac1a1a40ca8593d6b565855
+  data.tar.gz: 994dec6d305e0ce812c7311ef3ff4c15f5a439f61d09a21bcafdf235d6a4f08d
 SHA512:
-  metadata.gz: b2c3d0d25e6daa74d683e2fd4260a157604278dcf622eebf34208ebf01317d444693f8fbe676534f2aaaf9d53ab670995fdb5133742c8c86fadca5cde3964764
-  data.tar.gz: 6a545b06e0b977518bdf314467012360c827c511381c073e73e66848ba83f8b7e96d94a59f086ff1999141d735047d07273e021983c65e16e54b94ea3db7799c
+  metadata.gz: 642b211413fead95b9f8a33eeead86c404f9f6debc150c3440416f380534be866ea9c817a312a5e65610a3df06ba8f7d0397a74429be26e2afeae0dd9de5e6b1
+  data.tar.gz: 12cc8927f097db47b3b97c38fd66f708fb5ac81ae4e12e5f43a0a07ae011184d82eef46adaa0d7e3b6f49a1f2dc2b585bb9dc19f0551bf83023219743a429d4c

data/Gemfile

@@ -15,9 +15,9 @@ group :development, :test do
   gem 'acts_as_list'
   gem 'database_cleaner'
   gem 'factory_bot_rails', '5.2.0'
-  gem 'launchy',         '~> 2.5.0'
+  gem 'launchy', '~> 2.5.0'
   gem 'mysql2'
-  gem 'poltergeist',      '~> 1.18.1'
+  gem 'poltergeist', '~> 1.18.1'
   gem 'pry-byebug'
   gem 'rails-observers'
   gem 'rspec-rails'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (4.1.2)
+    trusty-cms (4.1.3)
       RedCloth (= 4.3.2)
       acts_as_list (>= 0.9.5, < 1.1.0)
       acts_as_tree (>= 2.6.1, < 2.9.0)
@@ -97,8 +97,8 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     bcrypt (3.1.13)
     builder (3.2.4)
-    byebug (11.1.1)
-    capybara (3.31.0)
+    byebug (11.1.3)
+    capybara (3.32.2)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
@@ -113,15 +113,15 @@ GEM
     cliver (0.3.2)
     cocaine (0.6.0)
       terrapin (= 0.6.0)
-    coderay (1.1.2)
+    coderay (1.1.3)
     concurrent-ruby (1.1.6)
     crass (1.0.6)
     css_parser (1.7.1)
       addressable
-    database_cleaner (1.8.4)
+    database_cleaner (1.8.5)
     delocalize (1.2.0)
       rails (>= 2)
-    devise (4.7.1)
+    devise (4.7.2)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -137,7 +137,7 @@ GEM
     factory_bot_rails (5.2.0)
       factory_bot (~> 5.2.0)
       railties (>= 4.2.0)
-    ffi (1.12.2)
+    ffi (1.13.1)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     haml (5.1.2)
@@ -155,10 +155,10 @@ GEM
       haml (>= 4.0, < 6)
       nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
-    httparty (0.18.0)
+    httparty (0.18.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.8.2)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
     json (2.3.0)
     kraken-io (0.1.3)
@@ -168,7 +168,7 @@ GEM
       multipart-post
     launchy (2.5.0)
       addressable (~> 2.7)
-    libv8 (7.3.492.27.1)
+    libv8 (7.3.492.27.1-x86_64-linux)
     loofah (2.5.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -203,15 +203,15 @@ GEM
       capybara (>= 2.1, < 4)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
-    pry (0.13.0)
+    pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     pry-byebug (3.9.0)
       byebug (~> 11.0)
       pry (~> 0.13.0)
-    public_suffix (4.0.3)
+    public_suffix (4.0.5)
     rack (2.0.9)
-    rack-cache (1.11.1)
+    rack-cache (1.12.0)
       rack (>= 0.4)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -246,8 +246,8 @@ GEM
       thor (>= 0.20.3, < 2.0)
     rake (12.3.3)
     rdoc (6.2.1)
-    regexp_parser (1.7.0)
-    responders (3.0.0)
+    regexp_parser (1.7.1)
+    responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
     roadie (4.0.0)
@@ -256,15 +256,15 @@ GEM
     roadie-rails (2.1.1)
       railties (>= 5.1, < 6.1)
       roadie (>= 3.1, < 5.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-rails (4.0.0)
+    rspec-rails (4.0.1)
       actionpack (>= 4.2)
       activesupport (>= 4.2)
       railties (>= 4.2)
@@ -272,10 +272,10 @@ GEM
       rspec-expectations (~> 3.9)
       rspec-mocks (~> 3.9)
       rspec-support (~> 3.9)
-    rspec-support (3.9.2)
+    rspec-support (3.9.3)
     ruby_parser (3.14.2)
       sexp_processor (~> 4.9)
-    sassc (2.3.0)
+    sassc (2.4.0)
       ffi (~> 1.9)
     sassc-rails (2.1.2)
       railties (>= 4.0.0)
@@ -283,12 +283,12 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    sexp_processor (4.14.1)
+    sexp_processor (4.15.0)
     simplecov (0.18.5)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
     simplecov-html (0.12.2)
-    sprockets (4.0.0)
+    sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
@@ -311,9 +311,9 @@ GEM
     uuidtools (2.1.5)
     warden (1.2.8)
       rack (>= 2.0.6)
-    websocket-driver (0.7.1)
+    websocket-driver (0.7.2)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
+    websocket-extensions (0.1.5)
     will_paginate (3.3.0)
     xpath (3.2.0)
       nokogiri (~> 1.8)

data/Rakefile

@@ -10,19 +10,19 @@ require 'pry'
 require 'byebug'
 require 'trustygems'
 
-#!/usr/bin/env rake
+# !/usr/bin/env rake
 begin
   require 'bundler/setup'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path('spec/dummy/Rakefile', __dir__)
 load 'rails/tasks/engine.rake'
 Bundler::GemHelper.install_tasks
-Dir[File.join(File.dirname(__FILE__), 'tasks/**/*.rake')].each {|f| load f }
+Dir[File.join(File.dirname(__FILE__), 'tasks/**/*.rake')].each { |f| load f }
 require 'rspec/core'
 require 'rspec/core/rake_task'
-desc "Run all specs in spec directory (excluding plugin specs)"
-RSpec::Core::RakeTask.new(:spec => 'app:db:test:prepare')
-task :default => :spec
-#TrustyCms::Application.load_tasks
+desc 'Run all specs in spec directory (excluding plugin specs)'
+RSpec::Core::RakeTask.new(spec: 'app:db:test:prepare')
+task default: :spec
+# TrustyCms::Application.load_tasks

data/app/assets/stylesheets/admin/partials/_content.scss

@@ -1,13 +1,12 @@
 main {
   float: left;
   grid-area: content;
-  padding: 1em 0 1em 1em;
   width: 100%;
 }
 
 .reversed main {
   .content {
-    padding: 1em 0;
+    padding: 1em;
   }
 }
 

data/app/controllers/admin/assets_controller.rb

@@ -1,15 +1,15 @@
 class Admin::AssetsController < Admin::ResourceController
-  paginate_models(:per_page => 50)
-  COMPRESS_FILE_TYPE = ["image/jpeg", "image/png", "image/gif", "image/svg+xml"]
+  paginate_models(per_page: 50)
+  COMPRESS_FILE_TYPE = ['image/jpeg', 'image/png', 'image/gif', 'image/svg+xml'].freeze
 
   def index
-    assets = Asset.order("created_at DESC")
+    assets = Asset.order('created_at DESC')
     @page = Page.find(params[:page_id]) if params[:page_id]
 
     @term = params[:search] || ''
     assets = assets.matching(@term) if @term && !@term.blank?
 
-    @types = params[:filter] ? params[:filter].split(",") : []
+    @types = params[:filter] ? params[:filter].split(',') : []
     if @types.include?('all')
       params[:filter] = nil
     elsif @types.any?
@@ -18,36 +18,36 @@ class Admin::AssetsController < Admin::ResourceController
 
     @assets = paginated? ? assets.paginate(pagination_parameters) : assets.all
     respond_to do |format|
-
-      format.js {
+      format.js do
         @page = Page.find_by_id(params[:page_id])
-        render :partial => 'asset_table', :locals => {:with_pagination => true}
-      }
-      format.html {
+        render partial: 'asset_table', locals: { with_pagination: true }
+      end
+      format.html do
         render
-      }
+      end
     end
   end
 
   def create
-    @assets, @page_attachments = [], []
+    @assets = []
+    @page_attachments = []
     compress = current_site.try(:compress) ? current_site.compress : true
     asset_params[:asset][:asset].to_a.each do |uploaded_asset|
-      if uploaded_asset.content_type == "application/octet-stream"
-        flash[:notice] = "Please only upload assets that have a valid extension in the name."
+      if uploaded_asset.content_type == 'application/octet-stream'
+        flash[:notice] = 'Please only upload assets that have a valid extension in the name.'
       else
         uploaded_asset = compress(uploaded_asset) if $kraken.api_key.present? && COMPRESS_FILE_TYPE.include?(uploaded_asset.content_type) && compress
-        @asset = Asset.create(:asset => uploaded_asset, :caption => asset_params[:asset][:caption])
+        @asset = Asset.create(asset: uploaded_asset, caption: asset_params[:asset][:caption])
         set_owner_or_editor
         if params[:for_attachment]
           @page = Page.find_by_id(params[:page_id]) || Page.new
-          @page_attachments << @page_attachment = @asset.page_attachments.build(:page => @page)
+          @page_attachments << @page_attachment = @asset.page_attachments.build(page: @page)
         end
         @assets << @asset
       end
     end
     if asset_params[:for_attachment]
-      render :partial => 'admin/page_attachments/attachment', :collection => @page_attachments
+      render partial: 'admin/page_attachments/attachment', collection: @page_attachments
     else
       response_for :create
     end
@@ -64,20 +64,21 @@ class Admin::AssetsController < Admin::ResourceController
     end
   end
 
-private
+  private
+
   def compress(uploaded_asset)
     data = $kraken.upload(uploaded_asset.tempfile.path, 'lossy' => true)
-    File.write(uploaded_asset.tempfile, open(data.kraked_url).read, { :mode => 'wb' })
+    File.write(uploaded_asset.tempfile, open(data.kraked_url).read, { mode: 'wb' })
     uploaded_asset
   end
 
   def set_owner_or_editor
-    @asset.created_by_id = current_user.id 
-    @asset.updated_by_id = current_user.id 
+    @asset.created_by_id = current_user.id
+    @asset.updated_by_id = current_user.id
     @asset.save! if @asset.id.present?
   end
 
   def asset_params
-    params.permit(:id, :for_attachment, :asset => [:caption, :for_attachment, :asset => []])
+    params.permit(:id, :for_attachment, asset: [:caption, :for_attachment, asset: []])
   end
 end

data/app/controllers/admin/configuration_controller.rb

@@ -1,5 +1,4 @@
 class Admin::ConfigurationController < ApplicationController
-
   # Admin::ConfigurationController handles the batch-updating of TrustyCms::Config entries.
   # It accepts any set of config name-value pairs but is accessible only to administrators.
   # Note that configuration is routed as a singular resource so we only deal with show/edit/update
@@ -8,9 +7,9 @@ class Admin::ConfigurationController < ApplicationController
   before_action :initialize_config
 
   only_allow_access_to :edit, :update,
-    :when => [:admin],
-    :denied_url => { :controller => 'admin/configuration', :action => 'show' },
-    :denied_message => 'You must have admin privileges to edit site configuration.'
+                       when: [:admin],
+                       denied_url: { controller: 'admin/configuration', action: 'show' },
+                       denied_message: 'You must have admin privileges to edit site configuration.'
 
   def show
     @user = current_user
@@ -27,24 +26,23 @@ class Admin::ConfigurationController < ApplicationController
         TrustyCms.config.transaction do
           params[:trusty_config].each_pair do |key, value|
             @trusty_config[key] = TrustyCms::Config.find_or_initialize_by(key: key)
-            @trusty_config[key].value = value      # validation sets errors on @trusty_config['key'] that the helper methods will pick up
+            @trusty_config[key].value = value # validation sets errors on @trusty_config['key'] that the helper methods will pick up
           end
-          redirect_to :action => :show
+          redirect_to action: :show
         end
       rescue ActiveRecord::RecordInvalid => e
-        flash[:error] = "Configuration error: please check the form"
-        render :action => :edit
+        flash[:error] = 'Configuration error: please check the form'
+        render action: :edit
       rescue TrustyCms::Config::ConfigError => e
         flash[:error] = "Configuration error: #{e}"
-        render :action => :edit
+        render action: :edit
       end
     end
   end
 
-protected
+  protected
 
   def initialize_config
     @trusty_config = {}
   end
-
 end

data/app/controllers/admin/extensions_controller.rb

@@ -1,8 +1,8 @@
 class Admin::ExtensionsController < ApplicationController
   only_allow_access_to :index,
-    :when => :admin,
-    :denied_url => { :controller => 'pages', :action => 'index' },
-    :denied_message => 'You must have administrative privileges to perform this action.'
+                       when: :admin,
+                       denied_url: { controller: 'pages', action: 'index' },
+                       denied_message: 'You must have administrative privileges to perform this action.'
 
   def index
     @template_name = 'index' # for Admin::RegionsHelper

data/app/controllers/admin/layouts_controller.rb

@@ -1,8 +1,7 @@
 class Admin::LayoutsController < Admin::ResourceController
   paginate_models
   only_allow_access_to :index, :show, :new, :create, :edit, :update, :remove, :destroy,
-    :when => [:designer, :admin],
-    :denied_url => { :controller => 'admin/pages', :action => 'index' },
-    :denied_message => 'You must have designer privileges to perform this action.'
-
+                       when: %i[designer admin],
+                       denied_url: { controller: 'admin/pages', action: 'index' },
+                       denied_message: 'You must have designer privileges to perform this action.'
 end

data/app/controllers/admin/page_attachments_controller.rb

@@ -2,7 +2,7 @@ class Admin::PageAttachmentsController < Admin::ResourceController
   helper 'admin/assets'
 
   def new
-    render :partial => 'attachment', :object => model
+    render partial: 'attachment', object: model
   end
 
   def load_model
@@ -10,14 +10,14 @@ class Admin::PageAttachmentsController < Admin::ResourceController
       @asset = Asset.find(params[:asset_id])
       @page = page_attachment_params[:page_id].blank? ? Page.new : Page.find_by_id(page_attachment_params[:page_id])
     rescue ActiveRecord::RecordNotFound
-      render :nothing => true, :layout => false
+      render nothing: true, layout: false
     end
-    self.model = PageAttachment.new(:asset => @asset, :page => @page)
+    self.model = PageAttachment.new(asset: @asset, page: @page)
   end
 
-private
+  private
+
   def page_attachment_params
     params.permit(:asset_id, :page_id)
   end
-
 end

data/app/controllers/admin/page_fields_controller.rb

@@ -1,10 +1,10 @@
 class Admin::PageFieldsController < Admin::ResourceController
   def create
-    self.model.attributes = page_fields_params
+    model.attributes = page_fields_params
     @controller_name = 'page'
     @template_name = 'edit'
-    render :partial => "page_field", :object => model,
-      :locals => { :page_field_counter => params[:page_field_counter].to_i}
+    render partial: 'page_field', object: model,
+           locals: { page_field_counter: params[:page_field_counter].to_i }
   end
 
   private
@@ -12,5 +12,4 @@ class Admin::PageFieldsController < Admin::ResourceController
   def page_fields_params
     params.require(:page_field).permit(:name, :content, :page_id)
   end
-
 end

data/app/controllers/admin/page_parts_controller.rb

@@ -1,16 +1,15 @@
 class Admin::PagePartsController < Admin::ResourceController
   def create
-    self.model.attributes = page_parts_params
+    model.attributes = page_parts_params
     @controller_name = 'page'
     @template_name = 'edit'
-    render :partial => "page_part", :object => model,
-      :locals => {:page_part_counter => params[:index].to_i}
+    render partial: 'page_part', object: model,
+           locals: { page_part_counter: params[:index].to_i }
   end
 
-private
+  private
 
   def page_parts_params
     params.require(:page_part).permit(:name, :filter_id, :content)
   end
-
 end