insulin 0.0.9 → 0.0.10

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    insulin (0.0.7)
+    insulin (0.0.10)
       bson_ext
+      ffi
       mongo
       thor
 

data/README.md

@@ -17,15 +17,21 @@ Usage
 
     insulin ingest </path/to/on_track_export_file.csv>
 
-This will take that file, turn it onto some nice JSON, and push into a number of collections in a MongoDB database called 'insulin'. You can see them with
+This will take that file, parse it, and push the JSON into a number of collections in a MongoDB database called 'insulin'. You can view them with something like
 
     $ mongo insulin
     MongoDB shell version: 2.0.6
     connecting to: insulin
     > db.events.find({serial : 266})
-    { "_id" : ObjectId("4ff07b371508cc259c8a8f0c"), "serial" : 266, "timestamp" : ISODate("2012-06-28T09:21:05Z"), "tzoffset" : "+0100", "timezone" : "BST", "unixtime" : 1340875265, "day" : "thursday", "date" : "2012-06-28", "time" : "10:21:05 BST", "type" : "medication", "subtype" : "humalog", "tag" : "after breakfast", "value" : 4, "notes" : { "food" : [ "2 bacon", "2 toast" ], "note" : [ "test note" ] } }
+    { "_id" : ObjectId("4ff07b371508cc259c8a8f0c"), "serial" : 266, "timestamp" : ISODate("2012-06-28T09:21:05Z"), "tzoffset" : "+0100", "timezone" : "BST", "unixtime" : 1340875265, "day" : "thursday", "date" : "2012-06-28", "time" : "10:21:05 BST", "type" : "medication", "subtype" : "humalog", "tag" : "breakfast", "value" : 4, "notes" : { "food" : [ "2 bacon", "2 toast" ], "note" : [ "test note" ] } }
     > 
 
+You can also run the tests, if you're into that sort of thing:
+
+    bundle exec rspec
+
+There's also some Postfix voodoo I've been using to extract the CSVs from incoming mail, which I'll document here soon.
+
 Next steps
 ==========
 
@@ -34,4 +40,6 @@ Next steps
 * Give it a [meteor](http://meteor.com/) front-end (might require some help from [Chris](https://github.com/mrchrisadams)). Graphs, yo
 * 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)
 
+---
 
+Project built using DDD (Diabetes-Driven Development)

data/TODO.md

@@ -1,2 +1,7 @@
-* Rake tasks to build, move to pkg/, publish
 * Executable needs to handle config somehow (~/.insulinrc maybe)
+* Indexes
+* Map/reduce somewhere?
+* Jenkins?
+* Food - combine available carbs data with meds object? or other way around?
+* Unhappy with event display from Day. Maybe just make these things fixed-width and move this into Event (which should have a variety of to_s-ish methods, including as_csv which takes a list of fields)
+* Estimated hba1c?

data/bin/insulin

@@ -5,13 +5,24 @@ require 'thor'
 
 module Insulin
   class I < Thor
-    map "-i" => :ingest
+    @@mongo = Insulin::MongoHandle.new ({"database" => "insulin"})
 
-    desc "ingest", "ingest OnTrack CSV export FILE"
+#    map "-i" => :ingest
+
+    desc "ingest FILE", "ingest OnTrack CSV export FILE"
     def ingest file
       csv = Insulin::OnTrackCsvFile.new file
-      mongo = Insulin::MongoHandle.new ({"database" => "insulin"})
-      csv.save_events mongo
+      csv.save_events @@mongo
+    end
+
+    desc "day DATE", "show stats for day DATE (default is today)"
+    def day date = nil
+      if not date
+        require 'time'
+        date = Time.new.strftime "%F"
+      end
+      d = Insulin::Day.new date, @@mongo
+      puts d
     end
   end
 end

data/files/google_spreadsheet.csv

@@ -0,0 +1,6 @@
+Date,Mass,Breakfast,,,,,Morning snacks,Lunch,,,,,Afternoon snacks,Dinner,,,,,Evening snacks,Bedtime,,
+,,Time,BG,Insulin,Food,Drink,,Time,BG,Insulin,Food,Drink,,Time,BG,Insulin,Food,Drink,,Time,BG,Insulin
+2012-06-28,,10:00:00,6.1,4,"Bacon, toast",Tea,,13:45:00,4.3,4,Haloumi salad,,Banana,19:00:00,5.7,8,Turkey stir-fry,Prosecco,Fun-size Twix,22:45:00,5.7,14
+2012-06-29,58,08:45:00,3.9,4,Eggs on toast,Tea,,13:00:00,5.6,6,Fishfinger sandwich,,"Crisps, prosecco",20:30:00,15.2,6,Japanese takeaway,Beer,,01:00:00,9.9,14
+2012-06-30,,11:00:00,7.0,,,,,12:00:00,,6,"Bacon, eggs, mushrooms, beans, toast",Tea,,19:00:00,4.4,6,"Prawns, egg-fried rice",,,23:30:00,17.5,14
+2012-07-01,,09:30:00,6.4,4,"Boiled eggs, toast",Tea,,,,,,,,,,,,,,,,

data/files/on_track.csv

@@ -1,18 +1,41 @@
+343,"Jul 4, 2012 11:04:56 PM",Medication,Lantus,Bedtime,12.0,""
+342,"Jul 4, 2012 10:09:11 PM",Glucose,,Bedtime,9.2,"B:4 pints
+N: new pot of strips"
+341,"Jul 4, 2012 6:16:28 PM",Medication,Humalog,Dinner,5.0,"F: picnic box (Leon)"
+340,"Jul 4, 2012 6:14:12 PM",Glucose,,Dinner,4.4,""
+339,"Jul 4, 2012 12:53:16 PM",Medication,Humalog,Lunch,4.0,"F: salmon and tuna tartare salad (Itsu), crisps"
+338,"Jul 4, 2012 12:53:09 PM",Glucose,,Lunch,5.6,""
+337,"Jul 4, 2012 11:23:37 AM",Glucose,,,6.6,""
+335,"Jul 4, 2012 8:43:04 AM",Exercise,Walking,After Breakfast,20.0,""
+334,"Jul 4, 2012 7:44:42 AM",Food,,Breakfast,36.0,""
+333,"Jul 4, 2012 7:28:40 AM",Medication,Humalog,Breakfast,3.0,"F: egg on toast"
+332,"Jul 4, 2012 7:27:37 AM",Glucose,,Breakfast,4.1,""
+302,"Jul 1, 2012 10:46:12 PM",Medication,Lantus,Bedtime,14.0,""
+301,"Jul 1, 2012 10:32:32 PM",Glucose,,Bedtime,7.5,""
+300,"Jul 1, 2012 9:06:01 PM",Glucose,,After Dinner,3.5,""
+299,"Jul 1, 2012 7:03:37 PM",Medication,Humalog,Dinner,6.0,"F:Roast chicken dinner"
+298,"Jul 1, 2012 6:56:25 PM",Glucose,,Dinner,4.9,""
+297,"Jul 1, 2012 2:03:05 PM",Medication,Humalog,Lunch,4.0,"F: prawns, avocado, mayonnaise, bruschetta"
+296,"Jul 1, 2012 1:54:04 PM",Glucose,,Lunch,5.0,""
+295,"Jul 1, 2012 12:40:43 PM",Weight,,Lunch,59.0,""
+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,""
+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"
+288,"Jun 30, 2012 6:24:50 PM",Glucose,,Dinner,4.4,""
 287,"Jun 30, 2012 1:55:02 PM",Glucose,,After Lunch,3.6,"N: new pot of strips"
 286,"Jun 30, 2012 12:07:56 PM",Medication,Humalog,Lunch,6.0,"F: fry-up"
+285,"Jun 30, 2012 11:09:53 AM",Glucose,,Breakfast,7.0,"N: slept late. It's going to be brunch today"
+283,"Jun 30, 2012 1:04:53 AM",Glucose,,Bedtime,9.9,""
+284,"Jun 30, 2012 1:04:53 AM",Medication,Lantus,Bedtime,14.0,""
+282,"Jun 29, 2012 10:59:13 PM",Glucose,,After Dinner,10.4,""
 281,"Jun 29, 2012 8:46:58 PM",Medication,Humalog,Dinner,6.0,"F: Japanese takeaway"
+280,"Jun 29, 2012 8:16:52 PM",Glucose,,Dinner,15.2,"B:prosecco"
+279,"Jun 29, 2012 6:29:58 PM",Glucose,,,3.8,""
 278,"Jun 29, 2012 1:02:13 PM",Medication,Humalog,Lunch,6.0,"Fishfinger sandwich, salad"
 277,"Jun 29, 2012 1:02:04 PM",Glucose,,Lunch,5.6,""
 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 28, 2012 10:52:14 PM",Medication,Lantus,Bedtime,14.0,""
-272,"Jun 28, 2012 10:46:13 PM",Glucose,,Bedtime,5.7,""
-271,"Jun 28, 2012 7:30:50 PM",Medication,Humalog,Dinner,8.0,"F: turkey stir-fry"
-270,"Jun 28, 2012 7:06:35 PM",Glucose,,Dinner,5.7,""
-268,"Jun 28, 2012 1:52:47 PM",Medication,Humalog,Lunch,4.0,"F: haloumi salad"
-267,"Jun 28, 2012 1:35:50 PM",Glucose,,Lunch,4.3,""
-266,"Jun 28, 2012 10:21:05 AM",Medication,Humalog,Breakfast,4.0,"F:2 bacon, 2 toast
-N:test note"
-265,"Jun 28, 2012 9:42:17 AM",Glucose,,Breakfast,6.1,""
-262,"Jun 27, 2012 11:58:07 PM",Exercise,Drumming,,120.0,""

data/insulin.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "thor"
   gem.add_dependency "mongo"
   gem.add_dependency "bson_ext"
+  gem.add_dependency "ffi"
 
   gem.add_development_dependency "rspec", "~> 2.6"
   gem.add_development_dependency "cucumber"

data/lib/insulin.rb

@@ -7,6 +7,8 @@ require "insulin/on_track_note_set"
 require "insulin/on_track_csv_line"
 require "insulin/on_track_csv_file"
 require "insulin/event"
+require "insulin/day"
+
 # Author::  Sam (mailto:sam@cruft.co)
 # License:: MIT
 

data/lib/insulin/day.rb

@@ -0,0 +1,60 @@
+require 'insulin'
+
+module Insulin
+  class Day < Hash
+    def initialize date, mongo
+      @date = date
+      @mongo = mongo
+
+      keys = [
+        "type",
+        "subtype",
+        "tag"
+      ]
+      self["all"] = []
+
+      @mongo.db.collection(date).find().each do |e|
+        ev = Insulin::Event.new(e)
+        keys.each do |k|
+          sub = ev[k]
+          if self[sub]
+            self[sub] << ev
+          else
+            self[sub] = [ev]
+          end
+        end
+
+        self["all"] << ev
+      end
+    end
+
+    def average_glucose
+      t = 0
+      c = 0
+      self["glucose"].each do |g|
+        @glucose_units = g["units"]
+        t += g["value"]
+        c += 1
+      end
+
+      return t / c
+    end
+
+    def to_s
+      s = ""
+      s << @date
+      s << "\n"
+
+      self["all"].each do |e|
+        s << e.simple
+        s << "\n"
+      end
+
+      s << "          Average glucose: %4.2f %s" % [
+        self.average_glucose,
+        @glucose_units
+      ]
+      s
+    end
+  end
+end

data/lib/insulin/event.rb

@@ -1,3 +1,5 @@
+require 'time'
+
 module Insulin
 # Author::  Sam (mailto:sam@cruft.co)
 # License:: MIT
@@ -5,20 +7,39 @@ module Insulin
   # This class represents a single OnTrack event (BG, meds, etc)
   class Event < Hash
 
+    @@units = {
+      "glucose" => "mmol/L",
+      "medication" => "x10^-5 L",
+      "weight" => "kg",
+      "exercise" => "minutes"
+    }
+
+# An event before this time is considered part of the previous day. Because
+# sometimes, we stay up late
+    @@cut_off_time = "04:00"
+
     # We expect to be passed a hash
     def initialize h
       self.update h
+
+      self["units"] = @@units[self["type"]]
     end
 
     # Save the event to Mongo via mongo_handle
     def save mongo_handle
 
+# See above
+      date_collection = self["date"]
+      if self["time"] < @@cut_off_time
+        date_collection = (Time.parse(self["date"]) - 86400).strftime "%F"
+      end
+
       # Save to each of these collections
       clxns = [
         "events",
         self["type"],
         self["subtype"],
-        self["date"]
+        date_collection
       ]
 
       clxns.each do |c|
@@ -36,5 +57,17 @@ module Insulin
         end
       end
     end
+
+    def simple
+      s = "          %s %-10s %-10s %4.1f %s" % [
+        self["time"],
+        self["type"],
+        self["subtype"],
+        self["value"],
+        self["units"]
+      ]
+
+      s
+    end
   end
 end

data/lib/insulin/on_track_csv_file.rb

@@ -51,11 +51,11 @@ module Insulin
 
     # Save the events to Mongo
     def save_events mongo
-      print "saving %d events to mongo... " % @events.count
+#      print "saving %d events to mongo... " % @events.count
       @events.each do |e|
         e.save mongo
       end
-      puts "done"
+#      puts "done"
     end
   end
 end

data/lib/insulin/version.rb

@@ -1,5 +1,5 @@
 module Insulin
 
   # Current version
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/scripts/build.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+. "${HOME}/.rvm/scripts/rvm"
+
+bundle install
+bundle exec rspec

data/spec/insulin_day_spec.rb

@@ -0,0 +1,36 @@
+require 'insulin'
+require "spec_helper.rb"
+
+describe Insulin::Day do
+  load_test_db
+
+  d = Insulin::Day.new "2012-06-30", @mongo
+
+  it "should contain something" do
+    d.keys.size.should > 0
+  end
+
+  it "should have events" do
+    d.keys.each do |k|
+      d[k].each do |e|
+        e.class.name.should == "Insulin::Event"
+      end
+    end
+  end
+
+  it "should have glucose events" do
+    d["glucose"].each do |g|
+      g["type"].should == "glucose"
+    end
+  end
+
+  it "should have at most 1 lantus event" do
+    d["lantus"].size.should < 2
+  end
+
+  it "should display correctly" do
+    d.to_s.should include "19:07:42 BST medication humalog     6.0 x10^-5 L"
+  end
+
+  drop_test_db
+end

data/spec/insulin_event_spec.rb

@@ -10,6 +10,10 @@ N:other note"}
     event["type"].should == "medication"
   end
 
+  it "should have the correct units" do
+    event["units"].should == "x10^-5 L"
+  end
+
   conf = Insulin::Config.new 'conf/insulin_dev.yaml'
   mconf = conf.get_section "mongo"
   mongo = Insulin::MongoHandle.new mconf
@@ -42,6 +46,22 @@ N:other note"}
     it "saved event should have correct value" do
       item["value"].should == 4.0
     end
+
+    it "saved event should have correct units" do
+      item["units"].should == "x10^-5 L"
+    end
+  end
+
+  mongo_event = Insulin::Event.new mongo.db.collection("events").find_one(
+    {"serial" => 266}
+  )
+
+  it "loaded event should have correct date" do
+    mongo_event["date"].should == "2012-06-28"
+  end
+
+  it "loaded event should have correct time" do
+    mongo_event["time"].should == "10:21:05 BST"
   end
 
   mongo.drop_db

data/spec/insulin_mongo_handle_spec.rb

@@ -20,7 +20,6 @@ describe Insulin::MongoHandle do
       true
   end
 
-
   it "should respond correctly to being passed a hash" do
     prod_handle = Insulin::MongoHandle.new(
       {

data/spec/insulin_on_track_csv_file_spec.rb

@@ -11,16 +11,15 @@ describe Insulin::OnTrackCsvFile do
     csv_file.lines[0].class.name.should == "Insulin::OnTrackCsvLine"
   end
 
-  it "line with serial 266 should have proper noteset" do
+  it "line with serial 342 should have proper noteset" do
     csv_file.lines.each do |c|
-      if c["serial"] == 266
+      if c["serial"] == 342
         c["notes"].should == {
-          "food"=>[
-            "2 bacon",
-            "2 toast"
+          "booze"=>[
+            "4 pints"
           ],
           "note"=>[
-            "test note"
+            "new pot of strips"
           ]
         }
       end
@@ -51,7 +50,18 @@ describe Insulin::OnTrackCsvFile do
 
   it "should save events" do
     csv_file.save_events @mongo
-    @mongo.db.collection("events").count.should >= 17
+    @mongo.db.collection("events").count.should >= 40
+  end
+
+  it "small-hours event should be assigned to previous-date collection" do
+    l = @mongo.db.collection("2012-06-30").find_one( { "serial" => 292 } )
+    l.should_not == nil
+    l["date"].should == "2012-07-01"
+  end
+
+  it "small-hours event should not appear in actual-date collection" do
+    l = @mongo.db.collection("2012-06-01").find_one( { "serial" => 292 } )
+    l.should == nil
   end
 
   after :all do

data/spec/spec_helper.rb

@@ -0,0 +1,16 @@
+require 'insulin'
+
+@mongo
+
+def load_test_db
+  config = Insulin::Config.new 'conf/insulin_dev.yaml'
+  mconf = config.get_section "mongo"
+  @mongo = Insulin::MongoHandle.new mconf
+
+  csv = Insulin::OnTrackCsvFile.new "files/on_track.csv"
+  csv.save_events @mongo
+end
+
+def drop_test_db
+  @mongo.drop_db
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: insulin
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-01 00:00:00.000000000 Z
+date: 2012-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -126,10 +142,12 @@ files:
 - bin/insulin
 - conf/insulin.yaml
 - conf/insulin_dev.yaml
+- files/google_spreadsheet.csv
 - files/on_track.csv
 - insulin.gemspec
 - lib/insulin.rb
 - lib/insulin/config.rb
+- lib/insulin/day.rb
 - lib/insulin/event.rb
 - lib/insulin/mongo_handle.rb
 - lib/insulin/on_track_csv_file.rb
@@ -138,7 +156,9 @@ files:
 - lib/insulin/on_track_note.rb
 - lib/insulin/on_track_note_set.rb
 - lib/insulin/version.rb
+- scripts/build.sh
 - spec/insulin_config_spec.rb
+- spec/insulin_day_spec.rb
 - spec/insulin_event_spec.rb
 - spec/insulin_mongo_handle_spec.rb
 - spec/insulin_on_track_csv_file_spec.rb
@@ -146,6 +166,7 @@ files:
 - spec/insulin_on_track_date_spec.rb
 - spec/insulin_on_track_note_set_spec.rb
 - spec/insulin_on_track_note_spec.rb
+- spec/spec_helper.rb
 homepage: http://pikesley.github.com/insulin/
 licenses: []
 post_install_message: 
@@ -172,6 +193,7 @@ specification_version: 3
 summary: Doing stuff with my diabetes data
 test_files:
 - spec/insulin_config_spec.rb
+- spec/insulin_day_spec.rb
 - spec/insulin_event_spec.rb
 - spec/insulin_mongo_handle_spec.rb
 - spec/insulin_on_track_csv_file_spec.rb
@@ -179,3 +201,4 @@ test_files:
 - spec/insulin_on_track_date_spec.rb
 - spec/insulin_on_track_note_set_spec.rb
 - spec/insulin_on_track_note_spec.rb
+- spec/spec_helper.rb