biz 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3467afd950542680b2be1e34d7810a643f482e993bde21c63f972612885138d5
-  data.tar.gz: 195dc3df994b9a964b5682d6ed6b5174ce78b803ffa6a45a44034d33c0fc7f17
+  metadata.gz: 78100d6bedcc407d7fd7f9d740963d7484e4bc2e211bb4f3d3b2ed8d30e2e85d
+  data.tar.gz: e2a72d2cf20cc430aab2db269d48e025c208da15b54d55afb2c00b08380fb925
 SHA512:
-  metadata.gz: 64f7b5fbedb898d6237edb853d80656cd7d511aa8bc91593fc8e2c181726a83675f3e2276231d92198118b9ab9189520f13981dda05192dc2bc1c155a6d79fde
-  data.tar.gz: eb583811538b0f27a5b78ba65db35c2c724110c7de99fa005f1593f1c5f654a9fdf1ce18b8addd062ffcc795a01f2b632307ba94588f763c283380dd36c7f0d5
+  metadata.gz: '0051858f8326ad8a583f98a791babe88999f290fffcf6a8640b345ece04f65b0cab6da496433d7be226e965657234a1bc3375c87f12c5157229fb230b82bbcae'
+  data.tar.gz: 3c2ddad60473deb1a4da239bf0092af9326e08b4a092150c45ca59c4648684250e0b112be09669399482c48f9753518f484fb34b6cdf3e81fcf1a083e60fdce8

data/README.md

@@ -341,7 +341,7 @@ To open a console with the gem and sample schedule loaded:
 
 ## Copyright and license
 
-Copyright 2015-18 Zendesk
+Copyright 2015-19 Zendesk
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use
 this gem except in compliance with the License.

data/lib/biz/calculation/for_duration.rb

@@ -25,14 +25,10 @@ module Biz
       def self.time_class
         Class.new(self) do
           def before(time)
-            return moment_before(time) if scalar.zero?
-
             advanced_periods(:before, time).last.start_time
           end
 
           def after(time)
-            return moment_after(time) if scalar.zero?
-
             advanced_periods(:after, time).last.end_time
           end
 
@@ -52,31 +48,34 @@ module Biz
       def self.day_class
         Class.new(self) do
           def before(time)
-            return moment_before(time) if scalar.zero?
-
             periods(:before, time).first.end_time
           end
 
           def after(time)
-            return moment_after(time) if scalar.zero?
-
             periods(:after, time).first.start_time
           end
 
           private
 
           def periods(direction, time)
-            schedule.periods.public_send(
-              direction,
-              advanced_time(direction, schedule.in_zone.local(time))
-            )
+            schedule
+              .periods
+              .public_send(
+                direction,
+                advanced_time(direction, schedule.in_zone.local(time))
+              )
           end
 
           def advanced_time(direction, time)
-            schedule.in_zone.on_date(
-              schedule.dates.days(scalar).public_send(direction, time),
-              DayTime.from_time(time)
-            )
+            schedule
+              .in_zone
+              .on_date(
+                schedule
+                  .dates
+                  .days(scalar)
+                  .public_send(direction, time.to_date),
+                DayTime.from_time(time)
+              )
           end
         end
       end
@@ -100,14 +99,6 @@ module Biz
         self.class.unit
       end
 
-      def moment_before(time)
-        schedule.periods.before(time).first.end_time
-      end
-
-      def moment_after(time)
-        schedule.periods.after(time).first.start_time
-      end
-
       [
         *%i[second seconds minute minutes hour hours].map { |unit|
           const_set(unit.to_s.capitalize, time_class)

data/lib/biz/day_time.rb

@@ -7,7 +7,8 @@ module Biz
 
     module Timestamp
       FORMAT  = '%02d:%02d'
-      PATTERN = /\A(?<hour>\d{2}):(?<minute>\d{2})(:?(?<second>\d{2}))?\Z/
+      PATTERN =
+        /\A(?<hour>\d{2}):(?<minute>\d{2})(:?(?<second>\d{2}))?\Z/.freeze
     end
 
     include Comparable

data/lib/biz/periods/abstract.rb

@@ -26,11 +26,10 @@ module Biz
       def periods
         Linear.new(week_periods, shifts, selector)
           .lazy
-          .select   { |period| relevant?(period) }
-          .map      { |period| period & boundary }
+          .map { |period| period & boundary }
+          .reject(&:disjoint?)
           .flat_map { |period| active_periods(period) }
           .reject   { |period| on_holiday?(period) }
-          .reject(&:empty?)
       end
 
       def week_periods

data/lib/biz/periods/after.rb

@@ -29,10 +29,6 @@ module Biz
         )
       end
 
-      def relevant?(period)
-        origin < period.end_time
-      end
-
     end
   end
 end

data/lib/biz/periods/before.rb

@@ -28,10 +28,6 @@ module Biz
           .downto(Week.since_epoch(Time.big_bang))
       end
 
-      def relevant?(period)
-        origin > period.start_time
-      end
-
       def active_periods(*)
         super.reverse
       end

data/lib/biz/time_segment.rb

@@ -24,7 +24,7 @@ module Biz
                 :date
 
     def duration
-      Duration.new(end_time - start_time)
+      Duration.new([end_time - start_time, 0].max)
     end
 
     def endpoints
@@ -32,7 +32,11 @@ module Biz
     end
 
     def empty?
-      start_time >= end_time
+      start_time == end_time
+    end
+
+    def disjoint?
+      start_time > end_time
     end
 
     def contains?(time)
@@ -40,17 +44,17 @@ module Biz
     end
 
     def &(other)
-      lower_bound = [self, other].map(&:start_time).max
-      upper_bound = [self, other].map(&:end_time).min
-
-      self.class.new(lower_bound, [lower_bound, upper_bound].max)
+      self.class.new(
+        [self, other].map(&:start_time).max,
+        [self, other].map(&:end_time).min
+      )
     end
 
     def /(other)
       [
         self.class.new(start_time, other.start_time),
         self.class.new(other.end_time, end_time)
-      ].reject(&:empty?).map { |potential| self & potential }
+      ].reject(&:disjoint?).map { |potential| self & potential }
     end
 
     private

data/lib/biz/timeline/abstract.rb

@@ -14,9 +14,9 @@ module Biz
         periods
           .map { |period| period & comparison_period(period, terminus) }
           .each do |period|
-            yield period unless period.empty?
-
             break if occurred?(period, terminus)
+
+            yield period unless period.disjoint?
           end
       end
 
@@ -26,13 +26,20 @@ module Biz
         remaining = duration
 
         periods
-          .map { |period| period & duration_period(period, remaining) }
           .each do |period|
-            yield period unless period.empty?
+            if overflow?(period, remaining)
+              remaining = Duration.new(0)
+
+              yield period
+            else
+              scoped_period = period & duration_period(period, remaining)
+
+              remaining -= scoped_period.duration
 
-            remaining -= period.duration
+              yield scoped_period unless scoped_period.disjoint?
 
-            break unless remaining.positive?
+              break unless remaining.positive?
+            end
           end
       end
 

data/lib/biz/timeline/backward.rb

@@ -10,8 +10,12 @@ module Biz
 
       private
 
-      def occurred?(period, time)
-        period.start_time <= time
+      def occurred?(period, terminus)
+        period.end_time <= terminus
+      end
+
+      def overflow?(*)
+        false
       end
 
       def comparison_period(period, terminus)

data/lib/biz/timeline/forward.rb

@@ -10,8 +10,12 @@ module Biz
 
       private
 
-      def occurred?(period, time)
-        period.end_time >= time
+      def occurred?(period, terminus)
+        period.start_time > terminus
+      end
+
+      def overflow?(period, remaining)
+        period.duration == remaining
       end
 
       def comparison_period(period, terminus)

data/lib/biz/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Biz
-  VERSION = '1.8.1'
+  VERSION = '1.8.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: biz
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - Craig Little
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-30 00:00:00.000000000 Z
+date: 2019-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clavius