biz 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14ced23b25b1eada2cc2120be433aa949741f16e
-  data.tar.gz: b2f797726e49278c6388bce71f7b85d04f435d48
+  metadata.gz: 17b73c0b4db75f5474b6ea1ffb504295aa9d5b33
+  data.tar.gz: 760ad3e6cac89007667985a38e6d9cddd0587c3a
 SHA512:
-  metadata.gz: bb3d77c08bc245fb5220ed69d71809cc52f27379c0d83a325288c2a41f1c4e78e0200ce965e3657694b52aa4967571f59afe841e3f0c9904c8d3fe6358f6bf21
-  data.tar.gz: 0b2bb9dc20437369b2c6b760baa87bc381d80640bdc9db7079ddd96105d0b9e4dd222c5bf1769af203af6a3e4e4e6533e98becaa83bec6ac286ac147fd057586
+  metadata.gz: 7559524dfaf3702887f4250e7a899114fb52d94a28cb662b2680abc0ad94c073b2f6d20b719d00023eb54079f9418ca04e51ed502945c8ec2cebbbaccea91716
+  data.tar.gz: fc2f54dcd99a298ff208ea53978106424b1543615f9c30c82e85abe2759d4cbb9047f758c017df0ade11c4d303f00872ef682cd7298635ec6a8c37827ba3ad54

data/README.md

@@ -171,7 +171,7 @@ To open a console with the gem and sample schedule loaded:
 
 ## Copyright and license
 
-Copyright 2015 Zendesk
+Copyright 2015-16 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.rb

@@ -3,10 +3,7 @@ require 'delegate'
 require 'forwardable'
 require 'set'
 
-require 'abstract_type'
 require 'clavius'
-require 'equalizer'
-require 'memoizable'
 require 'tzinfo'
 
 module Biz

data/lib/biz/calculation/duration_within.rb

@@ -4,7 +4,10 @@ module Biz
 
       def initialize(schedule, calculation_period)
         super(
-          schedule.periods.after(calculation_period.start_time).timeline
+          schedule
+            .periods
+            .after(calculation_period.start_time)
+            .timeline
             .until(calculation_period.end_time)
             .map(&:duration)
             .reduce(Duration.new(0), :+)

data/lib/biz/calculation/for_duration.rb

@@ -4,8 +4,6 @@ module Biz
 
       UNITS = Set.new(%i[second seconds minute minutes hour hours day days])
 
-      include AbstractType
-
       def self.with_unit(schedule, scalar, unit)
         unless UNITS.include?(unit)
           fail ArgumentError, 'The unit is not supported.'
@@ -23,9 +21,6 @@ module Biz
         @scalar   = scalar
       end
 
-      abstract_method :before,
-                      :after
-
       protected
 
       attr_reader :schedule,
@@ -39,7 +34,8 @@ module Biz
 
       [
         *%i[second seconds minute minutes hour hours].map { |unit|
-          const_set(unit.to_s.capitalize,
+          const_set(
+            unit.to_s.capitalize,
             Class.new(self) do
               def before(time)
                 timeline(:before, time).last.start_time
@@ -63,7 +59,8 @@ module Biz
           )
         },
         *%i[day days].map { |unit|
-          const_set(unit.to_s.capitalize,
+          const_set(
+            unit.to_s.capitalize,
             Class.new(self) do
               def before(time)
                 periods(:before, time).first.end_time

data/lib/biz/configuration.rb

@@ -1,8 +1,6 @@
 module Biz
   class Configuration
 
-    include Memoizable
-
     def initialize
       @raw = Raw.new.tap do |raw| yield raw if block_given? end
 
@@ -10,21 +8,27 @@ module Biz
     end
 
     def intervals
-      raw.hours.flat_map { |weekday, hours|
-        weekday_intervals(weekday, hours)
-      }.sort_by(&:start_time)
+      @intervals ||= begin
+        raw
+          .hours
+          .flat_map { |weekday, hours| weekday_intervals(weekday, hours) }
+          .sort_by(&:start_time)
+          .freeze
+      end
     end
 
     def holidays
-      raw.holidays.map { |date| Holiday.new(date, time_zone) }
+      @holidays ||= begin
+        raw.holidays.map { |date| Holiday.new(date, time_zone) }.freeze
+      end
     end
 
     def time_zone
-      TZInfo::TimezoneProxy.new(raw.time_zone)
+      @time_zone ||= TZInfo::TimezoneProxy.new(raw.time_zone)
     end
 
     def weekdays
-      raw.hours.keys.to_set
+      @weekdays ||= raw.hours.keys.to_set.freeze
     end
 
     protected
@@ -49,10 +53,6 @@ module Biz
       }
     end
 
-    memoize :intervals,
-            :holidays,
-            :weekdays
-
     Raw = Struct.new(:hours, :holidays, :time_zone) do
       module Default
         HOURS = {
@@ -61,9 +61,10 @@ module Biz
           wed: {'09:00' => '17:00'},
           thu: {'09:00' => '17:00'},
           fri: {'09:00' => '17:00'}
-        }
-        HOLIDAYS  = []
-        TIME_ZONE = 'Etc/UTC'
+        }.freeze
+
+        HOLIDAYS  = [].freeze
+        TIME_ZONE = 'Etc/UTC'.freeze
       end
 
       def initialize(*)

data/lib/biz/day.rb

@@ -15,7 +15,7 @@ module Biz
 
     class << self
 
-      alias_method :since_epoch, :from_time
+      alias since_epoch from_time
 
     end
 

data/lib/biz/day_of_week.rb

@@ -1,7 +1,7 @@
 module Biz
   class DayOfWeek
 
-    SYMBOLS = [:sun, :mon, :tue, :wed, :thu, :fri, :sat]
+    SYMBOLS = %i[sun mon tue wed thu fri sat].freeze
 
     def self.from_time(time)
       DAYS.fetch(time.wday)
@@ -21,7 +21,7 @@ module Biz
 
     class << self
 
-      alias_method :from_date, :from_time
+      alias from_date from_time
 
     end
 
@@ -67,7 +67,7 @@ module Biz
       THURSDAY  = new(4),
       FRIDAY    = new(5),
       SATURDAY  = new(6)
-    ]
+    ].freeze
 
     WEEKDAYS = [
       MONDAY,
@@ -75,7 +75,7 @@ module Biz
       WEDNESDAY,
       THURSDAY,
       FRIDAY
-    ]
+    ].freeze
 
   end
 end

data/lib/biz/day_time.rb

@@ -4,7 +4,7 @@ module Biz
     VALID_SECONDS = 0..Time::SECONDS_IN_DAY
 
     module Timestamp
-      FORMAT  = '%02d:%02d'
+      FORMAT  = '%02d:%02d'.freeze
       PATTERN = /\A(?<hour>\d{2}):(?<minute>\d{2})(:?(?<second>\d{2}))?\Z/
     end
 
@@ -44,13 +44,13 @@ module Biz
         MIDNIGHT
       end
 
-      alias_method :am, :midnight
+      alias am midnight
 
       def noon
         NOON
       end
 
-      alias_method :pm, :noon
+      alias pm noon
 
       def endnight
         ENDNIGHT

data/lib/biz/duration.rb

@@ -1,7 +1,6 @@
 module Biz
   class Duration
 
-    include Equalizer.new(:seconds)
     include Comparable
 
     extend Forwardable
@@ -12,19 +11,19 @@ module Biz
         new(seconds)
       end
 
-      alias_method :second, :seconds
+      alias second seconds
 
       def minutes(minutes)
         new(minutes * Time::SECONDS_IN_MINUTE)
       end
 
-      alias_method :minute, :minutes
+      alias minute minutes
 
       def hours(hours)
         new(hours * Time::SECONDS_IN_HOUR)
       end
 
-      alias_method :hour, :hours
+      alias hour hours
 
     end
 

data/lib/biz/holiday.rb

@@ -1,8 +1,6 @@
 module Biz
   class Holiday
 
-    include Equalizer.new(:date, :time_zone)
-
     attr_reader :date,
                 :time_zone
 
@@ -22,7 +20,7 @@ module Biz
       )
     end
 
-    alias_method :to_date, :date
+    alias to_date date
 
   end
 end

data/lib/biz/interval.rb

@@ -1,8 +1,6 @@
 module Biz
   class Interval
 
-    include Equalizer.new(:start_time, :end_time, :time_zone)
-
     attr_reader :start_time,
                 :end_time,
                 :time_zone

data/lib/biz/periods/abstract.rb

@@ -25,17 +25,16 @@ module Biz
       private
 
       def periods
-        weeks.lazy.flat_map { |week|
-          business_periods(week)
-        }.select { |business_period|
-          relevant?(business_period)
-        }.map { |business_period|
-          business_period & boundary
-        }.reject { |business_period|
-          schedule.holidays.any? { |holiday|
-            holiday.contains?(business_period.start_time)
+        weeks
+          .lazy
+          .flat_map { |week| business_periods(week) }
+          .select   { |business_period| relevant?(business_period) }
+          .map      { |business_period| business_period & boundary }
+          .reject   { |business_period|
+            schedule.holidays.any? { |holiday|
+              holiday.contains?(business_period.start_time)
+            }
           }
-        }
       end
 
       def business_periods(week)

data/lib/biz/schedule.rb

@@ -22,7 +22,7 @@ module Biz
       Dates.new(self)
     end
 
-    alias_method :date, :dates
+    alias date dates
 
     def time(scalar, unit)
       Calculation::ForDuration.with_unit(self, scalar, unit)
@@ -40,7 +40,7 @@ module Biz
       Calculation::OnHoliday.new(self, time).result
     end
 
-    alias_method :business_hours?, :in_hours?
+    alias business_hours? in_hours?
 
     def in_zone
       Time.new(time_zone)

data/lib/biz/time_segment.rb

@@ -1,8 +1,6 @@
 module Biz
   class TimeSegment
 
-    include Equalizer.new(:start_time, :end_time)
-
     def self.before(time)
       new(Time::BIG_BANG, time)
     end

data/lib/biz/timeline/abstract.rb

@@ -9,13 +9,13 @@ module Biz
       def until(terminus)
         return enum_for(:until, terminus) unless block_given?
 
-        periods.map { |period|
-          period & comparison_period(period, terminus)
-        }.each do |period|
-          yield period unless period.empty?
+        periods
+          .map { |period| period & comparison_period(period, terminus) }
+          .each do |period|
+            yield period unless period.empty?
 
-          break if occurred?(period, terminus)
-        end
+            break if occurred?(period, terminus)
+          end
       end
 
       def for(duration)
@@ -23,15 +23,15 @@ module Biz
 
         remaining = duration
 
-        periods.map { |period|
-          period & duration_period(period, remaining)
-        }.each do |period|
-          yield period unless period.empty?
+        periods
+          .map { |period| period & duration_period(period, remaining) }
+          .each do |period|
+            yield period unless period.empty?
 
-          remaining -= period.duration
+            remaining -= period.duration
 
-          break unless remaining.positive?
-        end
+            break unless remaining.positive?
+          end
       end
 
       protected

data/lib/biz/validation.rb

@@ -37,14 +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 = 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?
+        }
+      ]
+    )
 
   end
 end

data/lib/biz/version.rb

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

data/lib/biz/week.rb

@@ -15,7 +15,7 @@ module Biz
 
     class << self
 
-      alias_method :since_epoch, :from_time
+      alias since_epoch from_time
 
     end
 

data/lib/biz/week_time.rb

@@ -14,7 +14,7 @@ module Biz
         End.new(week_minute)
       end
 
-      alias_method :build, :start
+      alias build start
 
     end
   end

data/lib/biz/week_time/abstract.rb

@@ -2,9 +2,7 @@ module Biz
   module WeekTime
     class Abstract
 
-      include AbstractType
       include Comparable
-      include Memoizable
 
       extend Forwardable
 
@@ -49,8 +47,6 @@ module Biz
         to_int
       ] => :week_minute
 
-      abstract_method :day_time
-
       protected
 
       def <=>(other)
@@ -71,8 +67,6 @@ module Biz
         )
       end
 
-      abstract_method :day_of_week
-
     end
   end
 end

data/lib/biz/week_time/end.rb

@@ -3,18 +3,17 @@ module Biz
     class End < Abstract
 
       def day_time
-        DayTime.from_minute(day_of_week.day_minute(week_minute))
+        @day_time ||= DayTime.from_minute(day_of_week.day_minute(week_minute))
       end
 
       private
 
       def day_of_week
-        DayOfWeek::DAYS.find { |day| day.contains?(week_minute) }
+        @day_of_week ||= begin
+          DayOfWeek::DAYS.find { |day| day.contains?(week_minute) }
+        end
       end
 
-      memoize :day_of_week,
-              :day_time
-
     end
   end
 end

data/lib/biz/week_time/start.rb

@@ -3,20 +3,19 @@ module Biz
     class Start < Abstract
 
       def day_time
-        DayTime.from_minute(week_minute % Time::MINUTES_IN_DAY)
+        @day_time ||= DayTime.from_minute(week_minute % Time::MINUTES_IN_DAY)
       end
 
       private
 
       def day_of_week
-        DayOfWeek::DAYS.fetch(
-          week_minute / Time::MINUTES_IN_DAY % Time::DAYS_IN_WEEK
-        )
+        @day_of_week ||= begin
+          DayOfWeek::DAYS.fetch(
+            week_minute / Time::MINUTES_IN_DAY % Time::DAYS_IN_WEEK
+          )
+        end
       end
 
-      memoize :day_of_week,
-              :day_time
-
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: biz
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Craig Little
@@ -9,22 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2016-02-13 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: abstract_type
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.0
 - !ruby/object:Gem::Dependency
   name: clavius
   requirement: !ruby/object:Gem::Requirement
@@ -39,34 +25,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: equalizer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.0
-- !ruby/object:Gem::Dependency
-  name: memoizable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -183,3 +141,4 @@ signing_key:
 specification_version: 4
 summary: Business hours calculations
 test_files: []
+has_rdoc: