bizside 2.1.3 → 2.1.6

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: fbff8f17c03af10bb71a58f5a0a7f2b4e11f5390d7cca495c50c0bb5714cb9e9
4
- data.tar.gz: ff25c48196d58b1239836976979cb69d11f0bc01a3153f5bb234666bbea75ce7
3
+ metadata.gz: 9ef0f75b280c6f53af503f157be6d4f2d2d1327ac9096f4ad71b69b566bc3da5
4
+ data.tar.gz: cdef422bdd9c7b81432ba088bf9ffa8f1078305b90189f4133dc56bdafa58ef2
5
5
  SHA512:
6
- metadata.gz: 351554541b72bf05b7dfa65a2458a55aaf779872977bf58fe159f1bee1986f374ffda802eeef39b6cded9120002ccc69ebf70861d1973e06bbea893f147cc565
7
- data.tar.gz: b60196e75457ac84e676ce716207c9b702638940bcdb154e05e8fd450dd2b9ec138d001caf11fb927e7807d76d15caf36aa5fda491191cfc45605fc9c805abc8
6
+ metadata.gz: e48a8cba50cd5895d5b89d4f76d53ab26c04fc2e28f2d01e56dc3df1d8ad3ad52f11b3648097e2ea53145eb953c73da7ada90a74496cfdc6f3255ffbcfec5c25
7
+ data.tar.gz: 481340080a681e2a7fe488696d52aafe973b7d5eb05fbabd968228ad89f4d29460d8652430f45f50f276053867101526946ff8529edba3969dc2a4f11b4d2b2c
@@ -1,4 +1,5 @@
1
1
  require 'carrierwave'
2
+ require 'securerandom'
2
3
 
3
4
  # 日本語ファイル名のまま保存
4
5
  CARRIERWAVE_SANITIZE_REGEXP = /[^[:word:]①-⑨【】「」()・&、  \(\)\.\-\+]/
@@ -11,7 +12,10 @@ module Bizside
11
12
  attr_accessor :file_size
12
13
 
13
14
  def path
14
- original_filename
15
+ # Return non-existent path to prevent any actual file/directory from being the target of copy or move
16
+ # because this class does not refer to any file.
17
+ # (CarrierWave::Uploader::Base#cache! tries to copy or move a passed file to its working directory)
18
+ File.join(CarrierWave.tmp_path, SecureRandom.uuid, File.basename(original_filename))
15
19
  end
16
20
  end
17
21
  end
@@ -18,18 +18,24 @@ require_relative 'audit/job_logger'
18
18
  resque_file = File.join(File.expand_path(ENV['RAILS_ROOT'] || '.'), file)
19
19
  next unless File.exist?(resque_file)
20
20
 
21
- resque_config = ERB.new(File.read(resque_file), 0, '-').result
21
+ _resque_config = ERB.new(File.read(resque_file), 0, '-').result
22
22
 
23
23
  case format
24
24
  when :yaml
25
- Resque.redis = YAML.load(resque_config)[Bizside.env]
26
- break
25
+ resque_config = YAML.safe_load(_resque_config)[Bizside.env]
27
26
  when :json
28
- Resque.redis = ActiveSupport::JSON.decode(resque_config)[Bizside.env]
29
- break
27
+ resque_config = ActiveSupport::JSON.decode(_resque_config)[Bizside.env]
30
28
  else
31
29
  raise "不正なResque設定ファイルです。#{file}"
32
30
  end
31
+
32
+ if resque_config.is_a?(Hash)
33
+ # redis config keys must be symbol
34
+ resque_config = JSON.parse(resque_config.to_json, symbolize_names: true)
35
+ end
36
+
37
+ Resque.redis = resque_config
38
+ break
33
39
  end
34
40
  end
35
41
 
@@ -1,3 +1,3 @@
1
1
  module Bizside
2
- VERSION = '2.1.3'
2
+ VERSION = '2.1.6'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bizside
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.3
4
+ version: 2.1.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - bizside-developers
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-07-26 00:00:00.000000000 Z
11
+ date: 2022-09-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport
@@ -264,20 +264,6 @@ dependencies:
264
264
  - - "<"
265
265
  - !ruby/object:Gem::Version
266
266
  version: 5.0.0
267
- - !ruby/object:Gem::Dependency
268
- name: email_validator
269
- requirement: !ruby/object:Gem::Requirement
270
- requirements:
271
- - - '='
272
- - !ruby/object:Gem::Version
273
- version: 1.5.0
274
- type: :development
275
- prerelease: false
276
- version_requirements: !ruby/object:Gem::Requirement
277
- requirements:
278
- - - '='
279
- - !ruby/object:Gem::Version
280
- version: 1.5.0
281
267
  - !ruby/object:Gem::Dependency
282
268
  name: ipaddress
283
269
  requirement: !ruby/object:Gem::Requirement
@@ -462,7 +448,6 @@ files:
462
448
  - lib/yes.rb
463
449
  - rails/locales/ja.yml
464
450
  - validations/collection_presence_validator.rb
465
- - validations/email_validator.rb
466
451
  - validations/ip_address_validator.rb
467
452
  - validations/tel_validator.rb
468
453
  - validations/url_validator.rb
@@ -486,8 +471,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
486
471
  - !ruby/object:Gem::Version
487
472
  version: '0'
488
473
  requirements: []
489
- rubyforge_project:
490
- rubygems_version: 2.7.6.2
474
+ rubygems_version: 3.3.16
491
475
  signing_key:
492
476
  specification_version: 4
493
477
  summary: Bizside is an utilities for web application.
@@ -1 +0,0 @@
1
- require 'email_validator/strict'