bizside 3.0.7 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bff85a849e09b708e1a19204643018fc5875e10fd31cc2e87fbadc023a80d226
-  data.tar.gz: 646f20dd22ecb8376c35ac4c1251842f69bb1eac7dc3e805e523def8f2b9a61e
+  metadata.gz: c794fc9d4ac90370ce41511ba14a8e8079361e93f5af0b445a11926d7596161e
+  data.tar.gz: ac334f1b0ec653d7dc853f8c9a87e07a4762a2439aef5b86d327b25ab2d86ad8
 SHA512:
-  metadata.gz: 95af08215a1ba351d52619341d85ed5b46c85662b8f909ac51f1932a66e2a44a4104ace8822270ce58f379e706590c20ee1145c839e98efbc58766781aa7f841
-  data.tar.gz: 85083d1556ac7d6dc5d8f9acb2353fc6c20572bc7f3c61cd6138d3143f1e9ce0d4b5c066d943502d89e1e15fac94ac457b58ce2f4e76dda0a1f51a5435adbaf6
+  metadata.gz: 799826b9b036ccdcfcba3403ec3491f1d95317e5bf3c72bbf8f68e87c7bdb386e03cdf8ed53aa89cc4abaf080f1fc4bc93cf039cc41d7db626e8a21e3125baa4
+  data.tar.gz: 57cd54e56e84e494e6e2ff7caa711b5cffbeb25ecea0e6d06bd60f548f3a70867a7685b923264e6ffff7c299db4efc47fcc12fc324b39f0f73753fe88dec2ec8

data/lib/bizside/acl/access_control_utils.rb

@@ -14,9 +14,8 @@ class Bizside::Acl::AccessControlUtils
   end
 
   def self.merge(filename)
-    yml = YAML.load_file(filename)
-    
-    yml.each do |roll_key, values|
+    entire_config = YAML.respond_to?(:safe_load_file) ? YAML.safe_load_file(filename, aliases: true) : YAML.load_file(filename)
+    entire_config.each do |roll_key, values|
       @@access_control[roll_key] ||= {}
       @@access_control[roll_key].merge!(values)
     end
@@ -33,4 +32,4 @@ class Bizside::Acl::AccessControlUtils
     @@access_control[roll_key]
   end
   
-end
+end

data/lib/bizside/audit_log.rb

@@ -76,6 +76,7 @@ module Bizside
     def build_loginfo(env, start, stop, status, exception)
       info = {
         time: start,
+        env: ENV['X-BIZSIDE-ENV'].presence || ENV['RAILS_ENV'],
         add_on_name: detect_add_on_name(env),
         feature: detect_feature(env),
         action: detect_action(env),
@@ -99,12 +100,22 @@ module Bizside
         started_at: start,
         finished_at: stop,
         device: detect_device(env),
-        user_agent: detect_user_agent(env),
-        exception: detect_exception(exception),
-        exception_message: detect_exception_message(exception),
-        exception_backtrace: detect_exception_backtrace(exception)
+        user_agent: detect_user_agent(env)
       }
 
+      exception_class_name = detect_exception(exception)
+      if exception_class_name.to_s.present?
+        info[:exception] = exception_class_name
+      end
+      exception_message = detect_exception_message(exception)
+      if exception_message.to_s.present?
+        info[:exception_message] = exception_message
+      end
+      exception_backtrace = detect_exception_backtrace(exception)
+      if exception_backtrace.to_s.present?
+        info[:exception_backtrace] = exception_backtrace
+      end
+
       info
     end
 

data/lib/bizside/carrierwave.rb

@@ -27,7 +27,8 @@ end
 
 CarrierWave.configure do |config|
   database_yml = ERB.new(File.read(File.join('config', 'database.yml')), 0, '-').result
-  database = YAML.load(database_yml)[Bizside.env]['database']
+  entire_config = YAML.respond_to?(:safe_load) ? YAML.safe_load(database_yml, aliases: true) : YAML.load(database_yml)
+  database = entire_config[Bizside.env]['database']
 
   config.root = File.join('/data', Bizside.config.add_on_name, database)
 

data/lib/bizside/configurations/mail.rb

@@ -3,17 +3,16 @@ module Bizside
     module Mail
 
       def mail
-        if @mail.nil?
-          configfile = File.join('config', 'mail.yml')
+        return @mail if defined? @mail
+
+        configfile = File.join('config', 'mail.yml')
         
-          if File.exist?(configfile)
-            @mail = Bizside::Config.new(YAML.load_file(configfile)[Bizside.env])
+        @mail = if File.exist?(configfile)
+            entire_config = YAML.respond_to?(:safe_load_file) ? YAML.safe_load_file(configfile, aliases: true) : YAML.load_file(configfile)
+            Bizside::Config.new(entire_config[Bizside.env])
           else
-            @mail = Bizside::Config.new
+            Bizside::Config.new
           end
-        end
-
-        @mail
       end
 
       def default_url_options

data/lib/bizside/configurations/storage.rb

@@ -3,18 +3,16 @@ module Bizside
     module Storage
 
       def storage
-        if @storage.nil?
-          configfile = ENV['STORAGE_CONFIG_FILE'] ? ENV['STORAGE_CONFIG_FILE'] : default_configfile
+        return @storage if defined? @storage
 
-          if File.exist?(configfile)
-            config = ERB.new(File.read(configfile), 0, '-').result
-            @storage = Bizside::Config.new(YAML.load(config)[Bizside.env])
+        configfile = ENV['STORAGE_CONFIG_FILE'] ? ENV['STORAGE_CONFIG_FILE'] : default_configfile
+        @storage = if File.exist?(configfile)
+            text = ERB.new(File.read(configfile), 0, '-').result
+            entire_config = YAML.respond_to?(:safe_load) ? YAML.safe_load(text, aliases: true) : YAML.load(text)
+            Bizside::Config.new(entire_config[Bizside.env])
           else
-            @storage = Bizside::Config.new
+            Bizside::Config.new
           end
-        end
-
-        @storage
       end
 
       private

data/lib/bizside/gengou.rb

@@ -2,7 +2,9 @@ require 'yaml'
 
 module Bizside
   class Gengou
-    @@_gengou = YAML.load_file(File.join(File.dirname(__FILE__), 'gengou.yml'))
+    @@_gengou = File.join(__dir__, 'gengou.yml').then do |filename|
+      YAML.respond_to?(:safe_load_file) ? YAML.safe_load_file(filename, permitted_classes: [Date]) : YAML.load_file(filename)
+    end
 
     def self.to_seireki(gengou, year_jp)
       # 引数 year_jpには年度の値が入る

data/lib/bizside/hanaita_conf.rb

@@ -10,7 +10,10 @@ module Bizside
 
     def initialize
       conf_file = ENV['HANAITA_CONF'] || CONF_FILE
-      @_conf = YAML.load_file(conf_file) if File.exist?(conf_file)
+      @_conf = conf_file.then do |filename|
+        next nil unless File.exist?(filename)
+        YAML.respond_to?(:safe_load_file) ? YAML.safe_load_file(filename, aliases: true) : YAML.load_file(filename)
+      end
     end
 
     def conf

data/lib/bizside/itamae_conf.rb

@@ -41,7 +41,8 @@ module Bizside
       for conf_file in self.class.conf_files do
         if File.exist?(conf_file)
           @_conf ||= {}
-          hash = YAML.load(ERB.new(File.read(conf_file)).result)
+          text = ERB.new(File.read(conf_file)).result
+          hash = YAML.respond_to?(:safe_load) ? YAML.safe_load(text, aliases: true) : YAML.load(text)
 
           case conf_file
           # itamae.yml スペシャルロジック。ROLE必須。

data/lib/bizside/resque.rb

@@ -14,19 +14,20 @@ require_relative 'audit/job_logger'
   yaml: ['config/resque.yml', 'config/redis.yml'],
   json: ['config/resque.json', 'config/redis.json']
 }.each do |format, file_candidates|
+  resque_config_loader = case format
+    when :yaml
+      ->(text) { YAML.respond_to?(:safe_load) ? YAML.safe_load(text, aliases: true) : YAML.load(text) }
+    when :json
+      ->(text) { ActiveSupport::JSON.decode(text) }
+    end
+
   file_candidates.each do |file|
     resque_file = File.join(File.expand_path(ENV['RAILS_ROOT'] || '.'), file)
     next unless File.exist?(resque_file)
 
-    _resque_config = ERB.new(File.read(resque_file), 0, '-').result
-  
-    case format
-    when :yaml
-      resque_config = YAML.safe_load(_resque_config)[Bizside.env]
-    when :json
-      resque_config = ActiveSupport::JSON.decode(_resque_config)[Bizside.env]
-    else
-      raise "不正なResque設定ファイルです。#{file}"
+    resque_config = ERB.new(File.read(resque_file), 0, '-').result.then do |text|
+      entire_config = resque_config_loader.call(text)
+      entire_config[Bizside.env]
     end
 
     if resque_config.is_a?(Hash)
@@ -126,6 +127,7 @@ module Resque
       def build_loginfo
         info = {
           time: Time.now.strftime('%Y-%m-%dT%H:%M:%S.%3N%z'),
+          env: ENV['X-BIZSIDE-ENV'].presence || ENV['RAILS_ENV'],
           add_on_name: Bizside.config.add_on_name,
           server_address: hostname,
           class: payload['class'],
@@ -180,6 +182,7 @@ if defined? Resque::Scheduler
           @hostname ||= (`hostname`.chomp rescue '(unknown)')
           info = {
             time: Time.now.strftime('%Y-%m-%dT%H:%M:%S.%3N%z'),
+            env: ENV['X-BIZSIDE-ENV'].presence || ENV['RAILS_ENV'],
             add_on_name: Bizside.config.add_on_name,
             server_address: @hostname,
             class: payload['class'],

data/lib/bizside/task_helper.rb

@@ -176,7 +176,10 @@ end
 
 def self.ask_env(env_key, options = {})
   cache_file = 'tmp/cache/env'
-  cache = File.exist?(cache_file) ? YAML.load_file(cache_file) : {}
+  cache = cache_file.then do |filename|
+    next {} unless File.exist?(filename)
+    YAML.respond_to?(:unsafe_load_file) ? YAML.unsafe_load_file(filename) : YAML.load_file(filename)
+  end
 
   if options.fetch(:cache, false)
     options = options.merge(default: cache.fetch(env_key, options[:default]))

data/lib/bizside/uploader/extension_whitelist.rb

@@ -4,9 +4,11 @@ module Bizside
       extend ActiveSupport::Concern
 
       included do
-        default_extensions = Bizside.config.file_uploader.extensions_file_path.present? ? Bizside.config.file_uploader.extensions_file_path : 
-          File.join(File.dirname(__FILE__), 'default_extensions.yml')
-        @@extensions = YAML.load_file(default_extensions).values
+        @@extensions = Bizside.config.file_uploader.extensions_file_path.then do |filename|
+          filename = File.join(__dir__, 'default_extensions.yml') unless filename.present?
+          entire_config = YAML.respond_to?(:safe_load_file) ? YAML.safe_load_file(filename, aliases: true) : YAML.load_file(filename)
+          entire_config.values
+        end
       end
       
       def extension_allowlist

data/lib/bizside/version.rb

@@ -1,3 +1,3 @@
 module Bizside
-  VERSION = '3.0.7'
+  VERSION = '3.1.0'
 end

data/lib/bizside.rb

@@ -51,11 +51,10 @@ module Bizside
     end
 
     configfile = ENV['CONFIG_FILE'] || File.join('config', 'bizside.yml')
-    if File.exist?(configfile)
-      @@_config = Bizside::Config.new(YAML.load_file(configfile)[Bizside.env])
-    else
-      raise "設定ファイルの #{configfile} は必須です。"
-    end
+    raise "設定ファイルの #{configfile} は必須です。" unless File.exist?(configfile)
+
+    entire_config = YAML.respond_to?(:safe_load_file) ? YAML.safe_load_file(configfile, aliases: true) : YAML.load_file(configfile)
+    @@_config = Bizside::Config.new(entire_config[Bizside.env])
   end
 
   def self.logger

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bizside
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.1.0
 platform: ruby
 authors:
 - bizside-developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-01-14 00:00:00.000000000 Z
+date: 2025-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -482,7 +482,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="