add rollback in past and substraction

Author: jarthod

Rakefile

@@ -4,3 +4,8 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
+
+desc "Open an irb session preloaded with working_hours"
+task :console do
+  sh "irb -rubygems -I lib -r working_hours.rb"
+end

lib/working_hours.rb

@@ -5,6 +5,5 @@
 require "working_hours/core_ext/fixnum"
 
 module WorkingHours
-  UnknownDuration = Class.new StandardError
   InvalidConfiguration = Class.new StandardError
 end

lib/working_hours/computation.rb

@@ -40,12 +40,27 @@ def add_seconds origin, seconds
           end
         end
       end
+      while seconds < 0
+        # roll to previous business period
+        time = return_to_working_time(time)
+        # look at working ranges
+        time_in_day = time.seconds_since_midnight
+        config[:working_hours][time.wday].reverse_each do |from, to|
+          if time_in_day > from and time_in_day <= to
+            # take all we can
+            take = [time_in_day - from, -seconds].min
+            # advance time
+            time -= take
+            # decrease seconds
+            seconds += take
+          end
+        end
+      end
       convert_to_original_format time, origin
     end
 
     def advance_to_working_time time
       time = in_config_zone(time)
-      return time if in_working_hours? time
       loop do
         # skip holidays and weekends
         while not working_day?(time)
@@ -54,13 +69,33 @@ def advance_to_working_time time
         # find first working range after time
         time_in_day = time.seconds_since_midnight
         (Config.precompiled[:working_hours][time.wday] || {}).each do |from, to|
+          return time if time_in_day >= from and time_in_day < to
           return time + (from - time_in_day) if from >= time_in_day
         end
         # if none is found, go to next day and loop
         time = (time + 1.day).beginning_of_day
       end
     end
 
+    def return_to_working_time time
+      time = in_config_zone(time)
+      loop do
+        # skip holidays and weekends
+        while not working_day?(time)
+          time = (time - 1.day).end_of_day
+        end
+        # find last working range before time
+        time_in_day = time.seconds_since_midnight
+        (Config.precompiled[:working_hours][time.wday] || {}).reverse_each do |from, to|
+          # round is used to suppress miliseconds hack from `end_of_day`
+          return time.round if time_in_day > from and time_in_day <= to
+          return (time - (time_in_day - to)).round if to <= time_in_day
+        end
+        # if none is found, go to previous day and loop
+        time = (time - 1.day).end_of_day
+      end
+    end
+
     def working_day? time
       time = in_config_zone(time)
       Config.precompiled[:working_hours][time.wday].present? and not Config.precompiled[:holidays].include?(time.to_date)

lib/working_hours/duration.rb

@@ -10,11 +10,24 @@ class Duration
     SUPPORTED_KINDS = [:days, :hours, :minutes, :seconds]
 
     def initialize(value, kind)
-      raise WorkingHours::UnknownDuration unless SUPPORTED_KINDS.include?(kind)
+      raise ArgumentError.new("Invalid working time unit: #{kind}") unless SUPPORTED_KINDS.include?(kind)
       @value = value
       @kind = kind
     end
 
+    def -@
+      Duration.new(-value, kind)
+    end
+
+    def ==(other)
+      self.class == other.class and kind == other.kind and value == other.value
+    end
+    alias :eql? :==
+
+    def hash
+      [self.class, kind, value].hash
+    end
+
     def +(other)
       unless other.respond_to?(:in_time_zone)
         raise TypeError.new("Can't convert #{other.class} to a time")
@@ -26,5 +39,9 @@ def from_now
       self + Time.now
     end
 
+    def ago
+      (-self) + Time.now
+    end
+
   end
 end

spec/working_hours/computation_spec.rb

@@ -59,6 +59,11 @@
       expect(add_hours(time, 2)).to eq(Time.utc(1991, 11, 15, 16, 00, 42))
     end
 
+    it 'can substract working hours' do
+      time = Time.utc(1991, 11, 18, 14, 00, 42) # Monday
+      expect(add_hours(time, -7)).to eq(Time.utc(1991, 11, 15, 15, 00, 42)) # Friday
+    end
+
     it 'accepts time given from any time zone' do
       time = Time.utc(1991, 11, 15, 7, 0, 0) # Friday 7 am UTC
       WorkingHours::Config.time_zone = 'Tokyo' # But we are at tokyo, so it's already 4 pm
@@ -119,6 +124,38 @@
     end
   end
 
+  describe '.return_to_working_time' do
+    it 'jumps non-working day' do
+      WorkingHours::Config.holidays = [Date.new(2014, 5, 1)]
+      expect(return_to_working_time(Time.utc(2014, 5, 1, 12, 0))).to eq(Time.utc(2014, 4, 30, 17))
+      expect(return_to_working_time(Time.utc(2014, 6, 1, 12, 0))).to eq(Time.utc(2014, 5, 30, 17))
+    end
+
+    it 'returns self during working hours' do
+      expect(return_to_working_time(Time.utc(2014, 4, 7, 9, 1))).to eq(Time.utc(2014, 4, 7, 9, 1))
+      expect(return_to_working_time(Time.utc(2014, 4, 7, 17, 0))).to eq(Time.utc(2014, 4, 7, 17, 0))
+    end
+
+    it 'jumps outside working hours' do
+      expect(return_to_working_time(Time.utc(2014, 4, 7, 17, 1))).to eq(Time.utc(2014, 4, 7, 17, 0))
+      expect(return_to_working_time(Time.utc(2014, 4, 8, 9, 0))).to eq(Time.utc(2014, 4, 7, 17, 0))
+    end
+
+    it 'move between timespans' do
+      WorkingHours::Config.working_hours = {mon: {'07:00' => '12:00', '13:00' => '18:00'}}
+      expect(return_to_working_time(Time.utc(2014, 4, 7, 13, 1))).to eq(Time.utc(2014, 4, 7, 13, 1))
+      expect(return_to_working_time(Time.utc(2014, 4, 7, 13, 0))).to eq(Time.utc(2014, 4, 7, 12, 0))
+      expect(return_to_working_time(Time.utc(2014, 4, 7, 12, 1))).to eq(Time.utc(2014, 4, 7, 12, 0))
+      expect(return_to_working_time(Time.utc(2014, 4, 7, 12, 0))).to eq(Time.utc(2014, 4, 7, 12, 0))
+    end
+
+    it 'works with any input timezone (converts to config)' do
+      # Monday 1 am (-09:00) is 10am in UTC time, working time!
+      expect(return_to_working_time(Time.new(2014, 4, 7, 1, 0, 0 , "-09:00"))).to eq(Time.utc(2014, 4, 7, 10))
+      expect(return_to_working_time(Time.new(2014, 4, 7, 22, 0, 0 , "+02:00"))).to eq(Time.utc(2014, 4, 7, 17))
+    end
+  end
+
   describe '.working_day?' do
     it 'returns true on working day' do
       expect(working_day?(Date.new(2014, 4, 7))).to be(true)

spec/working_hours/duration_spec.rb

@@ -32,12 +32,15 @@
     it 'should not work with anything else' do
       expect {
         duration = WorkingHours::Duration.new(42, :foo)
-      }.to raise_error WorkingHours::UnknownDuration
+      }.to raise_error ArgumentError, "Invalid working time unit: foo"
     end
   end
 
-  describe 'substraction' do
-    pending
+  describe '#-@' do
+    it 'inverses value' do
+      expect(-2.working.days).to eq(WorkingHours::Duration.new(-2, :days))
+      expect(-(-1.working.hour)).to eq(WorkingHours::Duration.new(1, :hours))
+    end
   end
 
   describe '#from_now' do
@@ -48,7 +51,10 @@
   end
 
   describe '#ago' do
-    pending
+    it "performs substraction with Time.now" do
+      Timecop.freeze(Time.utc(1991, 11, 15, 21)) # we are Friday 21 pm UTC
+      expect(7.working.day.ago).to eq(Time.utc(1991, 11, 6, 21))
+    end
   end
 
 end