chrono 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6fd43e8b0de253b8ac79fdc3185f2358cdc1791
-  data.tar.gz: b67b7851d8a25655d694e344f898de04056428fe
+  metadata.gz: 82628fe0ca33aeac8bd5b8f6d72d570a250e5636
+  data.tar.gz: 093720914965710dccca4dca1054616bc676e783
 SHA512:
-  metadata.gz: b727c4e40b24389e70e6ec01830b77b93368d74231801b4d9e6bf3b8499577b340639e69c026013e947c89c52fa025fab1c6da010d5ef95550d1a859df3356e3
-  data.tar.gz: 5cbdd9900cff827c3d017fbdc5d2358253aa26bcc6c74c99f75bb9942e8f58ee9a6f4769859d59d71e0f7e3d9a28e3dcb22e88c62baa89a393309ca5f42d5680
+  metadata.gz: 2bdc77b1029f70e80ccde05ac6c5a3f4fe84d8e39d34c1484cf1b56a84580b0234e0e01b9b1604937d705c4241940f953565f5ff436a193cfb26f930b7339751
+  data.tar.gz: ff6f91a205265f49e78e208ada8f87f1c61d881d52c0bd9b6786eab1732944d8f72ce3fe1825327eacfa10f62507ca36a2cb92c11fbe709b6867bd1c41d95830

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.3.0
+- Fix bug on day and wday specs
+
 ## 0.2.0
 - Add more strict validations
 - Support some alias field names

data/lib/chrono/next_time.rb

@@ -27,8 +27,6 @@ module Chrono
           carry_month
         when !scheduled_in_this_day?
           carry_day
-        when !scheduled_in_this_wday?
-          carry_day
         when !scheduled_in_this_hour?
           carry_hour
         when !scheduled_in_this_minute?
@@ -54,11 +52,19 @@ module Chrono
     end
 
     def scheduled_in_this_day?
-      schedule.days.include?(time.day)
-    end
-
-    def scheduled_in_this_wday?
-      schedule.wdays.include?(time.wday)
+      if schedule.days?
+        if schedule.wdays?
+          schedule.days.include?(time.day) || schedule.wdays.include?(time.wday)
+        else
+          schedule.days.include?(time.day)
+        end
+      else
+        if schedule.wdays?
+          schedule.wdays.include?(time.wday)
+        else
+          true
+        end
+      end
     end
 
     def scheduled_in_this_hour?

data/lib/chrono/schedule.rb

@@ -38,6 +38,14 @@ module Chrono
       Fields::Wday.new(fields[4]).to_a
     end
 
+    def days?
+      fields[2] != '*'
+    end
+
+    def wdays?
+      fields[4] != '*'
+    end
+
     private
 
     def fields

data/lib/chrono/version.rb

@@ -1,3 +1,3 @@
 module Chrono
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/chrono/iterator_spec.rb

@@ -22,6 +22,8 @@ describe Chrono::Iterator do
       "2000-01-04 00:00:00", "2000-01-04 00:01:00", "* * * * 2,3",
       "2000-01-01 00:01:00", "2000-01-01 00:04:00", "1-20/3 * * * *",
       "2000-01-01 00:20:00", "2000-01-01 01:01:00", "1-20/3 * * * *",
+      "2000-01-01 00:00:00", "2000-01-03 00:00:00", "0 0 1,15 * 1",
+      "2000-01-01 00:00:00", "2000-01-05 00:00:00", "0 0 5,15,25 * 5",
     ].each_slice(3) do |from, to, source|
       it "ticks #{from} to #{to} by #{source}" do
         now = Time.parse(from)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chrono
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-08 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport