biz 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33c5eb58e4e8d9ee6f5b42c071c99e8c8cf8ed5b
-  data.tar.gz: 05fdc0175b78e6147aaffcaea14d274955744a2d
+  metadata.gz: 1d05e74b61bbcd76562d54907d90b90252579da8
+  data.tar.gz: b30af6939b9302e91d00e10289da02ef4ea87bbf
 SHA512:
-  metadata.gz: c6556e0069a7f41c67a0cdf9d80f7886b622b2cc043ba6c65a1bb6201d65f6a39facc1a8073b5c4d612f0d2d152a05b72bdbd8d2183dfc40d4cfc98ff34c4fc1
-  data.tar.gz: b42dfdb7a0fbba2386b1fa13e45ced2314517ea8c35c9ec66873b5804c6ee7dea7b61f9c8ab03bbbf856428127a71e25ce9c9b7cc9eeb4718878536559e079c8
+  metadata.gz: ce1f8adb07629077dd1a6f9d9f9f297a993792de30d362960ea2b690cee778c6f320f1ffdcf75ad5196a0dbb0eaea086a3c5d4cc51926475b3aa8aa768c7db26
+  data.tar.gz: e78efec99aeb0175351750d4354930e061961287dacfd00c20b6a7fb49bd8c46d7651b337d31e2722e70e4d101a07b3059b26512451dfa6785ce5f3c48dea943

data/README.md

@@ -131,6 +131,8 @@ require 'biz/core_ext'
 
 5.business_hours.after(Time.utc(2015, 4, 7, 8, 20))
 
+3.business_days.before(Time.utc(2015, 5, 9, 4, 12))
+
 Time.utc(2015, 8, 20, 9, 30).business_hours?
 
 Date.new(2015, 12, 10).business_day?

data/lib/biz/day_time.rb

@@ -1,8 +1,12 @@
 module Biz
   class DayTime
 
-    TIMESTAMP_FORMAT  = '%02d:%02d'
-    TIMESTAMP_PATTERN = /(?<hour>\d{2}):(?<minute>\d{2})/
+    module Timestamp
+
+      FORMAT  = '%02d:%02d'
+      PATTERN = /\A(?<hour>\d{2}):(?<minute>\d{2})(:?(?<second>\d{2}))?\Z/
+
+    end
 
     include Comparable
 
@@ -11,16 +15,24 @@ module Biz
     class << self
 
       def from_time(time)
-        new(time.hour * Time::MINUTES_IN_HOUR + time.min)
+        new(time.hour * Time::HOUR + time.min * Time::MINUTE + time.sec)
+      end
+
+      def from_minute(minute)
+        new(minute * Time::MINUTE)
       end
 
       def from_hour(hour)
-        new(hour * Time::MINUTES_IN_HOUR)
+        new(hour * Time::HOUR)
       end
 
       def from_timestamp(timestamp)
-        timestamp.match(TIMESTAMP_PATTERN) { |match|
-          new(match[:hour].to_i * Time::MINUTES_IN_HOUR + match[:minute].to_i)
+        timestamp.match(Timestamp::PATTERN) { |match|
+          new(
+            match[:hour].to_i * Time::HOUR +
+              match[:minute].to_i * Time::MINUTE +
+              match[:second].to_i
+          )
         }
       end
 
@@ -42,29 +54,37 @@ module Biz
 
     end
 
-    attr_reader :day_minute
+    attr_reader :day_second
 
     delegate strftime: :day_time
 
     delegate %i[
       to_i
       to_int
-    ] => :day_minute
+    ] => :day_second
 
-    def initialize(day_minute)
-      @day_minute = Integer(day_minute)
+    def initialize(day_second)
+      @day_second = Integer(day_second)
     end
 
     def hour
-      day_minute / Time::MINUTES_IN_HOUR
+      day_second / Time::HOUR
     end
 
     def minute
-      day_minute % Time::MINUTES_IN_HOUR
+      day_second % Time::HOUR / Time::MINUTE
+    end
+
+    def second
+      day_second % Time::MINUTE
+    end
+
+    def day_minute
+      hour * Time::MINUTES_IN_HOUR + minute
     end
 
     def timestamp
-      format(TIMESTAMP_FORMAT, hour, minute)
+      format(Timestamp::FORMAT, hour, minute)
     end
 
     def coerce(other)
@@ -76,7 +96,7 @@ module Biz
     def <=>(other)
       return nil unless other.respond_to?(:to_i)
 
-      day_minute <=> other.to_i
+      day_second <=> other.to_i
     end
 
     private
@@ -87,7 +107,8 @@ module Biz
         Date::EPOCH.month,
         Date::EPOCH.mday,
         hour,
-        minute
+        minute,
+        second
       )
     end
 

data/lib/biz/time.rb

@@ -33,12 +33,13 @@ module Biz
           date.month,
           date.mday,
           day_time.hour,
-          day_time.minute
+          day_time.minute,
+          day_time.second
         ),
         true
       )
     rescue TZInfo::PeriodNotFound
-      on_date(date, DayTime.new(day_time.day_minute + MINUTES_IN_HOUR))
+      on_date(date, DayTime.new(day_time.day_second + HOUR))
     end
 
     def during_week(week, week_time)

data/lib/biz/version.rb

@@ -1,5 +1,5 @@
 module Biz
 
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 
 end

data/lib/biz/week_time/abstract.rb

@@ -35,6 +35,7 @@ module Biz
       delegate %i[
         hour
         minute
+        second
         day_minute
         timestamp
       ] => :day_time

data/lib/biz/week_time/end.rb

@@ -9,7 +9,7 @@ module Biz
       end
 
       def day_time
-        DayTime.new(day_of_week.day_minute(week_minute))
+        DayTime.from_minute(day_of_week.day_minute(week_minute))
       end
 
       memoize :day_of_week,

data/lib/biz/week_time/start.rb

@@ -11,7 +11,7 @@ module Biz
       end
 
       def day_time
-        DayTime.new(week_minute % Time::MINUTES_IN_DAY)
+        DayTime.from_minute(week_minute % Time::MINUTES_IN_DAY)
       end
 
       memoize :day_of_week,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: biz
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Craig Little
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abstract_type