runby_pace 0.4.79 → 0.4.81

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzlmMjQyY2NiMTU3ZDg2NzJlOWM1MzA1YjA5ZjFmNmE3MjBmMThmMg==
+    NmNmZDQzMjZjOWJmNGEzYWQzMzdkZjVmNDMyMTQ1ZWZkZjk3ZWMxZg==
   data.tar.gz: !binary |-
-    NTIwZWQ5ODk2MGQ5N2Q4YTNlZWE2NzJhNzkyNGJmMjk1NTFiZDEyMA==
+    YjYzYTBjZTUwNjc4NGNlMGNlN2EyNWVkNmNjYjM4OWViZmIyYzFiMA==
 SHA512:
   metadata.gz: !binary |-
-    ZWIxYjNmZjY4ZDA4MWZiNzg3NjA0NDNiNDI4NTNkNzE0NzJlMjQ4ZjJiNTk2
-    OTMxNzc4NzBhNzIzMWM4MjMxOWMwMjg4Nzg0MDkwYTNmMGNkYmM4MzYwNTU4
-    ZjBjMTY3OTRhMmMwNWJlOTE4ZWVjZGM2MDJjNjcwYWZjNzUzMzg=
+    ZTBhNmVjNjBiMmQyODgxYTliNzQ1YTkzMjEwMmZiNDM4MTFhZmVlYjhhNzBk
+    ODYxY2Y0ODdkNGE2YTcwM2QzOTMwZmMwMDMxZDJlN2MwYjgwOTllZmFkODE4
+    ZGNmYjYzZThiN2Y1NzVhOTk1MGJkNTEzMGJkMjNhMzI5MThiOWQ=
   data.tar.gz: !binary |-
-    ZGQ0ZTY5YmFlMGQ5YjE2YmRhZGY5MTk0MzZkNDE2ZDA4OTJjZmZmNDAwZWE5
-    MzMzOTY5ZjNiMWZlNWQ0NjBjMmY2ODYyNzljY2VkODZhMmY2NGIzZWM0NTJh
-    NjAzZmE4NzU0YTk3NjcwZTNkYzFjZmM0ZmIwMWQ4ODNlYmMzZWY=
+    NGVmYmMzM2EyOTMxY2EyYWY4NjNkZDM0ZGZhZWE5ODgyNjkzMWNiYzQxMDhj
+    ZDViYjRiZGRlZmVjZDA0YzYzZWY4ZTA3NmIzZmRlOGM5YTBjNmEzMTNmZTU2
+    YWYyYTg4ZDE3OTU2NjZlZjFmNmEzYTczMTNlZGIwODI1ZTc3YzA=

data/lib/runby_pace/distance.rb

@@ -0,0 +1,64 @@
+module Runby
+  # Represents a distance (distance UOM and multiplier)
+  class Distance
+    attr_reader :uom, :multiplier
+    def initialize(distance_uom = :km, multiplier = 1)
+      # TODO: Test and cleanup
+      if distance_uom.is_a? Distance
+        return init_from_clone distance_uom
+      end
+
+      raise 'Invalid distance unit of measure' unless [String, Symbol].include? distance_uom.class
+      raise 'Invalid multiplier' unless multiplier.is_a?(Numeric)
+
+      if distance_uom.is_a? Symbol
+        raise "Unknown unit of measure #{distance_uom}" unless Runby::PaceUnits.known_uom? distance_uom
+        @uom = distance_uom
+        @multiplier = multiplier * 1.0
+        return
+      end
+
+      distance = Distance.parse distance_uom
+      @uom = distance.uom
+      @multiplier = distance.multiplier
+    end
+
+    def meters
+      kilometers = @multiplier * Runby::PaceUnits.distance_conversion_factor(@uom)
+      kilometers * 1000.0
+    end
+
+    def self.parse(str)
+      str = str.strip.chomp.downcase
+      # TODO: handle multipliers with commas/spaces
+      multiplier = str.scan(/[\d,.]+/).first.to_f
+      uom = str.scan(/[-_a-z ]+$/).first
+      # TODO: test V
+      raise "Unable to find distance unit in #{str}" if uom.nil?
+
+      parsed_uom = Runby::PaceUnits.parse_unit_of_measure uom
+      # TODO: test
+      raise "#{uom} is not recognized as a distance unit" if parsed_uom[:uom].nil?
+
+      self.new parsed_uom[:uom], parsed_uom[:factor] * multiplier
+    end
+
+    def to_s
+      "#{format('%g', @multiplier.round(2))} #{pluralized_uom}"
+    end
+
+    def pluralized_uom
+      uom_description = PaceUnits.description(@uom).downcase
+      if @multiplier > 1 then
+        uom_description += 's'
+      end
+      uom_description
+    end
+
+    private
+    def init_from_clone(distance)
+      @uom = distance.uom
+      @multiplier = distance.multiplier
+    end
+  end
+end

data/lib/runby_pace/pace.rb

@@ -0,0 +1,14 @@
+module Runby
+  # Represents a pace consisting of a distance and a time in which that distance was covered
+  class Pace
+    attr_reader :time, :distance
+    def initialize(time, distance = '1K')
+      @time = Runby::RunbyTime.parse(time)
+      @distance = Runby::Distance.new(distance)
+    end
+
+    def to_s
+      "#{time} per #{distance.pluralized_uom}"
+    end
+  end
+end

data/lib/runby_pace/pace_units.rb

@@ -3,22 +3,62 @@ module Runby
   #  including the human-readable description of each unit
   #  and the factor used to convert it to kilometers.
   class PaceUnits
-    def self.description(units)
-      descriptions[units]
+    def self.description(uom)
+      @@_distance_uom_definition[uom][:description]
+    end
+
+    def self.parse_unit_of_measure(description)
+      description = description.strip.chomp
+      found_uom = nil
+      found_uom_factor = 1
+      @@_distance_uom_definition.each do |uom, details|
+        if details[:synonyms].include? description
+          found_uom = uom
+          break
+        end
+      end
+      if found_uom.nil?
+        # Search the special UOMs
+        @@_distance_uom_definition_special.each_value do |details|
+          if details[:synonyms].include? description
+            found_uom = details[:uom]
+            found_uom_factor = details[:factor]
+            break
+          end
+        end
+      end
+      { uom: found_uom, factor: found_uom_factor }
     end
 
     def self.distance_conversion_factor(units)
       distance_conversion_factors[units]
     end
 
+    def self.known_uom?(symbol)
+      # TODO: test
+      @@_distance_uom_definition.has_key?(symbol) || @@_distance_uom_definition_special.has_key?(symbol)
+    end
+
     ### -- Private class methods --
 
-    private_class_method def self.descriptions
-      { km: 'Kilometers', mi: 'Miles' }
-    end
+    @@_distance_uom_definition =
+      { km: { description: 'Kilometer', synonyms: %w(k km kms kilometer kilometers) },
+        m:  { description: 'Meter', synonyms: %w(m meter meters) },
+        mi: { description: 'Mile', synonyms: %w(mi mile miles) },
+        ft: { description: 'Feet', synonyms: %w(ft foot feet) }
+      }
+
+    @@_distance_uom_definition_special =
+    {
+        marathon: { description: 'Marathon', uom: :mi, factor: 26.2, synonyms: %w(marathon) }
+    }
 
-    private_class_method def self.distance_conversion_factors
-      { km: 1.0, mi: 1.612903225806452 }
+    private_class_method
+    def self.distance_conversion_factors
+      { km: 1.0,
+        m:  0.001,
+        mi: 1.609344,
+        ft: 0.0003048 }
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runby_pace
 version: !ruby/object:Gem::Version
-  version: 0.4.79
+  version: 0.4.81
 platform: ruby
 authors:
 - Ty Walls
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,6 +73,8 @@ files:
 - bin/guard
 - bin/setup
 - lib/runby_pace.rb
+- lib/runby_pace/distance.rb
+- lib/runby_pace/pace.rb
 - lib/runby_pace/pace_data.rb
 - lib/runby_pace/pace_range.rb
 - lib/runby_pace/pace_units.rb
@@ -97,7 +99,7 @@ homepage: https://github.com/tygerbytes/runby-pace
 licenses:
 - MIT
 metadata:
-  commit-hash: a96d09a79619f8e55898292d6faf25a1970f9193
+  commit-hash: ce69f37e02c05d0a2e6bff809c8bb152e4ec13cf
 post_install_message: 
 rdoc_options: []
 require_paths: