on_calendar 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 452e1ff058496133e586d32e0bd5f697142627554871d43d2f76411faca50fed
-  data.tar.gz: 2a337cd8865b7c8cbb2a43c2c3771b1422dc8872af4f21f23d2db3dc96469d11
+  metadata.gz: baf51ec40d00667e28eb581adff1478e77cf5e34d40ea05ab0348ba3d0f300bb
+  data.tar.gz: 924a021e7fe2f18da64d7c73c1d277e71c27c326d4c9dc5cd7887067e53e6ff1
 SHA512:
-  metadata.gz: 650a891fdeee67ea1f78cca8eed34037cfdfb3628fc4bf36db5af70c4c2633133c9c28e00e4b4b3251881c847e223a03587995870cd78c72864cef18d224c290
-  data.tar.gz: 53722f292ed892e0652199e43197fce1f670ac973f5a3a35bd3f6342f66681586ef0802adda21d4a4379b8a55c56eb1a5d2f5994ca976aafadb6be45125cbe89
+  metadata.gz: d5b06b32d3a4553159745cc5f75ba4d67ac7756be4caa2225e02a45784c7a02f022b2c1a29a95d615956e50299b6a65618ec538752c7ec878605ef49d815c4d1
+  data.tar.gz: fc4980d4d436db145a6e7e5f40cf25f50f3e5fa4919e6a2976ffacebbbe7486dd26747dc7f051805abf671307975afadcb5453952ba64fa91520bebb960eb7db

data/lib/on_calendar/parser.rb

@@ -135,6 +135,7 @@ module OnCalendar
 
     def parse(expression)
       raise OnCalendar::Parser::Error, "Expression must be a string" unless expression.is_a?(String)
+      raise OnCalendar::Parser::Error, "Expression cannot be empty" if expression.empty?
 
       # Split string on white space and reverse
       segments = expression.split.reverse
@@ -233,18 +234,18 @@ module OnCalendar
         # Parse this segment
         begin
           parsed = OnCalendar::Segment.parse(segments.shift, max: max, min: min)
-        rescue OnCalendar::Segment::Error => e
-          raise Error, e
-        end
-        if parsed.nil?
-          # We are a wild card
-          conditions[idx] = [OnCalendar::Condition.const_get(klass).new(wildcard: true)]
-        else
-          # Lets build conditions with parsed
-          conditions[idx] = []
-          parsed.each do |c|
-            conditions[idx] << OnCalendar::Condition.const_get(klass).new(**c)
+          if parsed.nil?
+            # We are a wild card
+            conditions[idx] = [OnCalendar::Condition.const_get(klass).new(wildcard: true)]
+          else
+            # Lets build conditions with parsed
+            conditions[idx] = []
+            parsed.each do |c|
+              conditions[idx] << OnCalendar::Condition.const_get(klass).new(**c)
+            end
           end
+        rescue OnCalendar::Segment::Error, OnCalendar::Condition::Error => e
+          raise Error, e
         end
       end
       conditions

data/lib/on_calendar/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OnCalendar
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: on_calendar
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Ben Passmore