gb_work_day 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06c47230ed0b62eaf183e73881b2e8f516435470a500b1ce703f96cbcf71f414
-  data.tar.gz: 055b42d77c11caa155c821bc40662a39d2dca5b13e3e005750e69c0964b395a4
+  metadata.gz: 8697f8e4fc6efcec8b7cc8c32438fc50aa31b856fe44324db026aa1495183855
+  data.tar.gz: cf1e314b7734ac52c2e220f9f64f46ec63dddfb51d40a0b5452668f7595b6c52
 SHA512:
-  metadata.gz: 9bd9bb5b0d0d22b4960a109772619edf1600c515d7ec22282664a1ae5292b675a4616d31d1da57c01d0407926b0fc5295217b833c0dae3cb2bf1974a5a00446e
-  data.tar.gz: c08aed54bbd3c851a9ac0793a1faed0f242add8f61263e06c94e5817200cf1b1b8eb696da4983aa6cbb24e1aa0d163c5a88939631bb10569e478ccf2edcb88b5
+  metadata.gz: c8f789b355a2b07c5209adace10deab9166ce766bced2f27e7dd7462deb75db0b5cc570da46f3b0b3c84dc61104f78441ca35e5588e273935182d8115dac4f55
+  data.tar.gz: f151498882f8a5e4cd1e148d8ad50a2ac27e97ecab483e0ac070f067e744a242a43e5e94276aaf3c4bdb6bc93f747fb6d685910bb4b231ce27c3cf071d8ee3d5

data/lib/gb_work_day/core_ext/date.rb

@@ -25,48 +25,40 @@ class Date
 
   # Check if it is a work day.
   # @return [boolean]
-  def work?
-    default_week.work_day? self
+  def work?(week = default_week)
+    week.work_day? self
   end
 
   # Check if it is a work day.
   # @return [boolean]
-  def free?
-    default_week.free_day? self
+  def free?(week = default_week)
+    week.free_day? self
   end
 
   # Return next working day
   # @return [Time]
-  def next_work_day
-    if default_week.free_day? self
-      next_day = self
-      while default_week.free_day? next_day
-        next_day += 1
-      end
-      next_day
+  def next_work_day(week = default_week)
+    if week.free_day? self
+      self.beginning_of_week + 7.days
     else
-      self + GBWorkDay::Duration.new(1, default_week)
+      self + GBWorkDay::Duration.new(1, week)
     end
   end
 
   # Return previous working day
   # @return [Time]
-  def previous_work_day
-    if default_week.free_day? self
-      previous_day = self
-      while default_week.free_day? previous_day
-        previous_day -= 1
-      end
-      previous_day
+  def previous_work_day(week = default_week)
+    if week.free_day? self
+      next_work_day(week) - (week.free_days_per_week + 1).days
     else
-      self - GBWorkDay::Duration.new(1, default_week)
+      self - GBWorkDay::Duration.new(1, week)
     end
   end
 
   # Get date object for calculating working days
   #
   # @param week [GBWorkDay::WorkWeek] if not set, it will use week set globally. For more check {GBWorkingDay::WorkWeek#current}
-  def work_date(week=nil)
+  def work_date(week = nil)
     GBWorkDay::Date.from_date self, week
   end
   alias_method :to_work, :work_date

data/lib/gb_work_day/core_ext/time.rb

@@ -26,34 +26,40 @@ class Time
 
   # Check if it is a work day.
   # @return [boolean]
-  def work?
-    default_week.work_day? self
+  def work?(week = default_week)
+    week.work_day? self
   end
 
   # Check if it is a work day.
   # @return [boolean]
-  def free?
-    default_week.free_day? self
+  def free?(week = default_week)
+    week.free_day? self
   end
 
   # Return next working day
   # @return [Time]
-  def next_work_day
-    if default_week.free_day? self
-      next_day = self
-      while default_week.free_day? next_day
-        next_day += GBWorkDay::Duration::SEC_IN_DAY
-      end
-      next_day
+  def next_work_day(week = default_week)
+    if week.free_day? self
+      self.beginning_of_week + 7.days
     else
-      self + GBWorkDay::Duration.new(1, default_week)
+      self + GBWorkDay::Duration.new(1, week)
+    end
+  end
+
+  # Return previous working day
+  # @return [Time]
+  def previous_work_day(week = default_week)
+    if week.free_day? self
+      next_work_day(week) - (week.free_days_per_week + 1).days
+    else
+      self - GBWorkDay::Duration.new(1, week)
     end
   end
 
   # Get time object for calculating working days
   #
   # @param week [GBWorkDay::WorkWeek] if not set, it will use week set globally. For more check {GBWorkingDay::WorkWeek#current}
-  def work_time(week=nil)
+  def work_time(week = nil)
     GBWorkDay::Time.from_time self, week
   end
   alias_method :to_work, :work_time

data/lib/gb_work_day/duration.rb

@@ -73,6 +73,7 @@ module GBWorkDay
 
     # Calculates a new Time or Date that is as far in the future
     # as this Duration represents.
+    # If time is a free day, it is calculated starting from the next work day
     def since(time = ::Time.current)
       self.work_days > 0 ? sum(time) : subtract(time)
     end
@@ -80,6 +81,7 @@ module GBWorkDay
 
     # Calculates a new Time or Date that is as far in the past
     # as this Duration represents.
+    # Time has to be a work day, it is calculated starting from the next work day
     def ago(time = ::Time.current)
       self.work_days > 0 ? subtract(time) : sum(time)
     end
@@ -92,6 +94,7 @@ module GBWorkDay
     private
 
     def sum(time)
+      time = next_work_day time
       distance_to_last_monday = (time.wday - 1) % 7
       weekends_count = (distance_to_last_monday + self.work_days.abs) / @week.work_days_per_week
       weekends_length = weekends_count * @week.free_days_per_week
@@ -100,6 +103,7 @@ module GBWorkDay
     end
 
     def subtract(time)
+      time = next_work_day time
       distance_to_eof = distance_to_end_of_week(time)
       weekends_count = (distance_to_eof + self.work_days.abs) / @week.work_days_per_week
       weekends_length = weekends_count * @week.free_days_per_week
@@ -107,21 +111,31 @@ module GBWorkDay
       sum_normal_days(sum_normal_days(time, -weekends_length), -self.work_days.abs)
     end
 
-    # @param time [Date|Time]
+    # @param time [Date, Time]
     # @return distance_to_eof [Integer]
     def distance_to_end_of_week(time)
       (@week.work_days_per_week - time.wday) % (@week.work_days_per_week)
     end
 
-    # @param time [Date|Time]
-    # @param days [Integer]
-    def sum_normal_days(time, days)
-      if time.is_a? ::Date
-        time += days * 1
+    # Return next working day, or today if today is a working day
+    # @param day [Date, Time]
+    # @return [Date, Time]
+    def next_work_day(day)
+      if @week.free_day? day
+        day.next_work_day(@week)
       else
-        time += (days * SEC_IN_DAY)
+        day
       end
-      time
+    end
+
+    # @param time [Date, Time]
+    # @param days [Integer]
+    def sum_normal_days(time, days)
+      time + if time.is_a? ::Date
+               days * 1
+             else
+               (days * SEC_IN_DAY)
+             end
     end
   end
 end

data/lib/gb_work_day/interval.rb

@@ -1,5 +1,8 @@
 require 'gb_work_day/work_week'
 require 'gb_work_day/duration'
+require 'gb_work_day/core_ext/date'
+require 'gb_work_day/core_ext/integer'
+
 module GBWorkDay
   class Interval
     attr_reader :start_time, :end_time
@@ -8,31 +11,37 @@ module GBWorkDay
     # @param end_time [Time, Date]
     # @param params [Hash]
     # @option params [Fixnum] :work_days number of work days in a week, default is 7
-    # @option params [Fixnum] :week_start first working day in a week as number. Default value is 1 corresponding to Monday.
-    def initialize(start_time, end_time, params=Hash.new)
+    def initialize(start_time, end_time, params = Hash.new)
       @start_time = start_time
       @end_time = end_time
       @symbol = 1
       revert if @start_time > @end_time
       @working_week = params[:week]
       unless @working_week
-        if params[:work_days] || params[:week_start]
+        if params[:work_days]
           work_days = params.fetch(:work_days, 7)
-          week_start = params.fetch(:week_start, 1)
-          @working_week = WorkWeek.new work_days, week_start
+          @working_week = WorkWeek.new work_days
         else
           @working_week = WorkWeek.current
         end
       end
+      @work_start_time = next_work_day @start_time
+      @work_end_time = next_work_day @end_time
     end
 
     # @return [Integer] Number of working days in a given period
     def work_days
-      date = @start_time
-      work_days = 0
-      while date < end_time
-        work_days += 1 if @working_week.work_day?(date)
-        date += 1.day
+      if @working_week.work_days_per_week == 7
+        work_days = end_time.minus_without_work_duration(start_time).to_i
+      else
+        monday_before_start = @work_start_time.beginning_of_week
+        monday_before_end   = @work_end_time.beginning_of_week
+
+        full_week_days = monday_before_end.minus_without_work_duration(monday_before_start).to_i
+        days_without_weekends = full_week_days - (full_week_days / 7) * @working_week.free_days_per_week
+        partial_week_days = @work_end_time.wday - @work_start_time.wday
+
+        work_days = days_without_weekends + partial_week_days
       end
       Duration.new(work_days * @symbol, @working_week)
     end
@@ -49,7 +58,18 @@ module GBWorkDay
       new_end_time = @start_time
       @start_time = @end_time
       @end_time = new_end_time
-      @symbol= @symbol * -1
+      @symbol *= -1
+    end
+
+    # Return next working day, or today if today is a working day
+    # @param day [Date, Time]
+    # @return [Date, Time]
+    def next_work_day(day)
+      if @working_week.free_day? day
+        day.next_work_day(@working_week)
+      else
+        day
+      end
     end
   end
 end

data/lib/gb_work_day/version.rb

@@ -1,3 +1,3 @@
 module GBWorkDay
-  VERSION = '0.0.6'
+  VERSION = '0.1.0'
 end

data/lib/gb_work_day/work_week.rb

@@ -1,15 +1,14 @@
 module GBWorkDay
   class WorkWeek
-    attr_reader :work_days_per_week, :free_days_per_week, :work_days, :free_days, :week_start
+    attr_reader :work_days_per_week, :free_days_per_week, :work_days, :free_days
 
     # @param work_days [#to_i] Amount of working days in a week. Default value is 7.
-    # @param week_start [#to_i] Number of a week day, when work starts. Default value is 1 corresponding to Monday
-    def initialize(work_days=7, week_start=1)
+    def initialize(work_days = 7)
       work_days = work_days.to_i
-      week_start = week_start.to_i
+      week_start = 1
       raise ArgumentError, 'Work days have to be between 0 and 7!' unless work_days >= 0 && work_days <= 7
       @work_days_per_week = work_days
-      @week_start = week_start % 7
+      @week_start = week_start
       @free_days_per_week = 7 - @work_days_per_week
       @work_days = []
       @work_days_per_week.times do
@@ -38,11 +37,11 @@ module GBWorkDay
     end
 
     def ==(other) # :nodoc:
-      work_days_per_week == other.work_days_per_week && week_start == other.week_start
+      work_days_per_week == other.work_days_per_week
     end
 
     def eql?(other) # :nodoc:
-      work_days_per_week.eql?(other.work_days_per_week) && week_start.eql?(other.week_start)
+      work_days_per_week.eql?(other.work_days_per_week)
     end
 
     class << self

data/spec/duration_spec.rb

@@ -34,10 +34,6 @@ describe GBWorkDay::Duration do
     expect(GBWorkDay::Duration.new(1) == 1).to be_truthy
     expect(GBWorkDay::Duration.new(1) == 2).to be_falsey
 
-    week = GBWorkDay::WorkWeek.new(3, 3)
-    expect(GBWorkDay::Duration.new(1, week) == GBWorkDay::Duration.new(1)).to be_falsey
-    expect(GBWorkDay::Duration.new(1, week) == GBWorkDay::Duration.new(2)).to be_falsey
-
     expect(GBWorkDay::Duration.new(1).eql? GBWorkDay::Duration.new(1)).to be_truthy
     expect(GBWorkDay::Duration.new(1).eql? GBWorkDay::Duration.new(2)).to be_falsey
   end
@@ -57,7 +53,7 @@ describe GBWorkDay::Duration do
   end
 
   it 'should calculate proper time for future' do
-    week = GBWorkDay::WorkWeek.new(5, 1)
+    week = GBWorkDay::WorkWeek.new(5)
     monday = Time.now.beginning_of_week
 
     expect(GBWorkDay::Duration.new(1, week).since(monday)).to eq monday + 1.day
@@ -69,7 +65,7 @@ describe GBWorkDay::Duration do
   end
 
   it 'should calculate proper date for future' do
-    week = GBWorkDay::WorkWeek.new(5, 1)
+    week = GBWorkDay::WorkWeek.new(5)
     monday = Date.today.beginning_of_week
 
     expect(GBWorkDay::Duration.new(1, week).since(monday)).to eq monday + 1.day
@@ -81,7 +77,7 @@ describe GBWorkDay::Duration do
   end
 
   it 'should calculate proper time for past' do
-    week = GBWorkDay::WorkWeek.new(5, 1)
+    week = GBWorkDay::WorkWeek.new(5)
     monday = Time.now.beginning_of_week
 
     expect(GBWorkDay::Duration.new(1, week).until(monday)).to eq monday - 3.days
@@ -92,7 +88,7 @@ describe GBWorkDay::Duration do
   end
 
   it 'should calculate proper date for past' do
-    week = GBWorkDay::WorkWeek.new(5, 1)
+    week = GBWorkDay::WorkWeek.new(5)
     monday = Date.today.beginning_of_week
 
     expect(GBWorkDay::Duration.new(1, week).until(monday)).to eq monday - 3.days

data/spec/interval_spec.rb

@@ -4,7 +4,7 @@ require 'active_support/time'
 
 
 describe GBWorkDay::Interval do
-  it 'properly calculate work days for interval' do
+  it 'properly calculates work days for interval for a 5 days week' do
     week = GBWorkDay::WorkWeek.new(5)
     monday = Date.today.beginning_of_week
     expect(GBWorkDay::Interval.new(monday - 1.day, monday, week: week).duration.work_days).to eq 0
@@ -16,4 +16,26 @@ describe GBWorkDay::Interval do
     expect(GBWorkDay::Interval.new(monday, monday + 12.day, week: week).duration.work_days).to eq 10
     expect(GBWorkDay::Interval.new(monday, monday + 14.day, week: week).duration.work_days).to eq 10
   end
+
+  it 'properly calculates work days for interval for a 6 days week' do
+    week = GBWorkDay::WorkWeek.new(6)
+    monday = Date.today.beginning_of_week
+    expect(GBWorkDay::Interval.new(monday - 1.day, monday, week: week).duration.work_days).to eq 0
+    expect(GBWorkDay::Interval.new(monday - 2.day, monday, week: week).duration.work_days).to eq 1
+    expect(GBWorkDay::Interval.new(monday, monday + 1.day, week: week).duration.work_days).to eq 1
+    expect(GBWorkDay::Interval.new(monday, monday + 6.day, week: week).duration.work_days).to eq 6
+    expect(GBWorkDay::Interval.new(monday, monday + 7.day, week: week).duration.work_days).to eq 6
+    expect(GBWorkDay::Interval.new(monday, monday + 12.day, week: week).duration.work_days).to eq 11
+  end
+
+  it 'properly calculates work days for interval for a 7 days week' do
+    week = GBWorkDay::WorkWeek.new(7)
+    monday = Date.today.beginning_of_week
+    expect(GBWorkDay::Interval.new(monday - 1.day, monday, week: week).duration.work_days).to eq 1
+    expect(GBWorkDay::Interval.new(monday - 2.day, monday, week: week).duration.work_days).to eq 2
+    expect(GBWorkDay::Interval.new(monday, monday + 1.day, week: week).duration.work_days).to eq 1
+    expect(GBWorkDay::Interval.new(monday, monday + 6.day, week: week).duration.work_days).to eq 6
+    expect(GBWorkDay::Interval.new(monday, monday + 7.day, week: week).duration.work_days).to eq 7
+    expect(GBWorkDay::Interval.new(monday, monday + 12.day, week: week).duration.work_days).to eq 12
+  end
 end

data/spec/work_week_spec.rb

@@ -6,65 +6,29 @@ describe GBWorkDay::WorkWeek do
 
   context 'work days' do
     it 'should calculates work days for 7 days work and start on monday' do
-      week = GBWorkDay::WorkWeek.new(7, 1)
+      week = GBWorkDay::WorkWeek.new(7)
       expect(week.work_days).to eq [1,2,3,4,5,6,7]
     end
-
-    it 'should calculates work days for 7 days work and start on tuesday' do
-      week = GBWorkDay::WorkWeek.new(7, 2)
-      expect(week.work_days).to eq [1,2,3,4,5,6,7]
-    end
-
     it 'should calculates work days for 5 days work week and start on monday' do
-      week = GBWorkDay::WorkWeek.new(5, 1)
+      week = GBWorkDay::WorkWeek.new(5)
       expect(week.work_days).to eq [1,2,3,4,5]
     end
-
-    it 'should calculates work days for 5 days work week and start on tuesday' do
-      week = GBWorkDay::WorkWeek.new(5, 2)
-      expect(week.work_days).to eq [2,3,4,5,6]
-    end
-
-    it 'should calculates work days for 5 days work week and start on thursday' do
-      week = GBWorkDay::WorkWeek.new(5, 4)
-      expect(week.work_days).to eq [1,4,5,6,7]
-    end
-
-    it 'should calculates work days for 3 days work week and start on wednesday' do
-      week = GBWorkDay::WorkWeek.new(3, 3)
-      expect(week.work_days).to eq [3,4,5]
-    end
   end
 
   context 'free days' do
-    it 'should calculates free days for 7 days work and start on any day' do
-      week = GBWorkDay::WorkWeek.new(7, rand(6)+1)
+    it 'should calculates free days for 7 days work' do
+      week = GBWorkDay::WorkWeek.new(7)
       expect(week.free_days).to eq []
     end
 
     it 'should calculates free days for 5 days work week and start on monday' do
-      week = GBWorkDay::WorkWeek.new(5, 1)
+      week = GBWorkDay::WorkWeek.new(5)
       expect(week.free_days).to eq [6,7]
     end
-
-    it 'should calculates work days for 5 days work week and start on tuesday' do
-      week = GBWorkDay::WorkWeek.new(5, 2)
-      expect(week.free_days).to eq [1,7]
-    end
-
-    it 'should calculates work days for 5 days work week and start on thursday' do
-      week = GBWorkDay::WorkWeek.new(5, 4)
-      expect(week.free_days).to eq [2,3]
-    end
-
-    it 'should calculates work days for 3 days work week and start on wednesday' do
-      week = GBWorkDay::WorkWeek.new(3, 3)
-      expect(week.free_days).to eq [1,2,6,7]
-    end
   end
 
   it 'should respond to work_day? if day is a Time' do
-    week = GBWorkDay::WorkWeek.new(5, 1)
+    week = GBWorkDay::WorkWeek.new(5)
     expect(week.work_days).to eq [1,2,3,4,5]
     monday = Time.now.beginning_of_week
 
@@ -79,7 +43,7 @@ describe GBWorkDay::WorkWeek do
   end
 
   it 'should respond to work_day? if day is a Date' do
-    week = GBWorkDay::WorkWeek.new(5, 1)
+    week = GBWorkDay::WorkWeek.new(5)
     expect(week.work_days).to eq [1,2,3,4,5]
     monday = Date.today.beginning_of_week
 
@@ -93,7 +57,7 @@ describe GBWorkDay::WorkWeek do
   end
 
   it 'should respond to free_day? if day is a Time' do
-    week = GBWorkDay::WorkWeek.new(5, 1)
+    week = GBWorkDay::WorkWeek.new(5)
     expect(week.free_days).to eq [6,7]
     monday = Time.now.beginning_of_week
 
@@ -107,7 +71,7 @@ describe GBWorkDay::WorkWeek do
   end
 
   it 'should respond to free_day? if day is a Date' do
-    week = GBWorkDay::WorkWeek.new(5, 1)
+    week = GBWorkDay::WorkWeek.new(5)
     expect(week.free_days).to eq [6,7]
     monday = Date.today.beginning_of_week
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gb_work_day
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Kacper Kawecki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2019-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler