utils-rails 1.2.13 → 1.2.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/README.rdoc +1 -1
- data/lib/utils/file_util.rb +4 -3
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 891408216405b890a01543f06ca29f207af4414e6650f283cb28f7d623741254
|
|
4
|
+
data.tar.gz: 7119dc131775fbe8986f5ee473e58b19d3d4e65f2cc014d97ecded801f6cf91a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: e8678bdcd7ec0b665fd678b47e6a8e5d44f9e6c2e2d0e73675882f68943bcb7d58e9f9b16d61ac9c73e527f37e1026530c23bbab7f4f14343554c1f1d5fd604c
|
|
7
|
+
data.tar.gz: d97c9cd8084361a6289d28740fbca209a9e18962b5eb0b109a16699bd75a43702158f52e60fbb1cf1ea418d399fdf0e55195e2d58cbc708aba55a315a39be557
|
data/README.rdoc
CHANGED
data/lib/utils/file_util.rb
CHANGED
|
@@ -84,7 +84,7 @@ module Utils
|
|
|
84
84
|
file_name = get_upload_save_name(res_file.original_filename,to_jpg)
|
|
85
85
|
|
|
86
86
|
abs_file_name = get_full_path(upload_path,file_name)
|
|
87
|
-
logger.debug("res_file:" + res_file.original_filename + ",abs_file_name:" + abs_file_name)
|
|
87
|
+
logger.debug("to_jpg:#{to_jpg},res_file:" + res_file.original_filename + ",abs_file_name:" + abs_file_name)
|
|
88
88
|
|
|
89
89
|
max_width = 0
|
|
90
90
|
max_width = Rails.configuration.image_max_width.to_i if Rails.configuration.respond_to?('image_max_width')
|
|
@@ -125,10 +125,11 @@ module Utils
|
|
|
125
125
|
end
|
|
126
126
|
|
|
127
127
|
#获取上传文件保存名称
|
|
128
|
-
def self.get_upload_save_name(ori_filename,to_jpg=true)
|
|
128
|
+
def self.get_upload_save_name(ori_filename,to_jpg=true)
|
|
129
129
|
file_name_main = (Time.now.to_f * 1000000).to_i.to_s(16) + Digest::SHA2.hexdigest(rand.to_s)[0,8]
|
|
130
130
|
file_name_ext = File.extname(ori_filename).downcase #扩展名统一小写
|
|
131
131
|
file_name_ext = ".jpg" if image_file?(ori_filename) && to_jpg
|
|
132
|
+
logger.debug("to_jpg:#{to_jpg},file_name_ext:#{file_name_ext}")
|
|
132
133
|
file_name = file_name_main + file_name_ext
|
|
133
134
|
end
|
|
134
135
|
|
|
@@ -151,7 +152,7 @@ module Utils
|
|
|
151
152
|
|
|
152
153
|
#检查是否图片文件名
|
|
153
154
|
def self.image_file?(file_name)
|
|
154
|
-
return !file_name.blank? && !!file_name.downcase.match("\\.png|\\.bmp|\\.jpeg|\\.jpg|\\.gif")
|
|
155
|
+
return !file_name.blank? && !!file_name.downcase.match("\\.png|\\.bmp|\\.jpeg|\\.jpg|\\.gif|\\.webp|\\.avif")
|
|
155
156
|
end
|
|
156
157
|
|
|
157
158
|
#生成缩略图
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: utils-rails
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.2.
|
|
4
|
+
version: 1.2.15
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- wangfuhai
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2025-10-28 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: mini_magick
|