ice_cube_cron 0.0.5 → 1.0.0

data/spec/lib/ice_cube_cron/base_spec.rb

@@ -3,58 +3,62 @@ require 'spec_helper'
 describe ::IceCubeCron do
   context 'repeat options' do
     describe 'monthly' do
-      let(:ice_cube_model) { ::IceCube::Schedule.from_cron(::Date.new(2015, 7, 1), :repeat_day => '1') }
+      let(:schedule) { ::IceCube::Schedule.from_cron(::Date.new(2015, 7, 1), :day_of_month => '1', :hour => 0, :minute => 0) }
 
       it 'for same day' do
-        expect(ice_cube_model.occurrences_between(::Date.new(2015, 7, 1), ::Date.new(2015, 7, 1))).to eq([::Date.new(2015, 7, 1)])
+        expect(schedule.occurrences_between(::Date.new(2015, 7, 1), ::Date.new(2015, 7, 1))).to eq([::Date.new(2015, 7, 1)])
       end
 
       it 'for multiple months' do
-        expect(ice_cube_model.occurrences_between(::Date.new(2015, 7, 1), ::Date.new(2015, 9, 1))).to eq([::Date.new(2015, 7, 1), ::Date.new(2015, 8, 1), ::Date.new(2015, 9, 1)])
+        expect(schedule.occurrences_between(::Date.new(2015, 7, 1), ::Date.new(2015, 9, 1))).to eq([::Date.new(2015, 7, 1), ::Date.new(2015, 8, 1), ::Date.new(2015, 9, 1)])
       end
     end
 
     describe 'twice monthly' do
-      let(:ice_cube_model) { ::IceCube::Schedule.from_cron(::Date.new(2015, 7, 1), :repeat_day => '1,15') }
+      let(:schedule) { ::IceCube::Schedule.from_cron(::Date.new(2015, 7, 1), :day_of_month => '1,15', :hour => 0, :minute => 0) }
 
       it 'for one month' do
-        expect(ice_cube_model.occurrences_between(::Date.new(2015, 7, 1), ::Date.new(2015, 7, 31))).to eq([::Date.new(2015, 7, 1), ::Date.new(2015, 7, 15)])
+        expect(schedule.occurrences_between(::Date.new(2015, 7, 1), ::Date.new(2015, 7, 31))).to eq([::Date.new(2015, 7, 1), ::Date.new(2015, 7, 15)])
       end
 
       it 'for two months' do
-        expect(ice_cube_model.occurrences_between(::Date.new(2015, 7, 1), ::Date.new(2015, 8, 31))).to eq([::Date.new(2015, 7, 1), ::Date.new(2015, 7, 15), ::Date.new(2015, 8, 1), ::Date.new(2015, 8, 15)])
+        expect(schedule.occurrences_between(::Date.new(2015, 7, 1), ::Date.new(2015, 8, 31))).to eq([::Date.new(2015, 7, 1), ::Date.new(2015, 7, 15), ::Date.new(2015, 8, 1), ::Date.new(2015, 8, 15)])
       end
     end
 
     describe 'bi-monthly' do
-      let(:ice_cube_model) do
+      let(:schedule) do
         ::IceCube::Schedule.from_cron(
           ::Date.new(2015, 5, 1),
-          :repeat_day => '1',
-          :repeat_interval => '2'
+          :day_of_month => '1',
+          :repeat_interval => '2',
+          :hour => 0,
+          :minute => 0
         )
       end
 
       it 'for one month' do
-        expect(ice_cube_model.occurrences_between(::Date.new(2015, 7, 1), ::Date.new(2015, 7, 31))).to eq([::Date.new(2015, 7, 1)])
+        expect(schedule.occurrences_between(::Date.new(2015, 7, 1), ::Date.new(2015, 7, 31))).to eq([::Date.new(2015, 7, 1)])
       end
 
       it 'for multiple months' do
-        expect(ice_cube_model.occurrences_between(::Date.new(2015, 7, 1), ::Date.new(2015, 10, 31))).to eq([::Date.new(2015, 7, 1), ::Date.new(2015, 9, 1)])
+        expect(schedule.occurrences_between(::Date.new(2015, 7, 1), ::Date.new(2015, 10, 31))).to eq([::Date.new(2015, 7, 1), ::Date.new(2015, 9, 1)])
       end
     end
 
     describe 'every week' do
-      let(:ice_cube_model) do
+      let(:schedule) do
         ::IceCube::Schedule.from_cron(
           ::Date.new(2015, 7, 6),
-          :repeat_weekday => '1'
+          :day_of_week => '1',
+          :hour => 0,
+          :minute => 0
         )
       end
 
       it 'for one week' do
         expect(
-          ice_cube_model.occurrences_between(
+          schedule.occurrences_between(
             ::Date.new(2015, 7, 1),
             ::Date.new(2015, 7, 7)
           )
@@ -63,7 +67,7 @@ describe ::IceCubeCron do
 
       it 'for one month' do
         expect(
-          ice_cube_model.occurrences_between(
+          schedule.occurrences_between(
             ::Date.new(2015, 7, 1),
             ::Date.new(2015, 8, 31)
           )
@@ -84,17 +88,19 @@ describe ::IceCubeCron do
     end
 
     describe 'bi-weekly' do
-      let(:ice_cube_model) do
+      let(:schedule) do
         ::IceCube::Schedule.from_cron(
           ::Date.new(2015, 7, 6),
-          :repeat_weekday => '1',
-          :repeat_interval => '2'
+          :day_of_week => '1',
+          :repeat_interval => '2',
+          :hour => 0,
+          :minute => 0
         )
       end
 
       it 'for one week' do
         expect(
-          ice_cube_model.occurrences_between(
+          schedule.occurrences_between(
             ::Date.new(2015, 7, 1),
             ::Date.new(2015, 7, 7)
           )
@@ -103,7 +109,7 @@ describe ::IceCubeCron do
 
       it 'for two months' do
         expect(
-          ice_cube_model.occurrences_between(
+          schedule.occurrences_between(
             ::Date.new(2015, 7, 1),
             ::Date.new(2015, 8, 31)
           )
@@ -124,94 +130,107 @@ describe ::IceCubeCron do
     end
 
     describe 'annually' do
-      let(:ice_cube_model) do
+      let(:schedule) do
         ::IceCube::Schedule.from_cron(
           ::Date.new(2015, 1, 1),
-          :repeat_month => 2
+          :repeat_month => 2,
+          :day_of_month => 1,
+          :hour => 0,
+          :minute => 0
         )
       end
 
       it 'for one year' do
-        expect(ice_cube_model.occurrences_between(::Date.new(2015, 1, 1), ::Date.new(2015, 12, 31))).to eq([::Date.new(2015, 2, 1)])
+        expect(schedule.occurrences_between(::Date.new(2015, 1, 1), ::Date.new(2015, 12, 31))).to eq([::Date.new(2015, 2, 1)])
       end
 
       it 'for two years' do
-        expect(ice_cube_model.occurrences_between(::Date.new(2015, 1, 1), ::Date.new(2016, 12, 31))).to eq([::Date.new(2015, 2, 1), ::Date.new(2016, 2, 1)])
+        expect(schedule.occurrences_between(::Date.new(2015, 1, 1), ::Date.new(2016, 12, 31))).to eq([::Date.new(2015, 2, 1), ::Date.new(2016, 2, 1)])
       end
     end
 
     describe 'bi-annually' do
-      let(:ice_cube_model) do
+      let(:schedule) do
         ::IceCube::Schedule.from_cron(
           ::Date.new(2015, 1, 1),
           :repeat_interval => 2,
           :repeat_month => 2,
-          :repeat_day => 1
+          :day_of_month => 1,
+          :hour => 0,
+          :minute => 0
         )
       end
 
       it 'for two years' do
-        expect(ice_cube_model.occurrences_between(::Date.new(2015, 1, 1), ::Date.new(2016, 12, 31))).to eq([::Date.new(2015, 2, 1)])
+        expect(schedule.occurrences_between(::Date.new(2015, 1, 1), ::Date.new(2016, 12, 31))).to eq([::Date.new(2015, 2, 1)])
       end
     end
 
     describe 'last weekday of month' do
       context '31 day month' do
-        let(:ice_cube_model) do
+        let(:schedule) do
           ::IceCube::Schedule.from_cron(
             ::Date.new(2015, 1, 1),
-            :repeat_weekday => '5L'
+            :day_of_week => '5L',
+            :hour => 0,
+            :minute => 0
           )
         end
 
         it 'for one month' do
-          expect(ice_cube_model.occurrences_between(::Date.new(2015, 12, 1), ::Date.new(2015, 12, 31))).to eq([::Date.new(2015, 12, 25)])
+          expect(schedule.occurrences_between(::Date.new(2015, 12, 1), ::Date.new(2015, 12, 31))).to eq([::Date.new(2015, 12, 25)])
         end
       end
 
       context '29 day month' do
-        let(:ice_cube_model) do
+        let(:schedule) do
           ::IceCube::Schedule.from_cron(
             ::Date.new(2015, 1, 1),
-            :repeat_weekday => '3L'
+            :day_of_week => '3L',
+            :hour => 0,
+            :minute => 0
           )
         end
 
         it 'for one month' do
-          expect(ice_cube_model.occurrences_between(::Date.new(2016, 2, 1), ::Date.new(2016, 2, 29))).to eq([::Date.new(2016, 2, 24)])
+          expect(schedule.occurrences_between(::Date.new(2016, 2, 1), ::Date.new(2016, 2, 29))).to eq([::Date.new(2016, 2, 24)])
         end
       end
     end
 
     describe 'last day of month' do
       context '31 day month' do
-        let(:ice_cube_model) do
+        let(:schedule) do
           ::IceCube::Schedule.from_cron(
             ::Date.new(2015, 1, 1),
-            :repeat_day => 'L'
+            :day_of_month => 'L',
+            :hour => 0,
+            :minute => 0
           )
         end
 
         it 'for one multiple months' do
-          expect(ice_cube_model.occurrences_between(::Date.new(2015, 12, 1), ::Date.new(2016, 3, 1))).to eq([::Date.new(2015, 12, 31), ::Date.new(2016, 1, 31), ::Date.new(2016, 2, 29)])
+          expect(schedule.occurrences_between(::Date.new(2015, 12, 1), ::Date.new(2016, 3, 1))).to eq([::Date.new(2015, 12, 31), ::Date.new(2016, 1, 31), ::Date.new(2016, 2, 29)])
         end
       end
     end
 
     describe 'Nth day of week of month' do
-      let(:ice_cube_model) do
+      let(:schedule) do
         ::IceCube::Schedule.from_cron(
           ::Date.new(2015, 1, 1),
-          :repeat_weekday => '1#2'
+          :day_of_week => '1#2',
+          :hour => 0,
+          :minute => 0
         )
       end
 
       it 'for one month' do
-        expect(ice_cube_model.occurrences_between(::Date.new(2016, 2, 1), ::Date.new(2016, 2, 29))).to eq([::Date.new(2016, 2, 8)])
+        expect(schedule.occurrences_between(::Date.new(2016, 2, 1), ::Date.new(2016, 2, 29))).to eq([::Date.new(2016, 2, 8)])
       end
 
       it 'for mutiple months' do
-        expect(ice_cube_model.occurrences_between(::Date.new(2016, 2, 1), ::Date.new(2016, 4, 30))).to eq([::Date.new(2016, 2, 8), ::Date.new(2016, 3, 14), ::Date.new(2016, 4, 11)])
+        expect(schedule.occurrences_between(::Date.new(2016, 2, 1), ::Date.new(2016, 4, 30))).to eq([::Date.new(2016, 2, 8), ::Date.new(2016, 3, 14), ::Date.new(2016, 4, 11)])
       end
     end
 
@@ -219,8 +238,10 @@ describe ::IceCubeCron do
       let(:schedule) do
         ::IceCube::Schedule.from_cron(
           ::Date.new(2015, 1, 1),
-          :repeat_day => '1',
-          :repeat_until => ::Date.new(2015, 3, 1)
+          :day_of_month => '1',
+          :repeat_until => ::Date.new(2015, 3, 1),
+          :hour => 0,
+          :minute => 0
         )
       end
 
@@ -231,81 +252,118 @@ describe ::IceCubeCron do
 
     context 'year expression support (non-standard)' do
       context 'in month of a year' do
-        let(:ice_cube_model) do
+        let(:schedule) do
           ::IceCube::Schedule.from_cron(
             ::Date.new(2015, 1, 1),
             :year => '2015',
             :month => '6',
-            :day => '10'
+            :day_of_month => '10',
+            :hour => 0,
+            :minute => 0
           )
         end
 
         it '#occurrences_between' do
-          expect(ice_cube_model.occurrences_between(::Date.new(2013, 1, 1), ::Date.new(2017, 12, 31))).to eq([::Date.new(2015, 6, 10)])
+          expect(schedule.occurrences_between(::Date.new(2013, 1, 1), ::Date.new(2017, 12, 31))).to eq([::Date.new(2015, 6, 10)])
         end
 
         it '#to_s' do
-          expect(ice_cube_model.to_s).to eq('Yearly in 2015 in June on the 10th day of the month')
+          expect(schedule.to_s).to eq('Yearly in 2015 in June on the 10th day of the month')
         end
       end
 
       context 'in a month of multiple years' do
-        let(:ice_cube_model) do
+        let(:schedule) do
           ::IceCube::Schedule.from_cron(
             ::Date.new(2015, 1, 1),
             :year => '2015,2017',
             :month => '6',
-            :day => '10'
+            :day_of_month => '10',
+            :hour => 0,
+            :minute => 0
           )
         end
 
         it '#occurrences_between' do
-          expect(ice_cube_model.occurrences_between(::Date.new(2013, 1, 1), ::Date.new(2018, 12, 31))).to eq([::Date.new(2015, 6, 10), ::Date.new(2017, 6, 10)])
+          expect(schedule.occurrences_between(::Date.new(2013, 1, 1), ::Date.new(2018, 12, 31))).to eq([::Date.new(2015, 6, 10), ::Date.new(2017, 6, 10)])
         end
 
         it '#to_s' do
-          expect(ice_cube_model.to_s).to eq('Yearly in 2015 and 2017 in June on the 10th day of the month')
+          expect(schedule.to_s).to eq('Yearly in 2015 and 2017 in June on the 10th day of the month')
         end
       end
 
       context 'multiple days in month of a year' do
-        let(:ice_cube_model) do
+        let(:schedule) do
           ::IceCube::Schedule.from_cron(
             ::Date.new(2015, 1, 1),
             :year => '2015',
             :month => '6',
-            :day => '10,15'
+            :day_of_month => '10,15',
+            :hour => 0,
+            :minute => 0
           )
         end
 
         it '#occurrences_between' do
-          expect(ice_cube_model.occurrences_between(::Date.new(2013, 1, 1), ::Date.new(2017, 12, 31))).to eq([::Date.new(2015, 6, 10), ::Date.new(2015, 6, 15)])
+          expect(schedule.occurrences_between(::Date.new(2013, 1, 1), ::Date.new(2017, 12, 31))).to eq([::Date.new(2015, 6, 10), ::Date.new(2015, 6, 15)])
         end
 
         it '#to_s' do
-          expect(ice_cube_model.to_s).to eq('Yearly in 2015 in June on the 10th and 15th days of the month')
+          expect(schedule.to_s).to eq('Yearly in 2015 in June on the 10th and 15th days of the month')
         end
       end
     end
+
+    context 'every hour' do
+      let(:schedule) do
+        ::IceCube::Schedule.from_cron(
+          ::Date.new(2015, 1, 1),
+          :minute => '30'
+        )
+      end
+
+      it '#occurrences_between' do
+        expect(schedule.occurrences_between(::Time.new(2015, 1, 1, 0).utc, ::Time.new(2015, 1, 1, 1, 30).utc)).to eq([::Time.new(2015, 1, 1, 0, 30).utc, ::Time.new(2015, 1, 1, 1, 30).utc])
+      end
+    end
+
+    context 'every day' do
+      let(:schedule) do
+        ::IceCube::Schedule.from_cron(
+          ::Date.new(2015, 1, 1),
+          :hour => '1',
+          :minute => '30'
+        )
+      end
+
+      it '#occurrences_between' do
+        expect(schedule.occurrences_between(::Date.new(2015, 1, 1), ::Date.new(2015, 1, 3))).to eq([::Time.utc(2015, 1, 1, 1, 30), ::Time.utc(2015, 1, 2, 1, 30)])
+      end
+    end
   end
 
   context 'input types' do
     it 'handles ::DateTime as input' do
-      ice_cube_model = ::IceCube::Schedule.from_cron(
+      schedule = ::IceCube::Schedule.from_cron(
         ::DateTime.new(2015, 5, 1),
-        :repeat_day => '1',
-        :repeat_interval => '2'
+        :day_of_month => '1',
+        :repeat_interval => '2',
+        :hour => 0,
+        :minute => 0
       )
-      expect(ice_cube_model.occurrences_between(::Date.new(2015, 7, 1), ::Date.new(2015, 7, 31))).to eq([::Date.new(2015, 7, 1)])
+      expect(schedule.occurrences_between(::Date.new(2015, 7, 1), ::Date.new(2015, 7, 31))).to eq([::Date.new(2015, 7, 1)])
     end
 
     it 'handles integer (epoch) as input' do
-      ice_cube_model = ::IceCube::Schedule.from_cron(
+      schedule = ::IceCube::Schedule.from_cron(
         1_430_438_400, # Fri, 01 May 2015 00:00:00 GMT
-        :repeat_day => '1',
-        :repeat_interval => '2'
+        :day_of_month => '1',
+        :repeat_interval => '2',
+        :hour => 0,
+        :minute => 0
       )
-      expect(ice_cube_model.occurrences_between(::Date.new(2015, 7, 1), ::Date.new(2015, 7, 31))).to eq([::Date.new(2015, 7, 1)])
+      expect(schedule.occurrences_between(::Date.new(2015, 7, 1), ::Date.new(2015, 7, 31))).to eq([::Date.new(2015, 7, 1)])
     end
   end
 end