hour 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc30ebd848bc96facff31dfe72a600ee22fc2d63
-  data.tar.gz: f66923f200c50f2f1b139da32cd0afaee15de05f
+  metadata.gz: 91b0152711820c46e57ddb8107ab885c7921f19e
+  data.tar.gz: ae4d3d2efaf9a738e01df44f0695e1dddb88cef7
 SHA512:
-  metadata.gz: 2132974435122a4106b9973429a03f50ee9dac45275e3dfbc3944394a518863aff5f3c8d3ab18ceb67a007438afec20382e0f5722197e201be07eb8c42450f8e
-  data.tar.gz: 3ba0c37f51861c0782d6809cf2ee3f1b85d5202153240f23897500e59597b3e8d0365a51f0533aead1f7451dcc9f0f5ab417f05f091b350741d6e5fa407575d1
+  metadata.gz: 47c38b819df5ee82bd2bb2e4c76ac612fc908df7b4797cc82433c5f694dbd941771e101f28b8012816edddc008b000aacf165aaf5cb3016a991b8139a202c282
+  data.tar.gz: 02d1bd54e9590e794ddd16d751b541ee8740e31dda7d0f7f863ad55d5e1e67f141f6269530112abb3c0c71c05e1443313cae273cfd8044aeff143ce8aa9c2a78

data/lib/hour.rb

@@ -1,35 +1,44 @@
-require "hour/version"
+  require "hour/version"
 
 module Hour
   class Hour
-    attr_reader :hours, :minutes, :to_seconds, :to_days, :to_hours_less_days, :to_s, :to_formatted_s, :to_a, :to_time
+    attr_reader :hours, :minutes, :to_seconds, :days, :hours_less_days, :to_s, :to_formatted_s, :to_a, :to_time
 
     def initialize(hours, minutes = 0)
-      hours, minutes = hours.split(':').map(&:to_i) if hours.is_a? String
-      minutes = [0, minutes, 59].sort[1] #clamp: constrains the assignment to the middle value
-      @to_s = "#{'%02d' % hours}:#{'%02d' % minutes}"
-      @to_a = [@hours = hours, @minutes = minutes]
-      @to_seconds = ((hours * 60) + minutes) * 60
-      @to_days = hours / 24
-      @to_hours_less_days = hours - 24 * @to_days
-      @to_formatted_s = "#{@to_days} day#{'s' unless @to_days == 1}, " +
-                        "#{@to_hours_less_days} hour#{'s' unless @to_hours_less_days == 1}, " +
-                        "#{minutes} minute#{'s' unless minutes == 1}"
+      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
+      @to_a = [@hours = hours.to_i, @minutes]
+      @to_s = "#{'%02d' % @hours}:#{'%02d' % @minutes}" # Formats single-digits such that '1' will be '01'
+      @to_seconds = (@hours * 60 + @minutes) * 60
+      @days = @hours / 24 || 0
+      @hours_less_days = @hours - 24 * @days
+      @to_formatted_s = "#{@days} day#{'s' unless @days == 1}, " +
+                        "#{@hours_less_days} hour#{'s' unless @hours_less_days == 1}, " +
+                        "#{@minutes} minute#{'s' unless @minutes == 1}"
       @to_time = Time.new(
         0,                   #year
         1,                   #month
-        1 + @to_days,        #day
-        @to_hours_less_days, #hour
-        minutes,             #minute
+        1 + @days,        #day
+        @hours_less_days, #hour
+        @minutes,            #minute
         0,                   #second
-        0                    #UTC    #TODO: gracefully handle both the new Time.zone format and the deprecated UTC
+        0                    #UTC    #TODO: handle both Time.zone format & deprecated UTC default?
       )
     end
 
+    def on_this_day(day_elect = Time.now)
+      day_elect.change(day:  day_elect.day + @days,
+                       hour: @hours_less_days,
+                       min:  @minutes)
+    end
+
     def self.from_time(time_obj)
-      hour = time_obj.hour + (time_obj.day - 1) * 24 if time_obj.year == 0
+      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".
       self.new(hour || time_obj.hour, time_obj.min)
     end
 
+    alias_method :to_days, :days                        # DEPRECATION: to_days
+    alias_method :to_hours_less_days, :hours_less_days  # DEPRECATION: to_hours_less_days
+
   end
 end

data/lib/hour/version.rb

@@ -1,3 +1,3 @@
 module Hour
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 end

metadata

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