bizside 2.3.6 → 2.3.7
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/bizside/cron_validator.rb +23 -5
- data/lib/bizside/job_utils.rb +17 -1
- data/lib/bizside/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 3e862771bbdfb64ff2afb022531b1250695b8741628eeefbb1e3b04df397cdda
|
4
|
+
data.tar.gz: e1d399959f57b304de4decd054d21d45e9918bdd8f04a6f78f14e6aa53132827
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d047094b8f553a82da8ddc19b76dad83cf53b75241614fa29a52213d14d2cb2c20bf1f889f5b663dbc0c56889b40a65c314fa51f89605bae429c79f18359357f
|
7
|
+
data.tar.gz: e79df9ac71b7c9d7e3bc6df57108fdefadbc9a43bfe5b45181b736880f57c757a3006e9596b336c7418b1fe2e9041467b769de11dfb0b5dd83d4f466a14866c7
|
@@ -30,7 +30,7 @@ module Bizside
|
|
30
30
|
|
31
31
|
def valid_#{attr}?
|
32
32
|
valid_format?(@#{attr}) &&
|
33
|
-
|
33
|
+
valid_range_and_step?(MIN_#{attr.upcase}, MAX_#{attr.upcase}, @#{attr})
|
34
34
|
end
|
35
35
|
EOS
|
36
36
|
end
|
@@ -41,22 +41,40 @@ module Bizside
|
|
41
41
|
value =~ /\A(\*(\/\d+)?|\d+(,\d+)*(-\d+)*(\/\d+)*)\Z/
|
42
42
|
end
|
43
43
|
|
44
|
+
def valid_range_and_step?(min, max, value)
|
45
|
+
valid_range?(min, max, value) && valid_step?(min, max, value)
|
46
|
+
end
|
47
|
+
|
44
48
|
def valid_range?(min, max, value)
|
45
|
-
|
46
|
-
|
49
|
+
range_values = get_range_value(value).split(",")
|
50
|
+
range_values.reject do |v|
|
47
51
|
if v.include?("-")
|
48
52
|
range_v = v.split("-")
|
49
53
|
(min..max).include?(range_v[0].to_i) &&
|
50
54
|
(min..max).include?(range_v[1].to_i) &&
|
51
55
|
range_v[0].to_i < range_v[1].to_i
|
52
56
|
else
|
53
|
-
(min..max).include?
|
57
|
+
(min..max).include?(v.to_i)
|
54
58
|
end
|
55
59
|
end.empty?
|
56
60
|
end
|
57
61
|
|
58
|
-
def
|
62
|
+
def valid_step?(min, max, value)
|
63
|
+
v = get_step_value(value)
|
64
|
+
return true if v.empty?
|
65
|
+
|
66
|
+
v != '*' &&
|
67
|
+
v.to_i != 0 &&
|
68
|
+
(min..max).include?(v.to_i)
|
69
|
+
end
|
70
|
+
|
71
|
+
def get_range_value(value)
|
59
72
|
value.gsub(/(\/\d*|\*)/, "")
|
60
73
|
end
|
74
|
+
|
75
|
+
def get_step_value(value)
|
76
|
+
return "" unless value.include?('/')
|
77
|
+
value.gsub(/.*\/(.*)/) { $1 }
|
78
|
+
end
|
61
79
|
end
|
62
80
|
end
|
data/lib/bizside/job_utils.rb
CHANGED
@@ -173,9 +173,11 @@ module Bizside
|
|
173
173
|
if cronline.to_s.strip.empty?
|
174
174
|
return
|
175
175
|
elsif CronValidator.new(cronline).valid?
|
176
|
+
new_cron = set_cron_options(cron)
|
177
|
+
|
176
178
|
config = {
|
177
179
|
:class => job_type,
|
178
|
-
:cron =>
|
180
|
+
:cron => new_cron,
|
179
181
|
:args => args,
|
180
182
|
:persist => true
|
181
183
|
}
|
@@ -404,5 +406,19 @@ module Bizside
|
|
404
406
|
end
|
405
407
|
private_class_method :do_perform_and_hooks_instantly
|
406
408
|
|
409
|
+
def self.set_cron_options(cron)
|
410
|
+
ret = Array(cron)
|
411
|
+
if ret.size > 1
|
412
|
+
opts = ret.second
|
413
|
+
opts ||= {}
|
414
|
+
opts = opts.with_indifferent_access
|
415
|
+
opts = opts.merge(blocking: true)
|
416
|
+
else
|
417
|
+
opts = { blocking: true }.with_indifferent_access
|
418
|
+
end
|
419
|
+
ret[1] = opts
|
420
|
+
ret
|
421
|
+
end
|
422
|
+
|
407
423
|
end
|
408
424
|
end
|
data/lib/bizside/version.rb
CHANGED
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.3.
|
4
|
+
version: 2.3.7
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- bizside-developers
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2024-01-17 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activesupport
|
@@ -475,7 +475,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
475
475
|
- !ruby/object:Gem::Version
|
476
476
|
version: '0'
|
477
477
|
requirements: []
|
478
|
-
rubygems_version: 3.
|
478
|
+
rubygems_version: 3.4.19
|
479
479
|
signing_key:
|
480
480
|
specification_version: 4
|
481
481
|
summary: Bizside is an utilities for web application.
|