rails_com 1.2.9 → 1.3.0

data/lib/rails_com/active_storage/activestorage_attached.rb

@@ -1,13 +1,16 @@
-require 'httparty'
+# frozen_string_literal: true
+
+require 'httpx'
 module ActiveStorage
   class Attached
 
     def url_sync(url)
       filename = File.basename URI(url).path
-
+      
       Tempfile.open do |file|
         file.binmode
-        HTTParty.get(url, stream_body: true) do |fragment|
+        
+        HTTPX.get(url).body.each do |fragment|
           file.write fragment
         end
 
@@ -20,7 +23,7 @@ module ActiveStorage
     class One
 
       def variant(transformations)
-        if attachment.variable?
+        if attachment&.variable?
           attachment.variant(transformations)
         else
           self

data/lib/rails_com/active_storage/attached_macros.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsCom::AttachedOne
 
   def attachment
@@ -7,14 +9,24 @@ module RailsCom::AttachedOne
       return @attachment
     end
 
-    id = ActiveStorage::BlobDefault.defaults["#{record.class.name}_#{name}"]
-    @attachment = build_attachment(blob: ActiveStorage::Blob.find(id)) if id
+    id = Com::BlobDefault.defaults["#{record.class.name}_#{name}"]
+    if id
+      begin
+        @attachment = ActiveStorage::Attachment.new(record: record, name: name, blob: ActiveStorage::Blob.find(id))
+      rescue ActiveRecord::RecordNotFound => e
+        Rails.cache.delete('blob_default/default')
+        retry
+      end
+    end
   end
 
-  def attached?
-    attachment&.id?
+  def copy(from, from_name)
+    from_attachment = from.send "#{from_name}_attachment"
+    record.send "create_#{name}_attachment", blob_id: from_attachment.blob_id
   end
 
 end
 
-ActiveStorage::Attached::One.prepend RailsCom::AttachedOne
+ActiveSupport.on_load(:active_storage_record) do
+  ActiveStorage::Attached::One.prepend RailsCom::AttachedOne
+end

data/lib/rails_com/active_storage/attachment_prepend.rb

@@ -0,0 +1,14 @@
+module RailsCom::AttachmentPrepend
+
+  def identify_blob
+    if record.respond_to? "sync_#{name}"
+      record.send "sync_#{name}"
+    end
+    blob.identify_later
+  end
+
+end
+
+ActiveSupport.on_load(:active_storage_attachment) do
+  prepend RailsCom::AttachmentPrepend
+end

data/lib/rails_com/active_storage/attachment_transfer.rb

@@ -1,10 +1,15 @@
-require 'active_storage/downloading'
+# frozen_string_literal: true
+
 module RailsCom::AttachmentTransfer
-  include ActiveStorage::Downloading
+  extend ActiveSupport::Concern
+
+  included do
+    scope :garbled, -> { left_joins(:blob).where(ActiveStorage::Blob.table_name => { id: nil }) }
+  end
 
   def copy
     raise 'Only Support mirror service' unless service.is_a?(ActiveStorage::Service::MirrorService)
-    download_blob_to_tempfile do |io|
+    blob.open do |io|
       checksum = blob.send(:compute_checksum_in_chunks, io)
       service.mirrors.map do |service|
         service.upload key, io.tap(&:rewind), checksum: checksum
@@ -15,7 +20,7 @@ module RailsCom::AttachmentTransfer
   def transfer_faststart
     attach = self.record.send(self.name)
     r = nil
-    download_blob_to_tempfile do |input|
+    blob.open do |input|
       Tempfile.open([ 'ActiveStorage', self.filename.extension_with_delimiter ], Dir.tmpdir) do |file|
         file.binmode
         argv = [ffmpeg_path, '-i', input.path, '-codec', 'copy', '-movflags', 'faststart', '-f', 'mp4', '-y', file.path]
@@ -41,4 +46,6 @@ module RailsCom::AttachmentTransfer
 
 end
 
-ActiveStorage::Attachment.include RailsCom::AttachmentTransfer
+ActiveSupport.on_load(:active_storage_attachment) do
+  include RailsCom::AttachmentTransfer
+end

data/lib/rails_com/active_storage/video_response.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsCom::VideoResponse
   extend ActiveSupport::Concern
 
@@ -26,4 +28,6 @@ module RailsCom::VideoResponse
 
 end
 
-ActiveStorage::DiskController.include RailsCom::VideoResponse
+ActiveSupport.on_load :action_controller do
+  ActiveStorage::DiskController.include RailsCom::VideoResponse
+end

data/lib/rails_com/active_storage.rb

@@ -1,4 +1,9 @@
-require_relative 'active_storage/activestorage_attached'
-require_relative 'active_storage/attached_macros'
-require_relative 'active_storage/attachment_transfer'
-require_relative 'active_storage/video_response'
+# frozen_string_literal: true
+
+require 'rails_com/active_storage/activestorage_attached'
+require 'rails_com/active_storage/attached_macros'
+require 'rails_com/active_storage/attachment_transfer'
+require 'rails_com/active_storage/attachment_prepend'
+require 'rails_com/active_storage/video_response'
+
+ActiveStorage.mattr_accessor :service_urls_expire_in, default: 5.minutes

data/lib/rails_com/all.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+# rubocop:disable Style/RedundantBegin
+
+require 'rails'
+
+[
+  'active_record/railtie',
+  'active_storage/engine',
+  'action_controller/railtie',
+  'action_view/railtie',
+  'action_mailer/railtie',
+  'active_job/railtie',
+  'action_cable/engine',
+  'action_mailbox/engine',
+  'action_text/engine',
+  'rails/test_unit/railtie'
+].each do |railtie|
+  begin
+    require railtie
+  rescue LoadError
+  end
+end

data/lib/rails_com/api.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+# rubocop:disable Style/RedundantBegin
+
+require 'rails'
+
+[
+  'active_model/railtie',
+  'active_record/railtie',
+  'active_storage/engine',
+  'action_controller/railtie',
+  'action_view/railtie',
+  'action_mailer/railtie',
+  'active_job/railtie',
+  'action_cable/engine',
+  'action_mailbox/engine',
+  'action_text/engine',
+  'rails/test_unit/railtie'
+].each do |railtie|
+  begin
+    require railtie
+  rescue LoadError
+  end
+end

data/lib/rails_com/config.rb

@@ -1,14 +1,22 @@
-require 'active_support/configurable'
-
-module RailsCom #:nodoc:
-  include ActiveSupport::Configurable
-
-  configure do |config|
-    config.ignore_controllers = [
-      'rails/welcome'
-    ]
-    config.app_class = 'ApplicationController'
-    config.admin_class = 'AdminController'
-  end
-
-end
+# frozen_string_literal: true
+
+require 'active_support/configurable'
+
+module RailsCom #:nodoc:
+  include ActiveSupport::Configurable
+
+  configure do |config|
+    config.ignore_exception = [
+      'ActionController::UnknownFormat',
+      'ActiveRecord::RecordNotFound'
+    ]
+    config.disable_debug = true
+    config.notify_bot = 'WorkWechatBot'
+    config.notify_key = ''
+    config.not_found_logger = ActiveSupport::Logger.new('log/not_found.log')
+    config.github_hmac_key = 'must_change_this'
+    config.default_error_message = '服务端发生错误'
+    config.acme_url = 'https://acme-v02.api.letsencrypt.org/directory'  # 用于 SSL 证书自动签发服务
+  end
+
+end

data/lib/rails_com/engine.rb

@@ -1,32 +1,48 @@
-class RailsCom::Engine < ::Rails::Engine #:nodoc:
+# frozen_string_literal: true
 
-  config.generators do |g|
-    g.stylesheets false
-    g.javasricpts false
-    g.javascript_engine false
-    g.helper false
-    g.jbuilder false
-    g.templates.unshift File.expand_path('lib/templates', root)
-  end
+module RailsCom
+  class Engine < ::Rails::Engine #:nodoc:
 
-  initializer 'rails_com.assets.precompile' do |app|
-    app.config.assets.precompile += ['rails_com_manifest.js']
-    app.config.content_security_policy_nonce_generator = -> request {
-      request.headers['X-Csp-Nonce'] || SecureRandom.base64(16)
-    }
-  end
+    config.generators do |g|
+      g.stylesheets false
+      g.helper false
+      g.resource_route false
+      g.jbuilder false
+      g.templates.unshift File.expand_path('lib/templates', root)
+    end
 
-  initializer 'rails_com.add_assets_templates' do |app|
-    app.config.assets.paths.push(*Dir[File.expand_path('lib/nondigest_assets/*', root)])
-  end
+    initializer 'rails_com.add_generator_templates'do |app|
+      app.config.paths['lib/templates'].unshift File.expand_path('lib/templates', root)
+      # todo check if really works
+      app.config.generators do |g|
+        g.stylesheets false
+        g.helper false
+        g.resource_route false
+        g.jbuilder true
+      end
+    end
 
-  initializer 'rails_com.add_activestorage' do |app|
-    require 'rails_com/active_storage'
-    config_choice = Rails.configuration.active_storage.private_service
-    if config_choice
-      configs = Rails.configuration.active_storage.service_configurations
-      ActiveStorage::Blob.private_service = ActiveStorage::Service.configure config_choice, configs
+    config.action_view.field_error_proc = ->(html_tag, instance){ html_tag }
+
+    initializer 'rails_com.default_initializer' do |app|
+      app.config.content_security_policy_nonce_generator = -> request {
+        request.headers['X-Csp-Nonce'] || SecureRandom.base64(16)
+      }
+      app.config.action_dispatch.rescue_responses.merge!({
+        'ActionController::ForbiddenError' => :forbidden,
+        'ActionController::UnauthorizedError' => :unauthorized
+      })
+      Mime::Type.register 'image/webp', :webp
+      #ActiveStorage::Attached::One.prepend RailsCom::AttachedOne
     end
-  end
 
+    config.to_prepare do
+      overrides = RailsCom::Engine.root.join('app/overrides')
+      Rails.autoloaders.main.ignore(overrides)
+      Dir.glob("#{overrides}/**/*_override.rb").each do |override|
+        load override
+      end
+    end
+
+  end
 end

data/lib/rails_com/utils/hex_helper.rb

@@ -0,0 +1,12 @@
+module HexHelper
+  extend self
+
+  def sample
+    [rand(0..255), rand(0..255), rand(0..255)].map { |i| i.to_s(16).rjust(2, '0') }.join
+  end
+
+  def rgb_sample
+    "##{sample}"
+  end
+
+end

data/lib/rails_com/utils/jobber.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jobber
   extend self
 
@@ -67,4 +69,4 @@ module Jobber
     @config ||= Rails.application.config_for('jobber')
   end
 
-end
+end

data/lib/rails_com/utils/num_helper.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module NumHelper
-  NUM = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖']
-  DEL = ['', '拾', '佰', '仟']
-  SUB_DEL = ['分', '角']
-  UNIT = ['元', '万', '亿', '兆', '京']
-  DELIMITER_REGEX = /(\d)(?=(\d\d\d\d)+(?!\d))/
+  NUM = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'].freeze
+  DEL = ['', '拾', '佰', '仟'].freeze
+  SUB_DEL = ['分', '角'].freeze
+  UNIT = ['元', '万', '亿', '兆', '京'].freeze
+  DELIMITER_REGEX = /(\d)(?=(\d\d\d\d)+(?!\d))/.freeze
   extend self
 
   def to_rmb(num)

data/lib/rails_com/utils/qrcode_helper.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module QrcodeHelper
+  extend self
+  OPTIONS = {
+    resize_gte_to: false,
+    resize_exactly_to: false,
+    fill: 'white',
+    color: 'black',
+    size: 300,
+    border_modules: 1,  # 二维码图片padding
+    module_px_size: 6,
+    file: nil
+  }
+
+  def code_file(url, **options)
+    png = code_png url, **options
+    tmp = Tempfile.new
+    tmp.binmode
+    tmp.write png.to_s
+    tmp.rewind
+    tmp
+  end
+
+  def data_url(url, **options)
+    png = code_png url, **options
+    png.to_data_url
+  end
+
+  def code_png(url, **options)
+    qrcode = RQRCode::QRCode.new(url)
+    qrcode.as_png **OPTIONS.merge(options)
+  end
+
+end if defined? RQRCode

data/lib/rails_com/utils/setting.rb

@@ -1,4 +1,4 @@
-class Setting < OpenStruct
+class RailsCom::Setting < OpenStruct
 
   def initialize(hash = {})
     @table = {}
@@ -13,7 +13,7 @@ class Setting < OpenStruct
         @table[k.to_sym] = v
       end
       @hash_table[k.to_sym] = v
-      new_ostruct_member(k)
+      new_ostruct_member!(k)
     end
   end
 
@@ -23,12 +23,12 @@ class Setting < OpenStruct
 
 end
 
-class Settings < Array
+class RailsCom::Settings < Array
 
   def initialize(data = [])
     data.map do |h|
-      self << Setting.new(h)
+      self << RailsCom::Setting.new(h)
     end
   end
 
-end
+end

data/lib/rails_com/utils/time_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module TimeHelper
   extend self
 

data/lib/rails_com/utils/uid_helper.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module UidHelper
   extend self
 
-  def uuid(int, prefix = '', suffix = '')
+  def uuid(int, prefix: '', suffix: '', separator: '')
     str = int.to_s(36)
     str = str + suffix
-    str = str.upcase.scan(/.{1,4}/).join('-')
+    str = str.upcase.scan(/.{1,4}/).join(separator)
 
     if prefix.present?
       str = prefix + '-' + str
@@ -13,21 +15,26 @@ module UidHelper
     str
   end
 
-  def nsec_uuid(prefix = '', suffix = rand_string)
-    time = Time.now
+  def nsec_uuid(prefix = '', suffix: rand_string, separator: '-')
+    time = Time.current
     str = time.to_i.to_s + time.nsec.to_s
-    uuid str.to_i, prefix, suffix
+    uuid str.to_i, prefix: prefix, suffix: suffix, separator: separator
   end
 
-  def usec_uuid(prefix = '', suffix = rand_string(2))
-    time = Time.now
+  def usec_uuid(prefix = '', suffix: rand_string(2), separator: '-')
+    time = Time.current
     str = time.to_i.to_s + time.usec.to_s
-    uuid str.to_i, prefix, suffix
+    uuid str.to_i, prefix: prefix, suffix: suffix, separator: separator
+  end
+
+  def sec_uuid(prefix = '', suffix: rand_string(2), separator: '-')
+    time = Time.current
+    uuid time.to_i, prefix: prefix, suffix: suffix, separator: separator
   end
 
-  def sec_uuid(prefix = '', suffix = rand_string(2))
-    time = Time.now
-    uuid time.to_i, prefix, suffix
+  def rand_string(len = 4)
+    list = (0..9).to_a + ('A'..'Z').to_a
+    len.times.map { list.sample }.join
   end
 
   def decode_uuid(uuid, prefix: true)
@@ -50,8 +57,4 @@ module UidHelper
     end
   end
 
-  def rand_string(len = 4)
-    len.times.map { ((0..9).to_a + ('A'..'Z').to_a).sample }.join
-  end
-
 end

data/lib/rails_com.rb

@@ -1,33 +1,41 @@
-require 'rails_com/version'
-require 'rails_com/engine'
+# frozen_string_literal: true
+
 require 'rails_com/config'
+require 'rails_com/engine'
 
-require 'rails_com/core'
 require 'rails_com/action_controller'
 require 'rails_com/action_view'
-require 'rails_com/active_record'
-
-require 'rails_com/active_storage/blob_ext'
-
-# Meta for Rails
-require 'rails_com/meta/routes'
-require 'rails_com/meta/models'
-require 'rails_com/meta/controllers'
+require 'rails_com/action_text'
+require 'rails_com/action_mailbox'
+require 'rails_com/active_storage'
 
 # Rails extension
-require 'rails_com/generators/named_base'
-require 'rails_com/generators/scaffold_generator'
+require 'generators/scaffold_generator'
+require 'generators/jbuilder_generator' if defined?(Jbuilder)
 
-# controllers
-require 'rails_com/sprockets/non_digest_assets'
+# default_form, 需要位于 rails_com 的加载之后
+require 'default_form/config'
+require 'default_form/active_record/extend'
+require 'default_form/override/action_view/helpers/tags/collection_check_boxes'
+require 'default_form/override/action_view/helpers/tags/collection_radio_buttons'
+require 'default_form/controller_helper'
+require 'default_form/view_helper'
 
 # Utils
 require 'rails_com/utils/time_helper'
 require 'rails_com/utils/num_helper'
+require 'rails_com/utils/qrcode_helper'
 require 'rails_com/utils/uid_helper'
+require 'rails_com/utils/hex_helper'
 require 'rails_com/utils/jobber'
-require 'rails_com/utils/babel'
+
+# active storage
+require 'active_storage/service/disc_service'
 
 # outside
+require 'jbuilder'
 require 'default_where'
-require 'default_form'
+require 'rails_extend'
+require 'kaminari'
+require 'acts_as_list'
+require 'turbo-rails'

data/lib/templates/rails/scaffold_controller/api_controller.rb.tt

@@ -1,48 +1,49 @@
+<% module_namespacing do -%>
 class <%= controller_class_name %>Controller < ApplicationController
-  before_action :set_<%= singular_table_name %>, only: [:show, :update, :destroy]
+  before_action :set_<%= singular_name %>, only: [:show, :update, :destroy]
 
   def index
-    @<%= plural_table_name %> = <%= orm_class.all(class_name) %>
-
-    render json: <%= "@#{plural_table_name}" %>
+    @<%= plural_name %> = <%= class_name %>.page(params[:page])
   end
 
   def show
-    render json: <%= "@#{singular_table_name}" %>
   end
 
   def create
-    @<%= singular_table_name %> = <%= orm_class.build(class_name, "#{singular_table_name}_params") %>
+    @<%= singular_name %> = <%= orm_class.build(class_name, "#{singular_name}_params") %>
 
-    if @<%= orm_instance.save %>
-      render json: <%= "@#{singular_table_name}" %>, status: :created, location: <%= "@#{singular_table_name}" %>
+    if @<%= orm_instance(singular_name).save %>
+      render :create, status: :created
     else
-      render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity
+      render :new, locals: { model: @<%= singular_name %> }, status: :unprocessable_entity
     end
   end
 
   def update
-    if @<%= orm_instance.update("#{singular_table_name}_params") %>
-      render json: <%= "@#{singular_table_name}" %>
+    @<%= singular_name %>.assign_attributes(<%= singular_name %>_params)
+
+    if @<%= orm_instance(singular_name).save %>
+      render :update, status: :ok
     else
-      render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity
+      render :edit, locals: { model: @<%= singular_name %> }, status: :unprocessable_entity
     end
   end
 
   def destroy
-    @<%= orm_instance.destroy %>
+    @<%= orm_instance(singular_name).destroy %>
   end
 
   private
-  def set_<%= singular_table_name %>
-    @<%= singular_table_name %> = <%= orm_class.find(class_name, "params[:id]") %>
+  def set_<%= singular_name %>
+    @<%= singular_name %> = <%= orm_class.find(class_name, "params[:id]") %>
   end
 
-  def <%= "#{singular_table_name}_params" %>
+  def <%= "#{singular_name}_params" %>
     <%- if attributes_names.empty? -%>
-    params.fetch(:<%= singular_table_name %>, {})
+    params.fetch(<%= ":#{singular_name}" %>, {})
     <%- else -%>
-    params.require(:<%= singular_table_name %>).permit(<%= attributes_names.map { |name| ":#{name}" }.join(', ') %>)
+    params.require(<%= ":#{singular_name}" %>).permit(<%= permitted_params %>)
     <%- end -%>
   end
-end
+end
+<% end -%>

data/lib/templates/rails/scaffold_controller/controller.rb.tt

@@ -1,54 +1,3 @@
 class <%= controller_class_name %>Controller < <%= controller_class_path.map(&:camelize).join('::') %>::BaseController
-  before_action :set_<%= singular_name %>, only: [:show, :edit, :update, :destroy]
 
-  def index
-    @<%= plural_name %> = <%= class_name %>.page(params[:page])
-  end
-
-  def new
-    @<%= singular_name %> = <%= orm_class.build(class_name) %>
-  end
-
-  def create
-    @<%= singular_name %> = <%= orm_class.build(class_name, "#{singular_name}_params") %>
-
-    if @<%= orm_instance(singular_name).save %>
-      redirect_to <%= index_helper %>_url, notice: <%= "'#{human_name} was successfully created.'" %>
-    else
-      render :new
-    end
-  end
-
-  def show
-  end
-
-  def edit
-  end
-
-  def update
-    if @<%= orm_instance(singular_name).update("#{singular_name}_params") %>
-      redirect_to <%= index_helper %>_url, notice: <%= "'#{human_name} was successfully updated.'" %>
-    else
-      render :edit
-    end
-  end
-
-  def destroy
-    @<%= orm_instance(singular_name).destroy %>
-    redirect_to <%= index_helper %>_url, notice: <%= "'#{human_name} was successfully destroyed.'" %>
-  end
-
-  private
-  def set_<%= singular_name %>
-    @<%= singular_name %> = <%= orm_class.find(class_name, "params[:id]") %>
-  end
-
-  def <%= "#{singular_name}_params" %>
-    params.fetch(:<%= singular_name %>, {}).permit(
-<% attributes_names.map do |name| -%>
-      <%= ":#{name}," %>
-<% end -%>
-    )
-  end
-
-end
+end