biz 1.3.4 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17b73c0b4db75f5474b6ea1ffb504295aa9d5b33
-  data.tar.gz: 760ad3e6cac89007667985a38e6d9cddd0587c3a
+  metadata.gz: 44d8fc924a2b8a852ff1764be148922e4008590d
+  data.tar.gz: 29ac9f7b0423c1b3d329b1d5e7485071fcf32ef3
 SHA512:
-  metadata.gz: 7559524dfaf3702887f4250e7a899114fb52d94a28cb662b2680abc0ad94c073b2f6d20b719d00023eb54079f9418ca04e51ed502945c8ec2cebbbaccea91716
-  data.tar.gz: fc2f54dcd99a298ff208ea53978106424b1543615f9c30c82e85abe2759d4cbb9047f758c017df0ade11c4d303f00872ef682cd7298635ec6a8c37827ba3ad54
+  metadata.gz: a4a37ee33bd1d466bc7fd6bab13a36ccc6c1fad2ecad17f4ea3332aec2fd5233fd7bd8419354966eba261eee22a74fc2c137458fd22cf2d9cda5ace0d909db8a
+  data.tar.gz: 54078121bab03914cbbeac6a03d2cc4c9dae945c8fbd36d387badf48bdafa5afbc7d3e40e76a818495cddc92b833144cb418905f836a4778655ea5559d6b93ed

data/lib/biz/calculation/for_duration.rb

@@ -2,7 +2,13 @@ module Biz
   module Calculation
     class ForDuration
 
-      UNITS = Set.new(%i[second seconds minute minutes hour hours day days])
+      UNITS = %i[second seconds minute minutes hour hours day days].freeze
+
+      private_constant :UNITS
+
+      def self.units
+        UNITS
+      end
 
       def self.with_unit(schedule, scalar, unit)
         unless UNITS.include?(unit)

data/lib/biz/configuration.rb

@@ -2,7 +2,9 @@ module Biz
   class Configuration
 
     def initialize
-      @raw = Raw.new.tap do |raw| yield raw if block_given? end
+      @raw = Raw.new
+
+      yield raw if block_given?
 
       Validation.perform(raw)
     end
@@ -12,7 +14,7 @@ module Biz
         raw
           .hours
           .flat_map { |weekday, hours| weekday_intervals(weekday, hours) }
-          .sort_by(&:start_time)
+          .sort
           .freeze
       end
     end
@@ -78,5 +80,8 @@ module Biz
       alias_method :business_hours=, :hours=
     end
 
+    private_constant :Raw,
+                     :Default
+
   end
 end

data/lib/biz/core_ext/fixnum.rb

@@ -1,7 +1,7 @@
 module Biz
   module CoreExt
     module Fixnum
-      Calculation::ForDuration::UNITS.each do |unit|
+      Calculation::ForDuration.units.each do |unit|
         define_method("business_#{unit}") { Biz.time(self, unit) }
       end
     end

data/lib/biz/date.rb

@@ -1,15 +1,20 @@
 module Biz
   class Date
 
-    EPOCH = ::Date.new(2006, 1, 1)
+    EPOCH = ::Date.new(2006, 1, 1).freeze
+
+    private_constant :EPOCH
+
+    def self.epoch
+      EPOCH
+    end
 
     def self.from_day(day)
       EPOCH + day
     end
 
     def self.for_dst(date, day_time)
-      date +
-        (day_time.day_second + Time::SECONDS_IN_HOUR) / Time::SECONDS_IN_DAY
+      date + (day_time.day_second + Time.hour_seconds) / Time.day_seconds
     end
 
   end

data/lib/biz/dates.rb

@@ -5,7 +5,7 @@ module Biz
       super(
         Clavius::Schedule.new do |c|
           c.weekdays = schedule.weekdays
-          c.excluded = schedule.holidays.map(&:date)
+          c.excluded = schedule.holidays.map(&:to_date)
         end
       )
     end

data/lib/biz/day_of_week.rb

@@ -3,44 +3,30 @@ module Biz
 
     SYMBOLS = %i[sun mon tue wed thu fri sat].freeze
 
-    def self.from_time(time)
-      DAYS.fetch(time.wday)
-    end
-
-    def self.from_symbol(symbol)
-      DAYS.fetch(SYMBOLS.index(symbol))
-    end
-
-    def self.first
-      DAYS.first
-    end
+    include Comparable
 
-    def self.last
-      DAYS.last
+    def self.all
+      ALL
     end
 
-    class << self
-
-      alias from_date from_time
-
+    def self.from_symbol(symbol)
+      ALL.fetch(SYMBOLS.index(symbol))
     end
 
-    attr_reader :wday
-
     def initialize(wday)
       @wday = Integer(wday)
     end
 
-    def contains?(week_time)
-      minutes.cover?(week_time)
+    def contains?(week_minute)
+      minutes.cover?(week_minute)
     end
 
     def start_minute
-      wday * Time::MINUTES_IN_DAY
+      wday * Time.day_minutes
     end
 
     def end_minute
-      start_minute + Time::MINUTES_IN_DAY
+      start_minute + Time.day_minutes
     end
 
     def minutes
@@ -52,30 +38,31 @@ module Biz
     end
 
     def day_minute(week_minute)
-      (week_minute - 1) % Time::MINUTES_IN_DAY + 1
+      (week_minute - 1) % Time.day_minutes + 1
     end
 
     def symbol
       SYMBOLS.fetch(wday)
     end
 
-    DAYS = [
-      SUNDAY    = new(0),
-      MONDAY    = new(1),
-      TUESDAY   = new(2),
-      WEDNESDAY = new(3),
-      THURSDAY  = new(4),
-      FRIDAY    = new(5),
-      SATURDAY  = new(6)
-    ].freeze
-
-    WEEKDAYS = [
-      MONDAY,
-      TUESDAY,
-      WEDNESDAY,
-      THURSDAY,
-      FRIDAY
-    ].freeze
+    def wday?(other_wday)
+      wday == other_wday
+    end
+
+    def <=>(other)
+      return unless other.is_a?(self.class)
+
+      wday <=> other.wday
+    end
+
+    protected
+
+    attr_reader :wday
+
+    ALL = (0..6).map(&method(:new)).freeze
+
+    private_constant :SYMBOLS,
+                     :ALL
 
   end
 end

data/lib/biz/day_time.rb

@@ -1,7 +1,7 @@
 module Biz
   class DayTime
 
-    VALID_SECONDS = 0..Time::SECONDS_IN_DAY
+    VALID_SECONDS = (0..Time.day_seconds).freeze
 
     module Timestamp
       FORMAT  = '%02d:%02d'.freeze
@@ -10,31 +10,29 @@ module Biz
 
     include Comparable
 
-    extend Forwardable
-
     class << self
 
       def from_time(time)
         new(
-          time.hour * Time::SECONDS_IN_HOUR +
-            time.min * Time::SECONDS_IN_MINUTE +
+          time.hour * Time.hour_seconds +
+            time.min * Time.minute_seconds +
             time.sec
         )
       end
 
       def from_minute(minute)
-        new(minute * Time::SECONDS_IN_MINUTE)
+        new(minute * Time.minute_seconds)
       end
 
       def from_hour(hour)
-        new(hour * Time::SECONDS_IN_HOUR)
+        new(hour * Time.hour_seconds)
       end
 
       def from_timestamp(timestamp)
         timestamp.match(Timestamp::PATTERN) { |match|
           new(
-            match[:hour].to_i * Time::SECONDS_IN_HOUR +
-              match[:minute].to_i * Time::SECONDS_IN_MINUTE +
+            match[:hour].to_i * Time.hour_seconds +
+              match[:minute].to_i * Time.minute_seconds +
               match[:second].to_i
           )
         }
@@ -44,29 +42,12 @@ module Biz
         MIDNIGHT
       end
 
-      alias am midnight
-
-      def noon
-        NOON
-      end
-
-      alias pm noon
-
       def endnight
         ENDNIGHT
       end
 
     end
 
-    attr_reader :day_second
-
-    delegate strftime: :format_time
-
-    delegate %i[
-      to_i
-      to_int
-    ] => :day_second
-
     def initialize(day_second)
       @day_second = Integer(day_second)
 
@@ -75,60 +56,45 @@ module Biz
       end
     end
 
+    attr_reader :day_second
+
     def hour
-      day_second / Time::SECONDS_IN_HOUR
+      day_second / Time.hour_seconds
     end
 
     def minute
-      day_second % Time::SECONDS_IN_HOUR / Time::SECONDS_IN_MINUTE
+      day_second % Time.hour_seconds / Time.minute_seconds
     end
 
     def second
-      day_second % Time::SECONDS_IN_MINUTE
+      day_second % Time.minute_seconds
     end
 
     def day_minute
-      hour * Time::MINUTES_IN_HOUR + minute
+      hour * Time.hour_minutes + minute
     end
 
     def for_dst
-      self.class.new(
-        (day_second + Time::SECONDS_IN_HOUR) % Time::SECONDS_IN_DAY
-      )
+      self.class.new((day_second + Time.hour_seconds) % Time.day_seconds)
     end
 
     def timestamp
       format(Timestamp::FORMAT, hour, minute)
     end
 
-    def coerce(other)
-      [self.class.new(other), self]
-    end
-
-    protected
-
     def <=>(other)
-      return nil unless other.respond_to?(:to_i)
-
-      day_second <=> other.to_i
-    end
+      return unless other.is_a?(self.class)
 
-    private
-
-    def format_time
-      ::Time.new(
-        Date::EPOCH.year,
-        Date::EPOCH.month,
-        Date::EPOCH.mday,
-        hour,
-        minute,
-        second
-      )
+      day_second <=> other.day_second
     end
 
     MIDNIGHT = from_hour(0)
-    NOON     = from_hour(12)
     ENDNIGHT = from_hour(24)
 
+    private_constant :VALID_SECONDS,
+                     :Timestamp,
+                     :MIDNIGHT,
+                     :ENDNIGHT
+
   end
 end

data/lib/biz/duration.rb

@@ -3,8 +3,6 @@ module Biz
 
     include Comparable
 
-    extend Forwardable
-
     class << self
 
       def seconds(seconds)
@@ -14,23 +12,19 @@ module Biz
       alias second seconds
 
       def minutes(minutes)
-        new(minutes * Time::SECONDS_IN_MINUTE)
+        new(minutes * Time.minute_seconds)
       end
 
       alias minute minutes
 
       def hours(hours)
-        new(hours * Time::SECONDS_IN_HOUR)
+        new(hours * Time.hour_seconds)
       end
 
       alias hour hours
 
     end
 
-    attr_reader :seconds
-
-    delegate to_i: :seconds
-
     def initialize(seconds)
       @seconds = Integer(seconds)
     end
@@ -40,11 +34,11 @@ module Biz
     end
 
     def in_minutes
-      seconds / Time::SECONDS_IN_MINUTE
+      seconds / Time.minute_seconds
     end
 
     def in_hours
-      seconds / Time::SECONDS_IN_HOUR
+      seconds / Time.hour_seconds
     end
 
     def +(other)
@@ -63,17 +57,15 @@ module Biz
       self.class.new(seconds.abs)
     end
 
-    def coerce(other)
-      [self.class.new(other), self]
+    def <=>(other)
+      return unless other.is_a?(self.class)
+
+      seconds <=> other.seconds
     end
 
     protected
 
-    def <=>(other)
-      return nil unless other.respond_to?(:to_i)
-
-      seconds <=> other.to_i
-    end
+    attr_reader :seconds
 
   end
 end

data/lib/biz/holiday.rb

@@ -1,8 +1,7 @@
 module Biz
   class Holiday
 
-    attr_reader :date,
-                :time_zone
+    include Comparable
 
     def initialize(date, time_zone)
       @date      = date
@@ -20,7 +19,22 @@ module Biz
       )
     end
 
-    alias to_date date
+    def <=>(other)
+      return unless other.is_a?(self.class)
+
+      [date, time_zone] <=> [other.date, other.time_zone]
+    end
+
+    protected
+
+    attr_reader :date,
+                :time_zone
+
+    public
+
+    def to_date
+      date
+    end
 
   end
 end

data/lib/biz/interval.rb

@@ -1,9 +1,7 @@
 module Biz
   class Interval
 
-    attr_reader :start_time,
-                :end_time,
-                :time_zone
+    include Comparable
 
     def initialize(start_time, end_time, time_zone)
       @start_time = start_time
@@ -29,5 +27,18 @@ module Biz
       )
     end
 
+    def <=>(other)
+      return unless other.is_a?(self.class)
+
+      [start_time, end_time, time_zone] <=>
+        [other.start_time, other.end_time, other.time_zone]
+    end
+
+    protected
+
+    attr_reader :start_time,
+                :end_time,
+                :time_zone
+
   end
 end

data/lib/biz/periods/after.rb

@@ -11,7 +11,7 @@ module Biz
       def weeks
         Range.new(
           Week.since_epoch(Time.new(time_zone).local(origin)),
-          Week.since_epoch(Time::HEAT_DEATH)
+          Week.since_epoch(Time.heat_death)
         )
       end
 

data/lib/biz/periods/before.rb

@@ -9,9 +9,9 @@ module Biz
       private
 
       def weeks
-        Week.since_epoch(Time.new(time_zone).local(origin)).downto(
-          Week.since_epoch(Time::BIG_BANG)
-        )
+        Week
+          .since_epoch(Time.new(time_zone).local(origin))
+          .downto(Week.since_epoch(Time.big_bang))
       end
 
       def relevant?(period)

data/lib/biz/time.rb

@@ -1,22 +1,70 @@
 module Biz
   class Time
 
-    SECONDS_IN_MINUTE = 60
-    MINUTES_IN_HOUR   = 60
-    HOURS_IN_DAY      = 24
-    DAYS_IN_WEEK      = 7
+    MINUTE_SECONDS = 60
+    HOUR_MINUTES   = 60
+    DAY_HOURS      = 24
+    WEEK_DAYS      = 7
 
-    SECONDS_IN_HOUR = SECONDS_IN_MINUTE * MINUTES_IN_HOUR
-    SECONDS_IN_DAY  = SECONDS_IN_HOUR   * HOURS_IN_DAY
-    SECONDS_IN_WEEK = SECONDS_IN_DAY    * DAYS_IN_WEEK
+    HOUR_SECONDS = HOUR_MINUTES * MINUTE_SECONDS
+    DAY_SECONDS  = DAY_HOURS * HOUR_SECONDS
 
-    MINUTES_IN_DAY  = MINUTES_IN_HOUR * HOURS_IN_DAY
-    MINUTES_IN_WEEK = MINUTES_IN_DAY  * DAYS_IN_WEEK
+    DAY_MINUTES  = DAY_HOURS * HOUR_MINUTES
+    WEEK_MINUTES = WEEK_DAYS * DAY_MINUTES
 
-    BIG_BANG   = ::Time.new(-10**100)
-    HEAT_DEATH = ::Time.new(10**100)
+    BIG_BANG   = ::Time.new(-10**100).freeze
+    HEAT_DEATH = ::Time.new(10**100).freeze
 
-    attr_reader :time_zone
+    private_constant :MINUTE_SECONDS,
+                     :HOUR_MINUTES,
+                     :DAY_HOURS,
+                     :WEEK_DAYS,
+                     :HOUR_SECONDS,
+                     :DAY_SECONDS,
+                     :DAY_MINUTES,
+                     :WEEK_MINUTES,
+                     :BIG_BANG,
+                     :HEAT_DEATH
+
+    def self.minute_seconds
+      MINUTE_SECONDS
+    end
+
+    def self.hour_minutes
+      HOUR_MINUTES
+    end
+
+    def self.day_hours
+      DAY_HOURS
+    end
+
+    def self.week_days
+      WEEK_DAYS
+    end
+
+    def self.hour_seconds
+      HOUR_SECONDS
+    end
+
+    def self.day_seconds
+      DAY_SECONDS
+    end
+
+    def self.day_minutes
+      DAY_MINUTES
+    end
+
+    def self.week_minutes
+      WEEK_MINUTES
+    end
+
+    def self.big_bang
+      BIG_BANG
+    end
+
+    def self.heat_death
+      HEAT_DEATH
+    end
 
     def initialize(time_zone)
       @time_zone = time_zone
@@ -46,5 +94,9 @@ module Biz
       on_date(week.start_date + week_time.wday, week_time.day_time)
     end
 
+    protected
+
+    attr_reader :time_zone
+
   end
 end

data/lib/biz/time_segment.rb

@@ -1,22 +1,24 @@
 module Biz
   class TimeSegment
 
+    include Comparable
+
     def self.before(time)
-      new(Time::BIG_BANG, time)
+      new(Time.big_bang, time)
     end
 
     def self.after(time)
-      new(time, Time::HEAT_DEATH)
+      new(time, Time.heat_death)
     end
 
-    attr_reader :start_time,
-                :end_time
-
     def initialize(start_time, end_time)
       @start_time = start_time
       @end_time   = end_time
     end
 
+    attr_reader :start_time,
+                :end_time
+
     def duration
       Duration.new(end_time - start_time)
     end
@@ -40,11 +42,10 @@ module Biz
       )
     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 }
+    def <=>(other)
+      return unless other.is_a?(self.class)
+
+      [start_time, end_time] <=> [other.start_time, other.end_time]
     end
 
     private

data/lib/biz/validation.rb

@@ -37,16 +37,16 @@ module Biz
 
     end
 
-    RULES = Set.new(
-      [
-        Rule.new('Hours must be hash-like.') { |raw|
-          raw.hours.respond_to?(:to_h)
-        },
-        Rule.new('Hours must be provided.') { |raw|
-          raw.hours.to_h.any?
-        }
-      ]
-    )
+    RULES = [
+      Rule.new('Hours must be hash-like.') { |raw|
+        raw.hours.respond_to?(:to_h)
+      },
+      Rule.new('Hours must be provided.') { |raw|
+        raw.hours.to_h.any?
+      }
+    ].freeze
+
+    private_constant :RULES
 
   end
 end

data/lib/biz/version.rb

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

data/lib/biz/week.rb

@@ -3,10 +3,8 @@ module Biz
 
     include Comparable
 
-    extend Forwardable
-
     def self.from_date(date)
-      new(Day.from_date(date).to_i / Time::DAYS_IN_WEEK)
+      new((date - Date.epoch).to_i / Time.week_days)
     end
 
     def self.from_time(time)
@@ -19,20 +17,12 @@ module Biz
 
     end
 
-    attr_reader :week
-
-    delegate %i[
-      to_s
-      to_i
-      to_int
-    ] => :week
-
     def initialize(week)
       @week = Integer(week)
     end
 
     def start_date
-      Date.from_day(week * Time::DAYS_IN_WEEK)
+      Date.from_day(week * Time.week_days)
     end
 
     def succ
@@ -42,7 +32,7 @@ module Biz
     def downto(final_week)
       return enum_for(:downto, final_week) unless block_given?
 
-      week.downto(final_week.to_i).each do |raw_week|
+      week.downto(final_week.week).each do |raw_week|
         yield self.class.new(raw_week)
       end
     end
@@ -51,17 +41,15 @@ module Biz
       self.class.new(week + other.week)
     end
 
-    def coerce(other)
-      [self.class.new(other), self]
+    def <=>(other)
+      return unless other.is_a?(self.class)
+
+      week <=> other.week
     end
 
     protected
 
-    def <=>(other)
-      return nil unless other.respond_to?(:to_i)
-
-      week <=> other.to_i
-    end
+    attr_reader :week
 
   end
 end

data/lib/biz/week_time/abstract.rb

@@ -2,20 +2,18 @@ module Biz
   module WeekTime
     class Abstract
 
-      include Comparable
-
       extend Forwardable
 
+      include Comparable
+
       def self.from_time(time)
         new(
-          time.wday * Time::MINUTES_IN_DAY +
-            time.hour * Time::MINUTES_IN_HOUR +
+          time.wday * Time.day_minutes +
+            time.hour * Time.hour_minutes +
             time.min
         )
       end
 
-      attr_reader :week_minute
-
       def initialize(week_minute)
         @week_minute = Integer(week_minute)
       end
@@ -24,10 +22,6 @@ module Biz
         day_of_week.symbol
       end
 
-      def coerce(other)
-        [self.class.new(other), self]
-      end
-
       delegate wday: :day_of_week
 
       delegate %i[
@@ -39,33 +33,15 @@ module Biz
         timestamp
       ] => :day_time
 
-      delegate strftime: :week_time
-
-      delegate %i[
-        to_s
-        to_i
-        to_int
-      ] => :week_minute
-
-      protected
-
       def <=>(other)
-        return nil unless other.respond_to?(:to_i)
+        return unless other.is_a?(WeekTime::Abstract)
 
-        week_minute <=> other.to_i
+        week_minute <=> other.week_minute
       end
 
-      private
+      protected
 
-      def week_time
-        ::Time.new(
-          Date::EPOCH.year,
-          Date::EPOCH.month,
-          Date::EPOCH.mday + wday,
-          hour,
-          minute
-        )
-      end
+      attr_reader :week_minute
 
     end
   end

data/lib/biz/week_time/end.rb

@@ -9,9 +9,7 @@ module Biz
       private
 
       def day_of_week
-        @day_of_week ||= begin
-          DayOfWeek::DAYS.find { |day| day.contains?(week_minute) }
-        end
+        @day_of_week ||= DayOfWeek.all.find { |day| day.contains?(week_minute) }
       end
 
     end

data/lib/biz/week_time/start.rb

@@ -3,16 +3,16 @@ module Biz
     class Start < Abstract
 
       def day_time
-        @day_time ||= DayTime.from_minute(week_minute % Time::MINUTES_IN_DAY)
+        @day_time ||= DayTime.from_minute(week_minute % Time.day_minutes)
       end
 
       private
 
       def day_of_week
         @day_of_week ||= begin
-          DayOfWeek::DAYS.fetch(
-            week_minute / Time::MINUTES_IN_DAY % Time::DAYS_IN_WEEK
-          )
+          DayOfWeek.all.find { |day_of_week|
+            day_of_week.wday?(week_minute / Time.day_minutes % Time.week_days)
+          }
         end
       end
 

data/lib/biz.rb

@@ -44,7 +44,6 @@ require 'biz/time'
 require 'biz/calculation'
 require 'biz/configuration'
 require 'biz/dates'
-require 'biz/day'
 require 'biz/day_of_week'
 require 'biz/day_time'
 require 'biz/duration'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: biz
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.4.0
 platform: ruby
 authors:
 - Craig Little
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-13 00:00:00.000000000 Z
+date: 2016-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clavius
@@ -89,7 +89,6 @@ files:
 - lib/biz/core_ext/time.rb
 - lib/biz/date.rb
 - lib/biz/dates.rb
-- lib/biz/day.rb
 - lib/biz/day_of_week.rb
 - lib/biz/day_time.rb
 - lib/biz/duration.rb
@@ -136,9 +135,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Business hours calculations
 test_files: []
-has_rdoc: 

data/lib/biz/day.rb

@@ -1,51 +0,0 @@
-module Biz
-  class Day
-
-    include Comparable
-
-    extend Forwardable
-
-    def self.from_date(date)
-      new((date - Date::EPOCH).to_i)
-    end
-
-    def self.from_time(time)
-      from_date(time.to_date)
-    end
-
-    class << self
-
-      alias since_epoch from_time
-
-    end
-
-    attr_reader :day
-
-    delegate %i[
-      to_s
-      to_i
-      to_int
-    ] => :day
-
-    def initialize(day)
-      @day = Integer(day)
-    end
-
-    def to_date
-      Date.from_day(day)
-    end
-
-    def coerce(other)
-      [self.class.new(other), self]
-    end
-
-    protected
-
-    def <=>(other)
-      return nil unless other.respond_to?(:to_i)
-
-      day <=> other.to_i
-    end
-
-  end
-end