runby_pace 0.6.99 → 0.6.100

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTExYzNkNjUyZTFlOWIyNTJhOGIwMWI2ODYyMzBiNmM1ZTQ4MDRjZg==
+    ZjFiOGZmNjc3Njg2NTQ0MDc0Y2JkZjM1NTk5YzBjZGRmMThiN2NlOA==
   data.tar.gz: !binary |-
-    NzU3NWVmY2M5NWE1NGM1OTUzYzUwNDQ4M2NlY2E1NGVhOTZmMmFhMQ==
+    ZmNjNTY2ZjQyNTc1NzEyMjVhNGI5ODUxMDYxODc2ZDczMDgxMDY3MA==
 SHA512:
   metadata.gz: !binary |-
-    MGY3N2VlYmNjOGU4NDBiMzZjNjgyNmIyMTkyYWI0YTcwMGI4N2Q3YzY0MjYy
-    MWE3ODM5ZmFlYmFjODRlM2Y4OWQ1YmMwYjQ4ZTE2MDYwYzU5MzQ2YTc0MmM2
-    YzNhNmEyYTE2M2JhNmY3YmJhMzdiMzEzZTZlM2RkODgxMjBlYWY=
+    MGZkNTkwMWFlN2E5NTU4MTMwZDlmYzI2NWE2N2Y1NjJhNjQwNTU1M2YzNjU2
+    Yzk4NDA3MTkzZjIyMWFjMDcwYmRiNjIxODg4Mjc0MDIxOTQxMDYyYmE1MGJl
+    NWIzYjA1ZjdiMDZjNmFmMzA3NWUwZjQ4ZjcxZjZlMGM2MGZjYjk=
   data.tar.gz: !binary |-
-    OTZlMjZiNmExODQwNjYxNmFkM2QxNzVlNzZlNDBmNzkxNmEzZTdmZjkyNjYx
-    NDQ1MmU1YThhNzljMWYzY2EzZTAyMDRlNzY0NmYxZjY1M2QxYjg2M2MwNTNm
-    MmVlYjU2NmM3NTU5OTQzNzE0MGEwYTYwM2Q4NDQyYTU0OGUyYzU=
+    NjUxNTdlOTJhNTcyODg5ZWQ3Nzg3YWZiMDQzNjdjYWE0M2QwMGEyNWQzOTFl
+    NWNlZjcwYzMyMWJhYTMxZmViN2UxOWI3NGUyOTFlYWQzODY2ODg3MWFkYzNm
+    ZjA2ZDM0NmJkODNhYmFjZDBkZmY3MmM1ZTE0NGJhYTkzMGM3MzM=

data/lib/runby_pace/distance.rb

@@ -59,12 +59,17 @@ module Runby
 
     def pluralized_uom
       uom_description = @uom.description.downcase
-      if @multiplier > 1 then
+      if @multiplier > 1
         uom_description += 's'
       end
       uom_description
     end
 
+    def ==(other)
+      raise "Cannot compare Runby::Distance to #{other.class}" unless other.is_a? Distance
+      @uom == other.uom && @multiplier == other.multiplier
+    end
+
     private
 
     def init_from_clone(distance)

data/lib/runby_pace/distance_unit.rb

@@ -47,6 +47,16 @@ module Runby
       @@_uom_definitions.has_key?(symbol)
     end
 
+    def ==(other)
+      if other.is_a? DistanceUnit
+        @symbol == other.symbol
+      elsif other.is_a? String
+        @symbol == DistanceUnit.parse(other)
+      else
+        raise "Error comparing DistanceUnit to #{other.class}"
+      end
+    end
+
     @@_uom_definitions =
       { km: { description: 'Kilometer', conversion_factor: 1.0, synonyms: %w(k km kms kilometer kilometers) },
         m:  { description: 'Meter', conversion_factor: 0.001, synonyms: %w(m meter meters) },

data/lib/runby_pace/pace.rb

@@ -1,15 +1,49 @@
 module Runby
   # Represents a pace consisting of a distance and a time in which that distance was covered
   class Pace
+    include Comparable
+
     attr_reader :time, :distance
 
-    def initialize(time, distance = '1K')
-      @time = Runby::RunbyTime.parse(time)
-      @distance = Runby::Distance.new(distance)
+    def initialize(time_or_pace, distance = '1K')
+      if time_or_pace.is_a? Pace
+        init_from_clone time_or_pace
+      else
+        @time = Runby::RunbyTime.parse(time_or_pace)
+        @distance = Runby::Distance.new(distance)
+      end
     end
 
     def to_s
       "#{time} per #{distance.pluralized_uom}"
     end
+
+    def <=>(other)
+      if other.is_a? Pace
+        return nil unless @distance == other.distance
+        @time <=> other.time
+      elsif other.is_a? RunbyTime
+        @time <=> other.time
+      elsif other.is_a? String
+        @time <=> RunbyTime.parse(other)
+      end
+    end
+
+    def almost_equals?(other_pace, tolerance_time = '00:01')
+      if other_pace.is_a?(String)
+        other_pace = Pace.parse(other_pace)
+      end
+      tolerance = RunbyTime.new(tolerance_time)
+      # TODO: Clean this up by adding +- to Pace
+      self.time >= (other_pace.time - tolerance) && self.time <= (other_pace.time + tolerance)
+    end
+
+    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
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runby_pace
 version: !ruby/object:Gem::Version
-  version: 0.6.99
+  version: 0.6.100
 platform: ruby
 authors:
 - Ty Walls
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-18 00:00:00.000000000 Z
+date: 2016-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,7 +100,7 @@ homepage: https://github.com/tygerbytes/runby-pace
 licenses:
 - MIT
 metadata:
-  commit-hash: 844c69d489d5a69e0df6749bfc466f98e85ba755
+  commit-hash: 5e175da0082d9fb644dfd56117271a8e51928cb2
 post_install_message: 
 rdoc_options: []
 require_paths: