runby_pace 0.61.153 → 0.61.154

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c60a2e73563c7842283f902a9296cb19dab57ff1
-  data.tar.gz: 47ce26e84f4542fe38d64b3177231a9591801e94
+  metadata.gz: 606c3c91ef5137d4eb17d80fec2e6abc1de92110
+  data.tar.gz: 512fafad4f8f3f04a08274e3b63a34935bf25be9
 SHA512:
-  metadata.gz: cf89a3299ecd7230f8801021a015f61d5244376ec2ac3ba1e41bbee061bc31485e0f56e8665d19ffaed6f099670d22c506bd238b88713c2dbb8c20abf5c51365
-  data.tar.gz: 2225f218942a998edc91a1d551ab2d4badd816674638c343b1bd0a6dcc5ace56d8bac75056e062543d2d5d85370609c4b33474f60b7264634d1f4872055bff6e
+  metadata.gz: 95c099f7c0e5257f68136e32065fb6149c2f06bd5fdc0cfb3fa97b09b52c7030b8a7fe62a42bcdbb0ced3e82bcdba31081dc44f6fab46c027dc164dfcd1041e0
+  data.tar.gz: 35cf6b718b23ddd67b0c4bcf3af08ad945041cfa00cd3f1d37cf3d05e4c3e52c1ee9245536c0444d428c2a636a5d590cb9c31a2594e442b0e5474cbd3eec29e6

data/lib/runby_pace/distance.rb

@@ -6,14 +6,17 @@ module Runby
     include Comparable
 
     attr_reader :uom, :multiplier
+
+    def self.new(uom = :km, multiplier = 1)
+      return uom if uom.is_a? Distance
+      return Distance.parse uom if uom.is_a? String
+      super
+    end
+
     def initialize(uom = :km, multiplier = 1)
       case uom
-      when Distance
-        init_from_clone uom
       when DistanceUnit
         init_from_distance_unit uom, multiplier
-      when String
-        init_from_string uom
       when Symbol
         init_from_symbol uom, multiplier
       else
@@ -116,20 +119,11 @@ module Runby
 
     private
 
-    def init_from_clone(distance)
-      @uom = distance.uom
-      @multiplier = distance.multiplier
-    end
-
     def init_from_distance_unit(uom, multiplier)
       @uom = uom
       @multiplier = multiplier
     end
 
-    def init_from_string(string)
-      init_from_clone Distance.parse string
-    end
-
     def init_from_symbol(distance_uom_symbol, multiplier)
       raise "Unknown unit of measure #{distance_uom_symbol}" unless Runby::DistanceUnit.known_uom? distance_uom_symbol
       raise 'Invalid multiplier' unless multiplier.is_a?(Numeric)

data/lib/runby_pace/distance_unit.rb

@@ -7,12 +7,15 @@ module Runby
   class DistanceUnit
     attr_reader :symbol, :description, :conversion_factor
 
+    def self.new(unit_of_measure)
+      return unit_of_measure if unit_of_measure.is_a? DistanceUnit
+      return DistanceUnit.parse(unit_of_measure) if unit_of_measure.is_a? String
+      super
+    end
+
     def initialize(unit_of_measure)
-      if unit_of_measure.is_a? Symbol
-        init_from_symbol unit_of_measure
-      elsif unit_of_measure.is_a? String
-        init_from_string unit_of_measure
-      end
+      raise "':#{unit_of_measure}' is an unknown unit of measure" unless DistanceUnit.known_uom? unit_of_measure
+      @symbol = unit_of_measure
       @conversion_factor = UOM_DEFINITIONS[@symbol][:conversion_factor]
       @description = UOM_DEFINITIONS[@symbol][:description]
       freeze
@@ -81,17 +84,5 @@ module Runby
         # Fun distance unit of measures
         marathon: { description: 'marathon', description_plural: 'marathons', conversion_factor: 42.1648128,
                     synonyms: %w[marathon] } }.freeze
-
-    private
-
-    def init_from_symbol(unit_of_measure)
-      raise "':#{unit_of_measure}' is an unknown unit of measure" unless DistanceUnit.known_uom? unit_of_measure
-      @symbol = unit_of_measure
-    end
-
-    def init_from_string(unit_of_measure)
-      parsed_uom = DistanceUnit.parse(unit_of_measure)
-      @symbol = parsed_uom.symbol
-    end
   end
 end

data/lib/runby_pace/pace.rb

@@ -7,10 +7,13 @@ module Runby
 
     attr_reader :time, :distance
 
+    def self.new(time_or_pace, distance = '1K')
+      return time_or_pace if time_or_pace.is_a? Pace
+      super
+    end
+
     def initialize(time_or_pace, distance = '1K')
       case time_or_pace
-      when Pace
-        init_from_clone time_or_pace
       when RunbyTime
         init_from_time time_or_pace, distance
       when String
@@ -128,12 +131,6 @@ module Runby
 
     private
 
-    def init_from_clone(other_pace)
-      raise "#{other_pace} is not a Runby::Pace" unless other_pace.is_a? Pace
-      @time = other_pace.time
-      @distance = other_pace.distance
-    end
-
     def init_from_string(string, distance = '1K')
       pace = Pace.try_parse(string)
       if pace[:pace]

data/lib/runby_pace/speed.rb

@@ -7,16 +7,24 @@ module Runby
 
     attr_reader :distance
 
+    def self.new(distance_or_multiplier, units = :km)
+      return distance_or_multiplier if distance_or_multiplier.is_a? Speed
+      if distance_or_multiplier.is_a? String
+        parsed_speed = Speed.try_parse(distance_or_multiplier)
+        return parsed_speed[:speed] unless parsed_speed[:error]
+      end
+      super
+    end
+
     def initialize(distance_or_multiplier, units = :km)
       case distance_or_multiplier
       when Distance
         init_from_distance distance_or_multiplier
       when String
-        init_from_string distance_or_multiplier
+        # Already tried to parse it as a Speed string. Try parsing it as a Distance string.
+        init_from_distance_string distance_or_multiplier
       when Numeric
         init_from_multiplier(distance_or_multiplier, units)
-      when Speed
-        init_from_clone distance_or_multiplier
       else
         raise 'Unable to initialize Runby::Speed'
       end
@@ -68,27 +76,18 @@ module Runby
 
     private
 
-    def init_from_clone(other_speed)
-      @distance = Distance.new(other_speed.distance)
-    end
-
     def init_from_distance(distance)
-      @distance = Distance.new(distance)
+      @distance = distance
     end
 
     def init_from_multiplier(multiplier, uom)
       @distance = Distance.new(uom, multiplier)
     end
 
-    def init_from_string(str)
-      results = Speed.try_parse(str)
-      unless results[:error]
-        init_from_clone results[:speed]
-        return
-      end
+    def init_from_distance_string(str)
       results = Distance.try_parse(str)
       unless results[:error]
-        init_from_distance results[:distance]
+        @distance = results[:distance]
         return
       end
       raise "'#{str}' is not recognized as a Speed"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runby_pace
 version: !ruby/object:Gem::Version
-  version: 0.61.153
+  version: 0.61.154
 platform: ruby
 authors:
 - Ty Walls
@@ -108,7 +108,7 @@ homepage: https://github.com/tygerbytes/runby-pace
 licenses:
 - MIT
 metadata:
-  commit-hash: 3fc9ad10f233d833635a4ee48619fcd7957f98f3
+  commit-hash: 09fc1b1dbcb0402ebffe9a33901f65105ffb04aa
 post_install_message: 
 rdoc_options: []
 require_paths: