trusty-cms 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cda63c816a2fcbf3b9ae3dbfc8c0a2be2ce50b9bc0b103780aaf85d8ad553840
-  data.tar.gz: abb18785e54c1ee6caf17e1f60e5d8521c494654da04d4fc4cacc10d56c39287
+  metadata.gz: df7407acd1c4fbec623b0db122f04a560cacaa2d6997fc8c16bc95a76994bbef
+  data.tar.gz: c8d47d1c903e107608fe0da4d94f2254c678cbb2ad5195cb836bf619c4fb29da
 SHA512:
-  metadata.gz: 524fde7bdf413457452853b723302f0d055d6a207934f92b028a8a782b1ab8cb69780033128f9cd2a1b6e37e76455bf507a794bd5b56828e84e8ffc5ec8d6002
-  data.tar.gz: 92c35147763fdaaa09ee58636f3dd0d1d4a8f0a60d46cfc0e2d81c83de524e9112fd82218b5cd993b9f4c99ef5b0b8a9ea83457e139a9ee3a86337f3d18a3418
+  metadata.gz: 479e73974a02270bb4d666bb19dce9b354757551dbf6a2846a7fffaad8a482124bb85d81c1997ef22ff35772ceb093c90bfa75ba1ffbee7d12ae058345de60cc
+  data.tar.gz: b1e40b2f698f9e414fc83c39e54ad3eeb9c18ca0f5902c430946169ec7b6e632e7c56944598e7451944e2df103e2fb36f122ca74f54ac4c3f84d3dd36f16987b

data/Gemfile

@@ -15,7 +15,7 @@ group :development, :test do
   gem 'acts_as_list'
   gem 'database_cleaner'
   gem 'factory_bot_rails', '5.0.2'
-  gem 'launchy',         '~> 2.4.2'
+  gem 'launchy',         '~> 2.5.0'
   gem 'mysql2'
   gem 'poltergeist',      '~> 1.18.1'
   gem 'pry-byebug'

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    trusty-cms (4.0.1)
+    trusty-cms (4.0.2)
       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)
@@ -34,63 +34,63 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    actioncable (6.0.2.1)
-      actionpack (= 6.0.2.1)
+    actioncable (6.0.2.2)
+      actionpack (= 6.0.2.2)
       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.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)
       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.2.2)
+      actionpack (= 6.0.2.2)
+      actionview (= 6.0.2.2)
+      activejob (= 6.0.2.2)
       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.2.2)
+      actionview (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
       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.2.2)
+      actionpack (= 6.0.2.2)
+      activerecord (= 6.0.2.2)
+      activestorage (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
       nokogiri (>= 1.8.5)
-    actionview (6.0.2.1)
-      activesupport (= 6.0.2.1)
+    actionview (6.0.2.2)
+      activesupport (= 6.0.2.2)
       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.2.2)
+      activesupport (= 6.0.2.2)
       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.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)
       marcel (~> 0.3.1)
-    activesupport (6.0.2.1)
+    activesupport (6.0.2.2)
       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)
+    acts_as_list (1.0.1)
+      activerecord (>= 4.2)
     acts_as_tree (2.8.0)
       activerecord (>= 3.0.0)
     addressable (2.7.0)
@@ -166,9 +166,9 @@ GEM
       httparty
       json
       multipart-post
-    launchy (2.4.3)
-      addressable (~> 2.3)
-    libv8 (7.3.492.27.1-x86_64-linux)
+    launchy (2.5.0)
+      addressable (~> 2.7)
+    libv8 (7.3.492.27.1)
     loofah (2.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -176,7 +176,7 @@ GEM
       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)
@@ -203,12 +203,12 @@ 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.0)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
       byebug (~> 11.0)
-      pry (~> 0.10)
+      pry (~> 0.13.0)
     public_suffix (4.0.3)
     rack (2.0.9)
     rack-cache (1.11.0)
@@ -216,20 +216,20 @@ GEM
     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.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)
       bundler (>= 1.3.0)
-      railties (= 6.0.2.1)
+      railties (= 6.0.2.2)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
@@ -238,9 +238,9 @@ 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.2.2)
+      actionpack (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -258,20 +258,20 @@ GEM
       roadie (>= 3.1, < 5.0)
     rspec-core (3.9.1)
       rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    rspec-expectations (3.9.1)
       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-rails (4.0.0)
+      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.2)
     ruby_parser (3.14.2)
       sexp_processor (~> 4.9)
@@ -317,7 +317,7 @@ GEM
     will_paginate (3.3.0)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.2.2)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
@@ -326,7 +326,7 @@ DEPENDENCIES
   acts_as_list
   database_cleaner
   factory_bot_rails (= 5.0.2)
-  launchy (~> 2.4.2)
+  launchy (~> 2.5.0)
   mysql2
   poltergeist (~> 1.18.1)
   pry-byebug

data/app/assets/stylesheets/admin/partials/_forms.scss

@@ -48,6 +48,8 @@
   background-color: #f8d7da;
   color: #721c24;
   padding: 1em;
+  margin: 1em;
+  display: block;
 }
 
 #content {

data/app/controllers/admin/resource_controller.rb

@@ -136,8 +136,10 @@ class Admin::ResourceController < ApplicationController
     end
 
     def set_owner_or_editor
-      self.model.created_by_id = current_user.id if self.model.id == nil
-      self.model.updated_by_id = current_user.id 
+      if self.model.has_attribute? :created_by_id
+        self.model.created_by_id = current_user.id if self.model.id == nil
+        self.model.updated_by_id = current_user.id
+      end
     end
 
     def model

data/app/views/devise/passwords/new.html.haml

@@ -8,7 +8,7 @@
       .field
         = f.label :email
         %br/
-        = f.email_field :email, autofocus: true, autocomplete: "email"
+        = f.email_field :email, autofocus: true, autocomplete: "email", required: true
       .actions
         = f.submit "Send me reset password instructions"
     = render "devise/shared/links"

data/lib/trusty_cms.rb

@@ -2,6 +2,6 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..")) unle
 
 unless defined? TrustyCms::VERSION
   module TrustyCms
-    VERSION = '4.0.1'
+    VERSION = '4.0.2'
   end
 end

data/trusty_cms.gemspec

@@ -22,7 +22,7 @@ a general purpose content managment system--not merely a blogging engine.}
   s.license = %q{MIT}
   s.test_files = Dir["spec/**/*"]
 
-  s.add_dependency 'acts_as_list',    '~> 0.9.5'
+  s.add_dependency 'acts_as_list',    '>= 0.9.5', '< 1.1.0'
   s.add_dependency 'acts_as_tree',    '>= 2.6.1', '< 2.9.0'
   s.add_dependency 'ckeditor',        '>= 4.2.2', '< 4.3.0'
   s.add_dependency 'delocalize',      '>= 0.2', '< 2.0'

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-03 00:00:00.000000000 Z
+date: 2020-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: acts_as_tree
   requirement: !ruby/object:Gem::Requirement