calcpace 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4076fd00047c9b763ee7c4d38d5b3c75b638ec851c0af06895c70d050a122b10
-  data.tar.gz: 2c69b89a9f5508cd58a5f34b33f67517f6ac9a37218ae0e01fbbed600a269712
+  metadata.gz: 3f95d90f68ffe230e0f84e3d16b4221de5ffe61004e76ad2f2d2a18260ad9c30
+  data.tar.gz: fe206da9ac7d89e6df053fa0b6c6aff02227d06da7e81f48e6955cba183a720d
 SHA512:
-  metadata.gz: '029f28e39b899c3d2ddc13c873db6ed76a3a3b743080c4c167263a592550c56f1dd68bb19e4bb353c15846c63a339d6ba07d7e1a33c1ce83ff8d3159f059d5e7'
-  data.tar.gz: 2878a6024448fd28264e9b7df4d26fc19f2f41d02016dab82caa7c87f46b8b3bce0de55e5edaff627ca5ffa1b945e2461e5a3d49188df12f533a0cf003011eeb
+  metadata.gz: 8e93948a4751a908473f92cf526c09b6c8dc084978cb9c99a3e2a1977bd2ae7da7a14548631c689da95a0e10dcc361a512d1967f610f60cf38297e51fb7cdad6
+  data.tar.gz: bbf563ced661d193b79d5c90dd77ce63262488ceaf42fba06033b0154cebb0139a2f63f1749d1ed400985e854b1d716e54872a5a7b83756fabd2be16e081f7c8

data/lib/calcpace/calculator.rb

@@ -1,31 +1,33 @@
+# frozen_string_literal: true
+
 require 'bigdecimal'
 
 module Calculator
-  def pace(time, distance, bigdecimal = false)
-    pace_in_seconds = pace_seconds(time, distance, bigdecimal)
+  def pace(time, distance)
+    pace_in_seconds = pace_seconds(time, distance)
     convert_to_clocktime(pace_in_seconds)
   end
 
-  def pace_seconds(time, distance, bigdecimal = false)
+  def pace_seconds(time, distance)
     check_time(time)
     check_distance(distance)
     seconds = convert_to_seconds(time)
     bigdecimal ? seconds / BigDecimal(distance.to_s) : seconds / distance
   end
 
-  def total_time(pace, distance, bigdecimal = false)
-    total_time_in_seconds = total_time_seconds(pace, distance, bigdecimal)
+  def total_time(pace, distance)
+    total_time_in_seconds = total_time_seconds(pace, distance)
     convert_to_clocktime(total_time_in_seconds)
   end
 
-  def total_time_seconds(pace, distance, bigdecimal = false)
+  def total_time_seconds(pace, distance)
     check_time(pace)
     check_distance(distance)
     pace_seconds = convert_to_seconds(pace)
-    bigdecimal ? pace_seconds * BigDecimal(distance.to_s) : pace_seconds * distance
+    @bigdecimal ? pace_seconds * BigDecimal(distance.to_s) : pace_seconds * distance
   end
 
-  def distance(time, pace, bigdecimal = false)
+  def distance(time, pace)
     check_time(time)
     check_time(pace)
     if bigdecimal
@@ -37,4 +39,4 @@ module Calculator
     end
     time_seconds / pace_seconds
   end
-end
+end

data/lib/calcpace/converter.rb

@@ -3,8 +3,10 @@
 require 'bigdecimal'
 
 module Converter
-  KM_TO_MI = BigDecimal("0.621371")
-  MI_TO_KM = BigDecimal("1.60934")
+  KM_TO_MI_BIGDECIMAL = BigDecimal('0.621371')
+  KM_TO_MI = 0.621371
+  MI_TO_KM_BIGDECIMAL = BigDecimal('1.60934')
+  MI_TO_KM = 1.60934
 
   def to_seconds(time)
     check_time(time)
@@ -16,11 +18,18 @@ module Converter
     convert_to_clocktime(seconds)
   end
 
-  def convert(distance, unit, round_limit = 2)
+  def convert_to_miles(distance)
+    convert(distance, 'mi')
+  end
+
+  def convert_to_km(distance)
+    convert(distance, 'km')
+  end
+
+  def convert(distance, unit)
     check_distance(distance)
-    check_unit(unit)
-    check_integer(round_limit)
-    convert_the_distance(BigDecimal(distance.to_s), unit, round_limit)
+    bigdecimal ? distance_to_convert = BigDecimal(distance.to_s) : distance_to_convert = distance
+    convert_the_distance(distance_to_convert, unit)
   end
 
   def convert_to_seconds(time)
@@ -33,12 +42,14 @@ module Converter
     Time.at(seconds.to_i).utc.strftime(format)
   end
 
-  def convert_the_distance(distance, unit, round_limit = 2)
+  def convert_the_distance(distance, unit)
     case unit
-    when 'km'
-      (distance * KM_TO_MI).round(round_limit)
     when 'mi'
-      (distance * MI_TO_KM).round(round_limit)
+      bigdecimal ? km_to_mi = KM_TO_MI_BIGDECIMAL : km_to_mi = KM_TO_MI
+      (distance * km_to_mi)
+    when 'km'
+      bigdecimal ? mi_to_km = MI_TO_KM_BIGDECIMAL : mi_to_km = MI_TO_KM
+      (distance * mi_to_km)
     end
   end
-end
+end

data/lib/calcpace.rb

@@ -9,5 +9,9 @@ class Calcpace
   include Checker
   include Converter
 
-  def initialize; end
+  attr_reader :bigdecimal
+
+  def initialize(bigdecimal = false)
+    @bigdecimal = bigdecimal
+  end
 end

data/test/calcpace/test_calculator.rb

@@ -7,6 +7,7 @@ require_relative '../../lib/calcpace'
 class TestCalculator < Minitest::Test
   def setup
     @checker = Calcpace.new
+    @checker_bigdecimal = Calcpace.new(bigdecimal = true)
   end
 
   def test_pace
@@ -18,8 +19,12 @@ class TestCalculator < Minitest::Test
     assert_equal '00:07:54', @checker.pace('01:37:21', 12.3)
   end
 
+  def test_pace_with_bigdecimal_precision
+    assert_equal '00:07:54', @checker_bigdecimal.pace('01:37:21', 12.3)
+  end
+
   def test_pace_without_bigdecimal_precision
-    assert_equal '00:07:54', @checker.pace('01:37:21', 12.3, false)
+    assert_equal '00:07:54', @checker.pace('01:37:21', 12.3)
   end
 
   def test_pace_seconds
@@ -27,11 +32,11 @@ class TestCalculator < Minitest::Test
     assert_raises(RuntimeError) { @checker.pace_seconds('invalid', 10) }
     assert_raises(RuntimeError) { @checker.pace_seconds('00:00:00', 0) }
     assert_raises(RuntimeError) { @checker.pace_seconds('00:00:00', -1) }
-    assert_equal BigDecimal('474.8780487804878'), @checker.pace_seconds('01:37:21', 12.3)
+    assert_equal 474.8780487804878, @checker.pace_seconds('01:37:21', 12.3)
   end
 
   def test_pace_seconds_with_bigdecimal_precision
-    assert_equal BigDecimal('0.474878048780487804878048780487804878049e3'), @checker.pace_seconds('01:37:21', 12.3, true)
+    assert_equal BigDecimal('0.474878048780487804878048780487804878049e3'), @checker_bigdecimal.pace_seconds('01:37:21', 12.3)
   end
 
   def test_total_time
@@ -44,15 +49,15 @@ class TestCalculator < Minitest::Test
 
   def test_total_time_seconds
     assert_raises(RuntimeError) { @checker.total_time_seconds('', 10) }
-      assert_raises(RuntimeError) { @checker.total_time_seconds('invalid', 10) }
+    assert_raises(RuntimeError) { @checker.total_time_seconds('invalid', 10) }
     assert_raises(RuntimeError) { @checker.total_time_seconds('00:00:00', 0) }
     assert_raises(RuntimeError) { @checker.total_time_seconds('00:00:00', -1) }
     assert_equal 3600, @checker.total_time_seconds('00:05:00', 12)
-    assert_equal 71844.3, @checker.total_time_seconds('01:37:21', 12.3)
+    assert_equal 71_844.3, @checker.total_time_seconds('01:37:21', 12.3)
   end
 
   def test_total_time_seconds_with_bigdecimal_precision
-    assert_equal BigDecimal('0.718443e5'), @checker.total_time_seconds('01:37:21', 12.3, true)
+    assert_equal BigDecimal('0.718443e5'), @checker_bigdecimal.total_time_seconds('01:37:21', 12.3)
   end
 
   def test_distance
@@ -63,6 +68,6 @@ class TestCalculator < Minitest::Test
   end
 
   def test_distance_with_bigdecimal_precision
-    assert_equal BigDecimal('0.15493368700265251989389920424403183024e2'), @checker.distance('01:37:21', '00:06:17', true)
+    assert_equal BigDecimal('0.15493368700265251989389920424403183024e2'), @checker_bigdecimal.distance('01:37:21', '00:06:17')
   end
 end

data/test/calcpace/test_converter.rb

@@ -6,6 +6,7 @@ require_relative '../../lib/calcpace'
 class TestConverter < Minitest::Test
   def setup
     @checker = Calcpace.new
+    @checker_bigdecimal = Calcpace.new(bigdecimal = true)
   end
 
   def test_convert_to_seconds
@@ -23,27 +24,35 @@ class TestConverter < Minitest::Test
 
   def test_to_clocktime
     assert_equal '01:00:00', @checker.to_clocktime(3600)
-    assert_equal '02 01:00:00', @checker.to_clocktime(90000)
+    assert_equal '02 01:00:00', @checker.to_clocktime(90_000)
     assert_raises(RuntimeError) { @checker.to_clocktime(-1) }
     assert_raises(RuntimeError) { @checker.to_clocktime(0) }
     assert_raises(RuntimeError) { @checker.to_clocktime('invalid') }
   end
 
   def test_convert_the_distance
-    assert_equal 6.21, @checker.convert_the_distance(10, 'km')
-    assert_equal 6.2, @checker.convert_the_distance(10, 'km', 1)
-    assert_equal 6.214, @checker.convert_the_distance(10, 'km', 3)
-    assert_equal 16.09, @checker.convert_the_distance(10, 'mi')
+    assert_equal 6.21, @checker.convert_the_distance(10, 'mi').round(2)
+    assert_equal 6.2, @checker.convert_the_distance(10, 'mi').round(1)
+    assert_equal 6.214, @checker.convert_the_distance(10, 'mi').round(3)
+    assert_equal 16.09, @checker.convert_the_distance(10, 'km').round(2)
+  end
+
+  def test_convert_the_distance_with_bigdecimal_precision
+    assert_equal BigDecimal('6.21371'), @checker_bigdecimal.convert_the_distance(10, 'mi')
   end
 
   def test_convert
-    assert_equal 6.21, @checker.convert(10, 'km')
-    assert_equal 16.09, @checker.convert(10, 'mi')
-    assert_equal 6.2, @checker.convert(10, 'km', 1)
-    assert_raises(RuntimeError) { @checker.convert(10, 'invalid') }
+    assert_equal 6.21, @checker.convert(10, 'mi').round(2)
+    assert_equal 16.09, @checker.convert(10, 'km').round(2)
+    assert_equal 6.2, @checker.convert(10, 'mi').round(1)
     assert_raises(RuntimeError) { @checker.convert(-1, 'km') }
-    assert_raises(RuntimeError) { @checker.convert(10, 'km', -2) }
-    assert_raises(RuntimeError) { @checker.convert(10, 'km', 0) }
-    assert_raises(RuntimeError) { @checker.convert(10, 'km', 'invalid') }
+  end
+
+  def test_convert_to_miles
+    assert_equal 6.21, @checker.convert_to_miles(10).round(2)
+  end
+
+  def test_convert_to_km
+    assert_equal 16.09, @checker.convert_to_km(10).round(2)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calcpace
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Joao Gilberto Saraiva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-21 00:00:00.000000000 Z
+date: 2024-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -94,12 +94,12 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
-description: 'Calcpace is a Ruby gem that helps with calculations related to running/cycling
+description: Calcpace is a Ruby gem that helps with calculations related to running/cycling
   activities or general purposes involving distance and time. It can calculate pace,
   total time, and distance. It also converts distances between miles and kilometers
   and check formats of time and distance. The results are provided in a readable format,
   with times in HH:MM:SS or seconds and distances in X.X format. If you need, the
-  gem supports BigDecimal to handle the calculations, '
+  gem supports BigDecimal to handle the calculations with more precision.
 email: joaogilberto@tuta.io
 executables: []
 extensions: []