trusty-cms 4.0.2 → 4.1.4

data/bin/rails

@@ -2,12 +2,12 @@
 # This command will automatically be run when you run "rails" with Rails gems
 # installed from the root of your application.
 
-ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/trusty/cms/engine', __FILE__)
-APP_PATH = File.expand_path('../../test/dummy/config/application', __FILE__)
+ENGINE_ROOT = File.expand_path('..', __dir__)
+ENGINE_PATH = File.expand_path('../lib/trusty/cms/engine', __dir__)
+APP_PATH = File.expand_path('../test/dummy/config/application', __dir__)
 
 # Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
 
 require 'rails/all'

data/bin/trusty_cms

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 
-ENV["RAILS_ENV"] ||= 'production'
+ENV['RAILS_ENV'] ||= 'production'
 
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..')
 
 require 'ruby_version_check'
-Signal.trap("INT") { puts; exit }
+Signal.trap('INT') { puts; exit }
 
 require 'trusty_cms'
 if ARGV.any? { |arg| %w(--version -v).any? { |flag| arg == flag } }
@@ -19,7 +19,6 @@ require 'rails_generator'
 require 'rails_generator/scripts/generate'
 
 class Rails::Generator::Base
-
   def self.use_application_sources!
     reset_sources
     sources << Rails::Generator::PathSource.new(:builtin, "#{File.dirname(__FILE__)}/../lib/generators")
@@ -46,7 +45,6 @@ class Rails::Generator::Base
       end
     end
   end
-
 end
 
-Rails::Generators.invoke("trusty_cms", [ARGV])
+Rails::Generators.invoke('trusty_cms', [ARGV])

data/config.ru

@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
+require ::File.expand_path('../config/environment', __FILE__)
 run TrustyCms::Application

data/config/application.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../boot', __FILE__)
+require File.expand_path('boot', __dir__)
 
 require 'rails/all'
 require 'acts_as_tree'
@@ -10,9 +10,8 @@ require 'rack/cache'
 require 'trustygems'
 require 'devise'
 
-
 if defined?(Bundler)
-  Bundler.require(*Rails.groups(:assets => %w(development test)))
+  Bundler.require(*Rails.groups(assets: %w(development test)))
 end
 
 module TrustyCms
@@ -30,12 +29,12 @@ module TrustyCms
 
     # Initialize extension paths
     config.initialize_extension_paths
-    extension_loader = ExtensionLoader.instance {|l| l.initializer = self }
+    extension_loader = ExtensionLoader.instance { |l| l.initializer = self }
     extension_loader.paths(:load).reverse_each do |path|
       config.autoload_paths.unshift path
       $LOAD_PATH.unshift path
     end
-    paths["app/helpers"] = []
+    paths['app/helpers'] = []
     # config.add_plugin_paths(extension_loader.paths(:plugin))
     trusty_locale_paths = Dir[File.join(TRUSTY_CMS_ROOT, 'config', 'locales', '*.{rb,yml}')]
     config.i18n.load_path = trusty_locale_paths + extension_loader.paths(:locale)
@@ -44,16 +43,16 @@ module TrustyCms
     config.encoding = 'utf-8'
 
     config.middleware.use Rack::Cache,
-                          :private_headers => ['Authorization'],
-                          :entitystore => "trusty:tmp/cache/entity",
-                          :metastore => "trusty:tmp/cache/meta",
-                          :verbose => false,
-                          :allow_reload => false,
-                          :allow_revalidate => false
+                          private_headers: ['Authorization'],
+                          entitystore: 'trusty:tmp/cache/entity',
+                          metastore: 'trusty:tmp/cache/meta',
+                          verbose: false,
+                          allow_reload: false,
+                          allow_revalidate: false
     config.middleware.insert_before(Rack::ConditionalGet, Rack::Cache)
     config.assets.enabled = true
 
-    config.filter_parameters += [:password, :password_confirmation]
+    config.filter_parameters += %i[password password_confirmation]
 
     # Use the database for sessions instead of the cookie-based default,
     # which shouldn't be used to store highly confidential information
@@ -83,9 +82,9 @@ module TrustyCms
       extension_loader.load_extensions
       extension_loader.load_extension_initalizers
 
-      extension_loader.activate_extensions  # also calls initialize_views
-      #config.add_controller_paths(extension_loader.paths(:controller))
-      #config.add_eager_load_paths(extension_loader.paths(:eager_load))
+      extension_loader.activate_extensions # also calls initialize_views
+      # config.add_controller_paths(extension_loader.paths(:controller))
+      # config.add_eager_load_paths(extension_loader.paths(:eager_load))
 
       # Add new inflection rules using the following format:
       ActiveSupport::Inflector.inflections do |inflect|

data/config/boot.rb

@@ -1,8 +1,7 @@
 # Don't change this file!
 # Configure your app in config/environment.rb and config/environments/*.rb
 
-
 # Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
 require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

data/config/environment.rb

@@ -1,5 +1,5 @@
 # Load the rails application
-require File.expand_path('../application', __FILE__)
+require File.expand_path('application', __dir__)
 
 # Initialize the rails application
 TrustyCms::Application.initialize!

data/config/environments/production.rb

@@ -40,5 +40,4 @@ TrustyCms::Application.configure do
   # config.after_initialize do
   #   SiteController.cache_timeout = 12.hours
   # end
-
 end

data/config/environments/test.rb

@@ -18,13 +18,12 @@ TrustyCms::Application.configure do
   # end
 
   # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils    = true
+  config.whiny_nils = true
 
   # Show full error reports and disable caching
   config.consider_all_requests_local = true
   config.action_controller.perform_caching             = false
 
-
   # Raise an ActiveModel::MassAssignmentSecurity::Error any time
   # something is mass-assigned that shouldn't be for ease in debugging.
   # config.active_record.mass_assignment_sanitizer = :strict

data/config/initializers/devise.rb

@@ -20,7 +20,7 @@ Devise.setup do |config|
 
   # ==> Controller configuration
   # Configure the parent class to the devise controllers.
-  #config.parent_controller = 'ApplicationController'
+  # config.parent_controller = 'ApplicationController'
 
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,

data/config/initializers/kraken.rb

@@ -2,6 +2,6 @@ require 'rubygems'
 require 'kraken-io'
 
 $kraken = Kraken::API.new(
-    :api_key => ENV['KRAKEN_KEY'],
-    :api_secret => ENV['KRAKEN_SECRET']
+  api_key: ENV['KRAKEN_KEY'],
+  api_secret: ENV['KRAKEN_SECRET'],
 )

data/config/initializers/tmp.rb

@@ -1,2 +1,2 @@
 require 'fileutils'
-FileUtils.mkdir_p(Rails.root.join("tmp", "stylesheets"))
+FileUtils.mkdir_p(Rails.root.join('tmp', 'stylesheets'))

data/config/initializers/trusty_cms_config.rb

@@ -2,47 +2,47 @@ require 'multi_site/engine'
 require 'clipped/engine'
 
 TrustyCms.config do |config|
-  config.define 'admin.title', :default => "TrustyCms CMS"
+  config.define 'admin.title', default: 'TrustyCms CMS'
   config.define 'dev.host'
-  config.define 'local.timezone', :allow_change => true, :select_from => lambda { ActiveSupport::TimeZone::MAPPING.keys.sort }
-  config.define 'defaults.locale', :select_from => lambda { TrustyCms::AvailableLocales.locales }, :allow_blank => true
-  config.define 'defaults.page.parts', :default => "Body,Extended"
-  config.define 'defaults.page.status', :select_from => lambda { Status.selectable_values }, :allow_blank => false, :default => "Draft"
-  config.define 'defaults.page.filter', :select_from => lambda { TextFilter.descendants.map { |s| s.filter_name }.sort }, :allow_blank => true
+  config.define 'local.timezone', allow_change: true, select_from: lambda { ActiveSupport::TimeZone::MAPPING.keys.sort }
+  config.define 'defaults.locale', select_from: lambda { TrustyCms::AvailableLocales.locales }, allow_blank: true
+  config.define 'defaults.page.parts', default: 'Body,Extended'
+  config.define 'defaults.page.status', select_from: lambda { Status.selectable_values }, allow_blank: false, default: 'Draft'
+  config.define 'defaults.page.filter', select_from: lambda { TextFilter.descendants.map { |s| s.filter_name }.sort }, allow_blank: true
   config.define 'defaults.page.fields'
-  config.define 'pagination.param_name', :default => 'page'
-  config.define 'pagination.per_page_param_name', :default => 'per_page'
-  config.define 'admin.pagination.per_page', :type => :integer, :default => 50
-  config.define 'site.title', :default => "Your site title", :allow_blank => false
-  config.define 'site.host', :default => "www.example.com", :allow_blank => false
-  config.define 'user.allow_password_reset?', :default => true
-  config.define 'session_timeout', :default => 2.weeks
+  config.define 'pagination.param_name', default: 'page'
+  config.define 'pagination.per_page_param_name', default: 'per_page'
+  config.define 'admin.pagination.per_page', type: :integer, default: 50
+  config.define 'site.title', default: 'Your site title', allow_blank: false
+  config.define 'site.host', default: 'www.example.com', allow_blank: false
+  config.define 'user.allow_password_reset?', default: true
+  config.define 'session_timeout', default: 2.weeks
   require 'multi_site/scoped_validation'
 end
 
 TrustyCms.config do |config|
   config.namespace 'paperclip' do |pc|
-    pc.define 'url',                      :default => '/system/:attachment/:id/:style/:basename:no_original_style.:extension', :allow_change => true
-    pc.define 'path',                     :default => ':rails_root/public/system/:attachment/:id/:style/:basename:no_original_style.:extension', :allow_change => true
-    pc.define 'skip_filetype_validation', :default => true, :type => :boolean
-    pc.define 'storage', :default       => 'filesystem',
-                         :select_from   => {
-                           'File System'            => 'filesystem',
-                           'Amazon S3'              => 'fog',
-                           'Google Storage'         => 'fog',
-                           'Rackspace Cloud Files'  => 'fog'
+    pc.define 'url',                      default: '/system/:attachment/:id/:style/:basename:no_original_style.:extension', allow_change: true
+    pc.define 'path',                     default: ':rails_root/public/system/:attachment/:id/:style/:basename:no_original_style.:extension', allow_change: true
+    pc.define 'skip_filetype_validation', default: true, type: :boolean
+    pc.define 'storage', default: 'filesystem',
+                         select_from: {
+                           'File System' => 'filesystem',
+                           'Amazon S3' => 'fog',
+                           'Google Storage' => 'fog',
+                           'Rackspace Cloud Files' => 'fog',
                          },
-                         :allow_blank   => false,
-                         :allow_display => false
+                         allow_blank: false,
+                         allow_display: false
 
     pc.namespace 'fog' do |fog|
-      fog.define 'provider', :select_from => {
-                               'Amazon S3'              => 'AWS',
-                               'Google Storage'         => 'Google',
-                               'Rackspace Cloud Files'  => 'Rackspace'
-                             }
+      fog.define 'provider', select_from: {
+        'Amazon S3' => 'AWS',
+        'Google Storage' => 'Google',
+        'Rackspace Cloud Files' => 'Rackspace',
+      }
       fog.define 'directory'
-      fog.define 'public?', :default => true
+      fog.define 'public?', default: true
       fog.define 'host'
     end
 
@@ -59,35 +59,35 @@ TrustyCms.config do |config|
     pc.namespace 's3' do |s3|
       s3.define 'key'
       s3.define 'secret'
-      s3.define 'region', :select_from => {
-                            'Asia North East' => 'ap-northeast-1',
-                            'Asia South East' => 'ap-southeast-1',
-                            'EU West' => 'eu-west-1',
-                            'US East' => 'us-east-1',
-                            'US West' => 'us-west-1'
-                          }
+      s3.define 'region', select_from: {
+        'Asia North East' => 'ap-northeast-1',
+        'Asia South East' => 'ap-southeast-1',
+        'EU West' => 'eu-west-1',
+        'US East' => 'us-east-1',
+        'US West' => 'us-west-1',
+      }
     end
   end
 
-  config.namespace 'assets', :allow_display => false do |assets|
-    assets.define 'create_image_thumbnails?', :default => 'true'
-    assets.define 'create_video_thumbnails?', :default => 'true'
-    assets.define 'create_pdf_thumbnails?', :default => 'true'
+  config.namespace 'assets', allow_display: false do |assets|
+    assets.define 'create_image_thumbnails?', default: 'true'
+    assets.define 'create_video_thumbnails?', default: 'true'
+    assets.define 'create_pdf_thumbnails?', default: 'true'
 
     assets.namespace 'thumbnails' do |thumbs| # NB :icon and :thumbnail are already defined as fixed formats for use in the admin interface and can't be changed
-      thumbs.define 'image', :default => 'normal:size=640x640>|small:size=320x320>'
-      thumbs.define 'video', :default => 'normal:size=640x640>,format=jpg|small:size=320x320>,format=jpg'
-      thumbs.define 'pdf', :default => 'normal:size=640x640>,format=jpg|small:size=320x320>,format=jpg'
+      thumbs.define 'image', default: 'normal:size=640x640>|small:size=320x320>'
+      thumbs.define 'video', default: 'normal:size=640x640>,format=jpg|small:size=320x320>,format=jpg'
+      thumbs.define 'pdf', default: 'normal:size=640x640>,format=jpg|small:size=320x320>,format=jpg'
     end
 
-    assets.define 'max_asset_size', :default => 5, :type => :integer, :units => 'MB'
-    assets.define 'display_size', :default => 'normal', :allow_blank => true
-    assets.define 'insertion_size', :default => 'normal', :allow_blank => true
+    assets.define 'max_asset_size', default: 5, type: :integer, units: 'MB'
+    assets.define 'display_size', default: 'normal', allow_blank: true
+    assets.define 'insertion_size', default: 'normal', allow_blank: true
   end
 end
 
 if TrustyCms.config_definitions['defaults.snippet.filter'].nil?
-  TrustyCms.config.define 'defaults.snippet.filter', :select_from => lambda { TextFilter.descendants.map { |s| s.filter_name }.sort }, :allow_blank => true
+  TrustyCms.config.define 'defaults.snippet.filter', select_from: lambda { TextFilter.descendants.map { |s| s.filter_name }.sort }, allow_blank: true
 end
 
 Admin::LayoutsController.send :helper, MultiSite::SiteChooserHelper

data/config/locales/en.yml

@@ -83,8 +83,7 @@ en:
     choose_file: 'Choose File'
     documents: 'Documents'
     caption: 'Caption'
-    confirm_refresh_assets: 'Are you sure you want to regenerate every asset thumbnail? This is likely to take a long time and use a lot of server resources: <strong class="warning">the performance of your site is very likely to be affected</strong> and your browser may time out before the operation is complete. This is only recommended if your asset collection is small!'
-    confirm_remove_asset: 'Are you sure you want to permanently remove the following asset?'
+    confirm_remove_asset: 'Are you sure you want to <span class="warning">permanently remove</span> the following asset?'
     confirm_remove_from_page: 'Are you sure you want to remove this asset from the page?'
     delete_asset: 'Delete Asset'
     detach: 'Detach'
@@ -103,9 +102,6 @@ en:
     no_assets: 'No Assets'
     no_attached_assets: 'No assets attached.'
     others: 'Others'
-    refresh_assets: 'Regenerate all thumbnails'
-    regenerate: 'Regenerate'
-    regenerate_thumbnails: 'Regenerate Thumbnails'
     remove_asset: 'Remove Asset'
     remove_from_page: 'Remove from page'
     reorder: 'Reorder'
@@ -177,6 +173,7 @@ en:
       - :month
       - :day
   delete_layout: 'Delete Layout'
+  delete_snippet: 'Delete Snippet'
   delete_pages: 'Delete %{pages}'
   delete_user: 'Delete User'
   description: 'Description'
@@ -249,6 +246,7 @@ en:
   remove: 'Remove'
   remove_field: 'Remove Field'
   remove_layout: 'Remove Layout'
+  remove_snippet: 'Remove Snippet'
   remove_page: 'Remove Page'
   remove_pages: 'Remove %{pages}'
   remove_tab: 'Remove Tab'
@@ -279,11 +277,13 @@ en:
   testing: Testing
   text:
     layouts:
-      remove_warning: 'Are you sure you want to <strong class="warning">permanently remove</strong> the following layout?'
+      remove_warning: 'Are you sure you want to <span class="warning">permanently remove</span> the following layout?'
+    snippets:
+      remove_warning: 'Are you sure you want to <span class="warning">permanently remove</span> the following snippet?'
     pages:
-      remove_warning: 'Are you sure you want to <strong class="warning">permanently remove</strong> the following %{pages}?'
+      remove_warning: 'Are you sure you want to <span class="warning">permanently remove</span> the following %{pages}?'
     users:
-      remove_warning: 'Are you sure you want to <strong class="warning">permanently remove</strong> the following user?'
+      remove_warning: 'Are you sure you want to <span class="warning">permanently remove</span> the following user?'
   this_file_language: "English"
   time:
     am: 'am'

data/config/routes.rb

@@ -1,16 +1,16 @@
 TrustyCms::Application.routes.draw do
   root to: 'site#show_page'
-  devise_for :users, module: :devise, :skip => :registration
+  devise_for :users, module: :devise, skip: :registration
   as :user do
     post 'authenticate', to: 'devise/sessions#create', as: :authenticate
   end
   get '/rad_social/mail' => 'social_mailer#social_mail_form', as: :rad_social_mail_form
   post '/rad_social/mail' => 'social_mailer#create_social_mail', as: :rad_create_social_mail
-  TrustyCms::Application.config.enabled_extensions.each { |ext|
-  }
+  TrustyCms::Application.config.enabled_extensions.each do |ext|
+  end
   namespace :admin do
     resources :pages do
-      resources :children, :controller => 'pages'
+      resources :children, controller: 'pages'
       get 'remove', on: :member
     end
     resources :layouts do
@@ -22,12 +22,11 @@ TrustyCms::Application.routes.draw do
     resources :snippets do
       get :remove, on: :member
     end
-    post 'save-table-position' => "pages#save_table_position", as: "save_tables_position"
+    post 'save-table-position' => 'pages#save_table_position', as: 'save_tables_position'
 
     resources :assets do
       get :remove, on: :member
       get :refresh, on: :collection
-      post :regenerate, on: :collection
       put :refresh, on: :member
     end
     resources :page_attachments, only: [:new] do
@@ -39,7 +38,7 @@ TrustyCms::Application.routes.draw do
     end
   end
 
-  match 'admin/preview' => 'admin/pages#preview', :as => :preview, :via => [:post, :put]
+  match 'admin/preview' => 'admin/pages#preview', :as => :preview, :via => %i[post put]
   get 'admin' => 'admin/pages#index'
 
   namespace :admin do

data/lib/active_record_extensions/active_record_extensions.rb

@@ -1,12 +1,11 @@
 require 'active_record'
 
 class ActiveRecord::Base
-
   def self.validates_path(*args)
     configuration = args.extract_options!
     validates_each(args, configuration) do |record, attr_name, value|
       page = Page.find_by_path(value)
-      record.errors.add(attr_name, :page_not_found, :default => configuration[:message]) if page.nil? || page.is_a?(FileNotFoundPage)
+      record.errors.add(attr_name, :page_not_found, default: configuration[:message]) if page.nil? || page.is_a?(FileNotFoundPage)
     end
   end
 

data/lib/annotatable.rb

@@ -1,5 +1,4 @@
 module Annotatable
-
   def self.included(base)
     base.extend ClassMethods
   end
@@ -14,7 +13,7 @@ module Annotatable
 
     def annotate(*attrs)
       options = {}
-      options = attrs.pop if attrs.last.kind_of?(Hash)
+      options = attrs.pop if attrs.last.is_a?(Hash)
       options.symbolize_keys!
       inherit = options[:inherit]
       if inherit
@@ -42,13 +41,12 @@ module Annotatable
 
     def inherited_with_annotatable(subclass)
       inherited_without_annotatable(subclass)
-      (["inherited_annotations"] + (@inherited_annotations || [])).each do |t|
+      (['inherited_annotations'] + (@inherited_annotations || [])).each do |t|
         ivar = "@#{t}"
         subclass.instance_variable_set(ivar, instance_variable_get(ivar))
       end
     end
   end
-
 end
 
 # We don't necessarily have ActiveSupport loaded yet!
@@ -63,6 +61,6 @@ class Hash
 
   # Destructively convert all keys to symbols.
   def symbolize_keys!
-    self.replace(self.symbolize_keys)
+    replace(symbolize_keys)
   end
 end