trusty-cms 4.1.6 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c22f1a0c39d50f9db4b32cc516fc855a8be5b4867cc8904f738a52a7e71cdfa
-  data.tar.gz: e4574f3bf96460aa8ff2fb6bf9af28dfa30592a30056dc3432ea6c232a74f0b3
+  metadata.gz: 97e7e4f174a6b755702f6743fc5c4bed0a9f2384e266e3874b52eeab89df84b8
+  data.tar.gz: 59dfd764929a52eddf268255dba421eaaa4b90227e2cb04b07c66abc547b7bc1
 SHA512:
-  metadata.gz: ff2dbedfb3586408e6ef2a561e755e084ba1cbd8d9ed778722ca862bed105c4b9073fa6e9db71ccee918ef824399b335f656bd84f84fa502d1d016ed54c2cb7c
-  data.tar.gz: 3882e09eeed5febdd6f9d991d598ef02d9407cfcbd3ba40796b8e622b3308e884afc441563abac25fb14b3cea157f811dc47cc0fed68f2faee6df2559d68543c
+  metadata.gz: '083f2fd54a713baf10dc16d0ea3773a9ffe002b3ffdca09771e28c1b81a55511d106bb55bd231165548cacc2dfec9c0bc6157f2db9ecb177af36c0729c0269a2'
+  data.tar.gz: d0707e8e683982348b672b9dd3eaa16802c82c27565ac0c8b709d6828a2b01942c7fe46b4954f1954290e9f282c6b3ae198ab9030686ac44a63e5c3a6e50820b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (4.1.6)
+    trusty-cms (4.2.1)
       RedCloth (= 4.3.2)
       acts_as_list (>= 0.9.5, < 1.1.0)
       acts_as_tree (>= 2.6.1, < 2.9.0)
@@ -9,8 +9,8 @@ PATH
       delocalize (>= 0.2, < 2.0)
       devise
       execjs (~> 2.7)
-      haml (~> 5.0)
-      haml-rails (~> 1.0.0)
+      haml
+      haml-rails
       highline (>= 1.7.8, < 2.1.0)
       kraken-io
       mini_racer
@@ -20,7 +20,7 @@ PATH
       rack-cache (~> 1.7)
       radius (~> 0.7)
       rails
-      rake (< 13.0)
+      rake (< 14.0)
       rdoc (>= 5.1, < 7.0)
       roadie-rails
       sassc-rails
@@ -34,62 +34,66 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    actioncable (6.0.3.3)
-      actionpack (= 6.0.3.3)
+    actioncable (6.1.1)
+      actionpack (= 6.1.1)
+      activesupport (= 6.1.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.3.3)
-      actionpack (= 6.0.3.3)
-      activejob (= 6.0.3.3)
-      activerecord (= 6.0.3.3)
-      activestorage (= 6.0.3.3)
-      activesupport (= 6.0.3.3)
+    actionmailbox (6.1.1)
+      actionpack (= 6.1.1)
+      activejob (= 6.1.1)
+      activerecord (= 6.1.1)
+      activestorage (= 6.1.1)
+      activesupport (= 6.1.1)
       mail (>= 2.7.1)
-    actionmailer (6.0.3.3)
-      actionpack (= 6.0.3.3)
-      actionview (= 6.0.3.3)
-      activejob (= 6.0.3.3)
+    actionmailer (6.1.1)
+      actionpack (= 6.1.1)
+      actionview (= 6.1.1)
+      activejob (= 6.1.1)
+      activesupport (= 6.1.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.3.3)
-      actionview (= 6.0.3.3)
-      activesupport (= 6.0.3.3)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.1)
+      actionview (= 6.1.1)
+      activesupport (= 6.1.1)
+      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.0.3.3)
-      actionpack (= 6.0.3.3)
-      activerecord (= 6.0.3.3)
-      activestorage (= 6.0.3.3)
-      activesupport (= 6.0.3.3)
+    actiontext (6.1.1)
+      actionpack (= 6.1.1)
+      activerecord (= 6.1.1)
+      activestorage (= 6.1.1)
+      activesupport (= 6.1.1)
       nokogiri (>= 1.8.5)
-    actionview (6.0.3.3)
-      activesupport (= 6.0.3.3)
+    actionview (6.1.1)
+      activesupport (= 6.1.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.3.3)
-      activesupport (= 6.0.3.3)
+    activejob (6.1.1)
+      activesupport (= 6.1.1)
       globalid (>= 0.3.6)
-    activemodel (6.0.3.3)
-      activesupport (= 6.0.3.3)
-    activerecord (6.0.3.3)
-      activemodel (= 6.0.3.3)
-      activesupport (= 6.0.3.3)
-    activestorage (6.0.3.3)
-      actionpack (= 6.0.3.3)
-      activejob (= 6.0.3.3)
-      activerecord (= 6.0.3.3)
+    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)
-    activesupport (6.0.3.3)
+      mimemagic (~> 0.3.2)
+    activesupport (6.1.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    acts_as_list (1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    acts_as_list (1.0.3)
       activerecord (>= 4.2)
     acts_as_tree (2.8.0)
       activerecord (>= 3.0.0)
@@ -98,7 +102,7 @@ GEM
     bcrypt (3.1.16)
     builder (3.2.4)
     byebug (11.1.3)
-    capybara (3.33.0)
+    capybara (3.34.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
@@ -121,15 +125,15 @@ GEM
     database_cleaner (1.8.5)
     delocalize (1.2.0)
       rails (>= 2)
-    devise (4.7.2)
+    devise (4.7.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
     diff-lcs (1.4.4)
-    docile (1.3.2)
-    erubi (1.9.0)
+    docile (1.3.4)
+    erubi (1.10.0)
     erubis (2.7.0)
     execjs (2.7.0)
     factory_bot (6.1.0)
@@ -137,18 +141,18 @@ GEM
     factory_bot_rails (6.1.0)
       factory_bot (~> 6.1.0)
       railties (>= 5.0.0)
-    ffi (1.13.1)
+    ffi (1.14.2)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    haml (5.1.2)
+    haml (5.2.1)
       temple (>= 0.8.0)
       tilt
-    haml-rails (1.0.0)
-      actionpack (>= 4.0.1)
-      activesupport (>= 4.0.1)
+    haml-rails (2.0.1)
+      actionpack (>= 5.1)
+      activesupport (>= 5.1)
       haml (>= 4.0.6, < 6.0)
       html2haml (>= 1.0.1)
-      railties (>= 4.0.1)
+      railties (>= 5.1)
     highline (2.0.3)
     html2haml (2.2.0)
       erubis (~> 2.7.0)
@@ -158,9 +162,9 @@ GEM
     httparty (0.18.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.8.5)
+    i18n (1.8.7)
       concurrent-ruby (~> 1.0)
-    json (2.3.1)
+    json (2.5.1)
     kraken-io (0.1.3)
       activesupport
       httparty
@@ -169,7 +173,7 @@ GEM
     launchy (2.5.0)
       addressable (~> 2.7)
     libv8 (8.4.255.0)
-    loofah (2.7.0)
+    loofah (2.8.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -179,19 +183,20 @@ GEM
     method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.0512)
+    mime-types-data (3.2020.1104)
     mimemagic (0.3.5)
     mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
+    mini_portile2 (2.5.0)
     mini_racer (0.3.1)
       libv8 (~> 8.4.255)
-    minitest (5.14.2)
+    minitest (5.14.3)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     mysql2 (0.5.3)
-    nio4r (2.5.3)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
+    nio4r (2.5.4)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
     orm_adapter (0.5.0)
     paperclip (6.1.0)
       activemodel (>= 4.2.0)
@@ -210,26 +215,27 @@ GEM
       byebug (~> 11.0)
       pry (~> 0.13.0)
     public_suffix (4.0.6)
+    racc (1.5.2)
     rack (2.2.3)
-    rack-cache (1.12.0)
+    rack-cache (1.12.1)
       rack (>= 0.4)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     radius (0.7.5)
-    rails (6.0.3.3)
-      actioncable (= 6.0.3.3)
-      actionmailbox (= 6.0.3.3)
-      actionmailer (= 6.0.3.3)
-      actionpack (= 6.0.3.3)
-      actiontext (= 6.0.3.3)
-      actionview (= 6.0.3.3)
-      activejob (= 6.0.3.3)
-      activemodel (= 6.0.3.3)
-      activerecord (= 6.0.3.3)
-      activestorage (= 6.0.3.3)
-      activesupport (= 6.0.3.3)
-      bundler (>= 1.3.0)
-      railties (= 6.0.3.3)
+    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)
+      bundler (>= 1.15.0)
+      railties (= 6.1.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
@@ -238,42 +244,42 @@ GEM
       loofah (~> 2.3)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
-    railties (6.0.3.3)
-      actionpack (= 6.0.3.3)
-      activesupport (= 6.0.3.3)
+    railties (6.1.1)
+      actionpack (= 6.1.1)
+      activesupport (= 6.1.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.1)
+      thor (~> 1.0)
+    rake (13.0.3)
+    rdoc (6.3.0)
+    regexp_parser (1.8.2)
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
     roadie (4.0.0)
       css_parser (~> 1.4)
       nokogiri (~> 1.8)
-    roadie-rails (2.1.1)
-      railties (>= 5.1, < 6.1)
+    roadie-rails (2.2.0)
+      railties (>= 5.1, < 6.2)
       roadie (>= 3.1, < 5.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-rails (4.0.1)
+      rspec-support (~> 3.10.0)
+    rspec-rails (4.0.2)
       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.15.0)
+      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)
     sassc (2.4.0)
       ffi (~> 1.9)
@@ -283,11 +289,13 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    sexp_processor (4.15.1)
-    simplecov (0.19.0)
+    sexp_processor (4.15.2)
+    simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-html (0.12.2)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.2)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -300,12 +308,11 @@ GEM
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
     thor (1.0.1)
-    thread_safe (0.3.6)
     tilt (2.0.10)
     trustygems (0.2.1)
       rake
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     uuidtools (2.2.0)
@@ -317,7 +324,7 @@ GEM
     will_paginate (3.3.0)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.4.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby

data/INSTALL.md

@@ -15,4 +15,6 @@ From within the directory containing your TrustyCMS instance:
 
 5. add config.extensions = [ :snippets, :clipped, :layouts, :multi_site ] to enable them in application.rb
 
+7. Add utf8 encoding to your db.yml
+   
 6. Run `bundle exec rake db:setup`, `bundle exec rake trusty_cms_engine:install:migrations`, then `bundle exec rake db:bootstrap`.

data/app/controllers/admin/pages_controller.rb

@@ -75,7 +75,7 @@ class Admin::PagesController < Admin::ResourceController
       if request.referer =~ %r{/admin/pages/(\d+)/edit}
         page = Page.find($1).becomes(page_class)
         layout_id = page.layout_id
-        page.update_attributes(params[:page])
+        page.update(params[:page])
         page.published_at ||= Time.now
       else
         page = page_class.new(params[:page])

data/app/controllers/admin/preferences_controller.rb

@@ -11,7 +11,7 @@ class Admin::PreferencesController < ApplicationController
   end
 
   def update
-    if @user.update_attributes(preferences_params)
+    if @user.update(preferences_params)
       redirect_to admin_configuration_path
     else
       flash[:error] = t('preferences_controller.error_updating')

data/app/controllers/admin/resource_controller.rb

@@ -59,7 +59,7 @@ class Admin::ResourceController < ApplicationController
   %i[create update].each do |action|
     class_eval %{
       def #{action}                                       # def create
-        model.update_attributes!(permitted_params[model_symbol])    #   model.update_attributes!(params[model_symbol])
+        model.update!(permitted_params[model_symbol])    #   model.update!(params[model_symbol])
         response_for :#{action}                           #   response_for :create
       end                                                 # end
     }, __FILE__, __LINE__

data/app/controllers/admin/users_controller.rb

@@ -29,7 +29,7 @@ class Admin::UsersController < Admin::ResourceController
       announce_cannot_remove_self_from_admin_role
     end
     model.skip_password_validation = true unless user_params[:password_confirmation].present?
-    if model.update_attributes(user_params)
+    if model.update(user_params)
       response_for :update
     else
       flash[:error] = 'There was an error saving the user. Please try again.'

data/config/environments/development.rb

@@ -29,4 +29,6 @@ TrustyCms::Application.configure do
 
   # Expands the lines which load the assets
   config.assets.debug = true
+  config.assets.check_precompiled_asset = false
+
 end

data/lib/generators/extension/USAGE

@@ -0,0 +1,30 @@
+Description:
+    The extension generator creates stubs for a new TrustyCms extension.
+
+    The generator takes an extension name as its argument.  The extension name may be
+    given in CamelCase or under_score and should not be suffixed with 'Extension'.
+
+    The generator creates an extension directory in vendor/extensions that includes
+    <extension_name>_extension.rb, README and Rakefile files as well as db, lib, task,
+    and test directories.
+
+Example:
+    ./script/generate extension AssetManagement
+
+    This will create:
+    vendor/extensions/asset_management/app/controllers
+    vendor/extensions/asset_management/app/helpers
+    vendor/extensions/asset_management/app/models
+    vendor/extensions/asset_management/app/views
+    vendor/extensions/asset_management/db/migrate
+    vendor/extensions/asset_management/lib/tasks
+    vendor/extensions/asset_management/README
+    vendor/extensions/asset_management/asset_management_extension.rb
+    vendor/extensions/asset_management/lib/tasks/asset_management_extension_tasks.rake
+    vendor/extensions/asset_management/spec/controllers
+    vendor/extensions/asset_management/spec/models
+    vendor/extensions/asset_management/spec/views
+    vendor/extensions/asset_management/spec/helpers
+    vendor/extensions/asset_management/Rakefile
+    vendor/extensions/asset_management/spec/spec_helper.rb
+    vendor/extensions/asset_management/spec/spec.opts