trusty-cms 4.1.3 → 4.1.8

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

@@ -16,6 +16,9 @@ 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", $('meta[name=csrf-token]').attr('content'));
+            },
             success: function(data, status, xhr) {
                 form.find(".loader").removeClass('ajax-loader');
                 form.find(".loader-small").removeClass('ajax-loader-small');

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

@@ -1,6 +1,5 @@
 //= require jquery
 //= require 'rad_social/jquery.validate.min'
 //= require 'rad_social/rad_ajax_form'
-//= require 'rad_social/captcha'
 //= require 'rad_social/rad_email_validator'
 //= require 'rad_social/rad_email_form'

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

@@ -63,17 +63,12 @@ $(document).ready(function() {
     $('#rs-from_name').val('');
     $('#rs-to').val('');
     $('#rs-message').val($('#rs-base-message').val());
-    var captcha = new Captcha("#recaptcha-container");
-    captcha.reload();
   }
 
-function processFailure(xhr)
-{
-    var captcha = new Captcha("#recaptcha-container");
+  function processFailure(xhr) {
     var error_msg = xhr.getResponseHeader("ErrorMsg");
     displayErrorMessage(error_msg);
-    captcha.reload();
-}
+  }
 
 function displayErrorMessage(msg) {
     var error_msg_div = $('.rad-email-error');

data/app/assets/stylesheets/rad_social/rad_screen.scss

@@ -55,10 +55,6 @@
   float: right;
 }
 
-.rad-email-form .captcha-container {
-  padding: 10px 0px;
-}
-
 .rad-email-form input.std_input {
   margin-bottom: 10px;
 }

data/app/controllers/social_mailer_controller.rb

@@ -12,13 +12,6 @@ class SocialMailerController < ApplicationController
       message: params[:message],
       subject: params[:subject],
     }
-
-    if verify_recaptcha(action: 'emailSeats')
-      RadSocialMailer.social_mail(mailer_options).deliver_now
-      head :ok
-    else
-      head :bad_request, ErrorMsg: 'We have detected suspicious activity and have disabled this feature for your user.'
-    end
   end
 
   def social_mail_form

data/app/views/admin/assets/edit.html.haml

@@ -14,6 +14,9 @@
           %fieldset
             %label.filename
               = "#{t("clipped_extension.filename")}: #{@asset.asset_file_name unless @asset.new_record?}"
+            %br
+            %label.url
+              = "#{t("clipped_extension.asset_url")}: #{image_path @asset.thumbnail unless @asset.new_record?}"
           %p.asset
             - display_size = TrustyCms::config['assets.display_size'] || 'normal'
             = image_tag @asset.thumbnail(display_size.to_sym), :class => 'preview'

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

@@ -1,6 +1,6 @@
 = stylesheet_link_tag('rad_social/rad_screen')
-= javascript_include_tag('https://www.google.com/recaptcha/api/js/recaptcha_ajax.js')
 = javascript_include_tag('rad_social/rad_email')
+= csrf_meta_tags
 
 .rad-dialog-titlebar
   %span.rad-dialog-title
@@ -31,8 +31,6 @@
         = email_message
   %input{:type=>'hidden', :name=>'subject', :value=> email_subject}
   %input{:type=>'hidden', :id=>'rs-base-message', :value=> email_message}
-  #recaptcha-container.captcha-container
-    = recaptcha_v3 action: 'emailSeats'
   %input{:type=>'hidden', :name=>'submit_url', :value=> email_action_url}
   %input.button.primary-button{:id => 'rad_email_submit', :type=>:button ,:value=>'Submit'}
   .loader

data/app/views/widget/_email_form.html.haml

@@ -1,5 +1,3 @@
-- javascript('rad_social/captcha')
-
 = form_tag
 %form{:id=>'rad_social_email_form', :class=>'rad-email-form'}
   %label{:for => 'from'}
@@ -20,6 +18,3 @@
   %input{:type=>'hidden', :name=>'submit_url', :value=>'contact/email'}
   %input.button.primary-button{:id => 'email_submit', :type=>:button ,:value=>'Submit'}
   .loader
-
-  #recaptcha-container.captcha-container
-    = recaptcha_v3 action: 'emailSeats'

data/config/locales/en.yml

@@ -65,6 +65,7 @@ en:
     asset_errors: 'Sorry. {{errors}}'
     asset_page_attachment_note: 'Attached assets. These can be inserted with drag and drop or shown with the <code>&lt;r:assets:each /&gt;</code> tag.'
     asset_note: 'Attached assets. '
+    asset_url: 'Asset URL'
     assets: 'Assets'
     assets_explanation: 'Assets and images can be uploaded and then attached or inserted into pages, snippets and layouts. Click on an asset name above to edit it or click <code>Remove</code> to delete it.'
     assets_title: 'Assets'

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.1.3'.freeze
+    VERSION = '4.1.8'.freeze
   end
 end

data/lib/trusty_cms/engine.rb

@@ -12,7 +12,6 @@ module TrustyCms
         ckeditor/skins/moono/editor.css
         ckeditor/lang/en.js
         rad_social/rad_screen.css
-        rad_social/captcha.js
         rad_social/rad_email.js
         rad_social/rad_widget.js
       )

data/spec/spec/dummy/node_modules/yaml/browser/dist/tags/core.js

@@ -0,0 +1,126 @@
+import Scalar from '../schema/Scalar';
+import { stringifyNumber } from '../stringify';
+import failsafe from './failsafe';
+import { boolOptions, nullOptions } from './options';
+export var nullObj = {
+  identify: function identify(value) {
+    return value == null;
+  },
+  createNode: function createNode(schema, value, ctx) {
+    return ctx.wrapScalars ? new Scalar(null) : null;
+  },
+  default: true,
+  tag: 'tag:yaml.org,2002:null',
+  test: /^(?:~|[Nn]ull|NULL)?$/,
+  resolve: function resolve() {
+    return null;
+  },
+  options: nullOptions,
+  stringify: function stringify() {
+    return nullOptions.nullStr;
+  }
+};
+export var boolObj = {
+  identify: function identify(value) {
+    return typeof value === 'boolean';
+  },
+  default: true,
+  tag: 'tag:yaml.org,2002:bool',
+  test: /^(?:[Tt]rue|TRUE|[Ff]alse|FALSE)$/,
+  resolve: function resolve(str) {
+    return str[0] === 't' || str[0] === 'T';
+  },
+  options: boolOptions,
+  stringify: function stringify(_ref) {
+    var value = _ref.value;
+    return value ? boolOptions.trueStr : boolOptions.falseStr;
+  }
+};
+export var octObj = {
+  identify: function identify(value) {
+    return typeof value === 'number';
+  },
+  default: true,
+  tag: 'tag:yaml.org,2002:int',
+  format: 'OCT',
+  test: /^0o([0-7]+)$/,
+  resolve: function resolve(str, oct) {
+    return parseInt(oct, 8);
+  },
+  stringify: function stringify(_ref2) {
+    var value = _ref2.value;
+    return '0o' + value.toString(8);
+  }
+};
+export var intObj = {
+  identify: function identify(value) {
+    return typeof value === 'number';
+  },
+  default: true,
+  tag: 'tag:yaml.org,2002:int',
+  test: /^[-+]?[0-9]+$/,
+  resolve: function resolve(str) {
+    return parseInt(str, 10);
+  },
+  stringify: stringifyNumber
+};
+export var hexObj = {
+  identify: function identify(value) {
+    return typeof value === 'number';
+  },
+  default: true,
+  tag: 'tag:yaml.org,2002:int',
+  format: 'HEX',
+  test: /^0x([0-9a-fA-F]+)$/,
+  resolve: function resolve(str, hex) {
+    return parseInt(hex, 16);
+  },
+  stringify: function stringify(_ref3) {
+    var value = _ref3.value;
+    return '0x' + value.toString(16);
+  }
+};
+export var nanObj = {
+  identify: function identify(value) {
+    return typeof value === 'number';
+  },
+  default: true,
+  tag: 'tag:yaml.org,2002:float',
+  test: /^(?:[-+]?\.inf|(\.nan))$/i,
+  resolve: function resolve(str, nan) {
+    return nan ? NaN : str[0] === '-' ? Number.NEGATIVE_INFINITY : Number.POSITIVE_INFINITY;
+  },
+  stringify: stringifyNumber
+};
+export var expObj = {
+  identify: function identify(value) {
+    return typeof value === 'number';
+  },
+  default: true,
+  tag: 'tag:yaml.org,2002:float',
+  format: 'EXP',
+  test: /^[-+]?(?:\.[0-9]+|[0-9]+(?:\.[0-9]*)?)[eE][-+]?[0-9]+$/,
+  resolve: function resolve(str) {
+    return parseFloat(str);
+  },
+  stringify: function stringify(_ref4) {
+    var value = _ref4.value;
+    return Number(value).toExponential();
+  }
+};
+export var floatObj = {
+  identify: function identify(value) {
+    return typeof value === 'number';
+  },
+  default: true,
+  tag: 'tag:yaml.org,2002:float',
+  test: /^[-+]?(?:\.([0-9]+)|[0-9]+\.([0-9]*))$/,
+  resolve: function resolve(str, frac1, frac2) {
+    var frac = frac1 || frac2;
+    var node = new Scalar(parseFloat(str));
+    if (frac && frac[frac.length - 1] === '0') node.minFractionDigits = frac.length;
+    return node;
+  },
+  stringify: stringifyNumber
+};
+export default failsafe.concat([nullObj, boolObj, octObj, intObj, hexObj, nanObj, expObj, floatObj]);

data/spec/spec/dummy/node_modules/yaml/browser/dist/tags/failsafe/index.js

@@ -0,0 +1,4 @@
+import map from './map';
+import seq from './seq';
+import str from './string';
+export default [map, seq, str];

data/spec/spec/dummy/node_modules/yaml/browser/dist/tags/failsafe/map.js

@@ -0,0 +1,56 @@
+import _typeof from "@babel/runtime/helpers/typeof";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import YAMLMap from '../../schema/Map';
+import parseMap from '../../schema/parseMap';
+
+function createMap(schema, obj, ctx) {
+  var map = new YAMLMap(schema);
+
+  if (obj instanceof Map) {
+    var _iteratorNormalCompletion = true;
+    var _didIteratorError = false;
+    var _iteratorError = undefined;
+
+    try {
+      for (var _iterator = obj[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+        var _step$value = _slicedToArray(_step.value, 2),
+            key = _step$value[0],
+            value = _step$value[1];
+
+        map.items.push(schema.createPair(key, value, ctx));
+      }
+    } catch (err) {
+      _didIteratorError = true;
+      _iteratorError = err;
+    } finally {
+      try {
+        if (!_iteratorNormalCompletion && _iterator.return != null) {
+          _iterator.return();
+        }
+      } finally {
+        if (_didIteratorError) {
+          throw _iteratorError;
+        }
+      }
+    }
+  } else if (obj && _typeof(obj) === 'object') {
+    for (var _i = 0, _Object$keys = Object.keys(obj); _i < _Object$keys.length; _i++) {
+      var _key = _Object$keys[_i];
+      map.items.push(schema.createPair(_key, obj[_key], ctx));
+    }
+  }
+
+  if (typeof schema.sortMapEntries === 'function') {
+    map.items.sort(schema.sortMapEntries);
+  }
+
+  return map;
+}
+
+export default {
+  createNode: createMap,
+  default: true,
+  nodeClass: YAMLMap,
+  tag: 'tag:yaml.org,2002:map',
+  resolve: parseMap
+};

data/spec/spec/dummy/node_modules/yaml/browser/dist/tags/failsafe/seq.js

@@ -0,0 +1,43 @@
+import parseSeq from '../../schema/parseSeq';
+import YAMLSeq from '../../schema/Seq';
+
+function createSeq(schema, obj, ctx) {
+  var seq = new YAMLSeq(schema);
+
+  if (obj && obj[Symbol.iterator]) {
+    var _iteratorNormalCompletion = true;
+    var _didIteratorError = false;
+    var _iteratorError = undefined;
+
+    try {
+      for (var _iterator = obj[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+        var it = _step.value;
+        var v = schema.createNode(it, ctx.wrapScalars, null, ctx);
+        seq.items.push(v);
+      }
+    } catch (err) {
+      _didIteratorError = true;
+      _iteratorError = err;
+    } finally {
+      try {
+        if (!_iteratorNormalCompletion && _iterator.return != null) {
+          _iterator.return();
+        }
+      } finally {
+        if (_didIteratorError) {
+          throw _iteratorError;
+        }
+      }
+    }
+  }
+
+  return seq;
+}
+
+export default {
+  createNode: createSeq,
+  default: true,
+  nodeClass: YAMLSeq,
+  tag: 'tag:yaml.org,2002:seq',
+  resolve: parseSeq
+};

data/spec/spec/dummy/node_modules/yaml/browser/dist/tags/failsafe/string.js

@@ -0,0 +1,28 @@
+import { stringifyString } from '../../stringify';
+import { strOptions } from '../options';
+export var resolveString = function resolveString(doc, node) {
+  // on error, will return { str: string, errors: Error[] }
+  var res = node.strValue;
+  if (!res) return '';
+  if (typeof res === 'string') return res;
+  res.errors.forEach(function (error) {
+    if (!error.source) error.source = node;
+    doc.errors.push(error);
+  });
+  return res.str;
+};
+export default {
+  identify: function identify(value) {
+    return typeof value === 'string';
+  },
+  default: true,
+  tag: 'tag:yaml.org,2002:str',
+  resolve: resolveString,
+  stringify: function stringify(item, ctx, onComment, onChompKeep) {
+    ctx = Object.assign({
+      actualString: true
+    }, ctx);
+    return stringifyString(item, ctx, onComment, onChompKeep);
+  },
+  options: strOptions
+};

data/spec/spec/dummy/node_modules/yaml/browser/dist/tags/index.js

@@ -0,0 +1,36 @@
+import core, { nullObj, boolObj, octObj, intObj, hexObj, nanObj, expObj, floatObj } from './core';
+import failsafe from './failsafe';
+import json from './json';
+import yaml11 from './yaml-1.1';
+import map from './failsafe/map';
+import seq from './failsafe/seq';
+import binary from './yaml-1.1/binary';
+import omap from './yaml-1.1/omap';
+import pairs from './yaml-1.1/pairs';
+import set from './yaml-1.1/set';
+import { floatTime, intTime, timestamp } from './yaml-1.1/timestamp';
+export var schemas = {
+  core: core,
+  failsafe: failsafe,
+  json: json,
+  yaml11: yaml11
+};
+export var tags = {
+  binary: binary,
+  bool: boolObj,
+  float: floatObj,
+  floatExp: expObj,
+  floatNaN: nanObj,
+  floatTime: floatTime,
+  int: intObj,
+  intHex: hexObj,
+  intOct: octObj,
+  intTime: intTime,
+  map: map,
+  null: nullObj,
+  omap: omap,
+  pairs: pairs,
+  seq: seq,
+  set: set,
+  timestamp: timestamp
+};

data/spec/spec/dummy/node_modules/yaml/browser/dist/tags/json.js

@@ -0,0 +1,76 @@
+import map from './failsafe/map';
+import seq from './failsafe/seq';
+import Scalar from '../schema/Scalar';
+import { resolveString } from './failsafe/string';
+var schema = [map, seq, {
+  identify: function identify(value) {
+    return typeof value === 'string';
+  },
+  default: true,
+  tag: 'tag:yaml.org,2002:str',
+  resolve: resolveString,
+  stringify: function stringify(value) {
+    return JSON.stringify(value);
+  }
+}, {
+  identify: function identify(value) {
+    return value == null;
+  },
+  createNode: function createNode(schema, value, ctx) {
+    return ctx.wrapScalars ? new Scalar(null) : null;
+  },
+  default: true,
+  tag: 'tag:yaml.org,2002:null',
+  test: /^null$/,
+  resolve: function resolve() {
+    return null;
+  },
+  stringify: function stringify(value) {
+    return JSON.stringify(value);
+  }
+}, {
+  identify: function identify(value) {
+    return typeof value === 'boolean';
+  },
+  default: true,
+  tag: 'tag:yaml.org,2002:bool',
+  test: /^true|false$/,
+  resolve: function resolve(str) {
+    return str === 'true';
+  },
+  stringify: function stringify(value) {
+    return JSON.stringify(value);
+  }
+}, {
+  identify: function identify(value) {
+    return typeof value === 'number';
+  },
+  default: true,
+  tag: 'tag:yaml.org,2002:int',
+  test: /^-?(?:0|[1-9][0-9]*)$/,
+  resolve: function resolve(str) {
+    return parseInt(str, 10);
+  },
+  stringify: function stringify(value) {
+    return JSON.stringify(value);
+  }
+}, {
+  identify: function identify(value) {
+    return typeof value === 'number';
+  },
+  default: true,
+  tag: 'tag:yaml.org,2002:float',
+  test: /^-?(?:0|[1-9][0-9]*)(?:\.[0-9]*)?(?:[eE][-+]?[0-9]+)?$/,
+  resolve: function resolve(str) {
+    return parseFloat(str);
+  },
+  stringify: function stringify(value) {
+    return JSON.stringify(value);
+  }
+}];
+
+schema.scalarFallback = function (str) {
+  throw new SyntaxError("Unresolved plain scalar ".concat(JSON.stringify(str)));
+};
+
+export default schema;