hour 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7d9267b3b089937946d971b89f0af4d5562a5ec
-  data.tar.gz: 00d4d94e7769afcb2e127e9d539ccd19decd8bed
+  metadata.gz: d29d4aa32799ef7980b35d4d3b8290e5aaa610d5
+  data.tar.gz: fcbb928fa97720c3c84a6733abf02f7567e15886
 SHA512:
-  metadata.gz: 98389becbcd5fc96e451d38907e18c5b29c99a235e76593d8ea39e7ddc07351f6917ff06f779f1a08402febeef3d0222290fda8c4a5e6913c1f57ccc8acf7cb9
-  data.tar.gz: 668b7b56bdc3dbc1802c2d29213f729ffa44f5c67ea6217a39b148c51a371f59d48f7a1b0eab52c01dce7059aa7dd03e1d4774c460cc3803d728c2a2ca17e899
+  metadata.gz: 24a633548bb0c6f8b57037bddbca11ea016d58da2f5f6e8ea8c272943e41b4a69e3ee233c32a2f05de810a62dee8fa919f860fd22b6144664d5cbd81ab4a5ed0
+  data.tar.gz: 867d9de901f1395f8d0c132c1efb5d1429d8a55fe8db408f09dd1b30ba6f783d18adf0ed5a6d4c4c71bb8457acdf4628bd5a48596070a88dcf302e9d98196ec7

data/lib/hour.rb

@@ -6,11 +6,11 @@ module Hour
 
     def initialize(hours, minutes = 0)
       hours, minutes = hours.split(':') if hours.is_a? String
-      @minutes = [0, minutes.to_i, 59].sort[1]          # Constrains assignment to the middle value, w/o the #Clamp method
+      @minutes = [minimum = 0, minutes.to_i, maximum = 59].sort[1]
       @minutes_in_base10 = @minutes.to_f / 60
       @to_a = [@hours = hours.to_i, @minutes]
       @to_base10 = @hours + @minutes_in_base10
-      @to_s = "#{'%02d' % @hours}:#{'%02d' % @minutes}" # Formats single-digits such that '1' will be '01'
+      @to_s = "#{'%02d' % @hours}:#{'%02d' % @minutes}" # Formats single-digits such that 1 will read '01'
       @to_seconds = (@hours * 60 + @minutes) * 60
       @days = @hours / 24 || 0
       @hours_less_days = @hours - 24 * @days
@@ -20,8 +20,8 @@ module Hour
       @to_time = Time.new(
         0,                   #year
         1,                   #month
-        1 + @days,        #day
-        @hours_less_days, #hour
+        1 + @days,           #day
+        @hours_less_days,    #hour
         @minutes,            #minute
         0,                   #second
         0                    #UTC    #TODO: handle both Time.zone format & deprecated UTC default?
@@ -35,11 +35,13 @@ module Hour
     end
 
     def self.from_time(time_obj)
-      hour = time_obj.hour + (time_obj.day - 1) * 24 if time_obj.year == 0 # Note that we expect Time input to be year 0, month 1 (minimum values). Incrementing day to a value above 1 means "add 24 * x hours", where x is the number of days above 1, so that a day value of 1 and hour value of 4 will be interpreted as "4 hours", whereas a day value of 2 and an hour value of 4 will be interpreted as "28 hours".
+      return nil if time_obj.nil?
+      hour = time_obj.hour + (time_obj.day - 1) * 24 if time_obj.year.zero? # We expect Time input to be year 0, month 1 (minimum values). Incrementing day to a value above 1 means "add 24 * x hours," where x is the number of days above 1, so that a day value of 1 and hour value of 4 will be interpreted as "4 hours," whereas a day value of 2 and an hour value of 4 will be interpreted as "28 hours."
       self.new(hour || time_obj.hour, time_obj.min)
     end
 
     def self.from_base10(num)
+      return nil if num.nil?
       hour, minute = num.divmod(1)
       self.new(hour, minute * 60)
     end

data/lib/hour/version.rb

@@ -1,3 +1,3 @@
 module Hour
-  VERSION = "0.5.1"
+  VERSION = "0.5.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hour
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors:
 - davegregg
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-18 00:00:00.000000000 Z
+date: 2017-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler