rails_com 1.2.1 → 1.2.2

data/app/helpers/rails_com/assets_helper.rb

@@ -1,31 +1,57 @@
 # frozen_string_literal: true
 module RailsCom::AssetsHelper
 
-  def js_load(filename = nil, root: nil, **options)
+  def js_load(filename = nil, **options)
     filename ||= "controllers/#{controller_path}/#{action_name}"
-    root ||= @_rendered_from || Rails.root
-    path = root + 'app/assets/javascripts' + filename.to_s
-    if File.exist?(path.to_s + '.js') || File.exist?(path.to_s + '.js.erb')
+    paths = assets_load_path(filename)
+
+    if paths.any? { |path| File.exist?(path) }
       javascript_include_tag filename, options
     end
   end
 
-  def css_load(filename = nil, root: nil, **options)
+  def css_load(filename = nil, **options)
     filename ||= "controllers/#{controller_path}/#{action_name}"
-    root ||= @_rendered_from || Rails.root
-    path = root + 'app/assets/stylesheets' + filename.to_s
-    if File.exist?(path.to_s + '.css')
+    paths = assets_load_path(filename, relative_path: 'app/assets/stylesheets', ext: ['.css', '.css.erb'])
+
+    if paths.any? { |path| File.exist?(path) }
       stylesheet_link_tag filename, options
     end
   end
 
-  def js_ready(filename = nil, root: nil, **options)
-    filename ||= "controllers/#{controller_path}/#{action_name}.ready"
-    root ||= @_rendered_from || Rails.root
-    path = root + 'app/assets/javascripts' + filename.to_s
-    if File.exist?(path.to_s + '.js') || File.exist?(path.to_s + '.js.erb')
-      javascript_include_tag filename, options
+  def js_pack(filename = nil, **options)
+    filename ||= "controllers/#{controller_path}/#{action_name}"
+    paths = assets_load_path(filename, relative_path: 'app/javascript/packs', **options)
+
+    if paths.any? { |path| File.exist?(path) }
+      javascript_pack_tag filename, options
     end
   end
 
+  def js_ready(**options)
+    js_load("controllers/#{controller_path}/#{action_name}.ready", **options)
+  end
+
+  def js_pack_ready(**options)
+    js_pack("controllers/#{controller_path}/#{action_name}-ready", **options)
+  end
+
+  def assets_load_path(filename, relative_path: 'app/assets/javascripts', ext: ['.js', '.js.erb'])
+    paths = []
+
+    file_path = Pathname.new(relative_path).join filename
+    rails_path = Rails.root.join file_path
+    ext.each do |name|
+      paths << rails_path.to_s + name
+    end
+    if @_rendered_from
+      engine_path = @_rendered_from.join file_path
+      ext.each do |name|
+        paths << engine_path.to_s + name
+      end
+    end
+
+    paths
+  end
+
 end

data/app/helpers/rails_com/format_helper.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+module RailsCom::FormatHelper
+
+  def simple_format_hash(hash_text, html_options = {}, options = {})
+    wrapper_tag = options.fetch(:wrapper_tag, :p)
+
+    hash_text.map do |k, v|
+      if k.to_s.rstrip.end_with?(':')
+        text = k.to_s + ' ' + v.to_s
+      else
+        text = k.to_s + ': ' + v.to_s
+      end
+
+      content_tag(wrapper_tag, text, html_options)
+    end.join("\n\n").html_safe
+  end
+
+  def simple_format(text, html_options = {}, options = {})
+    if text.is_a?(Hash)
+      return simple_format_hash(text, html_options, options)
+    end
+
+    if text.is_a?(Array)
+      begin
+        hash_text = text.to_h
+        return simple_format_hash(hash_text, html_options, options)
+      rescue TypeError
+        return content_tag(:span, text, html_options)
+      end
+    end
+
+    text = text.to_s
+
+    super
+  end
+
+end

data/app/models/state_machine.rb

@@ -3,12 +3,12 @@ module StateMachine
   # to defined next_xxx_states in class
 
   # obj.next_to state: 'xxx'
-  def next_to(options = {})
+  def next_to(options = {}, &block)
     options.each do |column, value|
       if self.class.method_defined? "next_#{column}_states"
         _next_state = self.send("next_#{column}_states").first
       else
-        _next_state = next_state(column)
+        _next_state = next_state(column, &block)
       end
 
       if _next_state == value.to_s
@@ -21,17 +21,17 @@ module StateMachine
     end
   end
 
-  def next_to!(options = {})
+  def next_to!(options = {}, &block)
     self.next_to(options, &block)
     self.save!
   end
 
-  def trigger_to(options = {})
+  def trigger_to(options = {}, &block)
     options.each do |column, value|
       if self.class.method_defined? "next_#{column}_states"
         _next_states = self.send "next_#{column}_states"
       else
-        _next_states = next_states(column)
+        _next_states = next_states(column, &block)
       end
 
       if _next_states.include?(value.to_s)
@@ -44,11 +44,15 @@ module StateMachine
     end
   end
 
-  def trigger_to!(options = {})
+  def trigger_to!(options = {}, &block)
     self.trigger_to(options, &block)
     self.save!
   end
 
+  def next_state(state_name, &block)
+    next_states(state_name, &block).first
+  end
+
   # obj.next_states(:state) do |result|
   #   result.reject
   # end

data/app/views/active_storage/attachments/_image_item.html.erb

@@ -0,0 +1,6 @@
+<div class="ui small image">
+  <%= link_to rails_attachment_path(image.id), method: :delete, data: {confirm: 'Are you sure?'}, remote: true, class: 'ui grey right corner mini label' do %>
+    <i class="times icon"></i>
+  <% end %>
+  <%= image_tag image, id: "attachment_#{image.id}", data: { target: 'attachment.src' }, style: 'max-width: 100%' %>
+</div>

data/app/views/active_storage/attachments/_list.html.erb

@@ -0,0 +1,28 @@
+<% if target.is_a?(ActiveStorage::Attached::One) && target.attached? %>
+  <% if target.content_type.to_s.start_with?('image') %>
+    <%= image_tag target, style: 'max-width: 100%', class: 'ui small image' %>
+  <% elsif target.content_type.to_s.start_with?('video') %>
+    <%= link_to target.filename, rails_video_path(video), target: '_blank' %>
+  <% else %>
+    <p id="attachment_<%= target.id %>">
+      <%= link_to target.filename, rails_blob_path(target) %>
+    </p>
+  <% end %>
+<% elsif target.is_a?(ActiveStorage::Attached::Many) %>
+  <% target.each do |file| %>
+    <% if file.content_type.to_s.start_with?('image') %>
+      <%= image_tag file, style: 'max-width: 100%', class: 'ui small image' %>
+    <% elsif file.content_type.to_s.start_with?('video') %>
+      <p id="attachment_<%= file.id %>">
+        <%= link_to file.filename, rails_video_path(file), target: '_blank' %>
+      </p>
+    <% else %>
+      <p id="attachment_<%= file.id %>">
+        <%= link_to file.filename, rails_blob_path(file) %>
+      </p>
+    <% end %>
+  <% end %>
+<% end %>
+
+
+

data/app/views/active_storage/attachments/_list_edit.html.erb

@@ -0,0 +1,25 @@
+<% if target.is_a?(ActiveStorage::Attached::One) && target.attached? %>
+  <% if target.content_type.to_s.start_with?('image') %>
+    <%= render partial: 'active_storage/attachments/image_item', locals: { image: target } %>
+  <% elsif target.content_type.to_s.start_with?('video') %>
+    <%= render partial: 'active_storage/attachments/video_item', locals: { video: target } %>
+  <% else %>
+    <p id="attachment_<%= target.id %>">
+      <%= link_to target.filename, rails_blob_path(target) %>
+      <%= link_to 'x', rails_attachment_path(target.id), method: :delete, data: {confirm: 'Are you sure?'}, remote: true %>
+    </p>
+  <% end %>
+<% elsif target.is_a?(ActiveStorage::Attached::Many) %>
+  <% target.each do |file| %>
+    <% if file.content_type.to_s.start_with?('image') %>
+      <%= render partial: 'active_storage/attachments/image_item', locals: { image: file } %>
+    <% elsif file.content_type.to_s.start_with?('video') %>
+      <%= render partial: 'active_storage/attachments/video_item', locals: { video: file } %>
+    <% else %>
+      <p id="attachment_<%= file.id %>">
+        <%= link_to file.filename, rails_blob_path(file) %>
+        <%= link_to 'x', rails_attachment_path(file.id), method: :delete, data: {confirm: 'Are you sure?'}, remote: true %>
+      </p>
+    <% end %>
+  <% end %>
+<% end %>

data/app/views/active_storage/attachments/_list_form.html.erb

@@ -0,0 +1,28 @@
+<div class="top attached inline fields" id="<%= "#{target.record.class.name.underscore}_attachments_#{target.record.id}" %>">
+  <div class="six wide field"></div>
+  <div class="field" id="file_preview" data-controller="attachment">
+    <% if target.is_a?(ActiveStorage::Attached::One) && target.attached? %>
+      <% if target.content_type.to_s.start_with?('image') %>
+        <%= render partial: 'active_storage/attachments/image_item', locals: { image: target } %>
+      <% else %>
+        <p id="attachment_<%= target.id %>">
+          <%= link_to target.filename, rails_blob_path(target) %>
+          <%= link_to 'x', rails_attachment_path(target.id), method: :delete, data: {confirm: 'Are you sure?'}, remote: true %>
+        </p>
+      <% end %>
+    <% elsif target.is_a?(ActiveStorage::Attached::Many) %>
+      <% target.each do |file| %>
+        <% if file.content_type.to_s.start_with?('image') %>
+          <%= render partial: 'active_storage/attachments/image_item', locals: { image: file } %>
+        <% else %>
+          <p id="attachment_<%= file.id %>">
+            <%= link_to file.filename, rails_blob_path(file) %>
+            <%= link_to 'x', rails_attachment_path(file.id), method: :delete, data: {confirm: 'Are you sure?'}, remote: true %>
+          </p>
+        <% end %>
+      <% end %>
+    <% end %>
+  </div>
+</div>
+
+

data/app/views/active_storage/attachments/_video_item.html.erb

@@ -0,0 +1,6 @@
+<p id="attachment_<%= video.id %>">
+  <%= link_to video.filename, rails_video_path(video), target: '_blank' %>
+  <%= link_to 'transfer', transfer_rails_video_path(video.id), method: :put, data: { confirm: 'are you sure?' }, class: 'ui label' %>
+  <%= link_to 'x', rails_attachment_path(video.id), method: :delete, data: {confirm: 'Are you sure?'}, remote: true %>
+</p>
+

data/app/views/active_storage/attachments/destroy.js.erb

@@ -0,0 +1 @@
+$('#attachment_<%= @attachment.id %>').remove();

data/app/views/active_storage_ext/videos/show.html.erb

@@ -0,0 +1,6 @@
+<div class="ui basic center aligned segment">
+  <%= video_tag @video.service_url(disposition: params[:disposition]),
+                controls: true,
+                preload: 'auto'
+  %>
+</div>

data/app/views/kaminari/_next_page.html.erb

@@ -1,3 +1,3 @@
 <%= link_to url, class: 'item', title: t('views.pagination.next'), remote: remote do %>
-  <i class="right arrow icon"></i>
+  <i class="step forward icon"></i>
 <% end %>

data/app/views/kaminari/_prev_page.html.erb

@@ -1,3 +1,3 @@
 <%= link_to url, class: 'item', title: t('views.pagination.previous'), remote: remote do %>
-  <i class="left arrow icon"></i>
+  <i class="step backward icon"></i>
 <% end %>

data/app/views/shared/_error_messages.html.erb

@@ -1,7 +1,7 @@
 <% if target.errors.any? %>
   <div class="ui negative message">
     <i class="close icon"></i>
-    <div class="header">有 <%= target.errors.count %> 处问题导至无法提交:</div>
+    <div class="header"><%= target.errors.count %> <% if target.errors.count == 1 %> error <% else %> errors <% end %>: </div>
     <ul class="list">
       <% target.errors.full_messages.each do |msg| %>
         <li><%= msg %></li>

data/config/locales/en.yml

@@ -1,4 +1,9 @@
 en:
+  controller:
+    show: Show
+    edit: Edit
+    destroy: Delete
+    search: Search
   views:
     pagination:
       first: First

data/config/locales/zh.yml

@@ -1,4 +1,9 @@
 zh:
+  controller:
+    show: 详情
+    edit: 编辑
+    destroy: 删除
+    search: 搜索
   errors:
     format: "%{attribute} %{message}"
     messages:

data/config/routes.rb

@@ -1,8 +1,13 @@
 Rails.application.routes.draw do
-  
-  resources :the_guards
-  controller :common do
-    get :locales
+
+  scope :rails, as: 'rails', module: 'active_storage' do
+    resources :attachments, only: [:destroy]
+  end
+
+  scope :rails, as: 'rails', module: 'active_storage_ext' do
+    resources :videos, only: [:show] do
+      put :transfer, on: :member
+    end
   end
 
-end
+end

data/lib/assets/javascripts/input-attachment.js

@@ -4,7 +4,7 @@
 /*
 * Input Field with Attachment
 * Fork and Inspired by inlineAttachment(https://github.com/Rovak/InlineAttachment)
-* Author: 覃明圆
+* Author: mingyuan.qin
 * Contact: mingyuan0715@foxmail.com
 */
 
@@ -14,7 +14,6 @@
   var InputAttachment = function(options) {
     this.settings = InputAttachment.util.merge(options, InputAttachment.defaults);
     this.editor = InputAttachment.editors.initEditor(this.settings['editor']);
-    this.fileInput = InputAttachment.editors.initEditor(this.settings['fileInput']);
     this.filenameTag = '{filename}';
     this.lastValue = null;
   };
@@ -83,8 +82,8 @@
     /**
      * Inserts the given value at the current cursor position of the textarea element
      *
-     * @param  {HtmlElement} el
-     * @param  {String} value Text which will be inserted at the cursor position
+     * @param  {HTMLElement} el
+     * @param  {String} text Text which will be inserted at the cursor position
      */
     insertTextAtCursor: function(el, text) {
       var scrollPos = el.scrollTop,
@@ -93,17 +92,17 @@
         range;
 
       if ((el.selectionStart || el.selectionStart === '0')) {
-        browser = "ff";
+        browser = 'ff';
       } else if (document.selection) {
-        browser = "ie";
+        browser = 'ie';
       }
 
-      if (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") {
+      } else if (browser === 'ff') {
         strPos = el.selectionStart;
       }
 
@@ -111,7 +110,7 @@
       var back = (el.value).substring(strPos, el.value.length);
       el.value = front + text + back;
       strPos = strPos + text.length;
-      if (browser === "ie") {
+      if (browser === 'ie') {
         el.focus();
         range = document.selection.createRange();
         range.moveStart('character', -el.value.length);
@@ -150,6 +149,8 @@
 
     uploadFileInput: '',
 
+    previewDiv: 'file_preview',
+
     /**
      * Extension which will be used when a file extension could not
      * be detected
@@ -187,7 +188,7 @@
     /**
      * Text which will be used when uploading has failed
      */
-    errorText: "Error uploading file",
+    errorText: 'Error uploading file',
 
     /**
      * Extra parameters which will be send when uploading a file
@@ -231,7 +232,7 @@
     },
 
     /**
-     * When a file has succesfully been uploaded
+     * When a file has successfully been uploaded
      */
     onFileUploaded: function() {}
   };
@@ -262,14 +263,14 @@
       }
     }
 
-    var remoteFilename = "image-" + Date.now() + "." + extension;
+    var remoteFilename = 'image-' + Date.now() + '.' + extension;
     if (typeof settings.remoteFilename === 'function') {
       remoteFilename = settings.remoteFilename(file);
     }
 
     formData.append(settings.uploadFieldName, file, remoteFilename);
 
-    // Append the extra parameters to the formdata
+    // Append the extra parameters to the form data
     if (typeof settings.extraParams === "object") {
       for (var key in settings.extraParams) {
         if (settings.extraParams.hasOwnProperty(key)) {
@@ -281,7 +282,7 @@
     xhr.open('POST', settings.uploadUrl);
 
     // Add any available extra headers
-    if (typeof settings.extraHeaders === "object") {
+    if (typeof settings.extraHeaders === 'object') {
         for (var header in settings.extraHeaders) {
             if (settings.extraHeaders.hasOwnProperty(header)) {
                 xhr.setRequestHeader(header, settings.extraHeaders[header]);
@@ -303,10 +304,43 @@
     return xhr;
   };
 
+  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){
+
+      }
+    }
+
+    fileList.appendChild(img);
+  };
+
   /**
    * Returns if the given file is allowed to handle
    *
-   * @param {File} clipboard data file
+   * @param {File} file clipboard data file
    */
   InputAttachment.prototype.isFileAllowed = function(file) {
     if (file.kind === 'string') { return false; }
@@ -321,7 +355,7 @@
    * Handles upload response
    *
    * @param  {XMLHttpRequest} xhr
-   * @return {Void}
+   * @return {void}
    */
   InputAttachment.prototype.onFileUploadResponse = function(xhr) {
     if (this.settings.onFileUploadResponse.call(this, xhr) !== false) {
@@ -337,7 +371,7 @@
         }
         var text = this.editor.getValue().replace(this.lastValue, newValue);
         this.editor.setValue(text);
-        this.settings.onFileUploaded.call(this, filename);
+        this.settings.onFileUploaded.call(this, filename, result);
       }
     }
   };
@@ -347,7 +381,7 @@
    * Called when a file has failed to upload
    *
    * @param  {XMLHttpRequest} xhr
-   * @return {Void}
+   * @return {void}
    */
   InputAttachment.prototype.onFileUploadError = function(xhr) {
     if (this.settings.onFileUploadError.call(this, xhr) !== false) {
@@ -360,7 +394,7 @@
    * Called when a file has been inserted, either by drop or paste
    *
    * @param  {File} file
-   * @return {Void}
+   * @return {void}
    */
   InputAttachment.prototype.onFileInserted = function(file) {
     if (this.settings.onFileReceived.call(this, file) !== false) {
@@ -369,9 +403,8 @@
     }
   };
 
-
   /**
-   * Called when a paste event occured
+   * Called when a paste event occurred
    * @param  {Event} e
    * @return {Boolean} if the event was handled
    */
@@ -380,7 +413,7 @@
       clipboardData = e.clipboardData,
       items;
 
-    if (typeof clipboardData === "object") {
+    if (typeof clipboardData === 'object') {
       items = clipboardData.items || clipboardData.files || [];
 
       for (var i = 0; i < items.length; i++) {
@@ -430,6 +463,20 @@
     return result;
   };
 
+  InputAttachment.prototype.imagePreview = function(e){
+    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);
+      }
+    }
+
+    return result;
+  };
+
   InputAttachment.prototype.onFileInputClick = function(e) {
     console.log('fileInputClick', e)
   };
@@ -476,6 +523,20 @@
     }
   }
 
+  function attachToPreview(options) {
+    options = options || {};
+    var fileInput = document.getElementById(options['fileInput']);
+    options['fileInput'] = fileInput;
+    var inlineattach = new InputAttachment(options);
+
+    if (fileInput) {
+      fileInput.addEventListener('change', function(e) {
+        inlineattach.imagePreview(e)
+      }, false);
+    }
+  }
+
   window.attachToInput = attachToInput;
+  window.attachToPreview = attachToPreview;
 
 })(document, window);