bizside 2.0.2 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6dbf04b48547a39ca0f729cbc3f456c94e30862ed11492ccf7f25bc883053f66
-  data.tar.gz: ae396f40a073d80684580ddf9e85d9ae6113cc78f151acf7b6c523fa04f1ea9b
+  metadata.gz: 26c26db7d3e38fd8d2a1851b5c4424ffd34c0ab10fb2e91086d070a06075a5fe
+  data.tar.gz: 3f683257382c9c1578a177bb08899611a3b9e016c0473d92fc87523fd1dde980
 SHA512:
-  metadata.gz: c23a9c930e62f2c1fa6116ebdc2e7bd9ff9c2b82df6da82184aa7dddce580f02459b738aeaab9203f35cd0564ca4d52213e2d7e334768c97785f931623e30db2
-  data.tar.gz: a6777413583e1a3abd2777d48191ebc5eb760c1dfb491ccae1c47cef5020c0d1e163698bf687c5b71f6dd156808f9ed1b7779737c78a78a1d8657cb59db2098b
+  metadata.gz: b94958b3abbafda5e3143ececc2bd370115e1a35b102c04abcaa791c9831bc9a23306c94bf36888accc1d7e98a11df9026e1842c421fa59679d9295095f7339d
+  data.tar.gz: 9dac9f0377694abcb2d73cbc3869f1fd5923cb50ee1c6c3fa379ec8a68d3458003e3960f97125725189fd5ff9ea4c4e676f582719b74fdc9cf93d8e2dbaf5ba3

data/lib/bizside/config.rb

@@ -25,7 +25,7 @@ module Bizside
 
       ret
     end
-    
+
     def []=(key, value)
       value = self.class.new(value) if value.is_a?(Hash)
       @hash[key.to_s] = value
@@ -52,8 +52,10 @@ module Bizside
     def method_missing(name, *args)
       ret = self[name]
 
-      if ret.is_a?(Hash) and not args[0].nil?
-        ret = args[0]
+      if ret.is_a?(Hash) || ret.is_a?(::Bizside::Config)
+        unless args[0].nil?
+          ret = self[name] = args[0]
+        end
       end
 
       ret

data/lib/bizside/coverage/launch.rb

@@ -1,5 +1,24 @@
 module Bizside
   class CoverageLaunch
+
+    def self.load
+      if ENV["COVERAGE"].to_s.downcase == 'true' and ENV['ACCEPTANCE_TEST'].to_s.downcase == 'true'
+        setup()
+
+        SimpleCov.start 'rails' do
+          SimpleCov.command_name(ENV['COMMAND_NAME']) if ENV['COMMAND_NAME']
+          SimpleCov.merge_timeout(7200)
+        end
+      end
+    end
+
+    def self.load_from_test_helper
+      if ENV["COVERAGE"] == 'true'
+        setup()
+        SimpleCov.start 'rails'
+      end
+    end
+
     def self.setup
       require 'simplecov'
       require 'simplecov-rcov'
@@ -9,17 +28,6 @@ module Bizside
         Coverage::RcovFormatter
       ])
     end
+    private_class_method :setup
   end
 end
-
-if ENV["COVERAGE"].to_s.downcase == 'true' and ENV['ACCEPTANCE_TEST'].to_s.downcase == 'true'
-  Bizside::CoverageLaunch.setup()
-
-  SimpleCov.start 'rails' do
-    SimpleCov.command_name(ENV['COMMAND_NAME']) if ENV['COMMAND_NAME']
-    SimpleCov.merge_timeout(7200)
-  end
-elsif ENV["COVERAGE"]
-  Bizside::CoverageLaunch.setup()
-  SimpleCov.start 'rails'
-end

data/lib/bizside/file_converter.rb

@@ -1,5 +1,3 @@
-require 'rmagick'
-
 module Bizside
   module FileConverter
     EXT_IMAGE = ['.gif', '.jpg', '.jpeg', '.png']
@@ -26,6 +24,7 @@ module Bizside
     end
 
     def self.convert_to_image(file)
+      require 'rmagick'
 
       case File.extname(file.path)
       when *EXT_IMAGE

data/lib/bizside/file_uploader.rb

@@ -4,12 +4,7 @@ require_relative 'carrierwave'
 require_relative 'uploader/extension_whitelist'
 require_relative 'uploader/filename_validator'
 require_relative 'uploader/content_type_validator'
-
-if defined?(Rails) && Rails.application.class.parent_name.eql?('BizsideTestApp')
-  # not require 'uploader/exif'
-else
-  require_relative 'uploader/exif'
-end
+require_relative 'uploader/exif'
 
 module Bizside
   # === storage.yml
@@ -45,6 +40,21 @@ module Bizside
       Bizside.config.storage.fog? ? downloaded_file_from_fog(file.path) : file.path
     end
 
+    # ファイル名の長さチェックが可能なように
+    def cache!(new_file = sanitized_file)
+      begin
+        super
+      rescue Errno::ENAMETOOLONG => e
+        if Bizside.config.file_uploader.ignore_long_filename_error?
+          if self.model.respond_to?(:original_filename)
+            self.model.original_filename = filename
+          end
+        else
+          raise e
+        end
+      end
+    end
+
     private
 
     def downloaded_file_from_fog(path)

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/railtie.rb

@@ -1,4 +1,5 @@
 require_relative 'coverage/launch'
+Bizside::CoverageLaunch.load()
 
 module Bizside
   class Railtie < ::Rails::Railtie

data/lib/bizside/test_help.rb

@@ -1,6 +1,7 @@
 require 'minitest/reporters'
 
 require_relative 'coverage/launch'
+Bizside::CoverageLaunch.load_from_test_helper()
 
 case ENV['CI'].to_s.downcase
 when 'jenkins'

data/lib/bizside/version.rb

@@ -1,3 +1,3 @@
 module Bizside
-  VERSION = '2.0.2'
+  VERSION = '2.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bizside
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.6
 platform: ruby
 authors:
 - bizside-developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-01 00:00:00.000000000 Z
+date: 2022-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -326,6 +326,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: rmagick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -459,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.2.16
 signing_key: 
 specification_version: 4
 summary: Bizside is an utilities for web application.