chrono 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2654829b86a6c6e8ad37744e19fc96408a5ac9f
-  data.tar.gz: a50cb68f2dcd05bafd92ce0c2f6ff6cc5df4e0f6
+  metadata.gz: e6fd43e8b0de253b8ac79fdc3185f2358cdc1791
+  data.tar.gz: b67b7851d8a25655d694e344f898de04056428fe
 SHA512:
-  metadata.gz: 6d32b10ee846d5a185dcff6a05bb0dc11deee5cbb58ac9e68d32032fe26d04e80708be98da15b574abe7016d39059b19aba2685a73584ce3664859558a35a519
-  data.tar.gz: 81d639646d8c41744af982fc1bb616df02fd3d3514be8e09897b2306253f489e83ed8da3bb0c90fc013225c53e5c5fee885f73ff859227a43ad9ee6ae25e7543
+  metadata.gz: b727c4e40b24389e70e6ec01830b77b93368d74231801b4d9e6bf3b8499577b340639e69c026013e947c89c52fa025fab1c6da010d5ef95550d1a859df3356e3
+  data.tar.gz: 5cbdd9900cff827c3d017fbdc5d2358253aa26bcc6c74c99f75bb9942e8f58ee9a6f4769859d59d71e0f7e3d9a28e3dcb22e88c62baa89a393309ca5f42d5680

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.0
+- Add more strict validations
+- Support some alias field names
+
 ## 0.1.0
 - Raise errors on invalid fields (thx @eagletmt)
 

data/chrono.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "codeclimate-test-reporter"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "2.14.1"
+  spec.add_development_dependency "rspec", "~> 3.4.0"
   spec.add_development_dependency "simplecov"
 end

data/lib/chrono/fields/month.rb

@@ -1,8 +1,35 @@
 module Chrono
   module Fields
     class Month < Base
+      TABLE = {
+        'jan' => '1',
+        'feb' => '2',
+        'mar' => '3',
+        'apr' => '4',
+        'may' => '5',
+        'jun' => '6',
+        'jul' => '7',
+        'aug' => '8',
+        'sep' => '9',
+        'oct' => '10',
+        'nov' => '11',
+        'dec' => '12',
+      }
+      REGEXP = %r<\A(?<step>(?:\*|(?:(?<atom>\d+||jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)(?:-\g<atom>)?))(?:/\d+)?)(?:,\g<step>)*\z>ix
+
+      def initialize(source)
+        unless REGEXP =~ source
+          raise InvalidField.new('Unparsable field', source)
+        end
+        @source = source
+      end
+
       private
 
+      def interpolated
+        super.downcase.gsub(/jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec/, TABLE)
+      end
+
       def range
         1..12
       end

data/lib/chrono/fields/wday.rb

@@ -1,8 +1,31 @@
 module Chrono
   module Fields
     class Wday < Base
+      TABLE = {
+        '7'   => '0',
+        'sun' => '0',
+        'mon' => '1',
+        'tue' => '2',
+        'wed' => '3',
+        'thu' => '4',
+        'fri' => '5',
+        'sat' => '6',
+      }
+      REGEXP = %r<\A(?:(?<step>(?:\*|(?:(?<atom>\d+|sun|mon|tue|wed|thu|fri|sat)(?:-\g<atom>)?))(?:/\d+)?)(?:,\g<step>)*)\z>ix
+
+      def initialize(source)
+        unless REGEXP =~ source
+          raise InvalidField.new('Unparsable field', source)
+        end
+        @source = source
+      end
+
       private
 
+      def interpolated
+        super.downcase.gsub(/7|sun|mon|tue|wed|thu|fri|sat/, TABLE)
+      end
+
       def range
         0..6
       end

data/lib/chrono/schedule.rb

@@ -1,8 +1,20 @@
 module Chrono
   class Schedule
     attr_reader :source
+    TABLE = {
+      '@yearly'   => %w"0 0 1 1 *",
+      '@annually' => %w"0 0 1 1 *",
+      '@monthly'  => %w"0 0 1 * *",
+      '@weekly'   => %w"0 0 * * 0",
+      '@daily'    => %w"0 0 * * *",
+      '@hourly'   => %w"0 * * * *",
+    }
 
     def initialize(source)
+      if @fields = TABLE[source]
+      elsif %r<\A[ \t]*(?:(?<field>\S+)[ \t]+){4}\g<field>[ \t]*\z> !~ source
+        raise Chrono::Fields::Base::InvalidField.new('invalid source', source)
+      end
       @source = source
     end
 

data/lib/chrono/version.rb

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

data/spec/chrono/iterator_spec.rb

@@ -25,7 +25,7 @@ describe Chrono::Iterator do
     ].each_slice(3) do |from, to, source|
       it "ticks #{from} to #{to} by #{source}" do
         now = Time.parse(from)
-        described_class.new(source, now: now).next.should == Time.parse(to)
+        expect(described_class.new(source, now: now).next).to eq(Time.parse(to))
       end
 
       it 'raises error when empty range is given' do

data/spec/chrono/schedule_spec.rb

@@ -0,0 +1,268 @@
+require 'spec_helper'
+
+describe Chrono::Schedule do
+  let (:schedule) { Chrono::Schedule.new(source) }
+
+  describe '.new' do
+    context 'valid source' do
+      subject { Chrono::Schedule.new("\t*\t*\t*\t*\t*\t") }
+      it { is_expected.to be_a(Chrono::Schedule) }
+    end
+    context 'six fields' do
+      subject { Chrono::Schedule.new('* * * * * *') }
+      it { expect{subject.minutes}.to raise_error(Chrono::Fields::Base::InvalidField) }
+    end
+    context '@yearly' do
+      subject { Chrono::Schedule.new('@yearly') }
+      it do
+        expect(subject.minutes).to eq([0])
+        expect(subject.hours).to   eq([0])
+        expect(subject.days).to    eq([1])
+        expect(subject.months).to  eq([1])
+        expect(subject.wdays).to   eq(7.times.to_a)
+      end
+    end
+    context '@annually' do
+      subject { Chrono::Schedule.new('@annually') }
+      it do
+        expect(subject.minutes).to eq([0])
+        expect(subject.hours).to   eq([0])
+        expect(subject.days).to    eq([1])
+        expect(subject.months).to  eq([1])
+        expect(subject.wdays).to   eq(7.times.to_a)
+      end
+    end
+    context '@monthly' do
+      subject { Chrono::Schedule.new('@monthly') }
+      it do
+        expect(subject.minutes).to eq([0])
+        expect(subject.hours).to   eq([0])
+        expect(subject.days).to    eq([1])
+        expect(subject.months).to  eq((1..12).to_a)
+        expect(subject.wdays).to   eq(7.times.to_a)
+      end
+    end
+    context '@weekly' do
+      subject { Chrono::Schedule.new('@weekly') }
+      it do
+        expect(subject.minutes).to eq([0])
+        expect(subject.hours).to   eq([0])
+        expect(subject.days).to    eq((1..31).to_a)
+        expect(subject.months).to  eq((1..12).to_a)
+        expect(subject.wdays).to   eq([0])
+      end
+    end
+    context '@daily' do
+      subject { Chrono::Schedule.new('@daily') }
+      it do
+        expect(subject.minutes).to eq([0])
+        expect(subject.hours).to   eq([0])
+        expect(subject.days).to    eq((1..31).to_a)
+        expect(subject.months).to  eq((1..12).to_a)
+        expect(subject.wdays).to   eq(7.times.to_a)
+      end
+    end
+    context '@hourly' do
+      subject { Chrono::Schedule.new('@hourly') }
+      it do
+        expect(subject.minutes).to eq([0])
+        expect(subject.hours).to   eq(24.times.to_a)
+        expect(subject.days).to    eq((1..31).to_a)
+        expect(subject.months).to  eq((1..12).to_a)
+        expect(subject.wdays).to   eq(7.times.to_a)
+      end
+    end
+  end
+
+  describe '#minutes' do
+    subject { schedule.minutes }
+    context "'0 0 * * *'" do
+      let (:source){ '0 0 * * *' }
+      it { is_expected.to eq [0] }
+    end
+    context "'59 0 * * *'" do
+      let (:source){ '59 0 * * *' }
+      it { is_expected.to eq [59] }
+    end
+    context "'60 0 * * *'" do
+      let (:source){ '60 0 * * *' }
+      it { expect{subject}.to raise_error(Chrono::Fields::Base::InvalidField) }
+    end
+  end
+
+  describe '#hours' do
+    subject { schedule.hours }
+    context "'0 0 * * *'" do
+      let (:source){ '0 0 * * *' }
+      it { is_expected.to eq [0] }
+    end
+    context "'0 23 * * *'" do
+      let (:source){ '0 23 * * *' }
+      it { is_expected.to eq [23] }
+    end
+    context "'0 24 * * *'" do
+      let (:source){ '0 24 * * *' }
+      it { expect{subject}.to raise_error(Chrono::Fields::Base::InvalidField) }
+    end
+  end
+
+  describe '#days' do
+    subject { schedule.days }
+    context 'day: 1' do
+      let (:source){ '0 0 1 * *' }
+      it { is_expected.to eq [1] }
+    end
+    context 'day: 31' do
+      let (:source){ '0 0 31 * *' }
+      it { is_expected.to eq [31] }
+    end
+    context 'day" 0' do
+      let (:source){ '0 0 0 * *' }
+      it { expect{subject}.to raise_error(Chrono::Fields::Base::InvalidField) }
+    end
+    context 'day: 32' do
+      let (:source){ '0 0 32 * *' }
+      it { expect{subject}.to raise_error(Chrono::Fields::Base::InvalidField) }
+    end
+  end
+
+  describe '#months' do
+    subject { schedule.months }
+    context 'month: 1' do
+      let (:source){ '0 0 1 1 *' }
+      it { is_expected.to eq [1] }
+    end
+    context 'month: 12' do
+      let (:source){ '0 0 1 12 0' }
+      it { is_expected.to eq [12] }
+    end
+    context 'month: 0' do
+      let (:source){ '0 0 1 0 *' }
+      it { expect{subject}.to raise_error(Chrono::Fields::Base::InvalidField) }
+    end
+    context 'month: 13' do
+      let (:source){ '0 0 13 0 *' }
+      it { expect{subject}.to raise_error(Chrono::Fields::Base::InvalidField) }
+    end
+    context 'month: Jan' do
+      let (:source){ '0 0 1 Jan 0' }
+      it { is_expected.to eq [1] }
+    end
+    context 'month: Feb' do
+      let (:source){ '0 0 1 Feb 0' }
+      it { is_expected.to eq [2] }
+    end
+    context 'month: Mar' do
+      let (:source){ '0 0 1 Mar 0' }
+      it { is_expected.to eq [3] }
+    end
+    context 'month: Apr' do
+      let (:source){ '0 0 1 Apr 0' }
+      it { is_expected.to eq [4] }
+    end
+    context 'month: May' do
+      let (:source){ '0 0 1 May 0' }
+      it { is_expected.to eq [5] }
+    end
+    context 'month: Jun' do
+      let (:source){ '0 0 1 Jun 0' }
+      it { is_expected.to eq [6] }
+    end
+    context 'month: Jul' do
+      let (:source){ '0 0 1 Jul 0' }
+      it { is_expected.to eq [7] }
+    end
+    context 'month: Aug' do
+      let (:source){ '0 0 1 Aug 0' }
+      it { is_expected.to eq [8] }
+    end
+    context 'month: Sep' do
+      let (:source){ '0 0 1 Sep 0' }
+      it { is_expected.to eq [9] }
+    end
+    context 'month: Oct' do
+      let (:source){ '0 0 1 Oct 0' }
+      it { is_expected.to eq [10] }
+    end
+    context 'month: Nov' do
+      let (:source){ '0 0 1 Nov 0' }
+      it { is_expected.to eq [11] }
+    end
+    context 'month: Dec' do
+      let (:source){ '0 0 1 Dec 0' }
+      it { is_expected.to eq [12] }
+    end
+    context 'month: Mar-Dec/3' do
+      let (:source){ '0 0 1 Mar-Dec/3 0' }
+      it { is_expected.to eq [3,6,9,12] }
+    end
+    context 'month: Mar,Jun,Sep,Dec' do
+      let (:source){ '0 0 1 Mar,Jun,Sep,Dec/3 0' }
+      it { is_expected.to eq [3,6,9,12] }
+    end
+    context 'month: January' do
+      let (:source){ '0 0 1 January 0' }
+      it { expect{subject}.to raise_error(Chrono::Fields::Base::InvalidField) }
+    end
+    context 'month: Abc' do
+      let (:source){ '0 0 1 Abc 0' }
+      it { expect{subject}.to raise_error(Chrono::Fields::Base::InvalidField) }
+    end
+  end
+
+  describe '#wdays' do
+    subject { schedule.wdays }
+    context 'wdays: 0' do
+      let (:source){ '0 0 * * 0' }
+      it { is_expected.to eq [0] }
+    end
+    context 'wdays: 6' do
+      let (:source){ '0 0 * * 6' }
+      it { is_expected.to eq [6] }
+    end
+    context 'wdays: 7' do
+      let (:source){ '0 0 * * 7' }
+      it { is_expected.to eq [0] }
+    end
+    context 'wdays: 8' do
+      let (:source){ '0 0 * * 8' }
+      it { expect{subject}.to raise_error(Chrono::Fields::Base::InvalidField) }
+    end
+    context 'wdays: sun' do
+      let (:source){ '0 0 * * sun' }
+      it { is_expected.to eq [0] }
+    end
+    context 'wdays: mon' do
+      let (:source){ '0 0 * * mon' }
+      it { is_expected.to eq [1] }
+    end
+    context 'wdays: tue' do
+      let (:source){ '0 0 * * tue' }
+      it { is_expected.to eq [2] }
+    end
+    context 'wdays: wed' do
+      let (:source){ '0 0 * * wed' }
+      it { is_expected.to eq [3] }
+    end
+    context 'wdays: Thu' do
+      let (:source){ '0 0 * * Thu' }
+      it { is_expected.to eq [4] }
+    end
+    context 'wdays: FRI' do
+      let (:source){ '0 0 * * FRI' }
+      it { is_expected.to eq [5] }
+    end
+    context 'wdays: Sat' do
+      let (:source){ '0 0 * * Sat' }
+      it { is_expected.to eq [6] }
+    end
+    context 'wdays: Sun-Sat' do
+      let (:source){ '0 0 * * Sun-Sat' }
+      it { is_expected.to eq [0,1,2,3,4,5,6] }
+    end
+    context 'wdays: Sun,Sat' do
+      let (:source){ '0 0 * * Sun,Sat' }
+      it { is_expected.to eq [0,6] }
+    end
+  end
+end

data/spec/chrono/trigger_spec.rb

@@ -15,8 +15,8 @@ describe Chrono::Trigger do
 
   describe "#once" do
     it "waits till scheduled time and then triggers a given job only once" do
-      block.should_receive(:call)
-      trigger.should_receive(:sleep)
+      expect(block).to receive(:call)
+      expect(trigger).to receive(:sleep)
       trigger.once
     end
   end
@@ -24,7 +24,7 @@ describe Chrono::Trigger do
   # Stub Trigger#loop behavior to avoid blocking main process.
   describe "#run" do
     before do
-      trigger.stub(:loop) do |&block|
+      allow(trigger).to receive(:loop) do |&block|
         2.times do
           block.call
         end
@@ -32,8 +32,8 @@ describe Chrono::Trigger do
     end
 
     it "waits till scheduled time and then triggers a given job periodically" do
-      block.should_receive(:call).twice
-      trigger.should_receive(:sleep).twice
+      expect(block).to receive(:call).twice
+      expect(trigger).to receive(:sleep).twice
       trigger.run
     end
   end

data/spec/spec_helper.rb

@@ -10,7 +10,6 @@ $LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
 require "chrono"
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chrono
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-14 00:00:00.000000000 Z
+date: 2015-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -70,16 +70,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,7 @@ files:
 - lib/chrono/trigger.rb
 - lib/chrono/version.rb
 - spec/chrono/iterator_spec.rb
+- spec/chrono/schedule_spec.rb
 - spec/chrono/trigger_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/r7kamura/chrono
@@ -150,6 +151,7 @@ specification_version: 4
 summary: Provides a chain of logics about chronology.
 test_files:
 - spec/chrono/iterator_spec.rb
+- spec/chrono/schedule_spec.rb
 - spec/chrono/trigger_spec.rb
 - spec/spec_helper.rb
 has_rdoc: