bizside 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f00dba55e99db77fad3ddfe68afb706b89fe3bdc718ad774613309c3bebb7d7e
-  data.tar.gz: 16be628bb79ff1689956d1f63f0895559775531b74d80270d7edb6239ef9abf3
+  metadata.gz: 9689c1f6e742e9512e144312cdd80ab20e968b75780eee36b4211996f00f26a1
+  data.tar.gz: 6642f8337d4a1db6f55505278374888e87a198b882b3c0386ddddf1b5886bf8d
 SHA512:
-  metadata.gz: a2c0f432bd5d53b537f9db6b3a7f28a9f0c747b9eb0a49ec0838ec02ecfbdedc902d36bda002581d82cbaf5513f0177d5ac57fa229604fde0516bf729b1df9fb
-  data.tar.gz: b28b49b0f10c14bedf018a61d938465de5a95d4a8884a9721bf25291c08eec807e2017bad15d6d1594a4f0c82c971b3d70ee1d63502ad94ace3a6000f9ff54ea
+  metadata.gz: 3ae3c04ced97b0d14a52d5db5f03bb52a30cb1cd1d7fa743ce569b7af957949f42b4fa89ad8274e7eb09a026a6aa9a27af817c02e6d89b8ca909a4c84cfe75e6
+  data.tar.gz: 41c281d34b047bbece294070e4bd64ee5868a797cb7ac1422ce5565e99bbe9d2fea34a78b3dcdfd0f4342cae83a6f626419b0b502dc1949a0570177a7e407bfd

data/lib/bizside/task_helper.rb

@@ -176,7 +176,7 @@ end
 
 def self.ask_env(env_key, options = {})
   cache_file = 'tmp/cache/env'
-  cache = File.exists?(cache_file) ? YAML.load_file(cache_file) : {}
+  cache = File.exist?(cache_file) ? YAML.load_file(cache_file) : {}
 
   if options.fetch(:cache, false)
     options = options.merge(default: cache.fetch(env_key, options[:default]))
@@ -190,7 +190,7 @@ def self.ask_env(env_key, options = {})
     cache[env_key] = ENV[env_key]
     File.write(cache_file, YAML.dump(cache))
   else
-    if File.exists?(cache_file) and cache[env_key]
+    if File.exist?(cache_file) and cache[env_key]
       cache.delete(env_key)
       File.write(cache_file, YAML.dump(cache))
     end

data/lib/bizside/uploader/content_type_validator.rb

@@ -10,7 +10,7 @@ module Bizside
           require 'carrierwave-magic'
           include CarrierWave::Magic
           process :set_magic_content_type => true
-        rescue => e
+        rescue
           raise '[Bizside.gem ERROR] you need to add carrierwave-magic.gem.'
         end
         before :cache, :validate_content_type!

data/lib/bizside/user_agent/action_view/action_view_4.rb

@@ -40,7 +40,7 @@ class ActionView::TemplateRenderer
           options[:template] = option_for_template + '.' + priority
           ret = determine_template(options)
           break
-        rescue ActionView::MissingTemplate => e
+        rescue ActionView::MissingTemplate
         end
       end
     end

data/lib/bizside/version.rb

@@ -1,3 +1,3 @@
 module Bizside
-  VERSION = '2.0.7'
+  VERSION = '2.0.8'
 end

data/validations/tel_validator.rb

@@ -1,28 +1,28 @@
-# 電話番号のバリデーション
-# ActiveModel::EachValidatorを継承してRailsに統合する
-class TelValidator < ActiveModel::EachValidator
-
-  def initialize(options = {})
-    super(options)
-  end
-
-  # レコード保存時に呼び出されるバリデーションメソッド
-  # record ・・・　保存対象のレコード
-  # attribute　・・・　チェック対象の属性（DBのカラム）
-  # value　・・・　入力された値
-  def validate_each(record, attribute, value)
-    return if value.nil? or value.empty?
-    
-    unless validate_tel(record, value)
-      record.errors[attribute] << I18n.t('errors.messages.invalid')
-    end
-  end
-  
-  private
-
-  # 電話番号として妥当かどうかのチェック
-  def validate_tel(record, value)
-    # 全角・半角とわず数字とハイフンの構成であれば良しとしている
-    value.match(/^[0-9|０-９]+[-|－]?[0-9|０-９]+[-|－]?[0-9|０-９]+$/)
-  end
-end
+# 電話番号のバリデーション
+# ActiveModel::EachValidatorを継承してRailsに統合する
+class TelValidator < ActiveModel::EachValidator
+
+  def initialize(options = {})
+    super(options)
+  end
+
+  # レコード保存時に呼び出されるバリデーションメソッド
+  # record ・・・　保存対象のレコード
+  # attribute　・・・　チェック対象の属性（DBのカラム）
+  # value　・・・　入力された値
+  def validate_each(record, attribute, value)
+    return if value.nil? or value.empty?
+    
+    unless validate_tel(record, value)
+      record.errors[attribute] << I18n.t('errors.messages.invalid')
+    end
+  end
+  
+  private
+
+  # 電話番号として妥当かどうかのチェック
+  def validate_tel(record, value)
+    # 全角・半角とわず数字とハイフンの構成であれば良しとしている
+    value.match(/^[0-9|０-９]+[-|－]?[0-9|０-９]+[-|－]?[0-9|０-９]+$/)
+  end
+end

data/validations/zip_validator.rb

@@ -1,35 +1,35 @@
-class ZipValidator < ActiveModel::EachValidator
-
-  def initialize(options = {})
-    super(options)
-    @other = options[:other]
-  end
-
-  def validate_each(record, attribute, value)
-    zip1 = value
-    zip2 = get_other_value(record)
-
-    return if (zip1.nil? or zip1.empty?) and (zip2.nil? or zip2.empty?)
-
-    unless validate_zip(zip1, zip2)
-      record.errors[attribute] << I18n.t('errors.messages.zip')
-      return
-    end
-  end
-
-  private
-
-  def validate_zip(zip1, zip2)
-    return false unless zip1
-    return false unless zip1.match(/^[0-9|０-９]{3}$/)
-
-    return false unless zip2
-    return false unless zip2.match(/^[0-9|０-９]{4}$/)
-
-    true
-  end
-
-  def get_other_value(record)
-    record.__send__(@other)
-  end
-end
+class ZipValidator < ActiveModel::EachValidator
+
+  def initialize(options = {})
+    super(options)
+    @other = options[:other]
+  end
+
+  def validate_each(record, attribute, value)
+    zip1 = value
+    zip2 = get_other_value(record)
+
+    return if (zip1.nil? or zip1.empty?) and (zip2.nil? or zip2.empty?)
+
+    unless validate_zip(zip1, zip2)
+      record.errors[attribute] << I18n.t('errors.messages.zip')
+      return
+    end
+  end
+
+  private
+
+  def validate_zip(zip1, zip2)
+    return false unless zip1
+    return false unless zip1.match(/^[0-9|０-９]{3}$/)
+
+    return false unless zip2
+    return false unless zip2.match(/^[0-9|０-９]{4}$/)
+
+    true
+  end
+
+  def get_other_value(record)
+    record.__send__(@other)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bizside
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors:
 - bizside-developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-23 00:00:00.000000000 Z
+date: 2022-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -160,16 +160,22 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '14.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '14.0'
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
@@ -193,7 +199,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.36'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -203,27 +209,21 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.36'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.4'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '7.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.4'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
   requirement: !ruby/object:Gem::Requirement
@@ -350,22 +350,22 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
 description: Bizside is an utilities to assist building web application.
 email:
 - bizside-developers@lab.acs-jp.com
@@ -419,8 +419,6 @@ files:
 - lib/bizside/railtie.rb
 - lib/bizside/record_has_warnings.rb
 - lib/bizside/resque.rb
-- lib/bizside/resque.rb.bkp
-- lib/bizside/resque.rb~
 - lib/bizside/rsync.rb
 - lib/bizside/safe_pty.rb
 - lib/bizside/shib_utils.rb
@@ -443,7 +441,6 @@ files:
 - lib/bizside/user_agent/controller_helper.rb
 - lib/bizside/validations.rb
 - lib/bizside/version.rb
-- lib/bizside/version.rb~
 - lib/bizside/view_helper.rb
 - lib/bizside/warning.rb
 - lib/bizside/yes.rb
@@ -482,7 +479,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.29
+rubygems_version: 3.3.10
 signing_key: 
 specification_version: 4
 summary: Bizside is an utilities for web application.

data/lib/bizside/resque.rb.bkp

@@ -1,161 +0,0 @@
-module Bizside
-  module Resque
-  end
-end
-
-require 'resque'
-require 'resque/worker'
-require 'resque/failure/base'
-require 'resque/failure/multiple'
-require 'resque/failure/redis'
-require_relative 'audit/job_logger'
-
-{
-  yaml: ['config/resque.yml', 'config/redis.yml'],
-  json: ['config/resque.json', 'config/redis.json']
-}.each do |format, file_candidates|
-  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.redis = YAML.load(resque_config)[Bizside.env]
-      break
-    when :json
-      Resque.redis = ActiveSupport::JSON.decode(resque_config)[Bizside.env]
-      break
-    else
-      raise "不正なResque設定ファイルです。#{file}"
-    end
-  end
-end
-
-Resque.redis.namespace = "resque:#{Bizside.config.add_on_name}:#{Bizside.env}"
-
-if defined?(Resque::Scheduler)
-  Resque::Scheduler.dynamic = true
-end
-
-# tmp/stop.txt が存在する場合は一時停止する
-module Resque
-  class Worker
-
-    alias_method :reserve_without_stop_txt, :reserve
-
-    def reserve
-      stop_file_path = File.join('tmp', 'stop.txt')
-      if File.exist?(stop_file_path)
-       puts "#{Resque.redis.namespace} #{stop_file_path} が存在するため一時停止します。"
-       nil
-      else
-        reserve_without_stop_txt
-      end
-    end
-
-  end
-end
-
-# resque-webのエラーメッセージ文字化けに対するパッチ
-module Resque
-  module Failure
-    class Redis
-
-      def save
-        data = {
-          :failed_at => UTF8Util.clean(Time.now.strftime("%Y/%m/%d %H:%M:%S %Z")),
-          :payload   => payload,
-          :exception => exception.class.to_s,
-          :error     => exception.to_s, #UTF8Util.clean(exception.to_s), UTF8Util.cleanを呼ぶと文字化けする
-          :backtrace => filter_backtrace(Array(exception.backtrace)),
-          :worker    => worker.to_s,
-          :queue     => queue
-        }
-        data = Resque.encode(data)
-        Resque.redis.rpush(:failed, data)
-      end
-
-    end
-  end
-end
-
-# エラーをログに出力
-module Resque
-  module Failure
-    class LogOutput < Base
-      def save
-        Bizside.logger.error [
-          "[FATAL] Resque #{queue}:#{worker}",
-          "#{payload}",
-          "#{exception.class} #{exception.to_s}",
-          "#{Array(exception.backtrace).join("\n")}"
-        ].join("\n")
-      end
-    end
-  end
-end
-
-# エラーをLTSV形式で専用ログに出力
-module Resque
-  module Failure
-    class JobAuditLog < Base
-
-      def save
-        dump_env
-        info = build_loginfo
-        return info if Bizside.rails_env&.test?
-  
-        logger.record(info)
-  
-        info
-      end
-
-      private
-
-      def logger
-        @logger ||= Bizside::Audit::JobLogger.logger
-      end
-
-      def build_loginfo
-        info = {
-          time: Time.now.strftime('%Y-%m-%dT%H:%M:%S.%3N%z'),
-          add_on_name: Bizside.config.add_on_name,
-          server_address: hostname,
-          class: payload['class'],
-          args: payload['args'].to_s,
-          queue: queue,
-          worker: worker.to_s,
-          exception: exception.class,
-          exception_message: exception.to_s,
-          exception_backtrace: Array(exception.backtrace)[0..10].join("\n") # Get only the top 10 because there are many traces.
-        }
-        info
-      end
-
-
-      def dump_env
-        File.open('/tmp/resque-dump.log', 'a') do |f|
-          f.puts('== begin')
-          for k, v in ENV do
-            f.printf("%30s %s\n", k, v)
-          end
-          f.puts('')
-        end
-      end
-
-      # hostname(1) からホスト名を取得。
-      #
-      # job 実行環境(コンテナ等)では環境変数(HOSTNAME等)にホスト名はセットされていない。
-      def hostname
-        @hostname ||= (`hostname`.chomp rescue '(unknown)')
-      end
-
-    end
-  end
-end
-
-Resque::Failure::Multiple.configure do |multi|
-  multi.classes = [Resque::Failure::Redis, Resque::Failure::LogOutput, Resque::Failure::JobAuditLog]
-end

data/lib/bizside/resque.rb~

@@ -1,154 +0,0 @@
-module Bizside
-  module Resque
-  end
-end
-
-require 'resque'
-require 'resque/worker'
-require 'resque/failure/base'
-require 'resque/failure/multiple'
-require 'resque/failure/redis'
-require_relative 'audit/job_logger'
-
-{
-  yaml: ['config/resque.yml', 'config/redis.yml'],
-  json: ['config/resque.json', 'config/redis.json']
-}.each do |format, file_candidates|
-  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.redis = YAML.load(resque_config)[Bizside.env]
-      break
-    when :json
-      Resque.redis = ActiveSupport::JSON.decode(resque_config)[Bizside.env]
-      break
-    else
-      raise "不正なResque設定ファイルです。#{file}"
-    end
-  end
-end
-
-Resque.redis.namespace = "resque:#{Bizside.config.add_on_name}:#{Bizside.env}"
-
-if defined?(Resque::Scheduler)
-  Resque::Scheduler.dynamic = true
-end
-
-# tmp/stop.txt が存在する場合は一時停止する
-module Resque
-  class Worker
-
-    alias_method :reserve_without_stop_txt, :reserve
-
-    def reserve
-      stop_file_path = File.join('tmp', 'stop.txt')
-      if File.exist?(stop_file_path)
-       puts "#{Resque.redis.namespace} #{stop_file_path} が存在するため一時停止します。"
-       nil
-      else
-        reserve_without_stop_txt
-      end
-    end
-
-  end
-end
-
-# resque-webのエラーメッセージ文字化けに対するパッチ
-module Resque
-  module Failure
-    class Redis
-
-      def save
-        data = {
-          :failed_at => UTF8Util.clean(Time.now.strftime("%Y/%m/%d %H:%M:%S %Z")),
-          :payload   => payload,
-          :exception => exception.class.to_s,
-          :error     => exception.to_s, #UTF8Util.clean(exception.to_s), UTF8Util.cleanを呼ぶと文字化けする
-          :backtrace => filter_backtrace(Array(exception.backtrace)),
-          :worker    => worker.to_s,
-          :queue     => queue
-        }
-        data = Resque.encode(data)
-        Resque.redis.rpush(:failed, data)
-      end
-
-    end
-  end
-end
-
-# エラーをログに出力
-module Resque
-  module Failure
-    class LogOutput < Base
-      def save
-        Bizside.logger.error [
-          "[FATAL] Resque #{queue}:#{worker}",
-          "#{payload}",
-          "#{exception.class} #{exception.to_s}",
-          "#{Array(exception.backtrace).join("\n")}"
-        ].join("\n")
-      end
-    end
-  end
-end
-
-# エラーをLTSV形式で専用ログに出力
-module Resque
-  module Failure
-    class JobAuditLog < Base
-
-      def save
-        info = build_loginfo
-        return info if Bizside.rails_env&.test?
-  
-        logger.record(info)
-  
-        info
-      end
-
-      private
-
-      def logger
-        @logger ||= Bizside::Audit::JobLogger.logger
-      end
-
-      def build_loginfo
-        info = {
-          time: Time.now.strftime('%Y-%m-%dT%H:%M:%S.%3N%z'),
-          add_on_name: Bizside.config.add_on_name,
-          server_address: hostname,
-          class: payload['class'],
-          args: payload['args'].to_s,
-          queue: queue,
-          worker: worker.to_s,
-          exception: exception.class,
-          exception_message: exception.to_s,
-          exception_backtrace: Array(exception.backtrace)[0..10].join("\n") # Get only the top 10 because there are many traces.
-        }
-        info
-      end
-
-      # ホスト名を取得。
-      #
-      # 下記理由から hostname(1) を使用:
-      #
-      # * job 実行環境では環境変数 HOSTNAME がセットされていないケースがある
-      #   (例: 通常の god 起動の場合。他方、container 起動の場合は
-      #   HOSTNAME がセットされている模様)。
-      # * hostname(1) は Linux Standard Base 共通コマンドのため必ず存在する。
-      def hostname
-        @hostname ||= (`hostname`.chomp rescue '(unknown)')
-      end
-
-    end
-  end
-end
-
-Resque::Failure::Multiple.configure do |multi|
-  multi.classes = [Resque::Failure::Redis, Resque::Failure::LogOutput, Resque::Failure::JobAuditLog]
-end

data/lib/bizside/version.rb~

@@ -1,3 +0,0 @@
-module Bizside
-  VERSION = '2.0.6.1'
-end