m26 0.4.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23726f233388a0069c5caf3eaea3b6a04ebe4592
-  data.tar.gz: a92371efa9b9ccee824342b9f4826e765318be8a
+  metadata.gz: 8343325b39c429fa5c552a1c904f0eb37921da18
+  data.tar.gz: ffcbf76e7efffbd2e3bef238fc085358cd131c19
 SHA512:
-  metadata.gz: a0a06b1b9d4562c2f584f35a92f4086cb556b5bfc5b5daa8241f4ad8941d208c597011ed777d802b3ee5f151e90f80655fd303b550507ab212e155fbce747528
-  data.tar.gz: 8d4c18c2372521a704d99c936371380cb3f0ddc33ae038bdc637782f5b9c8a4231cfab21c55dd39e9645ee1ac7dfe612f5be7b73463ad86b83bdc73def4d1953
+  metadata.gz: 044b4550c5731e6ff0db90d70515c32b536d023a239726e8ddfa471243610e45e2a881cd92ea4c8db8dbe42d4e13566aac3d234bd608cc99bc9e4022fd48cdcf
+  data.tar.gz: 0821beceb0c858f34e13a559b1ed7b0900e82c10f4725b694c836d612cf38cf380790d11a720b91ac86fa93e9da01ba9ecc39440ed4a78f5639e58700164cba5

data/lib/m26.rb

@@ -1,6 +1,6 @@
 =begin
 
-Copyright (C) 2013 Chris Joakim, JoakimSoftware LLC
+Copyright (C) 2014 Chris Joakim, JoakimSoftware LLC
 
 =end
 
@@ -15,5 +15,3 @@ require 'm26_distance'
 require 'm26_elapsed_time'
 require 'm26_speed'
 require 'm26_ultra'
-
-# puts "m26 loaded in PID: #{Process.pid}"

data/lib/m26_age.rb

@@ -1,6 +1,6 @@
 =begin
 
-Copyright (C) 2013 Chris Joakim, JoakimSoftware LLC
+Copyright (C) 2014 Chris Joakim, JoakimSoftware LLC
 
 =end
 

data/lib/m26_age_grade.rb

@@ -1,6 +1,6 @@
 =begin
 
-Copyright (C) 2013 Chris Joakim, JoakimSoftware LLC.
+Copyright (C) 2014 Chris Joakim, JoakimSoftware LLC.
 
 =end
 
@@ -16,15 +16,15 @@ module M26
 
     public
 
-    def predict(elapsed_time, formula='maxpulse')
+    def calculate(elapsed_time, formula='maxpulse')
       if formula.to_s == 'maxpulse'
-        predict_maxpulse(elapsed_time)
+        calculate_maxpulse(elapsed_time)
       else
         nil
       end
     end
 
-    def predict_maxpulse(elapsed_time)
+    def calculate_maxpulse(elapsed_time)
       p1, p2 = maxpulse1.to_f, maxpulse2.to_f
       ratio  = p1 / p2
       psecs  = ratio * elapsed_time.secs.to_f
@@ -41,9 +41,9 @@ module M26
     end
 
     def maxpulse(age)
-      p = 220 - age
-      p = 196 if p > 196  # age 24 is "peak" (220-24=196)
-      p = 1   if p < 1
+      p = 220.0 - age
+      p = 196.0 if p > 196.0  # age 24 is "peak" (220-24=196)
+      p = 1.0   if p < 1
       p
     end
   end

data/lib/m26_constants.rb

@@ -1,6 +1,6 @@
 =begin
 
-Copyright (C) 2013 Chris Joakim, JoakimSoftware LLC
+Copyright (C) 2014 Chris Joakim, JoakimSoftware LLC
 
 =end
 
@@ -8,10 +8,10 @@ module M26
 
   module Constants
 
-    VERSION             = '0.4.0'
-    DATE                = '2013-11-01'
+    VERSION             = '1.0.0'
+    DATE                = '2014-10-17'
     AUTHOR              = 'Chris Joakim'
-    EMAIL               = 'cjoakim@bellsouth.net'
+    EMAIL               = 'christopher.joakim@gmail.com'
 
     UOM_MILES           = 'm'
     UOM_KILOMETERS      = 'k'

data/lib/m26_distance.rb

@@ -1,6 +1,6 @@
 =begin
 
-Copyright (C) 2013 Chris Joakim, JoakimSoftware LLC
+Copyright (C) 2014 Chris Joakim, JoakimSoftware LLC
 
 =end
 

data/lib/m26_elapsed_time.rb

@@ -1,6 +1,6 @@
 =begin
 
-Copyright (C) 2013 Chris Joakim, JoakimSoftware LLC
+Copyright (C) 2014 Chris Joakim, JoakimSoftware LLC
 
 =end
 
@@ -27,8 +27,8 @@ module M26
       @secs / SECONDS_PER_HOUR.to_f
     end
 
-    def as_hhmmss
-      return "#{zero_pad(@hh)}:#{zero_pad(@mm)}:#{zero_pad(@ss)}"
+    def as_hhmmss(ss_fractional_digits=2)
+      return "#{zero_pad(hh)}:#{zero_pad(mm)}:#{zero_pad(ss, ss_fractional_digits)}"
     end
 
     def subtract(another_instance)
@@ -39,11 +39,11 @@ module M26
     end
 
     def to_s
-      return "ElapsedTime: hh=#{@hh} mm=#{@mm} ss=#{@ss} secs=#{@secs} as_hours=#{as_hours()} as_hhmmss=#{as_hhmmss()}"
+      return "ElapsedTime: hh=#{hh} mm=#{mm} ss=#{ss} secs=#{secs} as_hours=#{as_hours()} as_hhmmss=#{as_hhmmss}"
     end
 
     def print_string
-      return to_s << " #{@secs} #{as_hours}"
+      return to_s << " #{secs} #{as_hours}"
     end
 
     private
@@ -54,36 +54,38 @@ module M26
         @hh = array[0].to_i
         @mm = array[1].to_i
         @ss = array[2].to_f
-        @ss = 59 if @ss > 59
+        @ss = 59.999 if @ss > 59
       end
 
       if (array.length == 2)
         @mm = array[0].to_i
         @ss = array[1].to_f
-        @ss = 59 if @ss > 59
+        @ss = 59.000 if @ss > 59
       end
 
       if (array.length == 1)
-        @ss = array[0].to_f.round
+        @ss = array[0].to_f
       end
 
-      @secs = (@hh.to_i * SECONDS_PER_HOUR) + (@mm.to_i * 60) + (@ss.to_f);
+      @secs = (hh.to_i * SECONDS_PER_HOUR) + (mm.to_i * 60) + ss;
     end
 
     def initialize_number(raw_val)
-      @secs = raw_val.to_i
+      @secs = raw_val
       @hh = (@secs / SECONDS_PER_HOUR).to_i
       rem = @secs - (@hh * SECONDS_PER_HOUR)
       @mm = (rem / 60).to_i
-      @ss = rem - (@mm * 60).to_i
-      @ss = 59 if @ss > 59
+      @ss = rem - (@mm * 60) # .to_i
+      @ss = 59.999 if @ss > 59
     end
 
-    def zero_pad(val)
-      if (val.to_i < 10)
-        return '0' + val.to_s
+    def zero_pad(val, fractional_digits=0)
+      fmt = "%2.#{fractional_digits}f"
+      vvv = sprintf(fmt, val).tr(' ','')
+      if (val < 10)
+        return '0' + vvv # val.to_s
       else
-        return '' + val.to_s
+        return '' + vvv # val.to_s
       end
     end
 

data/lib/m26_ruby_extensions.rb

@@ -1,6 +1,6 @@
 =begin
 
-Copyright (C) 2013 Chris Joakim, JoakimSoftware LLC
+Copyright (C) 2014 Chris Joakim, JoakimSoftware LLC
 
 =end
 

data/lib/m26_speed.rb

@@ -1,6 +1,6 @@
 =begin
 
-Copyright (C) 2013 Chris Joakim, JoakimSoftware LLC
+Copyright (C) 2014 Chris Joakim, JoakimSoftware LLC
 
 =end
 

data/lib/m26_ultra.rb

@@ -1,6 +1,6 @@
 =begin
 
-Copyright (C) 2013 Chris Joakim, JoakimSoftware LLC
+Copyright (C) 2014 Chris Joakim, JoakimSoftware LLC
 
 =end
 

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: m26
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Chris Joakim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-01 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.1
 description: A ruby gem for running, cycling, and swimming calculations.
-email: cjoakim@bellsouth.net
+email: christopher.joakim@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -49,18 +49,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.1.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: m26
 test_files: []
+has_rdoc: true