trusty-cms 4.0.2 → 4.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df7407acd1c4fbec623b0db122f04a560cacaa2d6997fc8c16bc95a76994bbef
-  data.tar.gz: c8d47d1c903e107608fe0da4d94f2254c678cbb2ad5195cb836bf619c4fb29da
+  metadata.gz: '06485f3b9ed1c9ca511e064801b64e301c62a152a1da3ad7902215ab146f6c0d'
+  data.tar.gz: f2c25843032b941ffb0f1b7cb8920b07298ab131f626b2bd4cab6aee580a61e4
 SHA512:
-  metadata.gz: 479e73974a02270bb4d666bb19dce9b354757551dbf6a2846a7fffaad8a482124bb85d81c1997ef22ff35772ceb093c90bfa75ba1ffbee7d12ae058345de60cc
-  data.tar.gz: b1e40b2f698f9e414fc83c39e54ad3eeb9c18ca0f5902c430946169ec7b6e632e7c56944598e7451944e2df103e2fb36f122ca74f54ac4c3f84d3dd36f16987b
+  metadata.gz: f3660bb986c773d9e81821660898e04af9c985297acfd8bc2a57c4623f931b9636dc4f628176e370a46d3676608f9778b476ff9a21e1d775587c2739755f6873
+  data.tar.gz: 23246702302f14f37569aa164467d76f771df08a562a1f7c2dc773a85308ab2abcfd81e7343f68bf4f4cab92c2678544fda3139161eacd23856beb6298e7cd29

data/Gemfile

@@ -14,10 +14,10 @@ gemspec
 group :development, :test do
   gem 'acts_as_list'
   gem 'database_cleaner'
-  gem 'factory_bot_rails', '5.0.2'
-  gem 'launchy',         '~> 2.5.0'
+  gem 'factory_bot_rails', '5.2.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.0.2)
+    trusty-cms (4.1.4)
       RedCloth (= 4.3.2)
       acts_as_list (>= 0.9.5, < 1.1.0)
       acts_as_tree (>= 2.6.1, < 2.9.0)
@@ -16,7 +16,7 @@ PATH
       mini_racer
       mysql2
       paperclip (> 5.2)
-      rack (~> 2.0.1)
+      rack (>= 2.0.1, < 2.3.0)
       rack-cache (~> 1.7)
       radius (~> 0.7)
       rails
@@ -25,7 +25,7 @@ PATH
       roadie-rails
       sassc-rails
       stringex (>= 2.7.1, < 2.9.0)
-      tzinfo (~> 1.2.3)
+      tzinfo (>= 1.2.3, < 2.1.0)
       uglifier (>= 3.2, < 5.0)
       uuidtools (~> 2.1.5)
       will_paginate (~> 3.0)
@@ -34,61 +34,61 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    actioncable (6.0.2.2)
-      actionpack (= 6.0.2.2)
+    actioncable (6.0.3.1)
+      actionpack (= 6.0.3.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.2.2)
-      actionpack (= 6.0.2.2)
-      activejob (= 6.0.2.2)
-      activerecord (= 6.0.2.2)
-      activestorage (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
+    actionmailbox (6.0.3.1)
+      actionpack (= 6.0.3.1)
+      activejob (= 6.0.3.1)
+      activerecord (= 6.0.3.1)
+      activestorage (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
       mail (>= 2.7.1)
-    actionmailer (6.0.2.2)
-      actionpack (= 6.0.2.2)
-      actionview (= 6.0.2.2)
-      activejob (= 6.0.2.2)
+    actionmailer (6.0.3.1)
+      actionpack (= 6.0.3.1)
+      actionview (= 6.0.3.1)
+      activejob (= 6.0.3.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.2.2)
-      actionview (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
+    actionpack (6.0.3.1)
+      actionview (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.2.2)
-      actionpack (= 6.0.2.2)
-      activerecord (= 6.0.2.2)
-      activestorage (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
+    actiontext (6.0.3.1)
+      actionpack (= 6.0.3.1)
+      activerecord (= 6.0.3.1)
+      activestorage (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
       nokogiri (>= 1.8.5)
-    actionview (6.0.2.2)
-      activesupport (= 6.0.2.2)
+    actionview (6.0.3.1)
+      activesupport (= 6.0.3.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.2.2)
-      activesupport (= 6.0.2.2)
+    activejob (6.0.3.1)
+      activesupport (= 6.0.3.1)
       globalid (>= 0.3.6)
-    activemodel (6.0.2.2)
-      activesupport (= 6.0.2.2)
-    activerecord (6.0.2.2)
-      activemodel (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
-    activestorage (6.0.2.2)
-      actionpack (= 6.0.2.2)
-      activejob (= 6.0.2.2)
-      activerecord (= 6.0.2.2)
+    activemodel (6.0.3.1)
+      activesupport (= 6.0.3.1)
+    activerecord (6.0.3.1)
+      activemodel (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
+    activestorage (6.0.3.1)
+      actionpack (= 6.0.3.1)
+      activejob (= 6.0.3.1)
+      activerecord (= 6.0.3.1)
       marcel (~> 0.3.1)
-    activesupport (6.0.2.2)
+    activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+      zeitwerk (~> 2.2, >= 2.2.2)
     acts_as_list (1.0.1)
       activerecord (>= 4.2)
     acts_as_tree (2.8.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.3)
+    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)
@@ -132,12 +132,12 @@ GEM
     erubi (1.9.0)
     erubis (2.7.0)
     execjs (2.7.0)
-    factory_bot (5.0.2)
+    factory_bot (5.2.0)
       activesupport (>= 4.2.0)
-    factory_bot_rails (5.0.2)
-      factory_bot (~> 5.0.2)
+    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)
@@ -169,7 +169,7 @@ GEM
     launchy (2.5.0)
       addressable (~> 2.7)
     libv8 (7.3.492.27.1)
-    loofah (2.4.0)
+    loofah (2.5.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -179,13 +179,13 @@ GEM
     method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
-    mimemagic (0.3.4)
+    mime-types-data (3.2020.0512)
+    mimemagic (0.3.5)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    mini_racer (0.2.9)
-      libv8 (>= 6.9.411)
-    minitest (5.14.0)
+    mini_racer (0.2.14)
+      libv8 (> 7.3)
+    minitest (5.14.1)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     mysql2 (0.5.3)
@@ -203,33 +203,33 @@ 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)
-    rack (2.0.9)
-    rack-cache (1.11.0)
+    public_suffix (4.0.5)
+    rack (2.2.3)
+    rack-cache (1.12.0)
       rack (>= 0.4)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     radius (0.7.5)
-    rails (6.0.2.2)
-      actioncable (= 6.0.2.2)
-      actionmailbox (= 6.0.2.2)
-      actionmailer (= 6.0.2.2)
-      actionpack (= 6.0.2.2)
-      actiontext (= 6.0.2.2)
-      actionview (= 6.0.2.2)
-      activejob (= 6.0.2.2)
-      activemodel (= 6.0.2.2)
-      activerecord (= 6.0.2.2)
-      activestorage (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
+    rails (6.0.3.1)
+      actioncable (= 6.0.3.1)
+      actionmailbox (= 6.0.3.1)
+      actionmailer (= 6.0.3.1)
+      actionpack (= 6.0.3.1)
+      actiontext (= 6.0.3.1)
+      actionview (= 6.0.3.1)
+      activejob (= 6.0.3.1)
+      activemodel (= 6.0.3.1)
+      activerecord (= 6.0.3.1)
+      activestorage (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
       bundler (>= 1.3.0)
-      railties (= 6.0.2.2)
+      railties (= 6.0.3.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
@@ -238,16 +238,16 @@ GEM
       loofah (~> 2.3)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
-    railties (6.0.2.2)
-      actionpack (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
+    railties (6.0.3.1)
+      actionpack (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
       method_source
       rake (>= 0.8.7)
       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.2.1)
+    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)
@@ -304,16 +304,16 @@ GEM
     tilt (2.0.10)
     trustygems (0.2.1)
       rake
-    tzinfo (1.2.6)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     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)
@@ -325,7 +325,7 @@ PLATFORMS
 DEPENDENCIES
   acts_as_list
   database_cleaner
-  factory_bot_rails (= 5.0.2)
+  factory_bot_rails (= 5.2.0)
   launchy (~> 2.5.0)
   mysql2
   poltergeist (~> 1.18.1)

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/javascripts/admin.js

@@ -34,3 +34,6 @@
 //= require 'admin/tags'
 //= require 'admin/treetable'
 //= require 'admin/sortable'
+//= require 'tablesaw/dist/tablesaw.jquery.js'
+//= require 'tablesaw/dist/tablesaw-init.js'
+//= require '@fortawesome/fontawesome-free/js/all.js'

data/app/assets/javascripts/admin/more-or-less.js

@@ -15,9 +15,9 @@
 
     $(link).toggleClass('less more');
     if (link.innerHTML.match(/less/i)) {
-      link.innerHTML = 'More';
+      link.innerHTML = 'More <i class="fas fa-angle-down"></i>';
     } else if (link.innerHTML.match(/more/i)) {
-      link.innerHTML = 'Less';
+      link.innerHTML = 'Less <i class="fas fa-angle-up"></i>';
     }
   }
 

data/app/assets/javascripts/admin/tabcontrol.js.erb

@@ -33,8 +33,7 @@
     }
 
   TabControl.addTab = function(tabText) {
-    var relative_url_root = "<%= ActionController::Base.relative_url_root %>";
-    $('div#tab_control .tabs').append("<a id='tab_" + tabText + "' href='#' class='tab'><span>" + tabText + "</span><img src='" + relative_url_root + "<%= asset_path('admin/tab_close.png') %>' class='close' alt='Remove part' title='Remove part' /></a>");
+    $('div#tab_control .tabs').append("<a id='tab_" + tabText + "' href='#' class='tab'><span>" + tabText + "</span><i class='fas fa-times-circle close' title='Remove part'></i></a>");
     var $page_part_index = $('#page_part_index_field');
     $page_part_index.val(parseInt($page_part_index.val()) + 1);
   }

data/app/assets/javascripts/rad_social/rad_ajax_form.js

@@ -16,6 +16,9 @@ function RadAjaxForm(form) {
             type: "POST",
             url: form.find('input[name=submit_url]').attr('value'),
             data: form.serialize(),
+            beforeSend: function ( xhr ) {
+              xhr.setRequestHeader("X-CSRF-Token", $('meta[name=csrf-token]').attr('content'));
+            },
             success: function(data, status, xhr) {
                 form.find(".loader").removeClass('ajax-loader');
                 form.find(".loader-small").removeClass('ajax-loader-small');