trusty-cms 3.5.2 → 3.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 60d2fbeb659c32f7e84840f73875fe52f8babbf5
-  data.tar.gz: d7f0af94bd84f4effc97e7cd7dea2e9082ca45a0
+SHA256:
+  metadata.gz: dd2e2662ffd9f41819193530dcfd638a6c10bd39a4298657824ec08c6b75d768
+  data.tar.gz: 365c6b610ebdae703463c75d282827fa26b4051fbe9cc23e6f4ea5ec65c56ed8
 SHA512:
-  metadata.gz: d47dd1277e06561bc020aa026631b1fb205211fd23dac68c802ee94465392807d7869fec0cb5f401116fc0def077c09ba32b8e254ef48e623ffaebb61deb6a91
-  data.tar.gz: 15044ee9f5e3d46a55b6f412663d06095ca19c5fbe65bfde7ce114524d207fbad1b1a2f16fc5c736b41be6ce7abbd1e0b71199de18e1bbee59ed29c273cb27cb
+  metadata.gz: 2afd2a40a89dc62fc0f9920ff7594a0bfed4818b726a8b5c0963ad6cc09377e4d0fcc48b36003853c302cd23ce242622eb81a28fa573647326d0634bbe30a4e3
+  data.tar.gz: 963b6843c6094aa5e132852cd7075a61d18fe285b154a13f67965724e3a71e0a1f6a143e08e5b06f0fd760bc48dded1dbb61cf3550bfe72c7787bdb381ee73cf

data/Gemfile

@@ -15,7 +15,7 @@ group :development, :test do
   gem 'acts_as_list'
   gem 'codeclimate-test-reporter'
   gem 'database_cleaner'
-  gem 'factory_bot_rails'
+  gem 'factory_bot_rails', '4.11.1'
   gem 'launchy',         '~> 2.4.2'
   gem 'mysql2'
   gem 'poltergeist',      '~> 1.18.1'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (3.5.2)
+    trusty-cms (3.5.3)
       RedCloth (= 4.3.2)
       acts_as_list (~> 0.9.5)
       acts_as_tree (>= 2.6.1, < 2.9.0)
@@ -13,6 +13,7 @@ PATH
       haml-rails (~> 1.0.0)
       highline (>= 1.7.8, < 2.1.0)
       kraken-io
+      mini_racer
       mysql2
       paperclip (> 5.2)
       rack (~> 2.0.1)
@@ -24,7 +25,6 @@ PATH
       roadie-rails
       sass-rails
       stringex (>= 2.7.1, < 2.9.0)
-      therubyracer (~> 0.12.3)
       tzinfo (~> 1.2.3)
       uglifier (>= 3.2, < 5.0)
       uuidtools (~> 2.1.5)
@@ -34,63 +34,64 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    actioncable (5.2.2)
-      actionpack (= 5.2.2)
+    actioncable (5.2.3)
+      actionpack (= 5.2.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.2)
-      actionpack (= 5.2.2)
-      actionview (= 5.2.2)
-      activejob (= 5.2.2)
+    actionmailer (5.2.3)
+      actionpack (= 5.2.3)
+      actionview (= 5.2.3)
+      activejob (= 5.2.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.2)
-      actionview (= 5.2.2)
-      activesupport (= 5.2.2)
+    actionpack (5.2.3)
+      actionview (= 5.2.3)
+      activesupport (= 5.2.3)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.2)
-      activesupport (= 5.2.2)
+    actionview (5.2.3)
+      activesupport (= 5.2.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.2)
-      activesupport (= 5.2.2)
+    activejob (5.2.3)
+      activesupport (= 5.2.3)
       globalid (>= 0.3.6)
-    activemodel (5.2.2)
-      activesupport (= 5.2.2)
-    activerecord (5.2.2)
-      activemodel (= 5.2.2)
-      activesupport (= 5.2.2)
+    activemodel (5.2.3)
+      activesupport (= 5.2.3)
+    activerecord (5.2.3)
+      activemodel (= 5.2.3)
+      activesupport (= 5.2.3)
       arel (>= 9.0)
-    activestorage (5.2.2)
-      actionpack (= 5.2.2)
-      activerecord (= 5.2.2)
+    activestorage (5.2.3)
+      actionpack (= 5.2.3)
+      activerecord (= 5.2.3)
       marcel (~> 0.3.1)
-    activesupport (5.2.2)
+    activesupport (5.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    acts_as_list (0.9.17)
+    acts_as_list (0.9.19)
       activerecord (>= 3.0)
     acts_as_tree (2.8.0)
       activerecord (>= 3.0.0)
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     arel (9.0.0)
     builder (3.2.3)
-    byebug (10.0.2)
-    capybara (3.5.1)
+    byebug (11.0.1)
+    capybara (3.16.1)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      xpath (~> 3.1)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
     ckeditor (4.2.4)
       cocaine
       orm_adapter (~> 0.5.0)
@@ -101,7 +102,7 @@ GEM
     codeclimate-test-reporter (1.0.9)
       simplecov (<= 0.13)
     coderay (1.1.2)
-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.5)
     crass (1.0.4)
     css_parser (1.7.0)
       addressable
@@ -130,7 +131,7 @@ GEM
       haml (>= 4.0.6, < 6.0)
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
-    highline (2.0.1)
+    highline (2.0.2)
     html2haml (2.2.0)
       erubis (~> 2.7.0)
       haml (>= 4.0, < 6)
@@ -139,9 +140,9 @@ GEM
     httparty (0.16.4)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.5.3)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
-    json (2.1.0)
+    json (2.2.0)
     kraken-io (0.1.3)
       activesupport
       httparty
@@ -149,7 +150,7 @@ GEM
       multipart-post
     launchy (2.4.3)
       addressable (~> 2.3)
-    libv8 (3.16.14.19)
+    libv8 (6.7.288.46.1)
     loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -160,16 +161,18 @@ GEM
     method_source (0.9.2)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2018.0812)
+    mime-types-data (3.2019.0331)
     mimemagic (0.3.3)
     mini_mime (1.0.1)
     mini_portile2 (2.4.0)
+    mini_racer (0.2.4)
+      libv8 (>= 6.3)
     minitest (5.11.3)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     mysql2 (0.5.2)
     nio4r (2.3.1)
-    nokogiri (1.10.1)
+    nokogiri (1.10.2)
       mini_portile2 (~> 2.4.0)
     orm_adapter (0.5.0)
     paperclip (6.1.0)
@@ -182,31 +185,31 @@ GEM
       capybara (>= 2.1, < 4)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
-    pry (0.11.3)
+    pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
       pry (~> 0.10)
-    public_suffix (3.0.2)
-    rack (2.0.6)
-    rack-cache (1.8.0)
+    public_suffix (3.0.3)
+    rack (2.0.7)
+    rack-cache (1.9.0)
       rack (>= 0.4)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    radius (0.7.4)
-    rails (5.2.2)
-      actioncable (= 5.2.2)
-      actionmailer (= 5.2.2)
-      actionpack (= 5.2.2)
-      actionview (= 5.2.2)
-      activejob (= 5.2.2)
-      activemodel (= 5.2.2)
-      activerecord (= 5.2.2)
-      activestorage (= 5.2.2)
-      activesupport (= 5.2.2)
+    radius (0.7.5)
+    rails (5.2.3)
+      actioncable (= 5.2.3)
+      actionmailer (= 5.2.3)
+      actionpack (= 5.2.3)
+      actionview (= 5.2.3)
+      activejob (= 5.2.3)
+      activemodel (= 5.2.3)
+      activerecord (= 5.2.3)
+      activestorage (= 5.2.3)
+      activesupport (= 5.2.3)
       bundler (>= 1.3.0)
-      railties (= 5.2.2)
+      railties (= 5.2.3)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
@@ -215,9 +218,9 @@ GEM
       loofah (~> 2.2, >= 2.2.2)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
-    railties (5.2.2)
-      actionpack (= 5.2.2)
-      activesupport (= 5.2.2)
+    railties (5.2.3)
+      actionpack (= 5.2.3)
+      activesupport (= 5.2.3)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
@@ -226,12 +229,12 @@ GEM
     rb-inotify (0.10.0)
       ffi (~> 1.0)
     rdoc (6.1.1)
-    ref (2.0.0)
+    regexp_parser (1.4.0)
     roadie (3.4.0)
       css_parser (~> 1.4)
       nokogiri (~> 1.5)
-    roadie-rails (1.3.0)
-      railties (>= 3.0, < 5.3)
+    roadie-rails (2.0.0)
+      railties (>= 5.1, < 5.3)
       roadie (~> 3.1)
     rspec-core (3.8.0)
       rspec-support (~> 3.8.0)
@@ -250,9 +253,9 @@ GEM
       rspec-mocks (~> 3.8.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    ruby_parser (3.12.0)
+    ruby_parser (3.13.1)
       sexp_processor (~> 4.9)
-    sass (3.7.3)
+    sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -263,7 +266,7 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    sexp_processor (4.11.0)
+    sexp_processor (4.12.0)
     simplecov (0.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
@@ -277,12 +280,9 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     stringex (2.8.5)
-    temple (0.8.0)
+    temple (0.8.1)
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
-    therubyracer (0.12.3)
-      libv8 (~> 3.16.14.15)
-      ref
     thor (0.20.3)
     thread_safe (0.3.6)
     tilt (2.0.9)
@@ -296,8 +296,8 @@ GEM
     websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
-    will_paginate (3.1.6)
-    xpath (3.1.0)
+    will_paginate (3.1.7)
+    xpath (3.2.0)
       nokogiri (~> 1.8)
 
 PLATFORMS
@@ -307,7 +307,7 @@ DEPENDENCIES
   acts_as_list
   codeclimate-test-reporter
   database_cleaner
-  factory_bot_rails
+  factory_bot_rails (= 4.11.1)
   launchy (~> 2.4.2)
   mysql2
   poltergeist (~> 1.18.1)

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

@@ -9,11 +9,11 @@
         $(this).toggleClass('selected');
         Dropdown.findMenu(this).closest('.dropdown_wrapper').slideToggle();
       })
-    };
+    }
   }
 
   Dropdown.findMenu = function(link) {
-    var match = $(link).attr('href').match(/\#(.+)$/)[1];
+    var match = $(link).attr('href').match(/#(.+)$/)[1];
     return $('#' + match);
   }
 

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

@@ -3,7 +3,7 @@
     $(link).on('click', function(event){
       event.preventDefault();
       var href = $(link).attr('href');
-      var match = href.match(/\#(.+)$/);
+      var match = href.match(/#(.+)$/);
       Popup.show(match[1]);
     });
   }

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

@@ -35,7 +35,6 @@ $(document).ready(function() {
         data.push(this_id, position)
       }
       data.splice(0,2);
-      console.log(data);
       $.ajax({
         data: {new_position: data},
         type: 'POST',

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

@@ -1,5 +1,5 @@
 // Non namespaced. At least they're not monkeypatching core javascript objects, ok?
 
 var toSlug = function(string) {
-  return string.trim().toLowerCase().replace(/[^-a-z0-9~\s\.:;+=_]/g, '').replace(/[\s\.:;=+]+/g, '-');
+  return string.trim().toLowerCase().replace(/[^-a-z0-9~\s.:;+=_]/g, '').replace(/[\s.:;=+]+/g, '-');
 }

data/app/assets/javascripts/ckeditor/config.js

@@ -2,7 +2,7 @@ CKEDITOR.editorConfig = function( config ) {
   config.allowedContent = true;
   config.removeFormatTags = "";
   config.protectedSource.push(/<r:([\S]+).*<\/r:\1>/g);
-  config.protectedSource.push(/<r:[^>\/]*\/>/g);
+  config.protectedSource.push(/<r:[^>/]*\/>/g);
 
   config.forcePasteAsPlainText = true;
   // if you want to remove clipboard, you have to remove all of these:

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

@@ -61,7 +61,7 @@ function RadAjaxForm(form) {
     function handleSuccess(data, status, xhr)
     {
         var url = xhr.getResponseHeader("BrowserRedirectTo");
-        if (!!url) {
+        if (url) {
           location.href = url
         }
     }

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 = '3.5.2'
+    VERSION = '3.5.3'
   end
 end

data/spec/factories/layout.rb

@@ -1,8 +1,8 @@
 FactoryBot.define do
 
   factory :layout do
-    name 'Main Layout'
-    content <<-CONTENT
+    name { 'Main Layout' }
+    content { <<-CONTENT }
     <html>
       <head>
         <title><r:title /></title>

data/spec/factories/page.rb

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :page do
-    title       'Page'
+    title       { 'Page' }
     breadcrumb  { title }
     slug        { title.slugify }
 
@@ -28,7 +28,7 @@ FactoryBot.define do
     end
 
     factory :published_page do
-      status_id Status[:published].id
+      status_id { Status[:published].id }
 
       factory :article do
         title { generate(:article_title)}
@@ -46,10 +46,10 @@ FactoryBot.define do
     end
 
     factory :home do |home|
-      title 'Home'
-      slug '/'
-      status_id Status[:published].id
-      parent_id nil
+      title { 'Home' }
+      slug { '/' }
+      status_id { Status[:published].id }
+      parent_id { nil }
     end
 
   end

data/spec/factories/page_part.rb

@@ -1,7 +1,7 @@
 FactoryBot.define do
 
   factory :page_part do
-    name 'unnamed'
+    name { 'unnamed' }
     content { name }
   end
 

data/spec/factories/user.rb

@@ -1,35 +1,35 @@
 FactoryBot.define do
   factory :user do
-    name 'User'
-    email 'email@test.com'
-    login 'user'
-    password 'password'
+    name { 'User' }
+    email { 'email@test.com' }
+    login { 'user' }
+    password { 'password' }
     password_confirmation { password }
 
     factory :admin do
-      name 'Admin'
-      login 'admin'
-      email 'admin@example.com'
-      admin true
+      name { 'Admin' }
+      login { 'admin' }
+      email { 'admin@example.com' }
+      admin { true }
     end
 
     factory :existing do
-      name 'Existing'
-      login 'existing'
-      email 'existing@example.com'
+      name { 'Existing' }
+      login { 'existing' }
+      email { 'existing@example.com' }
     end
 
     factory :designer do
-      name 'Designer'
-      login 'designer'
-      email ''
-      designer true
+      name { 'Designer' }
+      login { 'designer' }
+      email { '' }
+      designer { true }
     end
 
     factory :non_admin do
-      name 'Non Admin'
-      login 'non_admin'
-      admin false
+      name { 'Non Admin' }
+      login { 'non_admin' }
+      admin { false }
     end
   end
 end

data/trusty_cms.gemspec

@@ -33,6 +33,7 @@ a general purpose content managment system--not merely a blogging engine.}
   s.add_dependency 'highline',        '>= 1.7.8', '< 2.1.0'
   s.add_dependency 'kraken-io'
   s.add_dependency 'mysql2'
+  s.add_dependency 'mini_racer'
   s.add_dependency 'paperclip',       '> 5.2'
   s.add_dependency 'rack',            '~> 2.0.1'
   s.add_dependency 'rack-cache',      '~> 1.7'
@@ -44,7 +45,6 @@ a general purpose content managment system--not merely a blogging engine.}
   s.add_dependency 'roadie-rails'
   s.add_dependency 'sass-rails'
   s.add_dependency 'stringex',        '>= 2.7.1', '< 2.9.0'
-  s.add_dependency 'therubyracer',    '~> 0.12.3'
   s.add_dependency 'tzinfo',          '~> 1.2.3'
   s.add_dependency 'uglifier',        '>= 3.2', '< 5.0'
   s.add_dependency 'uuidtools',    '~> 2.1.5'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 3.5.2
+  version: 3.5.3
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-21 00:00:00.000000000 Z
+date: 2019-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -188,6 +188,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mini_racer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -354,20 +368,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.9.0
-- !ruby/object:Gem::Dependency
-  name: therubyracer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.12.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.12.3
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -1483,8 +1483,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: A no-fluff content management system designed for small teams.