trusty-cms 4.2 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 299f6d4ea4f8354fc95eca5057d85ef469ecf514a9b9caccea05498f3ee7b3db
-  data.tar.gz: 9c635ae0f8cb03af87e45321f6f139cdab67abea7ad57d5bb304c3bbb5426204
+  metadata.gz: ae1333499a79a83bd6a8a0a46673e1b5ef54e589b3e7cf0ec3447d473396b769
+  data.tar.gz: 3ca5980f13834a3cdfce5ca580a39259394345ca1c034580b09aa0c0df9662ee
 SHA512:
-  metadata.gz: 41043b6945a24d689aefc362b5eed571b0cb378aaffb9b3dcf67f4570fba089b86062341998e7d54ecc53391d74cab0f7e76af6de131a9743976227f47b5c5a8
-  data.tar.gz: cc491f12651bc85e7fddc1612319882c5b9982fe4dc4bce72d5b4325cbfbf597786a2e06ab8cabbbb1bf2453a515590ec62ddd719e76a4efae1984d6bb77ffa1
+  metadata.gz: 0e0d9815b5f9d3a5cdf4bfe06e23e6f8a018639c3871aae42e38e3f97623f0f469d5740bad25edf621b7277b8acdeb095de3fef5e475ea69e7643952cd91048b
+  data.tar.gz: 96869827969eedee8b76da2dee964ed2308bbbf5e58c0010a274970559bb890d5be2a6c2d431d5212aac1a6bd140c86c2beacb8978303eaebb09798e9970f5c7

data/Gemfile

@@ -14,7 +14,8 @@ gemspec
 group :development, :test do
   gem 'acts_as_list'
   gem 'database_cleaner'
-  gem 'factory_bot_rails', '6.1.0'
+  gem 'factory_bot_rails', '6.2.0'
+  gem 'kt-paperclip', '~> 7.0.0'
   gem 'launchy', '~> 2.5.0'
   gem 'mysql2'
   gem 'poltergeist', '~> 1.18.1'

data/Gemfile.lock

@@ -1,21 +1,20 @@
 PATH
   remote: .
   specs:
-    trusty-cms (4.2)
+    trusty-cms (4.3.1)
       RedCloth (= 4.3.2)
       acts_as_list (>= 0.9.5, < 1.1.0)
-      acts_as_tree (>= 2.6.1, < 2.9.0)
+      acts_as_tree (~> 2.9.1)
       ckeditor (>= 4.2.2, < 4.3.0)
       delocalize (>= 0.2, < 2.0)
       devise
       execjs (~> 2.7)
       haml
-      haml-rails
+      haml-rails (~> 2.0)
       highline (>= 1.7.8, < 2.1.0)
       kraken-io
       mini_racer
       mysql2
-      paperclip (> 5.2)
       rack (>= 2.0.1, < 2.3.0)
       rack-cache (~> 1.7)
       radius (~> 0.7)
@@ -23,7 +22,7 @@ PATH
       rake (< 14.0)
       rdoc (>= 5.1, < 7.0)
       roadie-rails
-      sassc-rails
+      sass-rails
       stringex (>= 2.7.1, < 2.9.0)
       tzinfo (>= 1.2.3, < 2.1.0)
       uglifier (>= 3.2, < 5.0)
@@ -34,81 +33,81 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    actioncable (6.1.1)
-      actionpack (= 6.1.1)
-      activesupport (= 6.1.1)
+    actioncable (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.1)
-      actionpack (= 6.1.1)
-      activejob (= 6.1.1)
-      activerecord (= 6.1.1)
-      activestorage (= 6.1.1)
-      activesupport (= 6.1.1)
+    actionmailbox (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      activejob (= 6.1.3.2)
+      activerecord (= 6.1.3.2)
+      activestorage (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
       mail (>= 2.7.1)
-    actionmailer (6.1.1)
-      actionpack (= 6.1.1)
-      actionview (= 6.1.1)
-      activejob (= 6.1.1)
-      activesupport (= 6.1.1)
+    actionmailer (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      actionview (= 6.1.3.2)
+      activejob (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.1)
-      actionview (= 6.1.1)
-      activesupport (= 6.1.1)
+    actionpack (6.1.3.2)
+      actionview (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.1)
-      actionpack (= 6.1.1)
-      activerecord (= 6.1.1)
-      activestorage (= 6.1.1)
-      activesupport (= 6.1.1)
+    actiontext (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      activerecord (= 6.1.3.2)
+      activestorage (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
       nokogiri (>= 1.8.5)
-    actionview (6.1.1)
-      activesupport (= 6.1.1)
+    actionview (6.1.3.2)
+      activesupport (= 6.1.3.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.1)
-      activesupport (= 6.1.1)
+    activejob (6.1.3.2)
+      activesupport (= 6.1.3.2)
       globalid (>= 0.3.6)
-    activemodel (6.1.1)
-      activesupport (= 6.1.1)
-    activerecord (6.1.1)
-      activemodel (= 6.1.1)
-      activesupport (= 6.1.1)
-    activestorage (6.1.1)
-      actionpack (= 6.1.1)
-      activejob (= 6.1.1)
-      activerecord (= 6.1.1)
-      activesupport (= 6.1.1)
-      marcel (~> 0.3.1)
-      mimemagic (~> 0.3.2)
-    activesupport (6.1.1)
+    activemodel (6.1.3.2)
+      activesupport (= 6.1.3.2)
+    activerecord (6.1.3.2)
+      activemodel (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
+    activestorage (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      activejob (= 6.1.3.2)
+      activerecord (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
+      marcel (~> 1.0.0)
+      mini_mime (~> 1.0.2)
+    activesupport (6.1.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    acts_as_list (1.0.3)
+    acts_as_list (1.0.4)
       activerecord (>= 4.2)
-    acts_as_tree (2.8.0)
+    acts_as_tree (2.9.1)
       activerecord (>= 3.0.0)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     bcrypt (3.1.16)
     builder (3.2.4)
     byebug (11.1.3)
-    capybara (3.34.0)
+    capybara (3.35.3)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      regexp_parser (~> 1.5)
+      regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
     ckeditor (4.2.4)
       cocaine
@@ -118,30 +117,35 @@ GEM
     cocaine (0.6.0)
       terrapin (= 0.6.0)
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.9)
     crass (1.0.6)
-    css_parser (1.7.1)
+    css_parser (1.9.0)
       addressable
-    database_cleaner (1.8.5)
+    database_cleaner (2.0.1)
+      database_cleaner-active_record (~> 2.0.0)
+    database_cleaner-active_record (2.0.1)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
     delocalize (1.2.0)
       rails (>= 2)
-    devise (4.7.3)
+    devise (4.8.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
     diff-lcs (1.4.4)
-    docile (1.3.4)
+    docile (1.4.0)
     erubi (1.10.0)
     erubis (2.7.0)
-    execjs (2.7.0)
-    factory_bot (6.1.0)
+    execjs (2.8.1)
+    factory_bot (6.2.0)
       activesupport (>= 5.0.0)
-    factory_bot_rails (6.1.0)
-      factory_bot (~> 6.1.0)
+    factory_bot_rails (6.2.0)
+      factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    ffi (1.14.2)
+    ffi (1.15.3)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     haml (5.2.1)
@@ -162,7 +166,7 @@ GEM
     httparty (0.18.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.8.7)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     json (2.5.1)
     kraken-io (0.1.3)
@@ -170,40 +174,36 @@ GEM
       httparty
       json
       multipart-post
+    kt-paperclip (7.0.0)
+      activemodel (>= 4.2.0)
+      activesupport (>= 4.2.0)
+      marcel (~> 1.0.1)
+      mime-types
+      terrapin (~> 0.6.0)
     launchy (2.5.0)
       addressable (~> 2.7)
-    libv8 (8.4.255.0)
-    loofah (2.8.0)
+    libv8-node (15.14.0.1-x86_64-darwin-18)
+    loofah (2.10.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)
+    marcel (1.0.1)
     method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.1104)
-    mimemagic (0.3.5)
-    mini_mime (1.0.2)
-    mini_portile2 (2.5.0)
-    mini_racer (0.3.1)
-      libv8 (~> 8.4.255)
-    minitest (5.14.3)
+    mime-types-data (3.2021.0225)
+    mini_mime (1.0.3)
+    mini_racer (0.4.0)
+      libv8-node (~> 15.14.0.0)
+    minitest (5.14.4)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     mysql2 (0.5.3)
-    nio4r (2.5.4)
-    nokogiri (1.11.1)
-      mini_portile2 (~> 2.5.0)
+    nio4r (2.5.7)
+    nokogiri (1.11.7-x86_64-darwin)
       racc (~> 1.4)
     orm_adapter (0.5.0)
-    paperclip (6.1.0)
-      activemodel (>= 4.2.0)
-      activesupport (>= 4.2.0)
-      mime-types
-      mimemagic (~> 0.3.0)
-      terrapin (~> 0.6.0)
     poltergeist (1.18.1)
       capybara (>= 2.1, < 4)
       cliver (~> 0.3.1)
@@ -222,20 +222,20 @@ GEM
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     radius (0.7.5)
-    rails (6.1.1)
-      actioncable (= 6.1.1)
-      actionmailbox (= 6.1.1)
-      actionmailer (= 6.1.1)
-      actionpack (= 6.1.1)
-      actiontext (= 6.1.1)
-      actionview (= 6.1.1)
-      activejob (= 6.1.1)
-      activemodel (= 6.1.1)
-      activerecord (= 6.1.1)
-      activestorage (= 6.1.1)
-      activesupport (= 6.1.1)
+    rails (6.1.3.2)
+      actioncable (= 6.1.3.2)
+      actionmailbox (= 6.1.3.2)
+      actionmailer (= 6.1.3.2)
+      actionpack (= 6.1.3.2)
+      actiontext (= 6.1.3.2)
+      actionview (= 6.1.3.2)
+      activejob (= 6.1.3.2)
+      activemodel (= 6.1.3.2)
+      activerecord (= 6.1.3.2)
+      activestorage (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
       bundler (>= 1.15.0)
-      railties (= 6.1.1)
+      railties (= 6.1.3.2)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
@@ -244,15 +244,15 @@ GEM
       loofah (~> 2.3)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
-    railties (6.1.1)
-      actionpack (= 6.1.1)
-      activesupport (= 6.1.1)
+    railties (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
       method_source
       rake (>= 0.8.7)
       thor (~> 1.0)
     rake (13.0.3)
-    rdoc (6.3.0)
-    regexp_parser (1.8.2)
+    rdoc (6.3.2)
+    regexp_parser (2.1.1)
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
@@ -267,20 +267,22 @@ GEM
     rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.1)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-rails (4.0.2)
-      actionpack (>= 4.2)
-      activesupport (>= 4.2)
-      railties (>= 4.2)
+    rspec-rails (5.0.1)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      railties (>= 5.2)
       rspec-core (~> 3.10)
       rspec-expectations (~> 3.10)
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
-    rspec-support (3.10.1)
-    ruby_parser (3.15.1)
-      sexp_processor (~> 4.9)
+    rspec-support (3.10.2)
+    ruby_parser (3.16.0)
+      sexp_processor (~> 4.15, >= 4.15.1)
+    sass-rails (6.0.0)
+      sassc-rails (~> 2.1, >= 2.1.1)
     sassc (2.4.0)
       ffi (~> 1.9)
     sassc-rails (2.1.2)
@@ -289,13 +291,13 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    sexp_processor (4.15.2)
+    sexp_processor (4.15.3)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.2)
+    simplecov_json_formatter (0.1.3)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -307,7 +309,7 @@ GEM
     temple (0.8.2)
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
-    thor (1.0.1)
+    thor (1.1.0)
     tilt (2.0.10)
     trustygems (0.2.1)
       rake
@@ -318,7 +320,7 @@ GEM
     uuidtools (2.2.0)
     warden (1.2.9)
       rack (>= 2.0.9)
-    websocket-driver (0.7.3)
+    websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     will_paginate (3.3.0)
@@ -327,12 +329,13 @@ GEM
     zeitwerk (2.4.2)
 
 PLATFORMS
-  ruby
+  x86_64-darwin-18
 
 DEPENDENCIES
   acts_as_list
   database_cleaner
-  factory_bot_rails (= 6.1.0)
+  factory_bot_rails (= 6.2.0)
+  kt-paperclip (~> 7.0.0)
   launchy (~> 2.5.0)
   mysql2
   poltergeist (~> 1.18.1)
@@ -344,4 +347,4 @@ DEPENDENCIES
   trustygems (~> 0.2.0)
 
 BUNDLED WITH
-   2.1.4
+   2.2.19

data/LICENSE.md

@@ -1,6 +1,6 @@
 # MIT License
 
-Copyright (c) 2006-2009, John W. Long and Sean D. Cribbs.
+Copyright (c) 2006-2021, John W. Long and Sean D. Cribbs.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/app/assets/config/trusty-cms/manifest.js

@@ -0,0 +1,7 @@
+//= link_tree ../../images
+//= link_directory ../../javascripts .js
+//= link_directory ../../stylesheets .css
+//= link admin/assets.css
+//= link admin/assets_admin.js
+//= link admin/assets_admin.js
+//= link admin/custom_file_upload.js

data/app/assets/javascripts/admin/custom_file_upload.js

@@ -0,0 +1,7 @@
+$(function () {
+  var fileUpload = $('#asset_asset');
+  var fileChosen = $('#file-chosen');
+  fileUpload.on('change', function() {
+    fileChosen.text(this.files[0].name)
+  })
+});