Add integer_or_default and float_or_default methods

dessy · dessy · commit 1ff36287367f · 2014-11-16T11:59:26.000-05:00
diff --git a/pedometer/models/trial.rb b/pedometer/models/trial.rb
@@ -22,4 +22,4 @@ def integer_or_default(val, default, greater_than_val)
     end
   end
 
-end
+end
diff --git a/pedometer/models/user.rb b/pedometer/models/user.rb
@@ -8,12 +8,23 @@ class User
 
   def initialize(gender = nil, height = nil, stride = nil)
     @gender = gender.to_s.downcase if GENDER.include? gender.to_s.downcase
-    @height = height.to_f if height.to_f > 0
-    @stride = (stride.to_f > 0) ? stride.to_f : calculate_stride
+    # @height = height.to_f if height.to_f > 0
+    # @stride = (stride.to_f > 0) ? stride.to_f : calculate_stride
+    @height = float_or_default(height, nil, 0)
+    @stride = float_or_default(stride, calculate_stride, 0)
   end
 
 private
 
+  def float_or_default(val, default, greater_than_val)
+    float = val.to_f
+    if (float.to_s == val.to_s || float.to_s.gsub('.0', '') == val.to_s)
+      (float > greater_than_val) ? float : default
+    else
+      default
+    end
+  end
+
   def calculate_stride
     if gender && height
       MULTIPLIERS[@gender] * height
diff --git a/pedometer/test/unit/trial_test.rb b/pedometer/test/unit/trial_test.rb
@@ -20,7 +20,6 @@ def test_create_empty
   end
 
   def test_create_with_rate
-    flunk 'Move integer_or_default method to helper'
     assert_equal 100, Trial.new(nil).rate
     assert_equal 100, Trial.new(nil, nil).rate
     assert_equal 100, Trial.new(nil, '').rate
@@ -40,7 +39,6 @@ def test_create_with_rate
   end
 
   def test_create_with_steps
-    flunk 'Move integer_or_default method to helper'
     assert_nil Trial.new(nil, nil).steps
     assert_nil Trial.new(nil, nil, nil).steps
     assert_nil Trial.new(nil, nil, '').steps
diff --git a/pedometer/test/unit/user_test.rb b/pedometer/test/unit/user_test.rb
@@ -36,12 +36,24 @@ def test_create_with_gender
   end
 
   def test_create_with_height
+    assert_nil User.new(nil).height
+    assert_nil User.new(nil, nil).height
+    assert_nil User.new(nil, '').height
+    assert_nil User.new(nil, 'bad height').height
+
+    assert_equal 150, User.new(nil, 150).height
+    assert_equal 150, User.new(nil, '150').height
+    assert_equal 150, User.new(nil, 150.0).height
+    assert_equal 150, User.new(nil, '150.0').height
+    assert_equal 167.5, User.new(nil, 167.5).height
     assert_equal 167.5, User.new(nil, '167.5').height
-    assert_equal 100.52, User.new(nil, 100.52).height
-    
-    assert_nil User.new(nil, 'invalid value').height
+    assert_equal 181.12, User.new(nil, 181.12).height
+    assert_equal 181.12, User.new(nil, '181.12').height
+
     assert_nil User.new(nil, 0).height
+    assert_nil User.new(nil, '0').height
     assert_nil User.new(nil, -1).height
+    assert_nil User.new(nil, '-1').height
   end
 
   def test_create_with_height_and_gender

-Original file line number
+Diff line change
     end
   end
 -end
 +end