biz 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44d8fc924a2b8a852ff1764be148922e4008590d
-  data.tar.gz: 29ac9f7b0423c1b3d329b1d5e7485071fcf32ef3
+  metadata.gz: 1bfccc20f9a27336663959946a872593d35c53a3
+  data.tar.gz: 962e4f9927fb08f8f609e76d3f11b10949d81922
 SHA512:
-  metadata.gz: a4a37ee33bd1d466bc7fd6bab13a36ccc6c1fad2ecad17f4ea3332aec2fd5233fd7bd8419354966eba261eee22a74fc2c137458fd22cf2d9cda5ace0d909db8a
-  data.tar.gz: 54078121bab03914cbbeac6a03d2cc4c9dae945c8fbd36d387badf48bdafa5afbc7d3e40e76a818495cddc92b833144cb418905f836a4778655ea5559d6b93ed
+  metadata.gz: 63aeb93f5ce1299b4164ba9ec5d537032d6f8ff174ca5b08c0fd62d62a4afec902b4528ec4d1d606899764cf20aacddd08c8cf64f95dc81348f50bf6a1446968
+  data.tar.gz: d81c55c540298d454bab98a9d54243cb139f2aeed16ff4b1c817479e63798dab3909dfdb43c35339646d9139a508fa78bb9f9b84a43d09863d2c38b5b36c448c

data/README.md

@@ -17,6 +17,7 @@ Time calculations using business hours.
   - Multiple schedule configurations.
 * Second-level precision on all calculations.
 * Accurate handling of Daylight Saving Time.
+* Schedule intersection.
 * Thread-safe.
 
 ## Anti-Features
@@ -50,7 +51,7 @@ Biz.configure do |config|
     sat: {'10:00' => '14:00'}
   }
 
-  config.holidays = [Date.new(2014, 1, 1), Date.new(2014, 12, 25)]
+  config.holidays = [Date.new(2016, 1, 1), Date.new(2016, 12, 25)]
 
   config.time_zone = 'America/Los_Angeles'
 end
@@ -120,6 +121,74 @@ Biz.periods
 #  #<Biz::TimeSegment start_time=2015-04-27 20:36:57 UTC end_time=2015-04-28 00:00:00 UTC>]
 ```
 
+## Schedule Intersection
+
+An intersection of two schedules can be found using `&`:
+
+```ruby
+schedule_1 = Biz::Schedule.new do |config|
+  config.hours = {
+    mon: {'09:00' => '17:00'},
+    tue: {'10:00' => '16:00'},
+    wed: {'09:00' => '17:00'},
+    thu: {'10:00' => '16:00'},
+    fri: {'09:00' => '17:00'},
+    sat: {'11:00' => '14:30'}
+  }
+
+  config.holidays = [Date.new(2016, 1, 1), Date.new(2016, 12, 25)]
+
+  config.time_zone = 'Etc/UTC'
+end
+
+schedule_2 = Biz::Schedule.new do |config|
+  config.hours = {
+    sun: {'10:00' => '12:00'},
+    mon: {'08:00' => '10:00'},
+    tue: {'11:00' => '15:00'},
+    wed: {'16:00' => '18:00'},
+    thu: {'11:00' => '12:00', '13:00' => '14:00'}
+  }
+
+  config.holidays = [
+    Date.new(2016, 1, 1),
+    Date.new(2016, 7, 4),
+    Date.new(2016, 11, 24)
+  ]
+
+  config.time_zone = 'America/Los_Angeles'
+end
+
+schedule_1 & schedule_2
+```
+
+The resulting schedule will be a combination of the two schedules: an
+intersection of the intervals, a union of the holidays, and the time zone of the
+first schedule.
+
+For the above example, the resulting schedule would be equivalent to one with
+the following configuration:
+
+```ruby
+Biz::Schedule.new do |config|
+  config.hours = {
+    mon: {'09:00' => '10:00'},
+    tue: {'11:00' => '15:00'},
+    wed: {'16:00' => '17:00'},
+    thu: {'11:00' => '12:00', '13:00' => '14:00'}
+  }
+
+  config.holidays = [
+    Date.new(2016, 1, 1),
+    Date.new(2016, 7, 4),
+    Date.new(2016, 11, 24),
+    Date.new(2016, 12, 25)
+  ]
+
+  config.time_zone = 'Etc/UTC'
+end
+```
+
 ## Core Extensions
 
 Optional extensions to core classes (`Date`, `Fixnum`, and `Time`) are available

data/lib/biz.rb

@@ -1,7 +1,6 @@
 require 'date'
 require 'delegate'
 require 'forwardable'
-require 'set'
 
 require 'clavius'
 require 'tzinfo'

data/lib/biz/configuration.rb

@@ -7,6 +7,8 @@ module Biz
       yield raw if block_given?
 
       Validation.perform(raw)
+
+      raw.freeze
     end
 
     def intervals
@@ -21,7 +23,12 @@ module Biz
 
     def holidays
       @holidays ||= begin
-        raw.holidays.map { |date| Holiday.new(date, time_zone) }.freeze
+        raw
+          .holidays
+          .uniq
+          .map { |date| Holiday.new(date, time_zone) }
+          .sort
+          .freeze
       end
     end
 
@@ -30,7 +37,7 @@ module Biz
     end
 
     def weekdays
-      @weekdays ||= raw.hours.keys.to_set.freeze
+      @weekdays ||= raw.hours.keys.uniq.freeze
     end
 
     protected

data/lib/biz/interval.rb

@@ -1,18 +1,38 @@
 module Biz
   class Interval
 
+    extend Forwardable
+
     include Comparable
 
+    def self.to_hours(intervals)
+      intervals.each_with_object(
+        Hash.new do |hours, wday| hours.store(wday, {}) end
+      ) do |interval, hours|
+        hours[interval.wday_symbol].store(*interval.endpoints.map(&:timestamp))
+      end
+    end
+
     def initialize(start_time, end_time, time_zone)
       @start_time = start_time
       @end_time   = end_time
       @time_zone  = time_zone
     end
 
+    attr_reader :start_time,
+                :end_time,
+                :time_zone
+
+    delegate wday_symbol: :start_time
+
     def endpoints
       [start_time, end_time]
     end
 
+    def empty?
+      start_time >= end_time
+    end
+
     def contains?(time)
       (start_time...end_time).cover?(
         WeekTime.from_time(Time.new(time_zone).local(time))
@@ -27,6 +47,13 @@ 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, time_zone)
+    end
+
     def <=>(other)
       return unless other.is_a?(self.class)
 
@@ -34,11 +61,5 @@ module Biz
         [other.start_time, other.end_time, other.time_zone]
     end
 
-    protected
-
-    attr_reader :start_time,
-                :end_time,
-                :time_zone
-
   end
 end

data/lib/biz/schedule.rb

@@ -46,6 +46,23 @@ module Biz
       Time.new(time_zone)
     end
 
+    def &(other)
+      self.class.new do |config|
+        config.hours = Interval.to_hours(
+          intervals.flat_map { |interval|
+            other
+              .intervals
+              .map { |other_interval| interval & other_interval }
+              .reject(&:empty?)
+          }
+        )
+
+        config.holidays = [*holidays, *other.holidays].map(&:to_date)
+
+        config.time_zone = time_zone.name
+      end
+    end
+
     protected
 
     attr_reader :configuration

data/lib/biz/time_segment.rb

@@ -36,10 +36,10 @@ module Biz
     end
 
     def &(other)
-      self.class.new(
-        lower_bound(other),
-        [lower_bound(other), upper_bound(other)].max
-      )
+      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)
     end
 
     def <=>(other)
@@ -48,15 +48,5 @@ module Biz
       [start_time, end_time] <=> [other.start_time, other.end_time]
     end
 
-    private
-
-    def lower_bound(other)
-      [self, other].map(&:start_time).max
-    end
-
-    def upper_bound(other)
-      [self, other].map(&:end_time).min
-    end
-
   end
 end

data/lib/biz/version.rb

@@ -1,3 +1,3 @@
 module Biz
-  VERSION = '1.4.0'.freeze
+  VERSION = '1.5.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: biz
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Craig Little
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clavius
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Business hours calculations