runby_pace 0.5.86 → 0.6.87

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWJjNGYwMWMzZDVkY2FmNjNiY2Q3NTFiMzg0ODZiMjdkYzJkZDUzYw==
+    ODUzOGU5MWZhZGI0NWU2ZGJiMjNmZGEzMjZhNmU2MGU3MWFlMjg1Mw==
   data.tar.gz: !binary |-
-    MDI1ZTc2ZDQyM2ZkOTYyNTM5ZDY4OGNjMDJkMmFjNGVmYzgzNWQyOQ==
+    NDFlZjBhOTllOWJlYmM3NjA4NzllMWM4MjgxYWZmMmI2Yzc3MDcyZQ==
 SHA512:
   metadata.gz: !binary |-
-    YmUyOGM2ZTE2NTczZDczMjhjM2NkNTViMDg2OGE2N2M2ZDZmMjlkZmJkOGU0
-    MWFmMzE0NDA3ZDljOWM0ZGE4Mzg0ZjBkMzFhMDliZDQxMGNlOTkxNGQ4MDJl
-    NDRmMDdlMWFkNWQ5NzQ3ZDNjZjJiOWU1NGNiN2UyYzkxODg4YTQ=
+    ODk1NTcwNTEzYTAwNTdhZmRlOTVhNWVkNDhkZDA2YWVmYWRhMDUwODgxNzFh
+    ODE0M2ViNzliZmI2YjdmZmI3OGQyMmE5YWFhMDJiYzVmNGQ3ZTg1Yjk5NTRh
+    N2QxNmMwMmI5ODMyNjM1NGQzMzhhNTc4ZjhlY2U0OTM5Y2NlZTU=
   data.tar.gz: !binary |-
-    ZTRkMGNkZGIyOTFiNWE1MTE0NThlYzk0NzY4NTJiYTU0YzNhZDhhZjFlZGM5
-    YmJjNzVhZTM4MmZjZGYxOGNmMTIxODc0MmViMDZiZDJlNzY0MDAyN2MyNTdl
-    NWJhNzViNGU3OTQxYmQxMGU1ZmUxODEyNTNhMWM5NThmOTEyNmY=
+    NTQxY2VhZjE0YTAzNDViNDEzYTIzODIzZGRmN2Y1Zjk4NDBiNzFhYjc2YzBj
+    YTVhZDUxNzM2YmU0ZGNjYjE4ODUwOWNhNTM1MDg1ZGE3ZTRmNTYwNzI1NjI4
+    YjY4NmE2ZGEyMTQyY2JjNzVhNmQ5YWZkMTIyNDA3MzUyMGRkMGY=

data/lib/runby_pace/distance.rb

@@ -3,21 +3,22 @@ module Runby
   class Distance
     attr_reader :uom, :multiplier
     def initialize(uom = :km, multiplier = 1)
-      raise 'Invalid multiplier' unless multiplier.is_a?(Numeric)
       case uom
         when Distance
           return init_from_clone uom
+        when DistanceUnit
+          return init_from_distance_unit uom, multiplier
         when String
           return init_from_string uom
         when Symbol
-          return init_from_symbol(uom, multiplier)
+          return init_from_symbol uom, multiplier
         else
           raise 'Invalid distance unit of measure'
       end
     end
 
     def meters
-      kilometers = @multiplier * Runby::DistanceUnits.conversion_factor(@uom)
+      kilometers = @multiplier * @uom.conversion_factor
       kilometers * 1000.0
     end
 
@@ -27,10 +28,10 @@ module Runby
       uom = str.scan(/[-_a-z ]+$/).first
       raise "Unable to find distance unit in '#{str}'" if uom.nil?
 
-      parsed_uom = Runby::DistanceUnits.parse uom
-      raise "'#{uom.strip}' is not recognized as a distance unit" if parsed_uom[:uom].nil?
+      parsed_uom = Runby::DistanceUnit.parse uom
+      raise "'#{uom.strip}' is not recognized as a distance unit" if parsed_uom.nil?
 
-      self.new parsed_uom[:uom], parsed_uom[:factor] * multiplier
+      self.new parsed_uom, multiplier
     end
 
     def to_s
@@ -38,7 +39,7 @@ module Runby
     end
 
     def pluralized_uom
-      uom_description = DistanceUnits.description(@uom).downcase
+      uom_description = @uom.description.downcase
       if @multiplier > 1 then
         uom_description += 's'
       end
@@ -52,13 +53,19 @@ module Runby
       @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, multiplier)
-      raise "Unknown unit of measure #{distance_uom}" unless Runby::DistanceUnits.known_uom? distance_uom
-      @uom = distance_uom
+    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)
+      @uom = DistanceUnit.new distance_uom_symbol
       @multiplier = multiplier * 1.0
     end
   end

data/lib/runby_pace/distance_unit.rb

@@ -0,0 +1,50 @@
+module Runby
+  # Represents the distance units (e.g. kilometers, miles) used in paces
+  #  including the human-readable description of each unit
+  #  and the factor used to convert it to kilometers.
+  class DistanceUnit
+    attr_reader :symbol, :description, :conversion_factor
+
+    def initialize(unit_of_measure)
+      if unit_of_measure.is_a? Symbol
+        raise "':#{unit_of_measure.to_s}' is an unknown unit of measure" unless DistanceUnit.known_uom? unit_of_measure
+        @symbol = unit_of_measure
+        @conversion_factor = @@_uom_definitions[@symbol][:conversion_factor]
+      elsif unit_of_measure.is_a? String
+        parsed_uom = DistanceUnit.parse(unit_of_measure)
+        @symbol = parsed_uom.symbol
+        @conversion_factor = @@_uom_definitions[@symbol][:conversion_factor]
+      end
+
+      @description = @@_uom_definitions[@symbol][:description]
+    end
+
+    def self.parse(description)
+      description = description.strip.chomp.downcase
+      found_uom = nil
+      @@_uom_definitions.each do |uom, details|
+        if details[:synonyms].include? description
+          found_uom = uom
+          break
+        end
+      end
+      raise "Error parsing distance unit '#{description}'" unless found_uom
+      return DistanceUnit.new found_uom
+    end
+
+    def self.known_uom?(symbol)
+      # TODO: test
+      @@_uom_definitions.has_key?(symbol)
+    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) },
+        mi: { description: 'Mile', conversion_factor: 1.609344, synonyms: %w(mi mile miles) },
+        ft: { description: 'Feet', conversion_factor: 0.0003048, synonyms: %w(ft foot feet) },
+        yd: { description: 'Yards', conversion_factor: 1093.61, synonyms: %w(y yd yds yard yards) },
+        # Fun distance unit of measures
+        marathon: { description: 'Marathon', conversion_factor: 42.1648128, synonyms: %w(marathon) }
+      }
+  end
+end

data/lib/runby_pace/pace_data.rb

@@ -38,10 +38,11 @@ module Runby
 
     # Calculate the prescribed pace for the given 5K time
     def calc(five_k_time, distance_units = :km)
-      five_k_time = Runby::RunbyTime.new(five_k_time)
+      five_k_time = Runby::RunbyTime.new five_k_time
+      distance_units = Runby::DistanceUnit.new distance_units
       x2 = ((five_k_time.total_minutes * 2) - (MIDPOINT_X - 1)) - 1
       minutes_per_km = slope * x2 + @fastest_pace_km.total_minutes + curve_minutes(x2)
-      minutes_per_unit = minutes_per_km * Runby::DistanceUnits.conversion_factor(distance_units)
+      minutes_per_unit = minutes_per_km * distance_units.conversion_factor
       Runby::RunbyTime.from_minutes(minutes_per_unit)
     end
 

data/lib/runby_pace/version.rb

@@ -1,3 +1,3 @@
 module Runby
-  VERSION = "0.5.#{`git rev-list --count HEAD`}".freeze
+  VERSION = "0.6.#{`git rev-list --count HEAD`}".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runby_pace
 version: !ruby/object:Gem::Version
-  version: 0.5.86
+  version: 0.6.87
 platform: ruby
 authors:
 - Ty Walls
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-11 00:00:00.000000000 Z
+date: 2016-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,7 +74,7 @@ files:
 - bin/setup
 - lib/runby_pace.rb
 - lib/runby_pace/distance.rb
-- lib/runby_pace/distance_units.rb
+- lib/runby_pace/distance_unit.rb
 - lib/runby_pace/pace.rb
 - lib/runby_pace/pace_data.rb
 - lib/runby_pace/pace_range.rb
@@ -99,7 +99,7 @@ homepage: https://github.com/tygerbytes/runby-pace
 licenses:
 - MIT
 metadata:
-  commit-hash: 0c6578c58d5e0a05921d05bb064583d5426a6b80
+  commit-hash: deb794e87cde1dc18d24e06c18190216cf6ef404
 post_install_message: 
 rdoc_options: []
 require_paths:

data/lib/runby_pace/distance_units.rb

@@ -1,46 +0,0 @@
-module Runby
-  # Represents the distance units (e.g. kilometers, miles) used in paces
-  #  including the human-readable description of each unit
-  #  and the factor used to convert it to kilometers.
-  class DistanceUnits
-    def self.description(uom)
-      @@_uom_definitions[uom][:description]
-    end
-
-    def self.parse(description)
-      description = description.strip.chomp
-      found_uom = nil
-      found_uom_factor = 1
-      @@_uom_definitions.each do |uom, details|
-        if details[:synonyms].include? description
-          if details.has_key? :uom
-            found_uom = details[:uom]
-            found_uom_factor = details[:factor]
-          else
-            found_uom = uom
-          end
-          break
-        end
-      end
-      { uom: found_uom, factor: found_uom_factor }
-    end
-
-    def self.conversion_factor(units)
-      @@_uom_definitions[units][:conversion_factor]
-    end
-
-    def self.known_uom?(symbol)
-      # TODO: test
-      @@_uom_definitions.has_key?(symbol)
-    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) },
-        mi: { description: 'Mile', conversion_factor: 1.609344, synonyms: %w(mi mile miles) },
-        ft: { description: 'Feet', conversion_factor: 0.0003048, synonyms: %w(ft foot feet) },
-        # Special UOMs, which just point to "real" UOMs in this hash table
-        marathon: { description: 'Marathon', synonyms: %w(marathon), uom: :mi, factor: 26.2 }
-      }
-  end
-end