bizside 2.0.1 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dcc6b0f9213ae2af553a733bccf759947c3815a9942c10c6942ad790920c4ec
-  data.tar.gz: 93a2466cbd7420b711fc9d2ca8a4d910bb2507054fc52b60a32b5268bb614349
+  metadata.gz: 9ad2622c94f4492dce9352aade7512d20cf24e0f37d279b489c83de842de0d04
+  data.tar.gz: 0e2d37c1cd091f298f9324edbeae13f6942514bd93fcfc49c9fa8422e5679953
 SHA512:
-  metadata.gz: f8e2f4bd706c81e0a9029af91a19af46835843e44b5074809bda0f17331eb66284da30723a57e5133220d168db5ea07b49c874198d06bc077654021d94d92cd0
-  data.tar.gz: 31bfb0c73147bcf7246d8378cc6b426d834fc989bca781d684ce7016f586070aa45e0c3a4ea7b65592b5c0c268becfcd1a279d8f0afcb624a4612d542558f2c3
+  metadata.gz: 71ed6d011a95dd34ba5d9d670d2c5b8101e650677f8869e7382f5813c2f19e735a026ecafce3298363e47a6e50ae457d8c95b8aa324eba915937ff79cf8e92c2
+  data.tar.gz: bebfdb0888313e89e1ea1d50b3b3da11900cebf0ae717d57eb22578ba86ab76f716a4ae073f20f5e35a03e1bdd60c36b1bb20dea70bdb815e236821dce2341c6

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)
@@ -53,7 +63,7 @@ module Bizside
 
     def download_file_from_fog(path)
       tmp_path = "/tmp/#{Bizside.config.add_on_name}-#{Bizside::StringUtils.current_time_string}-#{File.basename(path)}"
-      system("curl '#{file.url}' -o '#{tmp_path}'")
+      raise "File download failed.(curl '#{file.url}' -o '#{tmp_path}')" unless system("curl '#{file.url}' -o '#{tmp_path}'")
       tmp_path
     end
 
@@ -62,7 +72,7 @@ module Bizside
       unless File.exist?(cache_path)
         FileUtils.mkdir_p(File.dirname(cache_path))
         tmp_path = download_file_from_fog(path)
-        system("mv '#{tmp_path}' '#{cache_path}'")
+        raise "Failed to move file.(mv '#{tmp_path}' '#{cache_path}')" unless system("mv '#{tmp_path}' '#{cache_path}'")
       end
       cache_path
     end

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.1'
+  VERSION = '2.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bizside
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.5
 platform: ruby
 authors:
 - bizside-developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-28 00:00:00.000000000 Z
+date: 2021-11-29 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