bizside 2.0.5 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ad2622c94f4492dce9352aade7512d20cf24e0f37d279b489c83de842de0d04
-  data.tar.gz: 0e2d37c1cd091f298f9324edbeae13f6942514bd93fcfc49c9fa8422e5679953
+  metadata.gz: 9689c1f6e742e9512e144312cdd80ab20e968b75780eee36b4211996f00f26a1
+  data.tar.gz: 6642f8337d4a1db6f55505278374888e87a198b882b3c0386ddddf1b5886bf8d
 SHA512:
-  metadata.gz: 71ed6d011a95dd34ba5d9d670d2c5b8101e650677f8869e7382f5813c2f19e735a026ecafce3298363e47a6e50ae457d8c95b8aa324eba915937ff79cf8e92c2
-  data.tar.gz: bebfdb0888313e89e1ea1d50b3b3da11900cebf0ae717d57eb22578ba86ab76f716a4ae073f20f5e35a03e1bdd60c36b1bb20dea70bdb815e236821dce2341c6
+  metadata.gz: 3ae3c04ced97b0d14a52d5db5f03bb52a30cb1cd1d7fa743ce569b7af957949f42b4fa89ad8274e7eb09a026a6aa9a27af817c02e6d89b8ca909a4c84cfe75e6
+  data.tar.gz: 41c281d34b047bbece294070e4bd64ee5868a797cb7ac1422ce5565e99bbe9d2fea34a78b3dcdfd0f4342cae83a6f626419b0b502dc1949a0570177a7e407bfd

data/lib/bizside/job_utils.rb

@@ -47,6 +47,41 @@ module Bizside
       end
     end
 
+    def self.enqueue_at_with_queue(queue, time, klass, *args)
+      if Bizside.rails_env&.test?
+        if klass.respond_to?(:before_enqueue)
+          return unless klass.before_enqueue(*args)
+        end
+
+        Bizside.logger.info "テスト時には遅延ジョブの登録を行わず、即時実行します。"
+        klass.perform(*args)
+        return
+      end
+
+      if block_given?
+        yield
+      else
+        Bizside.logger.info "遅延ジョブ #{klass} を #{queue} に登録します。"
+      end
+
+      ::Resque.enqueue_at_with_queue(queue, time, klass, *args)
+    end
+
+    def self.enqueue_at_with_queue_silently(queue, time, klass, *args)
+      enqueue_at_with_queue(queue, time, klass, *args) do
+        # 何も出力しない
+      end
+    end
+
+    def self.remove_delayed_in_queue(klass, queue, *args)
+      if Bizside.rails_env&.test?
+        Rails.logger.info "テスト時には遅延ジョブのキャンセルを行いません。"
+        return
+      end
+
+      ::Resque.remove_delayed_in_queue(klass, queue, *args)
+    end
+
     def self.set_job_at(time, klass, *args)
       if Bizside.rails_env&.test?
         if klass.respond_to?(:before_enqueue)

data/lib/bizside/resque.rb

@@ -121,6 +121,7 @@ module Resque
         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,
@@ -132,6 +133,19 @@ module Resque
         info
       end
 
+      # ホスト名を取得。
+      #
+      # 下記理由から hostname(1) を使用:
+      #
+      # * job 実行環境では環境変数 HOSTNAME がセットされていないケースがある
+      #   (例: 通常の god 起動の場合。他方、container 起動の場合は
+      #   HOSTNAME がセットされている模様)。
+      # * hostname(1) は Linux Standard Base 共通コマンドのため必ず存在する。
+      #   @see https://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Common/LSB-Common/rcommands.html
+      def hostname
+        @hostname ||= (`hostname`.chomp rescue '(unknown)')
+      end
+
     end
   end
 end

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.5'
+  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.5
+  version: 2.0.8
 platform: ruby
 authors:
 - bizside-developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-29 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
@@ -479,8 +479,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.3.10
 signing_key: 
 specification_version: 4
 summary: Bizside is an utilities for web application.