bizside 2.3.6 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39b9880ea371f55ab17b2c82c67394a2f740bc612c4c9b69594db539d2e9b16f
-  data.tar.gz: b32b29653cc05e0332ff1bd51636ef2a750c8ccfbd6db608d7bc8ee6390df424
+  metadata.gz: 81dbebe065d4091665ab663600a57a56e54c97b2cde5d0b18f8fc78197c4ddbe
+  data.tar.gz: f80003853d525d8c79faa245008dd8ec4ca613bf2ec02f8d58a8b5128d12e68a
 SHA512:
-  metadata.gz: 64f122cfd9ad9ff1571b961e92733ff850015f1e2211c47e503705e1823bdce4334eab643fc10205369fa6ac345ee72491a6377d143a2f3092ade1394aa4e270
-  data.tar.gz: 6940e79997639635c66738ee8d19c6015447f3e187daa5d5e059009ccc5c784634a768f619a2cb0dc18c368cd1caf1486dc7ba79734ab94ca8456170f3ad70e1
+  metadata.gz: 0026f469b9d2d81d63b506c9667561cac3bd842e18bc6f327885f6ce8e3460e5eecf3ba89ba55079cab3a7eb257f84437c555ffa8044a918d3f2ea0e0c83b74d
+  data.tar.gz: 559dd6e411c386a5497542f87923d257342d89b0a4278e32db7811520df50e396a49e689c4556ace10789613d45b8629958b2bc43607de13eaaab4f8452594b5

data/lib/bizside/cron_validator.rb

@@ -30,7 +30,7 @@ module Bizside
 
         def valid_#{attr}?
           valid_format?(@#{attr}) &&
-          valid_range?(MIN_#{attr.upcase}, MAX_#{attr.upcase}, @#{attr})
+          valid_range_and_step?(MIN_#{attr.upcase}, MAX_#{attr.upcase}, @#{attr})
         end
       EOS
     end
@@ -41,22 +41,40 @@ module Bizside
       value =~ /\A(\*(\/\d+)?|\d+(,\d+)*(-\d+)*(\/\d+)*)\Z/
     end
 
+    def valid_range_and_step?(min, max, value)
+      valid_range?(min, max, value) && valid_step?(min, max, value)
+    end
+
     def valid_range?(min, max, value)
-      validate_values = remove_to_ignore_value(value).split(",")
-      validate_values.reject do |v|
+      range_values = get_range_value(value).split(",")
+      range_values.reject do |v|
         if v.include?("-")
           range_v = v.split("-")
           (min..max).include?(range_v[0].to_i) &&
           (min..max).include?(range_v[1].to_i) &&
           range_v[0].to_i < range_v[1].to_i
         else
-          (min..max).include? v.to_i
+          (min..max).include?(v.to_i)
         end
       end.empty?
     end
 
-    def remove_to_ignore_value(value)
+    def valid_step?(min, max, value)
+      v = get_step_value(value)
+      return true if v.empty?
+
+      v != '*' &&
+      v.to_i != 0 &&
+      (min..max).include?(v.to_i)
+    end
+
+    def get_range_value(value)
       value.gsub(/(\/\d*|\*)/, "")
     end
+
+    def get_step_value(value)
+      return "" unless value.include?('/')
+      value.gsub(/.*\/(.*)/) { $1 }
+    end
   end
 end

data/lib/bizside/job_utils.rb

@@ -173,9 +173,11 @@ module Bizside
       if cronline.to_s.strip.empty?
         return
       elsif CronValidator.new(cronline).valid?
+        new_cron = set_cron_options(cron)
+
         config = {
           :class => job_type,
-          :cron => cron,
+          :cron => new_cron,
           :args => args,
           :persist => true
         }
@@ -404,5 +406,19 @@ module Bizside
     end
     private_class_method :do_perform_and_hooks_instantly
 
+    def self.set_cron_options(cron)
+      ret = Array(cron)
+      if ret.size > 1
+        opts = ret.second
+        opts ||= {}
+        opts = opts.with_indifferent_access
+        opts = opts.merge(blocking: true)
+      else
+        opts = { blocking: true }.with_indifferent_access
+      end
+      ret[1] = opts
+      ret
+    end
+
   end
 end

data/lib/bizside/version.rb

@@ -1,3 +1,3 @@
 module Bizside
-  VERSION = '2.3.6'
+  VERSION = '3.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bizside
 version: !ruby/object:Gem::Version
-  version: 2.3.6
+  version: 3.0.0
 platform: ruby
 authors:
 - bizside-developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-14 00:00:00.000000000 Z
+date: 2024-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -62,16 +62,22 @@ dependencies:
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: carrierwave-magic
   requirement: !ruby/object:Gem::Requirement
@@ -217,9 +223,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.36'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -227,9 +230,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.36'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -468,14 +468,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Bizside is an utilities for web application.