insulin 0.1.0 → 0.1.1

data/README.md

@@ -63,10 +63,12 @@ OnTrack allows you to mail the exported CSV files to an email address. [This pag
 Next steps
 ==========
 
-* Get it generating custom CSVs for Spreadsheeting
-* Get it doing some analysis
+* Generate custom CSVs for spreadsheeting
+* Generate PDFs for daily mail reports
+* Do some analysis
 * Generate some more detailed output (latest HbA1c, BP, etc)
 * Give it a [meteor](http://meteor.com/) front-end (might require some help from [Chris](https://github.com/mrchrisadams)). Graphs, yo
+* Connect to the Google Drive API to pull the exported CSVs (OnTrack will push there) and push spreadsheetable CSVs
 * Possibly connect to [this API](http://platform.fatsecret.com/api/) to extract carb values from plain-text food descriptions (this may be a little ambitious, we'll see)
 
 ---

data/TODO.md

@@ -1,4 +1,3 @@
-* Default 'day' for executable doesn't make much sense
 * Indexes
 * Map/reduce somewhere?
 * Jenkins?
@@ -8,3 +7,10 @@
 * empty time periods should return "nothing known" 
 * https://github.com/prawnpdf/prawn
 * Fully detailed output showing latest HbA1c, BP, etc
+* Work out Google Drive API
+* Write some proper rubydocs
+* Should not include HbA1c or BP in normal output. Also, these things need units. And BP is not really a number
+* Number of tests &c per time period
+* Somehow include cholesterol
+* Test the insulin executable
+* "Latest weight, change since last, overall trend" &c

data/files/on_track.csv

@@ -21,6 +21,8 @@ N: new pot of strips"
 294,"Jul 1, 2012 9:57:09 AM",Medication,Humalog,Breakfast,4.0,"Boiled eggs, toast"
 293,"Jul 1, 2012 9:41:47 AM",Glucose,,Breakfast,6.4,""
 292,"Jul 1, 2012 12:40:24 AM",Medication,Lantus,Bedtime,14.0,""
+441,"Jun 30, 2012 3:46:29 PM",HbA1c,,,8.8,""
+440,"Jun 30, 2012 3:46:15 PM",Blood Pressure,,After Lunch,118/75,""
 291,"Jun 30, 2012 11:14:04 PM",Glucose,,Bedtime,17.5,"D:m"
 290,"Jun 30, 2012 7:56:20 PM",Glucose,,After Dinner,7.0,""
 289,"Jun 30, 2012 7:07:42 PM",Medication,Humalog,Dinner,6.0,"Prawns, egg-fried rice"
@@ -39,3 +41,4 @@ N: new pot of strips"
 276,"Jun 29, 2012 10:00:54 AM",Weight,,Breakfast,58.0,""
 275,"Jun 29, 2012 8:45:13 AM",Medication,Humalog,Breakfast,4.0,"F:2 eggs, 2 toast"
 274,"Jun 29, 2012 8:37:47 AM",Glucose,,Breakfast,3.9,""
+273,"Jun 29, 2012 3:46:29 PM",HbA1c,,,14.5,""

data/lib/insulin/day.rb

@@ -30,6 +30,14 @@ module Insulin
       end
     end
 
+    def has_events?
+      if self["all"].size > 0
+        return true
+      end
+
+      return false
+    end
+
     def average_glucose
       t = 0
       c = 0

data/lib/insulin/event.rb

@@ -11,7 +11,9 @@ module Insulin
       "glucose" => "mmol/L",
       "medication" => "x10^-5 L",
       "weight" => "kg",
-      "exercise" => "minutes"
+      "exercise" => "minutes",
+      "blood pressure" => "sp/df",
+      "hba1c" => "%"
     }
 
 # An event before this time is considered part of the previous day. Because
@@ -59,8 +61,12 @@ module Insulin
     end
 
     def simple
-      s = "%s | %-15s | %-10s | %-13s | %4.1f %s" % [
-        self["time"],
+      value_format = "%6.1f"
+      if self["value"].is_a? String
+        value_format = "%6s"
+      end
+      s = "%s | %-15s | %-14s | %-13s | #{value_format} %s" % [
+        self["short_time"],
         self["tag"],
         self["type"],
         self["subtype"],

data/lib/insulin/n_day_period.rb

@@ -15,7 +15,9 @@ module Insulin
         d = (t + (i * 86400))
         if d <= today
           day = Day.new d.strftime("%F"), @mongo
-          self << day
+          if day.has_events?
+            self << day
+          end
           @count += 1
         end
       end
@@ -24,12 +26,14 @@ module Insulin
         @count
       ]
 
+      @hba1c = @mongo.db.collection("hba1c").find.sort(:timestamp).to_a[-1]
     end
 
     def average_glucose
       total = 0
       self.each do |d|
         total += d.average_glucose
+        puts d.keys
       end
 
       return total / self.size
@@ -54,7 +58,15 @@ module Insulin
         @start_date,
         self.average_glucose,
         self[0].glucose_units
-      ] 
+      ]
+
+      s << "\n"
+      s << "    "
+      s << "latest hba1c (from %s): %0.1f%s" % [
+        @hba1c["date"],
+        @hba1c["value"],
+        @hba1c["units"]
+      ]
 
       s
     end

data/lib/insulin/on_track/csv_line.rb

@@ -22,7 +22,11 @@ module Insulin
         self["type"] = bits[3].downcase
         self["subtype"] = bits[4].downcase if not bits[4] == ""
         self["tag"] = bits[5].downcase
-        self["value"] = bits[6].to_f
+        if self["type"] == "blood pressure"
+          self["value"] = bits[6]
+        else
+          self["value"] = bits[6].to_f
+        end
 
         # Notes get complicated. Everything from field 7 to the end will be part
         # of the notes

data/lib/insulin/on_track/date.rb

@@ -21,6 +21,7 @@ module Insulin
         self["day"] = t.strftime("%A").downcase
         self["date"] = t.strftime "%F"
         self["time"] = t.strftime "%T #{self['timezone']}" 
+        self["short_time"] = t.strftime "%H:%M" 
       end
     end
   end

data/lib/insulin/version.rb

@@ -1,5 +1,5 @@
 module Insulin
 
   # Current version
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/day_spec.rb

@@ -29,7 +29,9 @@ describe Insulin::Day do
   end
 
   it "should display correctly" do
-    d.to_s.should include "19:07:42 BST | dinner          | medication | humalog       |  6.0 x10^-5 L"
+    d.to_s.should include "19:07 | dinner          | medication     | humalog       |    6.0 x10^-5 L"
+    d.to_s.should include "15:46 | after lunch     | blood pressure |               | 118/75 sp/df"
+    d.to_s.should include "15:46 |                 | hba1c          |               |    8.8 %"
   end
 
   it "minimal display should be correct" do

data/spec/event_spec.rb

@@ -64,5 +64,11 @@ N:other note"}
     mongo_event["time"].should == "10:21:05 BST"
   end
 
+  bp_event = Insulin::Event.new Insulin::OnTrack::CsvLine.new %q{440,"Jun 30, 2012 3:46:15 PM",Blood Pressure,,After Lunch,118/75,""}
+
+  it "should have the correct value" do
+    bp_event["value"].should == "118/75"
+  end
+
   mongo.drop_db
 end

data/spec/month_spec.rb

@@ -20,9 +20,5 @@ describe Insulin::Month do
     m.average_glucose.should_not == nil
   end
 
-  it "should say '15-day period'" do
-    m.to_s.should include "15-day period"
-  end
-
   drop_test_db
 end

data/spec/n_day_period_spec.rb

@@ -6,12 +6,12 @@ describe Insulin::NDayPeriod do
 
   b = Insulin::NDayPeriod.new({
     "start_date" => "2012-06-29",
-    "days" => 3,
+    "days" => 7,
     "mongo" => @mongo
   })
 
-  it "should contain 3 items" do
-    b.size.should == 3
+  it "should contain 4 items" do
+    b.size.should == 4
   end
 
   it "items should be days" do
@@ -20,19 +20,19 @@ describe Insulin::NDayPeriod do
     end
   end
 
-  it "should have average glucose of 7.16" do
-    ("%0.2f" % b.average_glucose).to_f.should == 7.16
+  it "should have average glucose of 6.87" do
+    ("%0.2f" % b.average_glucose).to_f.should == 6.87
   end
 
-  c = Insulin::NDayPeriod.new(
-    "start_date" => Time.new.strftime("%F"),
-    "days" => 7,
-    "mongo" => @mongo
-  )
-
-  it "should not go storming off into the future" do
-    c.size.should == 1
-  end
+#  c = Insulin::NDayPeriod.new(
+#    "start_date" => Time.new.strftime("%F"),
+#    "days" => 7,
+#    "mongo" => @mongo
+#  )
+#
+#  it "should not go storming off into the future" do
+#    c.size.should == 1
+#  end
 
   t = Time.new
   t = t + 86400

data/spec/on_track/date_spec.rb

@@ -19,6 +19,10 @@ describe Insulin::OnTrack::Date do
     otd["day"].should == "friday"
   end
 
+  it "should have the correct short time" do
+    otd["short_time"].should == "09:00"
+  end
+
   otd_gmt = Insulin::OnTrack::Date.new "Jan 22 2012 9:00:12 PM"
 
   it "should have the correct timestamp" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: insulin
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-13 00:00:00.000000000 Z
+date: 2012-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor