biz 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d16f3fcb143fead794e794f17195778043ff611
-  data.tar.gz: 4958afc77a8fddaa749a543c353d88209a213e35
+  metadata.gz: 14ced23b25b1eada2cc2120be433aa949741f16e
+  data.tar.gz: b2f797726e49278c6388bce71f7b85d04f435d48
 SHA512:
-  metadata.gz: b70ed92768f8ae067bcb6cbf3c5f837682555879a92e84a805f6b5d0311a18867523f0d4d01b2f57f72b8d7e5385639f46542f77a636a848c9b83ed2c58a43c5
-  data.tar.gz: 5d5ad52048db8ad7d800edbb05c4162f0ed311a8d45fd0596b157fcb098d1dd462c51f8362b9ed10c2afe72c6ad0d76eb2a7527d4cd3519f982c37fcc60822e5
+  metadata.gz: bb3d77c08bc245fb5220ed69d71809cc52f27379c0d83a325288c2a41f1c4e78e0200ce965e3657694b52aa4967571f59afe841e3f0c9904c8d3fe6358f6bf21
+  data.tar.gz: 0b2bb9dc20437369b2c6b760baa87bc381d80640bdc9db7079ddd96105d0b9e4dd222c5bf1769af203af6a3e4e4e6533e98becaa83bec6ac286ac147fd057586

data/lib/biz/date.rb

@@ -7,5 +7,10 @@ module Biz
       EPOCH + day
     end
 
+    def self.for_dst(date, day_time)
+      date +
+        (day_time.day_second + Time::SECONDS_IN_HOUR) / Time::SECONDS_IN_DAY
+    end
+
   end
 end

data/lib/biz/day_time.rb

@@ -1,6 +1,8 @@
 module Biz
   class DayTime
 
+    VALID_SECONDS = 0..Time::SECONDS_IN_DAY
+
     module Timestamp
       FORMAT  = '%02d:%02d'
       PATTERN = /\A(?<hour>\d{2}):(?<minute>\d{2})(:?(?<second>\d{2}))?\Z/
@@ -13,22 +15,26 @@ module Biz
     class << self
 
       def from_time(time)
-        new(time.hour * Time::HOUR + time.min * Time::MINUTE + time.sec)
+        new(
+          time.hour * Time::SECONDS_IN_HOUR +
+            time.min * Time::SECONDS_IN_MINUTE +
+            time.sec
+        )
       end
 
       def from_minute(minute)
-        new(minute * Time::MINUTE)
+        new(minute * Time::SECONDS_IN_MINUTE)
       end
 
       def from_hour(hour)
-        new(hour * Time::HOUR)
+        new(hour * Time::SECONDS_IN_HOUR)
       end
 
       def from_timestamp(timestamp)
         timestamp.match(Timestamp::PATTERN) { |match|
           new(
-            match[:hour].to_i * Time::HOUR +
-              match[:minute].to_i * Time::MINUTE +
+            match[:hour].to_i * Time::SECONDS_IN_HOUR +
+              match[:minute].to_i * Time::SECONDS_IN_MINUTE +
               match[:second].to_i
           )
         }
@@ -54,7 +60,7 @@ module Biz
 
     attr_reader :day_second
 
-    delegate strftime: :day_time
+    delegate strftime: :format_time
 
     delegate %i[
       to_i
@@ -63,24 +69,34 @@ module Biz
 
     def initialize(day_second)
       @day_second = Integer(day_second)
+
+      unless VALID_SECONDS.cover?(@day_second)
+        fail ArgumentError, 'Invalid number of seconds for a day.'
+      end
     end
 
     def hour
-      day_second / Time::HOUR
+      day_second / Time::SECONDS_IN_HOUR
     end
 
     def minute
-      day_second % Time::HOUR / Time::MINUTE
+      day_second % Time::SECONDS_IN_HOUR / Time::SECONDS_IN_MINUTE
     end
 
     def second
-      day_second % Time::MINUTE
+      day_second % Time::SECONDS_IN_MINUTE
     end
 
     def day_minute
       hour * Time::MINUTES_IN_HOUR + minute
     end
 
+    def for_dst
+      self.class.new(
+        (day_second + Time::SECONDS_IN_HOUR) % Time::SECONDS_IN_DAY
+      )
+    end
+
     def timestamp
       format(Timestamp::FORMAT, hour, minute)
     end
@@ -99,7 +115,7 @@ module Biz
 
     private
 
-    def day_time
+    def format_time
       ::Time.new(
         Date::EPOCH.year,
         Date::EPOCH.month,

data/lib/biz/duration.rb

@@ -15,13 +15,13 @@ module Biz
       alias_method :second, :seconds
 
       def minutes(minutes)
-        new(minutes * Time::MINUTE)
+        new(minutes * Time::SECONDS_IN_MINUTE)
       end
 
       alias_method :minute, :minutes
 
       def hours(hours)
-        new(hours * Time::HOUR)
+        new(hours * Time::SECONDS_IN_HOUR)
       end
 
       alias_method :hour, :hours
@@ -41,11 +41,11 @@ module Biz
     end
 
     def in_minutes
-      seconds / Time::MINUTE
+      seconds / Time::SECONDS_IN_MINUTE
     end
 
     def in_hours
-      seconds / Time::HOUR
+      seconds / Time::SECONDS_IN_HOUR
     end
 
     def +(other)

data/lib/biz/time.rb

@@ -1,18 +1,17 @@
 module Biz
   class Time
 
-    MINUTE = 60
-    HOUR   = 60 * MINUTE
-    DAY    = 24 * HOUR
-    WEEK   = 7 * DAY
+    SECONDS_IN_MINUTE = 60
+    MINUTES_IN_HOUR   = 60
+    HOURS_IN_DAY      = 24
+    DAYS_IN_WEEK      = 7
 
-    MINUTES_IN_HOUR = 60
-    HOURS_IN_DAY    = 24
-    DAYS_IN_WEEK    = 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
 
     MINUTES_IN_DAY  = MINUTES_IN_HOUR * HOURS_IN_DAY
-    MINUTES_IN_WEEK = MINUTES_IN_DAY * DAYS_IN_WEEK
-    SECONDS_IN_DAY  = MINUTES_IN_DAY * 60
+    MINUTES_IN_WEEK = MINUTES_IN_DAY  * DAYS_IN_WEEK
 
     BIG_BANG   = ::Time.new(-10**100)
     HEAT_DEATH = ::Time.new(10**100)
@@ -29,7 +28,7 @@ module Biz
 
     def on_date(date, day_time)
       time_zone.local_to_utc(
-        ::Time.utc(
+        ::Time.new(
           date.year,
           date.month,
           date.mday,
@@ -40,16 +39,11 @@ module Biz
         true
       )
     rescue TZInfo::PeriodNotFound
-      next_day_second = day_time.day_second + HOUR
-      if next_day_second > SECONDS_IN_DAY
-        on_date(date + 1, DayTime.new(next_day_second % SECONDS_IN_DAY))
-      else
-        on_date(date, DayTime.new(next_day_second))
-      end
+      on_date(Date.for_dst(date, day_time), day_time.for_dst)
     end
 
     def during_week(week, week_time)
-      on_date(week.start_date + week_time.wday, week_time)
+      on_date(week.start_date + week_time.wday, week_time.day_time)
     end
 
   end

data/lib/biz/version.rb

@@ -1,3 +1,3 @@
 module Biz
-  VERSION = '1.3.2'
+  VERSION = '1.3.3'
 end

data/lib/biz/week_time/abstract.rb

@@ -49,6 +49,8 @@ module Biz
         to_int
       ] => :week_minute
 
+      abstract_method :day_time
+
       protected
 
       def <=>(other)
@@ -69,8 +71,7 @@ module Biz
         )
       end
 
-      abstract_method :day_of_week,
-                      :day_time
+      abstract_method :day_of_week
 
     end
   end

data/lib/biz/week_time/end.rb

@@ -2,16 +2,16 @@ module Biz
   module WeekTime
     class End < Abstract
 
+      def 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) }
       end
 
-      def day_time
-        DayTime.from_minute(day_of_week.day_minute(week_minute))
-      end
-
       memoize :day_of_week,
               :day_time
 

data/lib/biz/week_time/start.rb

@@ -2,6 +2,10 @@ module Biz
   module WeekTime
     class Start < Abstract
 
+      def day_time
+        DayTime.from_minute(week_minute % Time::MINUTES_IN_DAY)
+      end
+
       private
 
       def day_of_week
@@ -10,10 +14,6 @@ module Biz
         )
       end
 
-      def day_time
-        DayTime.from_minute(week_minute % Time::MINUTES_IN_DAY)
-      end
-
       memoize :day_of_week,
               :day_time
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: biz
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Craig Little
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-18 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abstract_type
@@ -178,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Business hours calculations