rails_com 1.2.4 → 1.2.5

data/app/controllers/active_storage_ext/audios_controller.rb

@@ -0,0 +1,24 @@
+class ActiveStorageExt::AudiosController < RailsCom.config.app_class.constantize
+  before_action :set_video, only: [:show, :transfer]
+  before_action do
+    ActiveStorage::Current.host = request.base_url
+  end
+
+  def show
+    expires_in ActiveStorage::Blob.service.url_expires_in
+  end
+
+  def transfer
+    attached = @attachment.transfer_faststart
+    @video = attached.blob
+
+    flash[:notice] = 'well done!'
+    render 'show'
+  end
+
+  private
+  def set_video
+    @audio = ActiveStorage::Blob.find(params[:id])
+  end
+
+end

data/app/controllers/concerns/rails_common_api.rb

@@ -0,0 +1,50 @@
+module RailsCommonApi
+  extend ActiveSupport::Concern
+
+  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
+    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
+    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
+    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
+    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
+    end
+  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
+  end
+
+  def render *args
+    options = args.extract_options!
+
+    if options[:json]
+      options[:json].merge! code: 200
+    end
+
+    args << options
+    super *args
+  end
+
+end

data/app/controllers/concerns/rails_common_xhr.rb

@@ -0,0 +1,15 @@
+module RailsCommonXhr
+  extend ActiveSupport::Concern
+
+  included do
+
+  end
+
+  # process_js
+  def process_js
+    if self.request.xhr?
+      self.response.body = Babel.transform(self.response.body)
+    end
+  end
+
+end

data/app/helpers/rails_com/active_helper.rb

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 module RailsCom::ActiveHelper
 
-  # active_assert('notice' == 'notice', expected: 'ui info message', unexpected: 'ui negative message')
+  #
+  # return by assert return
+  #   active_assert('notice' == 'notice', expected: 'ui info message', unexpected: 'ui negative message')
+  #   #=> 'ui info message'
   def active_assert(assert, expected: 'item active', unexpected: 'item')
     if assert
       expected
@@ -10,8 +13,10 @@ module RailsCom::ActiveHelper
     end
   end
 
-  # active_asserts('active': true, expected: false)
-  def active_asserts(join: true, **options)
+  # return value by each keys which is true
+  #   active_asserts(active: true, item: false)
+  #   #=> 'active'
+  def active_asserts(join = true, **options)
     keys = options.select { |_, v| v }.keys
 
     if join
@@ -21,12 +26,17 @@ module RailsCom::ActiveHelper
     end
   end
 
-  # paths: active_helper paths: '/work/employees' or active_helper paths: ['/work/employees']
-  # controllers: active_helper controllers: 'xxx'  or active_helper controllers: ['xxx1', 'admin/xxx2']
-  # modules: active_helper modules: 'admin/oa'
-  # action: active_helper 'work/employee': ['index', 'show']
-  # params: active_params state: 'xxx'
-  # active_helper controller: 'users', action: 'show', id: 371
+  # See examples bellow:
+  # paths:
+  #   active_helper paths: '/work/employees' or active_helper paths: ['/work/employees']
+  # controllers:
+  #   active_helper controllers: 'xxx'  or active_helper controllers: ['xxx1', 'admin/xxx2']
+  # modules:
+  #   active_helper modules: 'admin/oa'
+  # action:
+  #   active_helper 'work/employee': ['index', 'show']
+  # params:
+  #   active_helper controller: 'users', action: 'show', id: 371
   def active_helper(paths: [], controllers: [], modules: [], active_class: 'item active', item_class: 'item', **options)
     check_parameters = options.delete(:check_parameters)
 
@@ -56,6 +66,8 @@ module RailsCom::ActiveHelper
     item_class
   end
 
+  # return value by params
+  #   active_params state: 'xxx'
   def active_params(active_class: 'item active', item_class: 'item', **options)
     options.select { |_, v| v.present? }.each do |k, v|
       if params[k].to_s == v.to_s

data/app/helpers/rails_com/assets_helper.rb

@@ -1,42 +1,76 @@
 # frozen_string_literal: true
 module RailsCom::AssetsHelper
 
-  def js_load(filename = nil, **options)
-    filename ||= "controllers/#{controller_path}/#{action_name}"
-    paths = assets_load_path(filename)
+  # Assets path: app/assets/javascripts/controllers
+  # Packs Path: app/javascript/packs/javascripts
+  def js_load(**options)
+    ext = ['.js', '.js.erb'] + Array(options.delete(:ext))
+    suffix = options.delete(:suffix)
 
-    if paths.any? { |path| File.exist?(path) }
-      javascript_include_tag filename, options
+    asset_filename = "controllers/#{controller_path}/#{action_name}"
+    if suffix
+      asset_filename += ['.', suffix].join
     end
-  end
-
-  def css_load(filename = nil, **options)
-    filename ||= "controllers/#{controller_path}/#{action_name}"
-    paths = assets_load_path(filename, relative_path: 'app/assets/stylesheets', ext: ['.css', '.css.erb'])
+    asset_paths = assets_load_path(asset_filename, relative_path: 'app/assets/javascripts', ext: ext)
 
-    if paths.any? { |path| File.exist?(path) }
-      stylesheet_link_tag filename, options
+    pack_filename ||= "javascripts/#{controller_path}/#{action_name}"
+    if suffix
+      pack_filename += ['-', suffix].join
     end
-  end
+    pack_paths = assets_load_path(pack_filename, relative_path: 'app/javascript/packs', ext: ext)
 
-  def js_pack(filename = nil, **options)
-    filename ||= "controllers/#{controller_path}/#{action_name}"
-    paths = assets_load_path(filename, relative_path: 'app/javascript/packs', **options)
+    r = []
+    if asset_paths.any? { |path| File.exist?(path) }
+      r << javascript_include_tag(asset_filename, options)
+    end
 
-    if paths.any? { |path| File.exist?(path) }
-      javascript_pack_tag filename, options
+    if pack_paths.any? { |path| File.exist?(path) }
+      r << javascript_pack_tag(pack_filename, options)
     end
+
+    r.join("\n    ").html_safe
   end
 
   def js_ready(**options)
-    js_load("controllers/#{controller_path}/#{action_name}.ready", **options)
+    js_load(suffix: 'ready', **options)
   end
 
-  def js_pack_ready(**options)
-    js_pack("controllers/#{controller_path}/#{action_name}-ready", **options)
+  # Assets path: app/assets/stylesheets/controllers
+  # Packs Path: app/javascript/packs/stylesheets
+  def css_load(**options)
+    ext = ['.css', '.css.erb'] + Array(options.delete(:ext))
+
+    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)
+
+    r = []
+    if asset_paths.any? { |path| File.exist?(path) }
+      r << stylesheet_link_tag(asset_filename, options)
+    end
+
+    if pack_paths.any? { |path| File.exist?(path) }
+      
+      begin
+        rs = stylesheet_pack_tag(pack_filename, options)
+      rescue
+        rs = nil
+      end
+
+      if rs.is_a?(String)
+        r << rs
+      else
+        r << javascript_pack_tag(pack_filename, options)
+      end
+    end
+
+    r.join("\n    ").html_safe
   end
 
-  def assets_load_path(filename, relative_path: 'app/assets/javascripts', ext: ['.js', '.js.erb'])
+  private
+  def assets_load_path(filename, relative_path:, ext:)
     paths = []
 
     file_path = Pathname.new(relative_path).join filename
@@ -54,4 +88,4 @@ module RailsCom::AssetsHelper
     paths
   end
 
-end
+end

data/app/helpers/rails_com/format_helper.rb

@@ -25,7 +25,7 @@ module RailsCom::FormatHelper
         hash_text = text.to_h
         return simple_format_hash(hash_text, html_options, options)
       rescue TypeError
-        return content_tag(:span, text, html_options)
+        return text.map { |t| content_tag(:p, t, html_options) }.join("\n").html_safe
       end
     end
 
@@ -34,4 +34,4 @@ module RailsCom::FormatHelper
     super
   end
 
-end
+end

data/app/helpers/rails_com/time_helper.rb

@@ -12,7 +12,8 @@ module RailsCom::TimeHelper
       str = ''
       result.each do |k, v|
         if v > 0
-          str << v.to_s << locale.t(k)
+          str += v.to_s
+          str += locale.t(k)
         end
       end
       str

data/app/models/active_storage/blob_default.rb

@@ -0,0 +1,5 @@
+class ActiveStorage::BlobDefault < ApplicationRecord
+  self.table_name = 'active_storage_blob_defaults'
+  has_one_attached :file
+
+end

data/app/models/application_record.rb

@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end

data/app/views/active_storage_ext/admin/blob_defaults/_form.html.erb

@@ -0,0 +1,7 @@
+<%= form_with model: [:rails_ext, @blob_default], local: true do |f| %>
+  <%= render 'shared/error_messages', target: @blob_default %>
+  <%= f.text_field :record_class %>
+  <%= f.text_field :name %>
+  <%= f.file_field :file %>
+  <%= f.submit %>
+<% end %>

data/app/views/active_storage_ext/admin/blob_defaults/_search_form.html.erb

@@ -0,0 +1,7 @@
+<%= search_form_with do |f| %>
+  <div class="fields">
+    <%= f.submit 'Search' %>
+  </div>
+<% end %>
+
+

data/app/views/active_storage_ext/admin/blob_defaults/edit.html.erb

@@ -0,0 +1,9 @@
+<div class="ui segment breadcrumb">
+  <%= link_to 'Back', rails_ext_blob_defaults_path, class: 'section' %>
+  <div class="divider"> / </div>
+  <div class="active section">Edit</div>
+</div>
+
+<div class="ui segment">
+  <%= render 'form' %>
+</div>

data/app/views/active_storage_ext/admin/blob_defaults/index.html.erb

@@ -0,0 +1,48 @@
+<div class="ui top attached borderless menu">
+  <div class="header item">Blob Defaults</div>
+  <div class="right menu">
+    <div class="item">
+      <%= link_to 'New Blob Default', new_rails_ext_blob_default_path, class: 'ui teal button' %>
+    </div>
+  </div>
+</div>
+
+<div class="ui attached segment">
+  <%= render 'search_form' %>
+</div>
+
+<table class="ui bottom attached table">
+  <thead>
+    <tr>
+      <th><%= ActiveStorage::BlobDefault.human_attribute_name(:id) %></th>
+      <th><%= ActiveStorage::BlobDefault.human_attribute_name(:record_class) %></th>
+      <th><%= ActiveStorage::BlobDefault.human_attribute_name(:name) %></th>
+      <th><%= ActiveStorage::BlobDefault.human_attribute_name(:file) %></th>
+      <th></th>
+      <th>Actions</th>
+    </tr>
+  </thead>
+  <tbody>
+  <% @blob_defaults.each do |blob_default| %>
+    <tr>
+      <td><%= blob_default.id %></td>
+      <td><%= blob_default.record_class %></td>
+      <td><%= blob_default.name %></td>
+      <td><%= blob_default.file_blob.key if blob_default.file_blob %></td>
+      <td>
+        <%= render 'active_storage_ext/attachments/list', target: blob_default.file %>
+      </td>
+      <td class="ui labels">
+        <%= link_to edit_rails_ext_blob_default_path(blob_default), data: { tooltip: t('.edit') }, class: 'ui pink mini icon button' do %>
+          <i class="pencil alternate icon"></i>
+        <% end %>
+        <%= link_to rails_ext_blob_default_path(blob_default), method: :delete, data: { tooltip: t('.destroy'), confirm: 'Are you sure?' }, class: 'ui red mini icon button' do %>
+          <i class="times icon"></i>
+        <% end %>
+      </td>
+    </tr>
+  <% end %>
+  </tbody>
+</table>
+
+<%= paginate @blob_defaults %>

data/app/views/active_storage_ext/admin/blob_defaults/new.html.erb

@@ -0,0 +1,9 @@
+<div class="ui segment breadcrumb">
+  <%= link_to 'Back', rails_ext_blob_defaults_path(blob_id: params[:blob_id]), class: 'section' %>
+  <div class="divider"> / </div>
+  <div class="active section">Add</div>
+</div>
+
+<div class="ui segment">
+  <%= render 'form' %>
+</div>

data/app/views/active_storage_ext/admin/blob_defaults/show.html.erb

@@ -0,0 +1,10 @@
+<div class="ui segment breadcrumb">
+  <%= link_to 'Back', blob_defaults_path, class: 'section' %>
+  <div class="divider"> / </div>
+  <div class="active section">Show</div>
+</div>
+
+<table class="ui very basic large table">
+  <tbody>
+  </tbody>
+</table>

data/app/views/active_storage_ext/admin/blobs/_search_form.html.erb

@@ -0,0 +1,9 @@
+<%= search_form_with do |f| %>
+  <div class="fields">
+    <%= f.text_field :key, placeholder: ActiveStorage::Blob.human_attribute_name(:key) %>
+    <%= f.text_field :filename, placeholder: ActiveStorage::Blob.human_attribute_name(:filename) %>
+    <%= f.submit 'Search' %>
+  </div>
+<% end %>
+
+

data/app/views/active_storage_ext/admin/blobs/destroy.js.erb

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

data/app/views/active_storage_ext/admin/blobs/index.html.erb

@@ -0,0 +1,51 @@
+<div class="ui top attached borderless menu">
+  <%= link_to 'All', rails_ext_blobs_path, class: active_helper(action: 'index') %>
+  <%= link_to 'Unattached', unattached_rails_ext_blobs_path, class: active_helper(action: 'unattached') %>
+  <div class="right menu">
+    <div class="item">
+      <%= link_to 'New ActiveStorage::Blob', new_rails_ext_blob_path, class: 'ui teal button' %>
+    </div>
+  </div>
+</div>
+
+<div class="ui attached segment">
+  <%= render 'search_form' %>
+</div>
+
+<table class="ui bottom attached table">
+  <thead>
+    <tr>
+      <th><%= ActiveStorage::Blob.human_attribute_name(:id) %></th>
+      <th><%= ActiveStorage::Blob.human_attribute_name(:key) %></th>
+      <th><%= ActiveStorage::Blob.human_attribute_name(:filename) %></th>
+      <th><%= ActiveStorage::Blob.human_attribute_name(:content_type) %></th>
+      <th><%= ActiveStorage::Blob.human_attribute_name(:metadata) %></th>
+      <th><%= ActiveStorage::Blob.human_attribute_name(:size) %></th>
+      <th><%= ActiveStorage::Blob.human_attribute_name(:created_at) %></th>
+      <th>Actions</th>
+    </tr>
+  </thead>
+  <tbody>
+  <% @blobs.each do |blob| %>
+    <tr>
+      <td><%= blob.id %></td>
+      <td><%= blob.key %></td>
+      <td><%= blob.filename %></td>
+      <td><%= blob.content_type %></td>
+      <td><%= simple_format(blob.metadata) %></td>
+      <td><%= number_to_human_size(blob.byte_size) %></td>
+      <td><time><%= blob.created_at.to_s(:rfc822) %></time></td>
+      <td class="ui labels">
+        <%= link_to rails_ext_blob_path(blob), method: :delete, data: { tooltip: t('.destroy'), confirm: 'Are you sure?' }, class: 'ui red mini icon button' do %>
+          <i class="times icon"></i>
+        <% end %>
+        <%= link_to rails_ext_audio_path(blob.id), target: '_blank', method: :delete, data: { tooltip: '默认' }, class: 'ui blue mini icon button' do %>
+          <i class="play icon"></i>
+        <% end %>
+      </td>
+    </tr>
+  <% end %>
+  </tbody>
+</table>
+
+<%= paginate @blobs %>