bmicalc 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b54dd21218de2e8062ae2318c58c6cf2038f296
-  data.tar.gz: c658de88014e818dfd3dc52e0b34adc4bc52ae1b
+  metadata.gz: caddc3d9ae32bd5dbc245aaf0ce951f436f5b6e5
+  data.tar.gz: 2ca53c881e67210ee7167012fa02aa0fcab38877
 SHA512:
-  metadata.gz: ba19def99612fd9bfcb1b932a4194351b301b2310473a90dbf9d864f2423d10375364b03af64bdbb84e7c3172caf27cb62967eaa66b58b4d99469c272e7b7aaf
-  data.tar.gz: 88c81c056436cbc273d6a262a5e797704e4905773761e1640259d22c3d0ab1c2553ef52b14243046122e7fa1ff5a35087d506f1887e947283e7417e8bfcec4f7
+  metadata.gz: e10b639bd9f98a46ddd4240c7647c97fb74cb9f26ed9e424efa3b1d28daa6bc3034a28187b64b031b495e7b793909dbb5e15a6195bb98767490116bae51d8015
+  data.tar.gz: a3f7cbb9e7d0b3454a55d612ae0678e2d351a0d3c6ba23f6ac25ada822dd5d4fa536e7ef317339601dd5d2f91262029e2970989c8e6fbd79424b3c9b26114c37

data/lib/bmicalc.rb

@@ -6,9 +6,10 @@ class Bmicalc
 
   def initialize(options = {})
     @round = options.fetch(:round, true)
+    @metric = options.fetch(:metric, true)
   end
 
-  def result(options = {})
+  def result
     error unless weight && height
     calculate_result
   end
@@ -16,10 +17,26 @@ class Bmicalc
   private
 
   def calculate_result
+    if @metric
+      round(metric)
+    else
+      round(imperial)
+    end
+  end
+
+  def metric
+    weight / (height * height)
+  end
+
+  def imperial
+    (weight * 703) / (height * height)
+  end
+
+  def round(result)
     if @round
-      (weight / (height * height)).round
+      result.round
     else
-      weight / (height * height)
+      result
     end
   end
 

data/lib/bmicalc/version.rb

@@ -1,3 +1,3 @@
 class Bmicalc
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/bmicalc_spec.rb

@@ -2,48 +2,65 @@ require 'bmicalc'
 
 describe Bmicalc do
 
-  context 'returns bmi' do
+  context 'metric' do
+    context 'returns bmi' do
 
-    it 'underweight' do
-      subject.weight = 54
-      subject.height = 1.78
-      expect(subject.result).to eq(17)
+      it 'underweight' do
+        subject.weight = 54
+        subject.height = 1.78
+        expect(subject.result).to eq(17)
+      end
+
+      it 'ideal' do
+        subject.weight = 64
+        subject.height = 1.78
+        expect(subject.result).to eq(20)
+      end
+
+      it 'overweight' do
+        subject.weight = 68
+        subject.height = 1.48
+        expect(subject.result).to eq(31)
+      end
+
+      it 'obese' do
+        subject.weight = 118
+        subject.height = 1.68
+        expect(subject.result).to eq(42)
+      end
     end
 
-    it 'ideal' do
-      subject.weight = 64
+    it 'returns correct error message for weight' do
       subject.height = 1.78
-      expect(subject.result).to eq(20)
+      proc { subject.result }.should raise_error(StandardError, 'weight not set')
     end
 
-    it 'overweight' do
-      subject.weight = 68
-      subject.height = 1.48
-      expect(subject.result).to eq(31)
+    it 'returns correct error message for height' do
+      subject.weight = 64
+      proc { subject.result }.should raise_error(StandardError, 'height not set')
     end
 
-    it 'obese' do
-      subject.weight = 118
-      subject.height = 1.68
-      expect(subject.result).to eq(42)
+    it 'returns bmi without rounding' do
+      bmi = Bmicalc.new(round: false)
+      bmi.weight = 64
+      bmi.height = 1.78
+      expect(bmi.result).to eq(20.199469763918696)
     end
   end
 
-  it 'returns correct error message for weight' do
-    subject.height = 1.78
-    proc { subject.result }.should raise_error(StandardError, 'weight not set')
-  end
-
-  it 'returns correct error message for height' do
-    subject.weight = 64
-    proc { subject.result }.should raise_error(StandardError, 'height not set')
-  end
+  context 'imperial' do
+    it 'calculates with imperial values' do
+      bmi = Bmicalc.new(metric: false)
+      bmi.weight = 141
+      bmi.height = 70
+      expect(bmi.result).to eq(20)
+    end
 
-  it 'returns bmi without rounding' do
-    bmi = Bmicalc.new(round: false)
-    bmi.weight = 64
-    bmi.height = 1.78
-    expect(bmi.result).to eq(20.199469763918696)
+    it 'returns bmi without rounding' do
+      bmi = Bmicalc.new(metric: false, round: false)
+      bmi.weight = 141
+      bmi.height = 70.1 
+      expect(bmi.result).to eq(20.171509622487545)
+    end
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bmicalc
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Tom Kadwill