trusty-cms 3.7.1 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66653170ed2ff1f3e44d119379737f1b23e7cb3f034fa835e7463f55a295b23b
-  data.tar.gz: 9f2e6451449b1f615489dc069e8f0eeeeb5947e755a2e1768b9e509e686ce704
+  metadata.gz: '09c49ebf8ef38af2824b8e5ec60b4cc04251e1ff3c20c91181c7ffdf83eaec80'
+  data.tar.gz: f771d1fade5badacbd46f3f901033b4a8d5ece389d1fd44706c9955420c902bb
 SHA512:
-  metadata.gz: ee32a4bdeeb850891cb630cea5767771934a1408b765d3ab0cc2299139687b40843f5498454e63bb2258900693a3dfc0b5ca14355c76013f2d1be526ac09d410
-  data.tar.gz: 558c43831e03d4c2ee30f5a0f7aa38bd3244f2a578cec9255cca07f5532b06c365325f83dce31b9b5680b43612a3c3628628208cf69809718e73d0677221504d
+  metadata.gz: 74a743d6606fb307e1e453dd53f89b64975e55e2de1e73f494a54e2ff45d4e657d9de34caeab7797810ec3173c3a70190300bbbabd3a25bdc5fad64205c2c3b4
+  data.tar.gz: 7fd3beabdd23c7f8aed72074d9e3f30e7b6050e8c5842705fedd7a442e38179e5c69b7fea4051624d69f1f1d9c4aff5af5d2e7b1554f66765fb92c4ad70d1bef

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (3.7.1)
+    trusty-cms (3.8.0)
       RedCloth (= 4.3.2)
       acts_as_list (~> 0.9.5)
       acts_as_tree (>= 2.6.1, < 2.9.0)
@@ -96,12 +96,12 @@ GEM
       orm_adapter (~> 0.5.0)
     climate_control (0.2.0)
     cliver (0.3.2)
-    cocaine (0.5.8)
-      climate_control (>= 0.0.3, < 1.0)
+    cocaine (0.6.0)
+      terrapin (= 0.6.0)
     coderay (1.1.2)
     concurrent-ruby (1.1.5)
-    crass (1.0.4)
-    css_parser (1.7.0)
+    crass (1.0.5)
+    css_parser (1.7.1)
       addressable
     database_cleaner (1.7.0)
     delocalize (1.2.0)
@@ -128,13 +128,13 @@ GEM
       haml (>= 4.0.6, < 6.0)
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
-    highline (2.0.2)
+    highline (2.0.3)
     html2haml (2.2.0)
       erubis (~> 2.7.0)
       haml (>= 4.0, < 6)
       nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
-    httparty (0.17.0)
+    httparty (0.17.3)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     i18n (1.6.0)
@@ -148,7 +148,7 @@ GEM
     launchy (2.4.3)
       addressable (~> 2.3)
     libv8 (7.3.492.27.1-x86_64-linux)
-    loofah (2.2.3)
+    loofah (2.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -156,28 +156,28 @@ GEM
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (0.9.2)
-    mime-types (3.2.2)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0331)
+    mime-types-data (3.2019.1009)
     mimemagic (0.3.3)
     mini_mime (1.0.1)
     mini_portile2 (2.4.0)
-    mini_racer (0.2.6)
+    mini_racer (0.2.9)
       libv8 (>= 6.9.411)
     minitest (5.11.3)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    mysql2 (0.5.2)
-    nio4r (2.4.0)
-    nokogiri (1.10.4)
+    mysql2 (0.5.3)
+    nio4r (2.5.2)
+    nokogiri (1.10.7)
       mini_portile2 (~> 2.4.0)
     orm_adapter (0.5.0)
-    paperclip (5.2.1)
+    paperclip (6.1.0)
       activemodel (>= 4.2.0)
       activesupport (>= 4.2.0)
-      cocaine (~> 0.5.5)
       mime-types
       mimemagic (~> 0.3.0)
+      terrapin (~> 0.6.0)
     poltergeist (1.18.1)
       capybara (>= 2.1, < 4)
       cliver (~> 0.3.1)
@@ -189,8 +189,8 @@ GEM
       byebug (~> 11.0)
       pry (~> 0.10)
     public_suffix (3.1.1)
-    rack (2.0.7)
-    rack-cache (1.9.0)
+    rack (2.0.8)
+    rack-cache (1.11.0)
       rack (>= 0.4)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -225,14 +225,14 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
-    rdoc (6.1.1)
+    rdoc (6.2.1)
     regexp_parser (1.5.1)
-    roadie (3.5.0)
+    roadie (4.0.0)
       css_parser (~> 1.4)
       nokogiri (~> 1.8)
-    roadie-rails (1.3.0)
-      railties (>= 3.0, < 5.3)
-      roadie (~> 3.1)
+    roadie-rails (2.1.1)
+      railties (>= 5.1, < 6.1)
+      roadie (>= 3.1, < 5.0)
     rspec-core (3.8.1)
       rspec-support (~> 3.8.0)
     rspec-expectations (3.8.4)
@@ -250,7 +250,7 @@ GEM
       rspec-mocks (~> 3.8.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.2)
-    ruby_parser (3.13.1)
+    ruby_parser (3.14.1)
       sexp_processor (~> 4.9)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
@@ -263,7 +263,7 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    sexp_processor (4.12.1)
+    sexp_processor (4.13.0)
     simplecov (0.17.0)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -277,7 +277,9 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     stringex (2.8.5)
-    temple (0.8.1)
+    temple (0.8.2)
+    terrapin (0.6.0)
+      climate_control (>= 0.0.3, < 1.0)
     thor (0.20.3)
     thread_safe (0.3.6)
     tilt (2.0.9)
@@ -285,13 +287,13 @@ GEM
       rake
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uglifier (4.1.20)
+    uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     uuidtools (2.1.5)
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
-    will_paginate (3.1.7)
+    will_paginate (3.2.1)
     xpath (3.2.0)
       nokogiri (~> 1.8)
 

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

@@ -16,9 +16,6 @@ function RadAjaxForm(form) {
             type: "POST",
             url: form.find('input[name=submit_url]').attr('value'),
             data: form.serialize(),
-          beforeSend: function ( xhr ) {
-                xhr.setRequestHeader("X-CSRF-Token", $("#auth_token").attr('value'));
-          },
             success: function(data, status, xhr) {
                 form.find(".loader").removeClass('ajax-loader');
                 form.find(".loader-small").removeClass('ajax-loader-small');

data/app/controllers/admin/password_resets_controller.rb

@@ -1,15 +1,11 @@
 class Admin::PasswordResetsController < ApplicationController
   no_login_required
-  skip_before_action :verify_authenticity_token
 
   def create
     user = User.find_by_email(params[:email])
-    if user
-      user.send_password_reset
-      redirect_to welcome_path, :notice => "Email sent with password reset instructions."
-    else
-      redirect_to welcome_path, :notice => "Email not registered. Double check your spelling or seek out your Admin."
-    end
+    user.send_password_reset if user
+    redirect_to welcome_path, :notice => "If the e-mail address you entered is associated with a customer account in our records, you will receive an e-mail from us with instructions for resetting your password.
+    If you don't receive this e-mail, please check your junk mail folder or speak with your TrustyCMS administrator."
   end
 
   def edit
@@ -32,5 +28,4 @@ private
   def password_params
     params.require(:user).permit(:password, :password_confirmation)
   end
-
 end

data/app/controllers/admin/welcome_controller.rb

@@ -1,7 +1,6 @@
 class Admin::WelcomeController < ApplicationController
   no_login_required
   before_action :never_cache
-  skip_before_action :verify_authenticity_token
 
   def index
     redirect_to admin_pages_path

data/app/controllers/application_controller.rb

@@ -5,8 +5,8 @@ class ApplicationController < ActionController::Base
   include LoginSystem
   # TODO: Add an ActionView::PathSet.new([paths]) for all extension view paths
   prepend_view_path("#{TRUSTY_CMS_ROOT}/app/views")
-
-  protect_from_forgery
+  
+  protect_from_forgery with: :exception
 
   before_action :set_current_user
   before_action :set_timezone

data/app/controllers/site_controller.rb

@@ -2,7 +2,6 @@ require 'trusty_cms/pagination/controller'
 class SiteController < ApplicationController
   include TrustyCms::Pagination::Controller
 
-  skip_before_action :verify_authenticity_token
   no_login_required
 
   def self.cache_timeout=(val)

data/app/views/admin/password_resets/new.html.haml

@@ -10,9 +10,3 @@
       = text_field_tag :email, params[:email], :class => 'textbox', :maxlength => 70, :size => 70
     .actions
       = submit_tag "Reset Password"
-
-  %p.version
-  = t('powered_by')
-  %a{ :href => "https://github.com/pgharts/trusty-cms" } TrustyCms CMS
-  = t('version')
-  = TrustyCms.loaded_via_gem? ? "#{TrustyCms::VERSION} (gem)." : "#{TrustyCms::VERSION}."

data/app/views/admin/sites/index.haml

@@ -31,7 +31,7 @@
               = h(site.base_domain)
           - tbody.modify_cell do
             %td.remove
-              = link_to image("remove.png", :alt => "Remove"), admin_site_path(site), :method => :delete, :confirm => "Are you sure you want to permanently remove #{site.name}?"
+              = link_to image("remove.png", :alt => "Remove"), admin_site_path(site), :method => :delete, :onclick => "return confirm('Are you sure you want to permanently remove #{site.name}?')"
           - tbody.order_cell do
             %td.order
               = order_links(site).html_safe

data/app/views/admin/welcome/login.html.haml

@@ -16,9 +16,3 @@
       %label.checkbox{:for=>"remember_me"}= t('remember_me_in_this_browser')
     .buttons
       %input.button{:type => "submit", :value => t('login')}
-
-%p.version
-  = t('powered_by')
-  %a{ :href => "https://github.com/pgharts/trusty-cms" } TrustyCms CMS
-  = t('version')
-  = TrustyCms.loaded_via_gem? ? "#{TrustyCms::VERSION} (gem)." : "#{TrustyCms::VERSION}."

data/app/views/rad_social_mailer/social_mail_form.html.haml

@@ -8,7 +8,6 @@
 
 %form{:id=>'rad-social-email-form', :class=>"rad-email-form"}
   .rad-email-error
-  %input{:type=>'hidden', :id=> "auth_token", :value=>"#{form_authenticity_token}"}
   %div.form-row
     %label.form-label{:type=>"label", :for=>"from"}
       From Email

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.7.1'
+    VERSION = '3.8.0'
   end
 end

data/vendor/extensions/clipped-extension/lib/asset_tags.rb

@@ -101,12 +101,6 @@ module AssetTags
     end
   end
 
-
-
-
-
-
-
   desc %{
     Renders the value for a top padding for a thumbnail. Put the thumbnail in a
     container with specified height and using this tag you can vertically
@@ -230,33 +224,6 @@ module AssetTags
     url = tag.locals.asset.thumbnail(size)
     ActionController::Base.helpers.image_tag(url, options)
   end
-  
-  desc %{
-    Embeds a flash-movie in a cross-browser-compatible fashion using only HTML
-    If no width and height attributes are given it will use the intrinsic
-    dimensions of the swf file
-    
-    *Usage:*
-    <pre><code><r:asset:flash [name="asset name" or id="asset id"] [width="100"] [height="100"]>Fallback content</flash></code></pre>
-    
-    *Example with text fallback:*
-    <pre><code><r:asset:flash name="flash_movie">
-        Sorry, you need to have flash installed, <a href="http://adobe.com/flash">get it here</a>
-    </flash></code></pre>
-    
-    *Example with image fallback and explicit dimensions:*
-    <pre><code><r:asset:flash name="flash_movie" width="300" height="200">
-        <r:asset:image name="flash_screenshot" />
-      </flash></code></pre>
-  }
-  tag 'asset:flash' do |tag|
-    asset, options = asset_and_options(tag)
-    if tag.locals.asset.flash?
-      url = asset.thumbnail('original')
-      dimensions = [(tag.attr['width'] || asset.width),(tag.attr['height'] || asset.height)]
-      swf_embed_markup url, dimensions, tag.expand
-    end
-  end
     
   desc %{
     Renders the url for the asset. If the asset is an image, the <code>size</code> attribute can be used to 

data/yarn.lock

@@ -5,13 +5,16 @@
 jquery-ui-bundle@^1.12.1:
   version "1.12.1"
   resolved "https://registry.yarnpkg.com/jquery-ui-bundle/-/jquery-ui-bundle-1.12.1.tgz#d6be2e4c377494e2378b1cae2920a91d1182d8c4"
+  integrity sha1-1r4uTDd0lOI3ixyuKSCpHRGC2MQ=
 
 jquery-ujs@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/jquery-ujs/-/jquery-ujs-1.2.2.tgz#6a8ef1020e6b6dda385b90a4bddc128c21c56397"
+  integrity sha1-ao7xAg5rbdo4W5CkvdwSjCHFY5c=
   dependencies:
     jquery ">=1.8.0"
 
 jquery@>=1.8.0, jquery@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.2.1.tgz#5c4d9de652af6cd0a770154a631bba12b015c787"
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
+  integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 3.7.1
+  version: 3.8.0
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-14 00:00:00.000000000 Z
+date: 2020-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -786,6 +786,31 @@ files:
 - config/locales/en_available_tags.yml
 - config/routes.rb
 - config/trustygems.yml
+- coverage/assets/0.10.2/application.css
+- coverage/assets/0.10.2/application.js
+- coverage/assets/0.10.2/colorbox/border.png
+- coverage/assets/0.10.2/colorbox/controls.png
+- coverage/assets/0.10.2/colorbox/loading.gif
+- coverage/assets/0.10.2/colorbox/loading_background.png
+- coverage/assets/0.10.2/favicon_green.png
+- coverage/assets/0.10.2/favicon_red.png
+- coverage/assets/0.10.2/favicon_yellow.png
+- coverage/assets/0.10.2/loading.gif
+- coverage/assets/0.10.2/magnify.png
+- coverage/assets/0.10.2/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
+- coverage/assets/0.10.2/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
+- coverage/assets/0.10.2/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
+- coverage/assets/0.10.2/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
+- coverage/assets/0.10.2/smoothness/images/ui-bg_glass_75_dadada_1x400.png
+- coverage/assets/0.10.2/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
+- coverage/assets/0.10.2/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
+- coverage/assets/0.10.2/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+- coverage/assets/0.10.2/smoothness/images/ui-icons_222222_256x240.png
+- coverage/assets/0.10.2/smoothness/images/ui-icons_2e83ff_256x240.png
+- coverage/assets/0.10.2/smoothness/images/ui-icons_454545_256x240.png
+- coverage/assets/0.10.2/smoothness/images/ui-icons_888888_256x240.png
+- coverage/assets/0.10.2/smoothness/images/ui-icons_cd0a0a_256x240.png
+- coverage/index.html
 - db/migrate/001_create_radiant_tables.rb
 - db/migrate/002_insert_initial_data.rb
 - db/migrate/004_rename_filter_column.rb
@@ -1015,6 +1040,7 @@ files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/dummy/tmp/radiant_config_cache.txt
 - spec/dummy/yarn.lock
 - spec/factories/layout.rb
 - spec/factories/page.rb
@@ -1125,7 +1151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A no-fluff content management system designed for small teams.
@@ -1167,6 +1193,7 @@ test_files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/dummy/tmp/radiant_config_cache.txt
 - spec/dummy/yarn.lock
 - spec/factories/layout.rb
 - spec/factories/page.rb