runby_pace 0.6.112 → 0.6.113

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6a23578f0080013d11088d8942eef4aeb20e808
-  data.tar.gz: 979e8d31b0ae9e4cfa1eda173fd6eab73978409b
+  metadata.gz: 863f82385f5fe82d808f93f6eb35019cd214787d
+  data.tar.gz: 264faa8e329286f77b6082e34ddb41eaa12ca527
 SHA512:
-  metadata.gz: 601aaaeb48f9fef5d97ee5edcc62f44cb2c9aa734d67b94d91ada0f0635e03aaafb0bf0b845a70898762595e60ebdcaad3eb6fee286dcaa13dbb0a831d49689a
-  data.tar.gz: b86423d35963e49e384f5de4b193118f662776f7074dca439c936c8cd85c8fc5d7c6e297148b7efbacafc0f9d725cd7ad8126b4a802f9a6460b9f8e0e25cb308
+  metadata.gz: 5d5a3ec0560b51b42e05a606457c45f47a9d30ab02fca106b83293feddc0fb3d34cfae85b324e5d7ee7961eb3cd53cd414285d9f510676f9d7f20df9bfdadba8
+  data.tar.gz: 3eca9c2755d6dc94a22f8eace340fe867fca958c01d6a3cdedf57df498667d1b46acb8a088b705d09af8c5ff7e68e4a07d76cc082f67c462a41423e97b918dfe

data/lib/runby_pace/distance.rb

@@ -1,6 +1,8 @@
 module Runby
   # Represents a distance (distance UOM and multiplier)
   class Distance
+    include Comparable
+
     attr_reader :uom, :multiplier
     def initialize(uom = :km, multiplier = 1)
       case uom
@@ -61,9 +63,13 @@ module Runby
       end
     end
 
-    def ==(other)
-      raise "Cannot compare Runby::Distance to #{other.class}" unless other.is_a? Distance
-      @uom == other.uom && @multiplier == other.multiplier
+    def <=>(other)
+      raise "Cannot compare Runby::Distance to #{other.class}" unless [Distance, String].include? other.class
+      if (other.is_a?(String))
+        return 0 if to_s == other.to_s || to_s(format: :long) == other.to_s(format: :long)
+        return self <=> try_parse(other)[:distance]
+      end
+      kilometers <=> other.kilometers
     end
 
     private

data/lib/runby_pace/speed.rb

@@ -56,12 +56,12 @@ module Runby
     end
 
     def <=>(other)
-      if other.is_a? Speed
-        @distance <=> other.distance
-      elsif other.is_a? String
-        # TODO: Parse as Speed when Speed.parse is available
-        to_s(format: :short) <=> other || to_s(format: :long) <=> other
+      raise "Cannot compare Runby::Speed to #{other.class}" unless [Speed, String].include? other.class
+      if other.is_a? String
+        return 0 if to_s == other.to_s || to_s(format: :long) == other.to_s(format: :long)
+        self <=> try_parse(other)[:speed]
       end
+      @distance <=> other.distance
     end
 
     private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runby_pace
 version: !ruby/object:Gem::Version
-  version: 0.6.112
+  version: 0.6.113
 platform: ruby
 authors:
 - Ty Walls
@@ -101,7 +101,7 @@ homepage: https://github.com/tygerbytes/runby-pace
 licenses:
 - MIT
 metadata:
-  commit-hash: fa51fc21a20b69ad77f48a217732e0294fe0218e
+  commit-hash: 989e6cd501d99bece9b7fc8a4e44e569b4d89d3b
 post_install_message: 
 rdoc_options: []
 require_paths: