runby_pace 0.5.85 → 0.5.86

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2Y0Y2I0Zjg3ZjYzZjc4NGNkYjBiN2NmODQwYTYyNTQ3MDkwMTZkNg==
+    MWJjNGYwMWMzZDVkY2FmNjNiY2Q3NTFiMzg0ODZiMjdkYzJkZDUzYw==
   data.tar.gz: !binary |-
-    ZmE5ZDdkZTgyNTdkOWI3YjVhYjc1NTg0NzE5ZjhhZmJhM2JkOTZiZA==
+    MDI1ZTc2ZDQyM2ZkOTYyNTM5ZDY4OGNjMDJkMmFjNGVmYzgzNWQyOQ==
 SHA512:
   metadata.gz: !binary |-
-    NWEwZmIwNjM3YWUzMTNhYmQ1YjcwODdmM2YwODhmMjc3OGI4ZTE4NWRjZDQ1
-    ZjZhYWQ0NjJkNTE5NDM4MTg1NDk4MDFjYTViZDMyNjY0ZTcyNmIzYjE5ODVj
-    YWZlOTk2NmQxODFmYjI0MWVkNDA2YjA4MmQxNTk5ZGM0NjIyN2Q=
+    YmUyOGM2ZTE2NTczZDczMjhjM2NkNTViMDg2OGE2N2M2ZDZmMjlkZmJkOGU0
+    MWFmMzE0NDA3ZDljOWM0ZGE4Mzg0ZjBkMzFhMDliZDQxMGNlOTkxNGQ4MDJl
+    NDRmMDdlMWFkNWQ5NzQ3ZDNjZjJiOWU1NGNiN2UyYzkxODg4YTQ=
   data.tar.gz: !binary |-
-    YTZmY2ZhOGUxYTNjZDM1MDY4M2NiZWQyODRjY2I3ODEyMDNhYWMxNWUwMjM5
-    ZTk0Mzc4NTNlNzJjNTZiOTA3NGQ2MzA2YTM1MGRlZjI1MTQ1OTU1MGJmZTk5
-    NzMzZDU4NTk1MjUzMzM4YzE1NmYzNTBiMDM1YTUxNjQxMDQ5NWE=
+    ZTRkMGNkZGIyOTFiNWE1MTE0NThlYzk0NzY4NTJiYTU0YzNhZDhhZjFlZGM5
+    YmJjNzVhZTM4MmZjZGYxOGNmMTIxODc0MmViMDZiZDJlNzY0MDAyN2MyNTdl
+    NWJhNzViNGU3OTQxYmQxMGU1ZmUxODEyNTNhMWM5NThmOTEyNmY=

data/lib/runby_pace/distance.rb

@@ -2,25 +2,18 @@ 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
+    def initialize(uom = :km, multiplier = 1)
       raise 'Invalid multiplier' unless multiplier.is_a?(Numeric)
-
-      if distance_uom.is_a? Symbol
-        raise "Unknown unit of measure #{distance_uom}" unless Runby::DistanceUnits.known_uom? distance_uom
-        @uom = distance_uom
-        @multiplier = multiplier * 1.0
-        return
+      case uom
+        when Distance
+          return init_from_clone uom
+        when String
+          return init_from_string uom
+        when Symbol
+          return init_from_symbol(uom, multiplier)
+        else
+          raise 'Invalid distance unit of measure'
       end
-
-      distance = Distance.parse distance_uom
-      @uom = distance.uom
-      @multiplier = distance.multiplier
     end
 
     def meters
@@ -30,15 +23,12 @@ module Runby
 
     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?
+      raise "Unable to find distance unit in '#{str}'" if uom.nil?
 
       parsed_uom = Runby::DistanceUnits.parse uom
-      # TODO: test
-      raise "#{uom} is not recognized as a distance unit" if parsed_uom[:uom].nil?
+      raise "'#{uom.strip}' is not recognized as a distance unit" if parsed_uom[:uom].nil?
 
       self.new parsed_uom[:uom], parsed_uom[:factor] * multiplier
     end
@@ -56,9 +46,20 @@ module Runby
     end
 
     private
+
     def init_from_clone(distance)
       @uom = distance.uom
       @multiplier = distance.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
+      @multiplier = multiplier * 1.0
+    end
   end
 end

data/lib/runby_pace/distance_units.rb

@@ -4,14 +4,14 @@ module Runby
   #  and the factor used to convert it to kilometers.
   class DistanceUnits
     def self.description(uom)
-      @@_uom_definition[uom][:description]
+      @@_uom_definitions[uom][:description]
     end
 
     def self.parse(description)
       description = description.strip.chomp
       found_uom = nil
       found_uom_factor = 1
-      @@_uom_definition.each do |uom, details|
+      @@_uom_definitions.each do |uom, details|
         if details[:synonyms].include? description
           if details.has_key? :uom
             found_uom = details[:uom]
@@ -26,15 +26,15 @@ module Runby
     end
 
     def self.conversion_factor(units)
-      @@_uom_definition[units][:conversion_factor]
+      @@_uom_definitions[units][:conversion_factor]
     end
 
     def self.known_uom?(symbol)
       # TODO: test
-      @@_uom_definition.has_key?(symbol)
+      @@_uom_definitions.has_key?(symbol)
     end
 
-    @@_uom_definition =
+    @@_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) },

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runby_pace
 version: !ruby/object:Gem::Version
-  version: 0.5.85
+  version: 0.5.86
 platform: ruby
 authors:
 - Ty Walls
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2016-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,7 +99,7 @@ homepage: https://github.com/tygerbytes/runby-pace
 licenses:
 - MIT
 metadata:
-  commit-hash: b7e91031243d197b78a140542c04b9089c35f47c
+  commit-hash: 0c6578c58d5e0a05921d05bb064583d5426a6b80
 post_install_message: 
 rdoc_options: []
 require_paths: