business_time 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa0158cf6f58b97d18d14f31f5e1fa969b880cd7
-  data.tar.gz: f7144c2f47e4ce925c19d661715212469f278245
+  metadata.gz: ec9aa7a308caa41ed4307f45ef8b798759b10a0c
+  data.tar.gz: 1430aa8263c16efb585414432230db3861472f55
 SHA512:
-  metadata.gz: 015f73637a4d3958b08442811e12552edfb68a251c6b5624e57ed46ec8fc923f48a70105d3082da292ada0c4fe3eeda590a8b228b038fde1c2e513411561d1d6
-  data.tar.gz: 7374e3d3c4264f29a5447408fb4932a2099af93b3e628a3f5a10a950ce27ea599fe624e3bd1158f564e66293e292177aadc6819e34db85a05a289c72568f72be
+  metadata.gz: 366fbc15803d7fab5a13ea85c485a62ad71c037de68322e3b662f9530ea1e261aecab5df46761391dcef13a3c408063b42633049f0aa70dc18832b5b4dab644b
+  data.tar.gz: 2c60d5bef66eaa83b38a70a8603c0b62f1a6ea1bb6ad562acfdb3714c8db6074c3c3248790bf26c86dd56b6f3729fe469bfb64b1bcc945f22d58eee1e117d7e3

data/lib/business_time/business_days.rb

@@ -17,7 +17,26 @@ module BusinessTime
     end
 
     def after(time = Time.current)
-      days = @days
+      positive_days? ? calculate_after(time, @days) : calculate_before(time, -@days)
+    end
+
+    alias_method :from_now, :after
+    alias_method :since, :after
+
+    def before(time = Time.current)
+      positive_days? ? calculate_before(time, @days) : calculate_after(time, -@days)
+    end
+
+    alias_method :ago, :before
+    alias_method :until, :before
+
+    private
+
+    def positive_days?
+      @days > 0
+    end
+
+    def calculate_after(time, days)
       while days > 0 || !time.workday?
         days -= 1 if time.workday?
         time += 1.day
@@ -30,11 +49,7 @@ module BusinessTime
       time
     end
 
-    alias_method :from_now, :after
-    alias_method :since, :after
-
-    def before(time = Time.current)
-      days = @days
+    def calculate_before(time, days)
       while days > 0 || !time.workday?
         days -= 1 if time.workday?
         time -= 1.day
@@ -48,8 +63,5 @@ module BusinessTime
       end
       time
     end
-
-    alias_method :ago, :before
-    alias_method :until, :before
   end
 end

data/lib/business_time/business_hours.rb

@@ -24,9 +24,24 @@ module BusinessTime
     end
 
     def after(time)
+      positive_hours? ? calculate_after(time, @hours) : calculate_before(time, -@hours)
+    end
+    alias_method :since, :after
+
+    def before(time)
+      positive_hours? ? calculate_before(time, @hours) : calculate_after(time, -@hours)
+    end
+
+    private
+
+    def positive_hours?
+      @hours > 0
+    end
+
+    def calculate_after(time, hours)
       after_time = Time.roll_forward(time)
       # Step through the hours, skipping over non-business hours
-      @hours.times do
+      hours.times do
         after_time = after_time + 1.hour
 
         if after_time.hour == 0 && after_time.min == 0 && after_time.sec == 0
@@ -44,12 +59,11 @@ module BusinessTime
       end
       after_time
     end
-    alias_method :since, :after
 
-    def before(time)
+    def calculate_before(time, hours)
       before_time = Time.roll_backward(time)
       # Step through the hours, skipping over non-business hours
-      @hours.times do
+      hours.times do
         before_time = before_time - 1.hour
 
         if before_time.hour == 0 && before_time.min == 0 && before_time.sec == 0

data/lib/business_time/time_extensions.rb

@@ -169,5 +169,30 @@ module BusinessTime
     def during_business_hours?
       self.workday? && self.to_i.between?(Time.beginning_of_workday(self).to_i, Time.end_of_workday(self).to_i)
     end
+
+    def consecutive_workdays
+      workday? ? consecutive_days { |date| date.workday? } : []
+    end
+
+    def consecutive_non_working_days
+      !workday? ? consecutive_days { |date| !date.workday? } : []
+    end
+
+    private
+
+    def consecutive_days
+      days = []
+      date = self + 1.day
+      while yield(date)
+        days << date
+        date += 1.day
+      end
+      date = self - 1.day
+      while yield(date)
+        days << date
+        date -= 1.day
+      end
+      (days << self).sort
+    end
   end
 end

data/lib/business_time/version.rb

@@ -1,3 +1,3 @@
 module BusinessTime
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: business_time
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - bokmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-04 00:00:00.000000000 Z
+date: 2017-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.8
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.8
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement