runby_pace 0.6.106 → 0.6.108

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NDM4OWZkODZlZTU0ZjFiMTcwMTc0MTJkMTUxMjVhOWQ1MDcxYzNhNg==
-  data.tar.gz: !binary |-
-    NTFhMWVjYjUyNTAwMTdhM2ZiNDFkMWEyN2VmMGNkY2MyYmZiYjhmMw==
+SHA1:
+  metadata.gz: 05fcd0b6b61a1ddf39929d5599adc170e8d9d01c
+  data.tar.gz: 8146a49cc46bac7e57d748c77e96ff77405d863b
 SHA512:
-  metadata.gz: !binary |-
-    ZjJlNTJiOGZhYmQwMjFlOGQ1OTQ0MTlhNjQyNmFmZTRmZmExOTQzZDJjNTY3
-    ZjRjMjA5MDQxMDRiNWI0OGY1YjdkMzk0ZjQ1ZGZjYTVhNzYxMGRkOGY0ZmI1
-    OTkxOThhZmIyODVhODU3MDhlZTkzMDg0YzJmMmFjMGQzNDRjOGE=
-  data.tar.gz: !binary |-
-    NmI1N2ZiOGNmZTljMjY1NjUyYWRiMTNkNGZmZDlmYTJmMTA1Yjk3ODAwNDE1
-    YWY2YzhhMmI0ZmEwZGJmMjY1NDc5MmM5NjJkNmE4NDdhMmJkOTBjYTI1NTc3
-    MzJkNWVmZmZjZGI5ZjI2OGU4NmU1OGE1NmQ4ODE5MmE2YjQwYzA=
+  metadata.gz: 3d58545472843d9e8297ce991a62eae09f570c8811d10931333c89c5cc79daec03e079ceff377d94827a1abcacdca34940acd00a6976cf0877ffd0eefcc6d489
+  data.tar.gz: defa3958eead76a0048a22d1133d959d8913e282f048bc7e1b1c215990460991e443e9409c6a69b81372022f86965ce257730a225362b7cdadd7c03d05cd6690

data/lib/runby_pace/pace.rb

@@ -24,6 +24,12 @@ module Runby
       end
     end
 
+    def as_speed
+      multiplier = (60 / @time.total_minutes).round(2)
+      distance = Runby::Distance.new(@distance.uom, multiplier)
+      Runby::Speed.new distance
+    end
+
     def <=>(other)
       if other.is_a? Pace
         return nil unless @distance == other.distance

data/lib/runby_pace/pace_range.rb

@@ -22,6 +22,10 @@ module Runby
       PaceRange.new fast, slow
     end
 
+    def as_speed_range
+      SpeedRange.new @fast.as_speed, @slow.as_speed
+    end
+
     def to_s(format: :long)
       if @fast == @slow
         @fast.to_s(format: format)

data/lib/runby_pace/run_math.rb

@@ -2,13 +2,11 @@ module Runby
   # An assortment of mathematical functions related to running.
   class RunMath
     def self.convert_pace_to_speed(pace)
-      pace = Runby::RunbyTime.new(pace)
-      (60 / pace.total_minutes).round(2)
+      pace.as_speed
     end
 
-    def self.convert_speed_to_pace(units_per_hour)
-      raise 'units_per_hour must be numeric' unless units_per_hour.is_a? Numeric
-      Runby::RunbyTime.from_minutes(60.0 / units_per_hour)
+    def self.convert_speed_to_pace(speed)
+      speed.as_pace
     end
 
     def self.distance_traveled(pace, time)

data/lib/runby_pace/runby_range.rb

@@ -9,9 +9,9 @@ module Runby
       raise 'RunbyRange is a base class for PaceRange and SpeedRange. Instantiate one of them instead.'
     end
 
-    def to_s
+    def to_s(format: :long)
       if @fast == @slow
-        @fast.to_s
+        @fast.to_s(format: format)
       else
         "#{@fast}-#{@slow}"
       end

data/lib/runby_pace/speed.rb

@@ -0,0 +1,80 @@
+module Runby
+  # Represents a speed consisting of a distance and a unit of time in which that distance was covered
+  class Speed
+    include Comparable
+
+    attr_reader :distance
+
+    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
+        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
+    end
+
+    def to_s(format: :long)
+      distance = @distance.to_s(format: format)
+      case format
+        when :short then "#{distance}/ph"
+        when :long then "#{distance} per hour"
+      end
+    end
+
+    def as_pace
+      time = Runby::RunbyTime.from_minutes(60.0 / @distance.multiplier)
+      Runby::Pace.new(time, @distance.uom)
+    end
+
+    def self.try_parse(description)
+      # TODO: hard coding
+      distance = Distance.new(:mi, 7)
+      speed = Speed.new distance
+      { speed: speed }
+    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
+      end
+    end
+
+    private
+
+    def init_from_clone(other_speed)
+      @distance = Distance.new(other_speed.distance)
+    end
+
+    def init_from_distance(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
+      results = Distance.try_parse(str)
+      unless results[:error]
+        init_from_distance results[:distance]
+        return
+      end
+      raise "'#{str}' is not recognized as a Speed"
+    end
+  end
+end

data/lib/runby_pace/speed_range.rb

@@ -4,17 +4,29 @@ module Runby
   # Represents a range of speeds, from fast to slow.
   class SpeedRange < RunbyRange
     def initialize(fast, slow)
-      raise 'Invalid speed values' unless fast.is_a?(Numeric) && slow.is_a?(Numeric)
-      @fast = fast.round(2)
-      @slow = slow.round(2)
+      raise "Invalid fast speed value: #{fast}" unless fast.is_a?(Numeric) || fast.is_a?(Speed)
+      raise "Invalid slow speed value: #{slow}" unless slow.is_a?(Numeric) || slow.is_a?(Speed)
+      @fast = Runby::Speed.new(fast)
+      @slow = Runby::Speed.new(slow)
     end
 
     # Create a new speed range from an existing pace range.
     def self.from_pace_range(pace_range)
-      # TODO: We need a Speed class with Distance_units included
-      fast = Runby::RunMath.convert_pace_to_speed pace_range.fast.time
-      slow = Runby::RunMath.convert_pace_to_speed pace_range.slow.time
-      SpeedRange.new fast, slow
+      pace_range.as_speed_range
+    end
+
+    def as_pace_range
+      Runby::PaceRange.new @fast.as_pace, @slow.as_pace
+    end
+
+    def to_s(format: :long)
+      if @fast == @slow
+        @fast.to_s(format: format)
+      else
+        fast_multiplier = format('%g', @fast.distance.multiplier.round(2))
+        slow_multiplier = format('%g', @slow.distance.multiplier.round(2))
+        @fast.to_s(format: format).sub("#{fast_multiplier}", "#{fast_multiplier}-#{slow_multiplier}")
+      end
     end
   end
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: runby_pace
 version: !ruby/object:Gem::Version
-  version: 0.6.106
+  version: 0.6.108
 platform: ruby
 authors:
 - Ty Walls
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-25 00:00:00.000000000 Z
+date: 2016-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 description: 
@@ -59,10 +59,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -92,6 +92,7 @@ files:
 - lib/runby_pace/run_types/tempo_run.rb
 - lib/runby_pace/runby_range.rb
 - lib/runby_pace/runby_time.rb
+- lib/runby_pace/speed.rb
 - lib/runby_pace/speed_range.rb
 - lib/runby_pace/version.rb
 - misc/rubymine.png
@@ -100,24 +101,24 @@ homepage: https://github.com/tygerbytes/runby-pace
 licenses:
 - MIT
 metadata:
-  commit-hash: 04d742e1b7c187763822443747659507ef89b555
+  commit-hash: 96f98250ad3dd63f0d01f88a5542e5a6a329e0c4
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Runby Pace is the core logic which simplifies the calculation of target paces