bizside 3.0.6 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bed5030b1dc567a2beb20a3151742c2941f771dfd41032330237fe10fa9f5809
-  data.tar.gz: 156b93de4011537b4154ef5ec6b02a17be8496e401790f49a0732c765150ac0e
+  metadata.gz: 312274c1efff07ea6624df5c4a0a4f378cb4910a072533eb8202a51108ee161b
+  data.tar.gz: a485415c70c87857fb5dfdefb9cbdc4f5302b30623fea264a0e5146631657a75
 SHA512:
-  metadata.gz: 285b6c8cdce686e9e74cc7cb63e7dcdfa21ad9c1f158a0f19cb4bbc466fe36bb278a7beaed6493144462d12b0b2a06b0621d63451afb50ec9005b9c74666cd8e
-  data.tar.gz: 9d299d2eac9d221de0f0029436695ba206ae4d99f399b23585f62df72fb83a1971631a7b7addf784e9290ebf6e8b149fa7ad761b9b33894f354a73fde80417a6
+  metadata.gz: 9582a9c5a3994a4991a1f548dd8dc62b76ddc8d457fd8cf5ff94d1f76b59adb15c187d3141f9c29482d4e35c08aecf0d2f02a1020192d776d944ffbf47c9eb1b
+  data.tar.gz: 69696ed8312bfd0dbe6717880d28af76dcdc645fbc98e498a477c00ef0d30c5ed516d04d9709aa93e67464ecfc9251aa15484ab3dffdf3e922dddb7a434d9d56

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

@@ -31,6 +31,10 @@ module Bizside
     end
 
     def call(env)
+      dup._call(env)
+    end
+
+    def _call(env)
       start = Time.now.strftime('%Y-%m-%dT%H:%M:%S.%3N%z')
       status, headers, response = @app.call(env)
       stop = Time.now.strftime('%Y-%m-%dT%H:%M:%S.%3N%z')

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)

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.6'
+  VERSION = '3.0.8'
 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.6
+  version: 3.0.8
 platform: ruby
 authors:
 - bizside-developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-01-07 00:00:00.000000000 Z
+date: 2025-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -126,6 +126,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 1.17.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 1.17.0
 - !ruby/object:Gem::Dependency
   name: ltsv
   requirement: !ruby/object:Gem::Requirement
@@ -475,7 +489,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.18
 signing_key: 
 specification_version: 4
 summary: Bizside is an utilities for web application.