runby_pace 0.6.140 → 0.6.141

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56abfe8dad10070a1ce15f6615e2b44c36508536
-  data.tar.gz: d8faf0b03d0b9a87e62efb8bfee09dffc0ce64f6
+  metadata.gz: 1395d5db7e4987b59ea810b4de352a33236c2a33
+  data.tar.gz: d866f42b73b2a51bc5c15b1c16f081fff98e69d0
 SHA512:
-  metadata.gz: 8d8bd2ae1fce0cb2c9a6cc7c4fa36dc26dc337de516692b0020b05903f84b864b6243b106b43dafd1bca14577688cef0ef6911d97a6ccd08e2734c7791385ef3
-  data.tar.gz: bf09f4b68dd8402fd5e2443d815bc6bf74c5b9182562b2220ffcb2f5c107e651e4b3c74576a3498227822eb95070d1ffe57d9b6a9dc7915648b666e9bc3569f1
+  metadata.gz: eb3405673abb4cb5e230bb719c6f3f60fffbb0c6fc8dbbe291c77883f8456d2b6e82a0da3cb5fd293897788a8e16804b04ec4e2e4fa91ec4b8c9cf30db75761f
+  data.tar.gz: c04f1c5e5e0682506c34bc52ec9d01495a8189a42dee8ae71afa800c6867fe867aae6409620887b56beca15ec99deb96d72405a1c434135d96713238a8972126

data/lib/runby_pace/distance.rb

@@ -6,16 +6,16 @@ module Runby
     attr_reader :uom, :multiplier
     def initialize(uom = :km, multiplier = 1)
       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
-        else
-          raise 'Invalid distance unit of measure'
+      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
+      else
+        raise 'Invalid distance unit of measure'
       end
     end
 
@@ -60,8 +60,8 @@ module Runby
     def to_s(format: :short)
       formatted_multiplier = format('%g', @multiplier.round(2))
       case format
-        when :short then "#{formatted_multiplier} #{@uom.to_s(format: format)}"
-        when :long then "#{formatted_multiplier} #{@uom.to_s(format: format, pluralize: (@multiplier > 1))}"
+      when :short then "#{formatted_multiplier} #{@uom.to_s(format: format)}"
+      when :long then "#{formatted_multiplier} #{@uom.to_s(format: format, pluralize: (@multiplier > 1))}"
       end
     end
 

data/lib/runby_pace/pace.rb

@@ -99,8 +99,7 @@ module Runby
     # @param [Pace, RunbyTime] other
     def -(other)
       if other.is_a?(Pace)
-        raise 'Pace arithmetic with different units is not currently supported' unless @distance == other.distance
-        Pace.new(@time - other.time, @distance)
+        Pace.new(@time - other.convert_to(@distance).time, @distance)
       elsif other.is_a?(RunbyTime)
         Pace.new(@time - other, @distance)
       end
@@ -109,8 +108,7 @@ module Runby
     # @param [Pace, RunbyTime] other
     def +(other)
       if other.is_a?(Pace)
-        raise 'Pace arithmetic with different units is not currently supported' unless @distance == other.distance
-        Pace.new(@time + other.time, @distance)
+        Pace.new(@time + other.convert_to(@distance).time, @distance)
       elsif other.is_a?(RunbyTime)
         Pace.new(@time + other, @distance)
       end
@@ -122,8 +120,8 @@ module Runby
         return Runby::Distance.new(@distance.uom, 0)
       end
       divisor = @time.total_minutes / time.total_minutes / @distance.multiplier
-      distance_units_traveled = Runby::Distance.new(@distance.uom, 1 / divisor)
-      distance_units_traveled
+      distance_covered = Runby::Distance.new(@distance.uom, 1 / divisor)
+      distance_covered
     end
 
     private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runby_pace
 version: !ruby/object:Gem::Version
-  version: 0.6.140
+  version: 0.6.141
 platform: ruby
 authors:
 - Ty Walls
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-03 00:00:00.000000000 Z
+date: 2017-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,7 +104,7 @@ homepage: https://github.com/tygerbytes/runby-pace
 licenses:
 - MIT
 metadata:
-  commit-hash: 01a70d7e4ba6544e76da8e3822fb42674f0568df
+  commit-hash: c4c983d998e0dfc43538a963bd657c74ffd8e5f0
 post_install_message: 
 rdoc_options: []
 require_paths: