runby_pace 0.6.150 → 0.6.151

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49cc12cba10d44c5bf4502da8d57bbad5cbbde8a
-  data.tar.gz: 841d4456163ddcc77ba860ca6060cf773f1aef1c
+  metadata.gz: 71c401e8a77a8960c6c7114917cabf50a2c0d8ad
+  data.tar.gz: 423bbf069cd9fb50c76f23dfe02302750f9bf209
 SHA512:
-  metadata.gz: f528ae26fc7c9a2a8b983955fc82e0fcee1ec898412f1c0393269ec10ff55eb3ac1b10747bba001da95a5bf9e5c50049cdac6ff3f2d0bf9bc6b3428dd14eb9bd
-  data.tar.gz: 09a2177c4ccdd96dad0e8870d11b0a273a79f53ca1191a94ca063168413e29d7026607f2c0bf9cee8dd8f23efd3960dd5bde4360bf65fe2d2daec5de95ac6e08
+  metadata.gz: 5762c55f858d8c425b730501868f376c26b71369a58ddfb944593a4613b2d707dc7867d35a35788bcea58cf528567010c68f21758781a98b2c2546e2c1137988
+  data.tar.gz: 8f0daa76640f6cb19e16e1476acae567e918348f27a7e0f400f0c7f1d86187db4018ae778fbf9e0264d7abacc95b2fa4affc74443fd0ed0134f3f9713f18fa60

data/lib/runby_pace/runby_time.rb

@@ -7,14 +7,14 @@ module Runby
 
     attr_reader :time_s, :hours_part, :minutes_part, :seconds_part
 
+    def self.new(time)
+      return time if time.is_a? RunbyTime
+      return RunbyTime.parse time if time.is_a?(String) || time.is_a?(Symbol)
+      super
+    end
+
     def initialize(time)
-      if time.is_a?(String) || time.is_a?(Symbol)
-        init_from_string time
-      elsif time.is_a?(RunbyTime)
-        init_from_clone time
-      elsif time.is_a?(Hash)
-        init_from_hash time
-      end
+      init_from_parts time if time.is_a? RunbyTimeParser::TimeParts
       freeze
     end
 
@@ -62,7 +62,7 @@ module Runby
     end
 
     def to_s
-      @time_s.sub(/^0/, '')
+      @time_s
     end
 
     def total_hours
@@ -126,25 +126,12 @@ module Runby
 
     private
 
-    # @param [Hash] params
-    def init_from_hash(params = {})
-      @time_s = params.fetch :time_s, '00:00'
-      @hours_part = params.fetch :hours_part, 0.0
-      @minutes_part = params.fetch :minutes_part, 0.0
-      @seconds_part = params.fetch :seconds_part, 0.0
-    end
-
-    # @param [RunbyTime] time
-    def init_from_clone(time)
-      @time_s = time.time_s
-      @hours_part = time.hours_part
-      @minutes_part = time.minutes_part
-      @seconds_part = time.seconds_part
-    end
-
-    # @param [String] time
-    def init_from_string(time)
-      init_from_clone RunbyTime.parse time
+    # @param [RunbyTimeParser::TimeParts] parts
+    def init_from_parts(parts)
+      @time_s = parts.format
+      @hours_part = parts[:hours]
+      @minutes_part = parts[:minutes]
+      @seconds_part = parts[:seconds]
     end
   end
 end

data/lib/runby_pace/runby_time_parser.rb

@@ -5,41 +5,76 @@ module Runby
   class RunbyTimeParser
     def self.parse(str)
       time = str.to_s.strip.chomp
-
-      if time.match?(/^\d?\d:\d\d:\d\d$/)
-        parts = time.split(':')
-        hours_part = parts[0].to_i
-        minutes_part = parts[1].to_i
-        seconds_part = parts[2].to_i
-      elsif time.match?(/^\d?\d:\d\d$/)
-        parts = time.split(':')
-        hours_part = 0
-        minutes_part = parts[0].to_i
-        seconds_part = parts[1].to_i
-      elsif time.match?(/^\d+$/)
-        hours_part = 0
-        minutes_part = time.to_i
-        seconds_part = 0
-      elsif time.match?(/^\d+[,. ]\d+$/)
-        parts = time.split(/[,. ]/)
-        hours_part = 0
-        minutes_part = parts[0].to_i
-        seconds_part = (parts[1].to_i / 10.0 * 60).to_i
+      if time_string?(time)
+        parts = TimeParts.new(time.split(':').reverse)
+      elsif integer?(time)
+        parts = extract_minutes_from_integer time
+      elsif decimal?(time)
+        parts = extract_minutes_from_decimal time
       else
         raise 'Invalid time format'
       end
+      RunbyTime.new(parts)
+    end
 
-      raise 'Hours must be less than 24' if hours_part > 23
-      raise 'Minutes must be less than 60 if hours are supplied' if hours_part.positive? && minutes_part > 59
-      raise 'Minutes must be less than 99 if no hours are supplied' if hours_part.zero? && minutes_part > 99
-      raise 'Seconds must be less than 60' if seconds_part > 59
-      hours_part_formatted = ''
-      if hours_part.positive?
-        hours_part_formatted = "#{hours_part.to_s.rjust(2, '0')}:"
+    def self.decimal?(str)
+      str.match?(/^\d+[,. ]\d+$/)
+    end
+
+    def self.integer?(str)
+      str.match?(/^\d+$/)
+    end
+
+    def self.time_string?(str)
+      str.match?(/^\d?\d(:\d\d)+$/)
+    end
+
+    def self.extract_minutes_from_decimal(decimal_str)
+      decimal_parts = decimal_str.split(/[,. ]/)
+      minutes = decimal_parts[0].to_i
+      seconds = (decimal_parts[1].to_i / 10.0 * 60).to_i
+      TimeParts.new([seconds, minutes])
+    end
+
+    def self.extract_minutes_from_integer(integer_str)
+      TimeParts.new([0, integer_str.to_i])
+    end
+
+    # Encapsulates the parts of a time string
+    class TimeParts
+      def initialize(parts_array)
+        @keys = { seconds: 0, minutes: 1, hours: 2 }
+        @parts = Array.new(@keys.count, 0)
+        Range.new(0, parts_array.count - 1).each { |i| @parts[i] = parts_array[i] }
+        validate
+        freeze
+      end
+
+      def [](key)
+        i = @keys[key]
+        @parts[i].to_i
+      end
+
+      def format
+        time_f = +''
+        @parts.reverse_each do |part|
+          time_f << ':' << part.to_s.rjust(2, '0')
+        end
+        # Remove leading ':'
+        time_f.slice!(0)
+        # Remove leading '00:00...'
+        time_f.sub!(/^(?:00:)+(\d\d:\d\d)/, '\1') if time_f.length > 5
+        # If the time looks like 00:48, only show 0:48
+        time_f.slice!(0) if time_f.slice(0) == '0'
+        time_f
       end
-      time_formatted = "#{hours_part_formatted}#{minutes_part.to_s.rjust(2, '0')}:#{seconds_part.to_s.rjust(2, '0')}"
 
-      RunbyTime.new(time_s: time_formatted, hours_part: hours_part, minutes_part: minutes_part, seconds_part: seconds_part)
+      def validate
+        raise 'Hours must be less than 24' if self[:hours] > 23
+        raise 'Minutes must be less than 60 if hours are supplied' if self[:hours].positive? && self[:minutes] > 59
+        raise 'Minutes must be less than 99 if no hours are supplied' if self[:hours].zero? && self[:minutes] > 99
+        raise 'Seconds must be less than 60' if self[:seconds] > 59
+      end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runby_pace
 version: !ruby/object:Gem::Version
-  version: 0.6.150
+  version: 0.6.151
 platform: ruby
 authors:
 - Ty Walls
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-13 00:00:00.000000000 Z
+date: 2017-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -106,7 +106,7 @@ homepage: https://github.com/tygerbytes/runby-pace
 licenses:
 - MIT
 metadata:
-  commit-hash: 54de432a4f35967353f0d104008c5402f357c237
+  commit-hash: bb461b8b253e567bb6123f62a963be7a875b3285
 post_install_message: 
 rdoc_options: []
 require_paths: