trusty-cms 4.0.1 → 4.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cda63c816a2fcbf3b9ae3dbfc8c0a2be2ce50b9bc0b103780aaf85d8ad553840
-  data.tar.gz: abb18785e54c1ee6caf17e1f60e5d8521c494654da04d4fc4cacc10d56c39287
+  metadata.gz: 5ec4507891ffcef07709998473113f66f350d6c17ac1a1a40ca8593d6b565855
+  data.tar.gz: 994dec6d305e0ce812c7311ef3ff4c15f5a439f61d09a21bcafdf235d6a4f08d
 SHA512:
-  metadata.gz: 524fde7bdf413457452853b723302f0d055d6a207934f92b028a8a782b1ab8cb69780033128f9cd2a1b6e37e76455bf507a794bd5b56828e84e8ffc5ec8d6002
-  data.tar.gz: 92c35147763fdaaa09ee58636f3dd0d1d4a8f0a60d46cfc0e2d81c83de524e9112fd82218b5cd993b9f4c99ef5b0b8a9ea83457e139a9ee3a86337f3d18a3418
+  metadata.gz: 642b211413fead95b9f8a33eeead86c404f9f6debc150c3440416f380534be866ea9c817a312a5e65610a3df06ba8f7d0397a74429be26e2afeae0dd9de5e6b1
+  data.tar.gz: 12cc8927f097db47b3b97c38fd66f708fb5ac81ae4e12e5f43a0a07ae011184d82eef46adaa0d7e3b6f49a1f2dc2b585bb9dc19f0551bf83023219743a429d4c

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.4.2'
+  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,9 +1,9 @@
 PATH
   remote: .
   specs:
-    trusty-cms (4.0.1)
+    trusty-cms (4.1.3)
       RedCloth (= 4.3.2)
-      acts_as_list (~> 0.9.5)
+      acts_as_list (>= 0.9.5, < 1.1.0)
       acts_as_tree (>= 2.6.1, < 2.9.0)
       ckeditor (>= 4.2.2, < 4.3.0)
       delocalize (>= 0.2, < 2.0)
@@ -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,71 +34,71 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    actioncable (6.0.2.1)
-      actionpack (= 6.0.2.1)
+    actioncable (6.0.3.1)
+      actionpack (= 6.0.3.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.2.1)
-      actionpack (= 6.0.2.1)
-      activejob (= 6.0.2.1)
-      activerecord (= 6.0.2.1)
-      activestorage (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
+    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.1)
-      actionpack (= 6.0.2.1)
-      actionview (= 6.0.2.1)
-      activejob (= 6.0.2.1)
+    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.1)
-      actionview (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
+    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.1)
-      actionpack (= 6.0.2.1)
-      activerecord (= 6.0.2.1)
-      activestorage (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
+    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.1)
-      activesupport (= 6.0.2.1)
+    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.1)
-      activesupport (= 6.0.2.1)
+    activejob (6.0.3.1)
+      activesupport (= 6.0.3.1)
       globalid (>= 0.3.6)
-    activemodel (6.0.2.1)
-      activesupport (= 6.0.2.1)
-    activerecord (6.0.2.1)
-      activemodel (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
-    activestorage (6.0.2.1)
-      actionpack (= 6.0.2.1)
-      activejob (= 6.0.2.1)
-      activerecord (= 6.0.2.1)
+    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.1)
+    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)
-    acts_as_list (0.9.19)
-      activerecord (>= 3.0)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    acts_as_list (1.0.1)
+      activerecord (>= 4.2)
     acts_as_tree (2.8.0)
       activerecord (>= 3.0.0)
     addressable (2.7.0)
       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)
@@ -166,26 +166,26 @@ GEM
       httparty
       json
       multipart-post
-    launchy (2.4.3)
-      addressable (~> 2.3)
+    launchy (2.5.0)
+      addressable (~> 2.7)
     libv8 (7.3.492.27.1-x86_64-linux)
-    loofah (2.4.0)
+    loofah (2.5.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
-    method_source (0.9.2)
+    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.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.8.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
       byebug (~> 11.0)
-      pry (~> 0.10)
-    public_suffix (4.0.3)
+      pry (~> 0.13.0)
+    public_suffix (4.0.5)
     rack (2.0.9)
-    rack-cache (1.11.0)
+    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.1)
-      actioncable (= 6.0.2.1)
-      actionmailbox (= 6.0.2.1)
-      actionmailer (= 6.0.2.1)
-      actionpack (= 6.0.2.1)
-      actiontext (= 6.0.2.1)
-      actionview (= 6.0.2.1)
-      activejob (= 6.0.2.1)
-      activemodel (= 6.0.2.1)
-      activerecord (= 6.0.2.1)
-      activestorage (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
+    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.1)
+      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.1)
-      actionpack (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
+    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,26 +256,26 @@ 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.0)
+    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 (3.9.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+    rspec-rails (4.0.1)
+      actionpack (>= 4.2)
+      activesupport (>= 4.2)
+      railties (>= 4.2)
+      rspec-core (~> 3.9)
+      rspec-expectations (~> 3.9)
+      rspec-mocks (~> 3.9)
+      rspec-support (~> 3.9)
+    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,20 +304,20 @@ 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)
-    zeitwerk (2.2.2)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
@@ -325,8 +325,8 @@ PLATFORMS
 DEPENDENCIES
   acts_as_list
   database_cleaner
-  factory_bot_rails (= 5.0.2)
-  launchy (~> 2.4.2)
+  factory_bot_rails (= 5.2.0)
+  launchy (~> 2.5.0)
   mysql2
   poltergeist (~> 1.18.1)
   pry-byebug

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>';
     }
   }