rails_com 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d89a903e9f829ba767afbef9f90d9a7ddf635ce8d108223ca745f9dc6578f48f
-  data.tar.gz: 389b8a92919cda43adc6024090f3c8aa67bfb33aaa3d2aaf710e27e0235b31e5
+  metadata.gz: 87299107f1442c24126546dff21a4d484162bbad8549d6424d15a6eb880d05db
+  data.tar.gz: a700869e1a3db98b654616814724a47952323e0d70ad7ec66ddedbdbd9f5c72e
 SHA512:
-  metadata.gz: 1d0616448bc813c6da2eb8794f2a5894bb671bf2e2a47cf0231bd46d30814046b25d7737ecb7b26f5df89cc40e013fed5731b1ab80722ec8c84bcf0b9570af34
-  data.tar.gz: 85f715d2616e82f7fba685963964524c71b49e6575a217ea6b1022bf7ee3c4e10640578fe14210f0818d399187a3432582f1bc612d05db5c35e950aac1fd309f
+  metadata.gz: e4c1af32eeec4d14e445347ebd89cb776439833f71ed81ddce6ea371243306adfbbe8a46cfbff3b309119bfcbf539157785fb76d43f4ed3d6186be9ca46d7faf
+  data.tar.gz: 4a65adc64a1d6c38b49e76f7cc6be115d13277d8db192a6b7ba2ee77e461c1b5fd91b0b7fe89c1208851819b30a68add5c580d96348934aec812c5d5679eceb4

data/app/assets/javascripts/rails_com/application.js

@@ -1,45 +1,29 @@
 //= require rails-ujs
 //= require turbolinks
-//= require stimulus
-//= require activestorage
+//= require ./time_local
 //= require_self
 
-function timeForLocalized(){
-  $('time[data-localized!="true"]').each(function(){
-    if (this.textContent.length > 0) {
-      var format = this.dataset['format'] || 'YYYY-MM-DD HH:mm:ss';
-      this.textContent = moment.utc(this.textContent).local().format(format);
-      this.dataset['localized'] = 'true'
-    }
-  })
-}
-
-function clickCallback(e) {
-  if (e.target.tagName !== 'A') {
-    return;
-  }
-  (new Date).getTimezoneOffset();
-}
-//document.addEventListener('click', clickCallback, false);
-
-function htmlToElement(html_str) {
-  var template = document.createElement('template');
-  template.innerHTML = html_str.trim();
-  return template.content.firstChild;
-}
-
 document.addEventListener('DOMContentLoaded', function() {
   timeForLocalized()
 });
+document.addEventListener('ajax:beforeSend', function(event) {
+  var detail = event.detail;
+  var xhr = detail[0];
+  var offset = (new Date).getTimezoneOffset();
+  xhr.setRequestHeader('Utc-Offset', offset);
+  xhr.setRequestHeader('X-Csp-Nonce', Rails.cspNonce())
+});
+
 document.addEventListener('turbolinks:load', function() {
   timeForLocalized()
 });
 document.addEventListener('turbolinks:visit', function() {
   timeForLocalized()
 });
-
 document.addEventListener('turbolinks:request-start', function(event) {
   var xhr = event.data.xhr;
   var offset = (new Date).getTimezoneOffset();
   xhr.setRequestHeader('Utc-Offset', offset);
+  xhr.setRequestHeader('X-Csp-Nonce', Rails.cspNonce())
 });
+

data/app/assets/javascripts/rails_com/attachment.js

@@ -3,14 +3,14 @@
 
 /*
 * Input Field with Attachment
-* based on https://github.com/Rovak/InlineAttachment/blob/master/LICENSE
+* based on https://github.com/Rovak/inlineAttachment/blob/master/LICENSE
 */
 
 (function(document, window) {
   'use strict';
 
   var InputAttachment = function(options) {
-    this.settings = Object.assign(options, InputAttachment.defaults);
+    this.settings = Object.assign(InputAttachment.defaults, options);
     this.editor = this.settings['editor'];
     this.filenameTag = '{filename}';
     this.lastValue = null;
@@ -39,7 +39,7 @@
 
     uploadFileInput: '',
 
-    previewDiv: 'file_preview',
+    templateDiv: 'file_template',
 
     /**
      * Extension which will be used when a file extension could not
@@ -196,17 +196,22 @@
     return xhr;
   };
 
-  InputAttachment.prototype.previewFile = function(file, obj) {
-    var fileList = document.getElementById(this.settings.previewDiv)
+  InputAttachment.prototype.previewFile = function(file, previewDiv) {
+    var fileList = document.getElementById(previewDiv);
+    var templateDiv = document.getElementById(this.settings.templateDiv);
     var template = document.createElement('template');
-    template.innerHTML = fileList.firstElementChild.outerHTML.trim();
+    fileList.querySelectorAll('[data-preview=true]').forEach(e => e.parentNode.removeChild(e));
+    template.innerHTML = templateDiv.outerHTML.trim();
     var img_div = template.content.firstChild;
+    img_div.style.display = 'inline-block';
+    img_div.dataset['preview'] = true;
+    img_div.id = null;
     var img = img_div.lastElementChild;
 
     img.src = window.URL.createObjectURL(file); //创建一个object URL，并不是你的本地路径
     img.onload = function(e) {
       window.URL.revokeObjectURL(this.src); //图片加载后，释放object URL
-    }
+    };
 
     fileList.appendChild(img_div);
   };
@@ -243,7 +248,7 @@
         } else {
           newValue = this.settings.urlText.replace(this.filenameTag, filename);
         }
-        this.editor.input.value.replace(this.lastValue, newValue);
+        this.editor.value.replace(this.lastValue, newValue);
         this.settings.onFileUploaded.call(this, filename, result);
       }
     }
@@ -258,7 +263,7 @@
    */
   InputAttachment.prototype.onFileUploadError = function(xhr) {
     if (this.settings.onFileUploadError.call(this, xhr) !== false) {
-      this.editor.input.value.replace(this.lastValue, '');
+      this.editor.value.replace(this.lastValue, '');
     }
   };
 
@@ -272,7 +277,7 @@
     if (this.settings.onFileReceived.call(this, file) !== false) {
       this.lastValue = this.settings.progressText;
 
-      var scrollPos = el.scrollTop
+      var scrollPos = el.scrollTop;
       el.value = this.lastValue;
       el.scrollTop = scrollPos;
     }
@@ -338,14 +343,14 @@
     return result;
   };
 
-  InputAttachment.prototype.imagePreview = function(e){
+  InputAttachment.prototype.imagePreview = function(e, previewDiv){
     var result = false;
 
     for (var i = 0; i < e.target.files.length; i++) {
       var file = e.target.files[i];
       if (this.isFileAllowed(file)) {
         result = true;
-        this.previewFile(file, e.target);
+        this.previewFile(file, previewDiv);
       }
     }
 
@@ -364,17 +369,17 @@
     var fileInput = document.getElementById(options['fileInput']);
     options['editor'] = input;
     options['fileInput'] = fileInput;
-    var inlineattach = new InputAttachment(options);
+    var inlineAttach = new InputAttachment(options);
 
     if (input) {
       input.addEventListener('paste', function(e) {
-        inlineattach.onPaste(e);
+        inlineAttach.onPaste(e);
       }, false);
 
       input.addEventListener('drop', function(e) {
         e.stopPropagation();
         e.preventDefault();
-        inlineattach.onDrop(e);
+        inlineAttach.onDrop(e);
       }, false);
 
       input.addEventListener('dragenter', function(e) {
@@ -389,11 +394,11 @@
     }
     if (fileInput) {
       fileInput.addEventListener('click', function(e) {
-        inlineattach.onFileInputClick(e)
+        inlineAttach.onFileInputClick(e)
       }, false);
 
       fileInput.addEventListener('change', function(e) {
-        inlineattach.onFileInputChange(e)
+        inlineAttach.onFileInputChange(e)
       }, false);
     }
   }
@@ -402,11 +407,11 @@
     options = options || {};
     var fileInput = document.getElementById(options['fileInput']);
     options['fileInput'] = fileInput;
-    var inlineattach = new InputAttachment(options);
+    var inlineAttach = new InputAttachment(options);
 
     if (fileInput) {
       fileInput.addEventListener('change', function(e) {
-        inlineattach.imagePreview(e)
+        inlineAttach.imagePreview(e, options['previewDiv'])
       }, false);
     }
   }

data/app/assets/javascripts/rails_com/fetch_xhr_script.js

@@ -6,15 +6,26 @@ function fetch_xhr_script(url, params){
       'X-CSRF-Token': document.head.querySelector("[name=csrf-token]").content
     }
   };
-  var _params = Object.assign(default_params, params)
+  var _params = Object.assign(default_params, params);
 
   fetch(url, _params).then(function(response) {
     return response.text();
   }).then(function(text) {
     var script = document.createElement('script');
+    script.setAttribute('nonce', Rails.cspNonce());
     script.text = text;
     document.head.appendChild(script).parentNode.removeChild(script);
   }).catch(function(ex) {
     console.log('parsing failed', ex);
   })
-}
+}
+
+function remote_js_load(paths) {
+  for (i = 0; i < paths.length; i++) {
+    Rails.ajax({
+      url: paths[i],
+      type: 'GET',
+      dataType: 'script'
+    })
+  }
+}

data/app/assets/javascripts/rails_com/footer.js

@@ -1,3 +1,9 @@
 $('.message .close').on('click', function() {
   $(this).closest('.message').fadeOut();
-});
+});
+$('.ui.toggle.checkbox').checkbox();
+document.querySelectorAll('input[data-submit="true"]').forEach(function (el) {
+  el.addEventListener('change', function () {
+    this.dataset['params'] = this.name + '=' + this.checked;
+  });
+});

data/app/assets/javascripts/rails_com/picture.js

@@ -1,4 +1,5 @@
 //= require ./attachment
+//= require stimulus
 
 class PictureController extends Stimulus.Controller {
   greet() {

data/app/assets/javascripts/rails_com/time_local.js

@@ -0,0 +1,10 @@
+//= require moment
+function timeForLocalized(){
+  $('time[data-localized!="true"]').each(function(){
+    if (this.textContent.length > 0) {
+      var format = this.dataset['format'] || 'YYYY-MM-DD HH:mm:ss';
+      this.textContent = moment.utc(this.textContent).local().format(format);
+      this.dataset['localized'] = 'true'
+    }
+  })
+}

data/app/controllers/active_storage_ext/admin/blob_defaults_controller.rb

@@ -47,7 +47,8 @@ class ActiveStorageExt::Admin::BlobDefaultsController < ActiveStorageExt::Admin:
     params.fetch(:blob_default, {}).permit(
       :record_class,
       :name,
-      :file
+      :file,
+      :private
     )
   end
 

data/app/controllers/concerns/rails_common_api.rb

@@ -4,47 +4,57 @@ module RailsCommonApi
   included do
     rescue_from 'StandardError' do |exp|
       puts nil, exp.full_message(highlight: true, order: :top)
-      render json: { code: 500, error: { class: exp.class.inspect }, message: exp.message }, status: 500
+      render json: { error: { class: exp.class.inspect }, message: exp.message }, status: 500
     end
 
     rescue_from 'ActiveRecord::RecordNotFound' do |exp|
       puts nil, exp.full_message(highlight: true, order: :top)
-      render json: { code: 404, error: { class: exp.class.inspect }, message: exp.message }, status: 404
+      render json: { error: { class: exp.class.inspect, id: exp.id }, message: exp.message }, status: 404
+    end
+
+    rescue_from 'AbstractController::ActionNotFound', 'ActionController::RoutingError' do |exp|
+      puts nil, exp.full_message(highlight: true, order: :top)
+      render json: { error: { class: exp.class.inspect }, message: exp.message }, status: 404
     end
 
     rescue_from 'ActionController::ForbiddenError' do |exp|
       puts nil, exp.full_message(highlight: true, order: :top)
-      render json: { code: 403, error: { class: exp.class.inspect }, message: exp.message }, status: 403
+      render json: { error: { class: exp.class.inspect }, message: exp.message }, status: 403
     end
 
     rescue_from 'ActionController::UnauthorizedError' do |exp|
       puts nil, exp.full_message(highlight: true, order: :top)
-      render json: { code: 401, error: { class: exp.class.inspect }, message: exp.message }, status: 401
+      render json: { error: { class: exp.class.inspect }, message: exp.message }, status: 401
     end
 
     rescue_from 'ActionController::ParameterMissing' do |exp|
       puts nil, exp.full_message(highlight: true, order: :top)
-      render json: { code: 400, error: { class: exp.class.inspect }, message: exp.message }, status: 400
+      render json: { error: { class: exp.class.inspect }, message: exp.message }, status: 400
     end
+    before_action :set_locale
   end
 
   def process_errors(model)
     render json: {
-      code: 406,
       error: model.errors.as_json(full_messages: true),
       message: model.errors.full_messages.join("\n")
-    }, status: 200
+    }, status: :bad_request
   end
 
-  def render *args
-    options = args.extract_options!
-
-    if options[:json]
-      options[:json].merge! code: 200
+  # Accept-Language: "en,zh-CN;q=0.9,zh;q=0.8,en-US;q=0.7,zh-TW;q=0.6"
+  def set_locale
+    request_locales = request.headers['Accept-Language'].to_s.split(',')
+    available_locales = I18n.available_locales.map(&:to_s)
+    locale = (available_locales & request_locales)[0]
+    unless locale.present?
+      locale = request_locales.first.to_s.split('-').first
     end
-
-    args << options
-    super *args
+    locale ||= I18n.default_locale
+    I18n.locale = locale
+    if current_user && current_user.locale.to_s != I18n.locale.to_s
+      current_user.update locale: I18n.locale
+    end
+    logger.debug "  ==========> Locale: #{I18n.locale}"
   end
 
 end

data/app/controllers/concerns/rails_common_controller.rb

@@ -0,0 +1,46 @@
+module RailsCommonController
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :set_locale,
+                  :set_timezone
+  end
+
+  def set_timezone
+    if session[:zone]
+      Time.zone = session[:zone]
+    elsif request.headers['HTTP_UTC_OFFSET'].present?
+      zone = -(request.headers['HTTP_UTC_OFFSET'].to_i / 60)
+      Time.zone = zone
+      session[:zone] = zone
+    end
+
+    if current_user && current_user.timezone.blank?
+      current_user.update timezone: Time.zone.name
+    end
+    logger.debug "  ==========> Zone: #{Time.zone}"
+  end
+
+  def set_locale
+    if params[:locale]
+      session[:locale] = params[:locale]
+    end
+
+    I18n.locale = session[:locale] || I18n.default_locale
+    if current_user && current_user.locale.to_s != session[:locale].to_s
+      current_user.update locale: session[:locale]
+    end
+    logger.debug "  ==========> Locale: #{I18n.locale}"
+  end
+
+  def set_country
+    if params[:country]
+      session[:country] = params[:country]
+    elsif current_user
+      session[:country] = current_user.country
+    end
+
+    logger.debug "  ==========> Country: #{session[:country]}"
+  end
+
+end

data/app/helpers/rails_com/assets_helper.rb

@@ -3,32 +3,44 @@ module RailsCom::AssetsHelper
 
   # Assets path: app/assets/javascripts/controllers
   # Packs Path: app/javascript/packs/javascripts
-  def js_load(**options)
+  def origin_js_load(**options)
     ext = ['.js', '.js.erb'] + Array(options.delete(:ext))
     suffix = options.delete(:suffix)
 
     asset_filename = "controllers/#{controller_path}/#{action_name}"
-    if suffix
-      asset_filename += ['.', suffix].join
-    end
-    asset_paths = assets_load_path(asset_filename, relative_path: 'app/assets/javascripts', ext: ext)
+    pack_filename = "javascripts/#{controller_path}/#{action_name}"
 
-    pack_filename ||= "javascripts/#{controller_path}/#{action_name}"
     if suffix
-      pack_filename += ['-', suffix].join
+      asset_filename = [asset_filename, '-', suffix].join
+      pack_filename = [pack_filename, '-', suffix].join
     end
-    pack_paths = assets_load_path(pack_filename, relative_path: 'app/javascript/packs', ext: ext)
+
+    asset_paths = assets_load_path(asset_filename, relative_path: 'app/assets/javascripts', ext: ext, suffix: suffix)
+    pack_paths = assets_load_path(pack_filename, relative_path: 'app/javascript/packs', ext: ext, suffix: suffix)
 
     r = []
+    ar = []
     if asset_paths.any? { |path| File.exist?(path) }
       r << javascript_include_tag(asset_filename, options)
+      ar << javascript_path(asset_filename)
     end
 
     if pack_paths.any? { |path| File.exist?(path) }
       r << javascript_pack_tag(pack_filename, options)
+      ar << asset_pack_path(pack_filename + '.js')
     end
 
-    r.join("\n    ").html_safe
+    [r.join("\n    ").html_safe, ar]
+  end
+
+  def js_load(**options)
+    r, _ = origin_js_load(options)
+    r
+  end
+
+  def remote_js_load(**options)
+    _, r = origin_js_load(options)
+    r
   end
 
   def js_ready(**options)
@@ -39,12 +51,18 @@ module RailsCom::AssetsHelper
   # Packs Path: app/javascript/packs/stylesheets
   def css_load(**options)
     ext = ['.css', '.css.erb'] + Array(options.delete(:ext))
+    suffix = options.delete(:suffix)
 
     asset_filename = "controllers/#{controller_path}/#{action_name}"
-    asset_paths = assets_load_path(asset_filename, relative_path: 'app/assets/stylesheets', ext: ext )
-
     pack_filename = "stylesheets/#{controller_path}/#{action_name}"
-    pack_paths = assets_load_path(pack_filename, relative_path: 'app/javascript/packs', ext: ext)
+
+    if suffix
+      asset_filename = [asset_filename, '-', suffix].join
+      pack_filename = [pack_filename, '-', suffix].join
+    end
+
+    asset_paths = assets_load_path(asset_filename, relative_path: 'app/assets/stylesheets', ext: ext, suffix: suffix)
+    pack_paths = assets_load_path(pack_filename, relative_path: 'app/javascript/packs', ext: ext, suffix: suffix)
 
     r = []
     if asset_paths.any? { |path| File.exist?(path) }
@@ -52,7 +70,7 @@ module RailsCom::AssetsHelper
     end
 
     if pack_paths.any? { |path| File.exist?(path) }
-      
+
       begin
         rs = stylesheet_pack_tag(pack_filename, options)
       rescue
@@ -70,7 +88,7 @@ module RailsCom::AssetsHelper
   end
 
   private
-  def assets_load_path(filename, relative_path:, ext:)
+  def assets_load_path(filename, relative_path:, ext:, suffix: nil)
     paths = []
 
     file_path = Pathname.new(relative_path).join filename