lita-diabetter 0.1.1.alpha.18 → 0.1.1.alpha.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9831cd122ebc2856e73410f1746284d8350edd73
-  data.tar.gz: ccb3867ebb584d17e84caf4ded553ef3bda2e225
+  metadata.gz: a2f4db00d5949f1b8a71c565ed3195778f56efd0
+  data.tar.gz: 07ff8c8bca25a27b6a5d7179dbf0c29dd7f0032d
 SHA512:
-  metadata.gz: 49701a4f93605e411b86df6613b10c1b15cca1a23fc917d99f47d51f0f133c306d20c70c17f9db75d1aa33f9918644775fb9efcbb8136dcdb216f85de447a81e
-  data.tar.gz: 9d1902fd368b879f1b8da3915b0b6bb27cb1d6dbcf3692d1711096ae83da133e048722ba9da6d9948aa5150d86723e1027e499b9412913e83ea5b7a9a5761789
+  metadata.gz: 75913b24887283dbd85cd25f8af42098651513c5bdb72f207f3cad03aaad8fa022a045b53cfa863522348fd4e857e27c0b9754ff84300dffc485fcfbc84ded91
+  data.tar.gz: 6df2274cc8c9fadfa32411145e4f00ed898966f0943a57901433ab48849ef082629b08ba58798257f82443346b744aae0df671d933c0e6fa084da21a973bfe97

data/lib/lita/handlers/diabetter.rb

@@ -2,6 +2,9 @@ module Lita
   module Handlers
     class Diabetter < Handler
       @@conversion_ratio = 18.0182
+      @@lower = 25.0 # Lower limit for mmol/L - mg/dL cutoff
+      @@upper = 50.0 # Upper limit for mmol/L - mg/dL cutoff
+
       route(/(?:^|_)(\d{1,3}|\d{1,2}\.\d+)(?:$|_)/, :convert, command: false, help: {
           '<number>' => 'Convert glucose between mass/molar concentration units.',
           '_<number>_' => 'Convert glucose between mass/molar concentration units inline. E.g "I started at _125_ today"'
@@ -18,13 +21,10 @@ module Lita
         if response.message.body.match(URI.regexp(%w(http https))).nil?
           input = response.matches[0][0]
           Lita.logger.debug('Converting BG for input "' + input + '"')
-          lower = 25.0
-          upper = 50.0
-
 
-          if input.to_f < lower
+          if input.to_f < @@lower
             response.reply("#{input} mmol/L is #{mmol_to_mgdl(input).to_s} mg/dL")
-          elsif input.to_f >= lower && input.to_f < upper
+          elsif input.to_f >= @@lower && input.to_f < @@upper
             mmol = mgdl_to_mmol(input).to_s
             mgdl = mmol_to_mgdl(input).to_s
 
@@ -42,26 +42,52 @@ module Lita
       def estimate_a1c(response)
         input = response.matches[0][0]
         Lita.logger.debug('Estimating a1c for input "' + input + '"')
-        mmol = 0
-        mgdl = 0
 
-        if input.index('.') == nil
-          mgdl = input.to_i
-          mmol = mgdl_to_mmol(mgdl)
-        else
+
+        if input.to_f < @@lower
           mmol = input.to_f.round(1)
           mgdl = mmol_to_mgdl(mmol)
+
+          type = 'mmol'
+        elsif input.to_f >= @@lower && input.to_f < @@upper
+          mmol = mgdl_to_mmol(input.to_f).round(1)
+          mgdl = mmol_to_mgdl(input.to_f)
+
+          type = 'unknown'
+        else
+          mgdl = input.to_i
+          mmol = mgdl_to_mmol(mgdl)
+
+          type = 'mgdl'
         end
 
         dcct = mgdl_to_dcct(mgdl)
-        reply = 'an average of ' + mgdl.to_s + ' mg/dL or '
-        reply = reply + mmol.to_s + ' mmol/L'
-        reply = reply + ' is about '
-        reply = reply + dcct.round(1).to_s + '% (DCCT) or '
-        reply = reply + dcct_to_ifcc(dcct).round(0).to_s + ' mmol/mol (IFCC)'
+        ifcc = dcct_to_ifcc(dcct).round(0).to_s
+
+
+        if type == 'unknown'
+          reply = "*I'm not sure if you entered mmol/L or mg/dL, so I'll give you both*\n"
+          reply += make_average_sentence('mmol', mmol, dcct.to_s, ifcc) + "\n"
+          reply += make_average_sentence('mgdl', mgdl, dcct.to_s, ifcc)
+        elsif type=='mmol'
+          reply = make_average_sentence('mmol', mmol, dcct.to_s, ifcc)
+        else
+          reply = make_average_sentence('mgdl', mgdl, dcct.to_s, ifcc)
+        end
+
         response.reply(reply)
       end
 
+      def make_average_sentence(type, value, dcct, ifcc)
+        if type == 'mmol'
+          string = "An average of **#{value} mmol/L** is about "
+        elsif type == 'mgdl'
+          string = "An average of **#{value} mg/dL** is about "
+        end
+
+        string += "**#{dcct}%** (DCCT) or **#{ifcc} mmol/mol** (IFCC)"
+      end
+
       def estimate_average_from_a1c(response)
         input = response.matches[0][0]
         Lita.logger.debug('Converting a1c to BG for input "' + input + '"')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-diabetter
 version: !ruby/object:Gem::Version
-  version: 0.1.1.alpha.18
+  version: 0.1.1.alpha.19
 platform: ruby
 authors:
 - Cas Eliëns