rails_com 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e44eabdf535b6568792758d0e46b070ebe47f924a477a24cc65f2f30c41b0be
-  data.tar.gz: b43af789f129ad25e2d580d600c6e54132e6e462f4a3c38d1665d52da6f62d22
+  metadata.gz: d89a903e9f829ba767afbef9f90d9a7ddf635ce8d108223ca745f9dc6578f48f
+  data.tar.gz: 389b8a92919cda43adc6024090f3c8aa67bfb33aaa3d2aaf710e27e0235b31e5
 SHA512:
-  metadata.gz: f3d55a1073296dbdae0858561c7569a567ce5769c6e3c2381f50c9e14a7d6de7e142419a69a7178bb0eaf7cf818e02b74fa1b33a4d1d4087452bee2ad7e4758e
-  data.tar.gz: b1eb52db37b960b9f3bf20cca2429d64b7d7e35ab842c22398c69fb8ca4186012b3dde71de9be3625c95ec7ce2e16ac4334b571617186090c94a063f6ce661ff
+  metadata.gz: 1d0616448bc813c6da2eb8794f2a5894bb671bf2e2a47cf0231bd46d30814046b25d7737ecb7b26f5df89cc40e013fed5731b1ab80722ec8c84bcf0b9570af34
+  data.tar.gz: 85f715d2616e82f7fba685963964524c71b49e6575a217ea6b1022bf7ee3c4e10640578fe14210f0818d399187a3432582f1bc612d05db5c35e950aac1fd309f

data/README.md

@@ -1,7 +1,7 @@
 # RailsCom
 Rails 通用基础库
 
-## 说明
+## 功能
 * examples: puma, configs etc.
 * rails and ruby core extension;
 * methods deal rails model/controller/routes etc.

data/Rakefile

@@ -1,9 +1,5 @@
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
+require 'bundler/setup'
+require 'pry'
 require 'sdoc'
 require 'rdoc/task'
 
@@ -13,22 +9,13 @@ RDoc::Task.new(:sdoc) do |rdoc|
   rdoc.options << '--format=sdoc'
   rdoc.template = 'rails'
   rdoc.rdoc_files.include('README.md')
+  rdoc.rdoc_files.include('app/**/*.rb')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path('test/dummy/Rakefile', __dir__)
 load 'rails/tasks/engine.rake'
 load 'rails/tasks/statistics.rake'
 
 require 'bundler/gem_tasks'
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-
 
-task default: :test

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

@@ -1,3 +1,45 @@
 //= require rails-ujs
 //= require turbolinks
-//= require_self
+//= require stimulus
+//= require activestorage
+//= 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('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);
+});

data/{lib/assets/javascripts/input-attachment.js → app/assets/javascripts/rails_com/attachment.js}

@@ -3,129 +3,19 @@
 
 /*
 * Input Field with Attachment
-* Fork and Inspired by inlineAttachment(https://github.com/Rovak/InlineAttachment)
-* Author: mingyuan.qin
-* Contact: mingyuan0715@foxmail.com
+* based on https://github.com/Rovak/InlineAttachment/blob/master/LICENSE
 */
 
 (function(document, window) {
   'use strict';
 
   var InputAttachment = function(options) {
-    this.settings = InputAttachment.util.merge(options, InputAttachment.defaults);
-    this.editor = InputAttachment.editors.initEditor(this.settings['editor']);
+    this.settings = Object.assign(options, InputAttachment.defaults);
+    this.editor = this.settings['editor'];
     this.filenameTag = '{filename}';
     this.lastValue = null;
   };
 
-  /**
-   * Will holds the available editors
-   *
-   * @type {Object}
-   */
-  InputAttachment.editors = {
-
-    initEditor: function(input) {
-
-      return {
-        getValue: function() {
-          return input.value;
-        },
-
-        insertValue: function(val) {
-          InputAttachment.util.insertTextAtCursor(input, val);
-        },
-
-        setValue: function(val) {
-          input.value = val;
-        }
-      }
-    }
-  };
-
-  /**
-   * Utility functions
-   */
-  InputAttachment.util = {
-
-    /**
-     * Simple function to merge the given objects
-     *
-     * @param {Object[]} object Multiple object parameters
-     * @returns {Object}
-     */
-    merge: function() {
-      var result = {};
-      for (var i = arguments.length - 1; i >= 0; i--) {
-        var obj = arguments[i];
-        for (var k in obj) {
-          if (obj.hasOwnProperty(k)) {
-            result[k] = obj[k];
-          }
-        }
-      }
-      return result;
-    },
-
-    /**
-     * Append a line of text at the bottom, ensuring there aren't unnecessary newlines
-     *
-     * @param {String} appended Current content
-     * @param {String} previous Value which should be appended after the current content
-     */
-    appendInItsOwnLine: function(previous, appended) {
-      return (previous + "\n\n[[D]]" + appended)
-        .replace(/(\n{2,})\[\[D\]\]/, "\n\n")
-        .replace(/^(\n*)/, "");
-    },
-
-    /**
-     * Inserts the given value at the current cursor position of the textarea element
-     *
-     * @param  {HTMLElement} el
-     * @param  {String} text Text which will be inserted at the cursor position
-     */
-    insertTextAtCursor: function(el, text) {
-      var scrollPos = el.scrollTop,
-        strPos = 0,
-        browser = false,
-        range;
-
-      if ((el.selectionStart || el.selectionStart === '0')) {
-        browser = 'ff';
-      } else if (document.selection) {
-        browser = 'ie';
-      }
-
-      if (browser === 'ie') {
-        el.focus();
-        range = document.selection.createRange();
-        range.moveStart('character', -el.value.length);
-        strPos = range.text.length;
-      } else if (browser === 'ff') {
-        strPos = el.selectionStart;
-      }
-
-      var front = (el.value).substring(0, strPos);
-      var back = (el.value).substring(strPos, el.value.length);
-      el.value = front + text + back;
-      strPos = strPos + text.length;
-      if (browser === 'ie') {
-        el.focus();
-        range = document.selection.createRange();
-        range.moveStart('character', -el.value.length);
-        range.moveStart('character', strPos);
-        range.moveEnd('character', 0);
-        range.select();
-      } else if (browser === "ff") {
-        el.selectionStart = strPos;
-        el.selectionEnd = strPos;
-        el.focus();
-      }
-      el.scrollTop = scrollPos;
-    }
-  };
-
   /**
    * Default configuration options
    *
@@ -210,7 +100,9 @@
     /**
      * Triggers when a file is dropped or pasted
      */
-    onFileReceived: function() {},
+    onFileReceived: function() {
+
+    },
 
     /**
      * Custom upload handler
@@ -271,7 +163,7 @@
     formData.append(settings.uploadFieldName, file, remoteFilename);
 
     // Append the extra parameters to the form data
-    if (typeof settings.extraParams === "object") {
+    if (typeof settings.extraParams === 'object') {
       for (var key in settings.extraParams) {
         if (settings.extraParams.hasOwnProperty(key)) {
           formData.append(key, settings.extraParams[key]);
@@ -305,36 +197,18 @@
   };
 
   InputAttachment.prototype.previewFile = function(file, obj) {
-    var fileList = document.getElementById(this.settings.previewDiv),
-      img = new Image();
-    img.classList.add('ui', 'small', 'image');
-
-    if(window.URL){
-      //File API
-      img.src = window.URL.createObjectURL(file); //创建一个object URL，并不是你的本地路径
-      img.onload = function(e) {
-        window.URL.revokeObjectURL(this.src); //图片加载后，释放object URL
-      }
-    } else if(window.FileReader){
-      //opera不支持createObjectURL/revokeObjectURL方法。我们用FileReader对象来处理
-      var reader = new FileReader();
-      reader.readAsDataURL(file);
-      reader.onload = function(e){
-        img.src = this.result;
-      }
-    }else{
-      //ie
-      obj.select();
-      obj.blur();
-      var nfile = document.selection.createRange().text;
-      document.selection.empty();
-      img.src = nfile;
-      img.onload=function(e){
-
-      }
+    var fileList = document.getElementById(this.settings.previewDiv)
+    var template = document.createElement('template');
+    template.innerHTML = fileList.firstElementChild.outerHTML.trim();
+    var img_div = template.content.firstChild;
+    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);
+    fileList.appendChild(img_div);
   };
 
   /**
@@ -369,8 +243,7 @@
         } else {
           newValue = this.settings.urlText.replace(this.filenameTag, filename);
         }
-        var text = this.editor.getValue().replace(this.lastValue, newValue);
-        this.editor.setValue(text);
+        this.editor.input.value.replace(this.lastValue, newValue);
         this.settings.onFileUploaded.call(this, filename, result);
       }
     }
@@ -385,8 +258,7 @@
    */
   InputAttachment.prototype.onFileUploadError = function(xhr) {
     if (this.settings.onFileUploadError.call(this, xhr) !== false) {
-      var text = this.editor.getValue().replace(this.lastValue, "");
-      this.editor.setValue(text);
+      this.editor.input.value.replace(this.lastValue, '');
     }
   };
 
@@ -399,7 +271,10 @@
   InputAttachment.prototype.onFileInserted = function(file) {
     if (this.settings.onFileReceived.call(this, file) !== false) {
       this.lastValue = this.settings.progressText;
-      this.editor.insertValue(this.lastValue);
+
+      var scrollPos = el.scrollTop
+      el.value = this.lastValue;
+      el.scrollTop = scrollPos;
     }
   };
 
@@ -538,5 +413,4 @@
 
   window.attachToInput = attachToInput;
   window.attachToPreview = attachToPreview;
-
-})(document, window);
+})(document, window);

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

@@ -0,0 +1,17 @@
+//= require ./attachment
+
+class PictureController extends Stimulus.Controller {
+  greet() {
+    console.log('Hellos, Stimulus!', this.element)
+  }
+
+  connect() {
+    console.log('Connects, Stimulus!', this.element)
+    attachToPreview({
+      fileInput: 'picture_file'
+    });
+  }
+}
+PictureController.targets = ['src']
+const application = Stimulus.Application.start()
+application.register('picture', PictureController)

data/app/controllers/{active_storage → active_storage_ext/admin}/attachments_controller.rb

@@ -1,4 +1,4 @@
-class ActiveStorage::AttachmentsController < ActiveStorage::BaseController
+class ActiveStorageExt::Admin::AttachmentsController < ActiveStorageExt::Admin::BaseController
   before_action :set_attachment, only: [:destroy]
 
   def destroy
@@ -10,4 +10,4 @@ class ActiveStorage::AttachmentsController < ActiveStorage::BaseController
     @attachment = ActiveStorage::Attachment.find(params[:id])
   end
 
-end
+end

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

@@ -0,0 +1,4 @@
+class ActiveStorageExt::Admin::BaseController < RailsCom.config.admin_class.constantize
+
+
+end

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

@@ -0,0 +1,54 @@
+class ActiveStorageExt::Admin::BlobDefaultsController < ActiveStorageExt::Admin::BaseController
+  before_action :set_blob_default, only: [:show, :edit, :update, :destroy]
+
+  def index
+    @blob_defaults = ActiveStorage::BlobDefault.page(params[:page])
+  end
+
+  def new
+    @blob_default = ActiveStorage::BlobDefault.new
+  end
+
+  def create
+    @blob_default = ActiveStorage::BlobDefault.new(blob_default_params)
+
+    if @blob_default.save
+      redirect_to rails_ext_blob_defaults_url, notice: 'Blob default was successfully created.'
+    else
+      render :new
+    end
+  end
+
+  def show
+  end
+
+  def edit
+  end
+
+  def update
+    if @blob_default.update(blob_default_params)
+      redirect_to rails_ext_blob_defaults_url, notice: 'Blob default was successfully updated.'
+    else
+      render :edit
+    end
+  end
+
+  def destroy
+    @blob_default.destroy
+    redirect_to rails_ext_blob_defaults_url, notice: 'Blob default was successfully destroyed.'
+  end
+
+  private
+  def set_blob_default
+    @blob_default = ActiveStorage::BlobDefault.find(params[:id])
+  end
+
+  def blob_default_params
+    params.fetch(:blob_default, {}).permit(
+      :record_class,
+      :name,
+      :file
+    )
+  end
+
+end

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

@@ -0,0 +1,48 @@
+class ActiveStorageExt::Admin::BlobsController < ActiveStorageExt::Admin::BaseController
+  before_action :set_blob, only: [:destroy]
+
+  def index
+    q_params = {}.with_indifferent_access
+    q_params.merge params.fetch(:q, {}).permit(:key, :filename)
+    @blobs = ActiveStorage::Blob.default_where(q_params).order(id: :desc).page(params[:page])
+  end
+
+  def unattached
+    q_params = {}.with_indifferent_access
+    q_params.merge params.fetch(:q, {}).permit(:key, :filename)
+    @blobs = ActiveStorage::Blob.unattached.default_where(q_params).order(id: :desc).page(params[:page])
+    render :index
+  end
+
+  def new
+    @blob = ActiveStorage::Blob.new(filename: '')
+  end
+
+  def create
+    @blob = ActiveStorage::Blob.build_after_upload(io: blob_params[:io].tempfile, filename: blob_params[:io].original_filename)
+
+    if @blob.save
+      redirect_to rails_ext_blobs_url, notice: 'Blob was successfully created.'
+    else
+      render :new
+    end
+  end
+
+  def destroy
+    @blob.purge
+    redirect_to rails_ext_blobs_url, notice: 'Blob was successfully destroyed.'
+  end
+
+  private
+  def set_blob
+    @blob = ActiveStorage::Blob.find(params[:id])
+  end
+
+  def blob_params
+    params.fetch(:blob, {}).permit(
+      :key,
+      :io
+    )
+  end
+
+end