chrono 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a42cc20a3ed6750c544e39bd47e14ace15f36d5b
-  data.tar.gz: c55208bf4082532883e069f3c18a69332641f288
+  metadata.gz: b2654829b86a6c6e8ad37744e19fc96408a5ac9f
+  data.tar.gz: a50cb68f2dcd05bafd92ce0c2f6ff6cc5df4e0f6
 SHA512:
-  metadata.gz: 86f6bb35356917719c2fcc4bb467ea81dd2d11b4ea770f4b04cf78d3ad1f727c4a3d591adf54d5b9014b4f2d026802ed1858e0b609985b91f21bc7716b8c9cb8
-  data.tar.gz: 8455ebc6191819ed3ec105462fbc36dd98cef6f4635f73ad7e16649d377f5ea2ee552c1fc3a18317d731c5ac21f6e1681fe8ef3c9f9cf8b688da6e992b624114
+  metadata.gz: 6d32b10ee846d5a185dcff6a05bb0dc11deee5cbb58ac9e68d32032fe26d04e80708be98da15b574abe7016d39059b19aba2685a73584ce3664859558a35a519
+  data.tar.gz: 81d639646d8c41744af982fc1bb616df02fd3d3514be8e09897b2306253f489e83ed8da3bb0c90fc013225c53e5c5fee885f73ff859227a43ad9ee6ae25e7543

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.1.0
+- Raise errors on invalid fields (thx @eagletmt)
+
 ## 0.0.6
 - Support ActiveSupport 3 and 4
 

data/README.md

@@ -37,7 +37,7 @@ for more details.
 ```
 * * * * *
 T T T T T
-| | | | `- wday --- 0 ..  6
+| | | | `- wday --- 0 ..  6 (0 = Sunday)
 | | | `--- month -- 1 .. 12
 | | `----- day ---- 1 .. 31
 | `------- hour --- 0 .. 23

data/lib/chrono/fields/base.rb

@@ -1,6 +1,15 @@
 module Chrono
   module Fields
     class Base
+      class InvalidField < StandardError
+        attr_reader :source
+
+        def initialize(message, source)
+          super("#{message}: #{source}")
+          @source = source
+        end
+      end
+
       attr_reader :source
 
       def initialize(source)
@@ -11,6 +20,7 @@ module Chrono
         if has_multiple_elements?
           fields.map(&:to_a).flatten.uniq.sort
         else
+          validate!
           lower.step(upper, step).to_a.sort
         end
       end
@@ -21,6 +31,22 @@ module Chrono
         source.gsub("*", "#{range.first}-#{range.last}")
       end
 
+      def validate!
+        unless match_data
+          raise InvalidField.new('Unparsable field', source)
+        end
+
+        if lower < range.begin || range.end < upper
+          raise InvalidField.new('The field is out-of-range', source)
+        end
+
+        if upper < lower
+          raise InvalidField.new('The range is evaluated to empty', source)
+        end
+
+        true
+      end
+
       def lower
         @lower ||= match_data[1].to_i
       end

data/lib/chrono/version.rb

@@ -1,3 +1,3 @@
 module Chrono
-  VERSION = "0.0.6"
+  VERSION = "0.1.0"
 end

data/spec/chrono/iterator_spec.rb

@@ -27,6 +27,22 @@ describe Chrono::Iterator do
         now = Time.parse(from)
         described_class.new(source, now: now).next.should == Time.parse(to)
       end
+
+      it 'raises error when empty range is given' do
+        expect { described_class.new('5-0 * * * *').next }.to raise_error(Chrono::Fields::Base::InvalidField)
+      end
+
+      it 'raises error when too large upper is given' do
+        expect { described_class.new('5-60 * * * *').next }.to raise_error(Chrono::Fields::Base::InvalidField)
+      end
+
+      it 'raises error when too low lower is given' do
+        expect { described_class.new('* * 0 * *').next }.to raise_error(Chrono::Fields::Base::InvalidField)
+      end
+
+      it 'raises error when unparsable field is given' do
+        expect { described_class.new('a-z * * * *').next }.to raise_error(Chrono::Fields::Base::InvalidField)
+      end
     end
   end
 end

metadata

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