uv-rays 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea05ae786dcebc37d1ef84cb3d2d7d5509ed6e72
-  data.tar.gz: 2b43bb14cd91406d42ead3ff66711008884b52f6
+  metadata.gz: fb2605b3097dbf2b0ef3c8c17df39580ce036185
+  data.tar.gz: 6983fdeea7d991cda8740e3076a98fc07d479630
 SHA512:
-  metadata.gz: 235f1a3189b0356e59a06f26eed5c971483371c146d793f8343f971d8543827a60f749010b239379a503d787f565a2aebe47087d87b2a50c8da154074c6b7ccc
-  data.tar.gz: 8100f97d5d06df4ea953771e4a2dcf85cee6ea9afbd1de9e3d6d98a7d4a398b6302704c826a981e369db746a5b3b4c6d7467ba4d017417999bb95f37a5692d7c
+  metadata.gz: 40556df7599e68cdbed13ffe47bddf74c5fee91fdb296b8f5468d6f881e44b0e5db7490b5a6f150ab90f2025beb2ccc1c754df281a2c58d5af54ecb09077f75b
+  data.tar.gz: 990adf1a8c5282b80ab3c93a19ea8785519e436add68136a68b8891bfe0e6e9cd7676bfe243df9429b47711bb44109c37ed4f8bbcb17bcb849a5ef02f2065dc7

data/lib/uv-rays/abstract_tokenizer.rb

@@ -61,7 +61,7 @@ module UV
 
                     # Check for multi-byte indicator edge case
                     case result
-                    when Integer, Fixnum
+                    when Integer
                         entities << last[0...result]
                         @input = last[result..-1]
                     else

data/lib/uv-rays/scheduler.rb

@@ -138,7 +138,7 @@ module UV
 
         def next_time
             @last_scheduled = @reactor.now
-            if @every.is_a? Fixnum
+            if @every.is_a? Integer
                 @next_scheduled = @last_scheduled + @every
             else
                 # must be a cron

data/lib/uv-rays/scheduler/cron.rb

@@ -76,7 +76,7 @@ module UV
 
                 raise ArgumentError.new(
                   "invalid cronline: '#{line}'"
-                ) if es && es.find { |e| ! e.is_a?(Fixnum) }
+                ) if es && es.find { |e| ! e.is_a?(Integer) }
               end
             end
 
@@ -268,7 +268,7 @@ module UV
                 end
               end
 
-              weekdays = weekdays.uniq if weekdays
+              weekdays = weekdays.uniq.sort if weekdays
 
               [ weekdays, monthdays ]
             end
@@ -283,6 +283,7 @@ module UV
                 "found duplicates in #{item.inspect}"
               ) if r.uniq.size < r.size
 
+              r = r.sort_by { |e| e.is_a?(String) ? 61 : e.to_i }
               r
             end
 

data/lib/uv-rays/tcp_server.rb

@@ -8,7 +8,7 @@ module UV
             @klass = klass
             @args = args
 
-            if server == port && port.is_a?(Fixnum)
+            if server == port && port.is_a?(Integer)
                 # We are opening a socket descriptor
                 open(server)
             else

data/lib/uv-rays/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UV
-    VERSION = '2.0.3'
+    VERSION = '2.0.4'
 end

data/spec/scheduler_cron_spec.rb

@@ -28,8 +28,8 @@ describe UV::Scheduler::CronLine do
 
         it 'interprets cron strings correctly' do
 
-            to_a '* * * * *', [ [0], nil, nil, nil, nil, nil, nil, nil ]
-            to_a '10-12 * * * *', [ [0], [10, 11, 12], nil, nil,    nil, nil, nil, nil ]
+            to_a '* * * * *',       [ [0], nil, nil, nil, nil, nil, nil, nil ]
+            to_a '10-12 * * * *', [ [0], [10, 11, 12], nil, nil, nil, nil, nil, nil ]
             to_a '* * * * sun,mon', [ [0], nil, nil, nil, nil, [0, 1], nil, nil ]
             to_a '* * * * mon-wed', [ [0], nil, nil, nil, nil, [1, 2, 3], nil, nil ]
             to_a '* * * * 7', [ [0], nil, nil, nil, nil, [0], nil, nil ]
@@ -40,6 +40,7 @@ describe UV::Scheduler::CronLine do
             to_a '* * * * sun,2-4', [ [0], nil, nil, nil, nil, [0, 2, 3, 4], nil, nil ]
 
             to_a '* * * * sun,mon-tue', [ [0], nil, nil, nil, nil, [0, 1, 2], nil, nil ]
+            to_a '0 0 * * mon#1,tue', [[0], [0], [0], nil, nil, [2], ["mon#1"], nil]
 
             to_a '* * * * * *', [ nil, nil, nil, nil, nil, nil, nil, nil ]
             to_a '1 * * * * *', [ [1], nil, nil, nil, nil, nil, nil, nil ]
@@ -48,12 +49,22 @@ describe UV::Scheduler::CronLine do
 
             to_a '0 0 1 1 *', [ [0], [0], [0], [1], [1], nil, nil, nil ]
 
-            to_a '0 23-24 * * *', [ [0], [0], [23, 0], nil, nil, nil, nil, nil ]
-                #
-                # as reported by Aimee Rose in
-                # https://github.com/jmettraux/rufus-scheduler/issues/56
+            to_a '52 0 * * *', [ [0], [52], [0], nil, nil, nil, nil, nil ]
+
+            to_a '0 16 * * *', [ [0], [0], [16], nil, nil, nil, nil, nil ]
+
+            to_a '0 23-24 * * *', [ [0], [0], [0, 23], nil, nil, nil, nil, nil ]
+
+            to_a '0 23-2 * * *', [ [0], [0], [0, 1, 2, 23], nil, nil, nil, nil, nil ]
+
+            # modulo forms work for five-field forms
+            to_a '*/17 * * * *', [[0], [0, 17, 34, 51], nil, nil, nil, nil, nil, nil]
+            to_a '13 */17 * * *', [[0], [13], [0, 17], nil, nil, nil, nil, nil]
+
+            # modulo forms work for six-field forms
+            to_a '*/17 * * * * *', [[0, 17, 34, 51], nil, nil, nil, nil, nil, nil, nil]
+            to_a '13 */17 * * * *', [[13], [0, 17, 34, 51], nil, nil, nil, nil, nil, nil]
 
-            to_a '0 23-2 * * *', [ [0], [0], [23, 0, 1, 2], nil, nil, nil, nil, nil ]
         end
 
         it 'rejects invalid weekday expressions' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uv-rays
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-12 00:00:00.000000000 Z
+date: 2017-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libuv