insulin 0.0.18 → 0.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    insulin (0.0.16)
+    insulin (0.1.0)
       bson_ext
       ffi
       mongo

data/README.md

@@ -28,26 +28,28 @@ This will take that file, parse it, and push the JSON into a number of collectio
     { "_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" ] } }
     > 
 
-Currently the only supported output operation is
+Current output options are
 
     insulin day DATE
-
-to show stats for date DATE (in YYYY-MM-DD format) - defaults to 'today' if no date supplied. Note that insulin considers events that occur up to 04:00 as part of the previous actual day (because sometimes we stay up late, right?). Output will look something like
-
-    2012-07-06
-              06:50:54 BST glucose                6.4 mmol/L
-              07:05:38 BST weight                59.0 kg
-              09:43:33 BST glucose                6.7 mmol/L
-              09:50:23 BST medication humalog     4.0 x10^-5 L
-              13:17:43 BST glucose                4.7 mmol/L
-              13:31:44 BST medication humalog     4.0 x10^-5 L
-              15:57:12 BST glucose                6.2 mmol/L
-              20:01:41 BST glucose                6.2 mmol/L
-              20:05:21 BST medication humalog     6.0 x10^-5 L
-              21:42:38 BST glucose                9.0 mmol/L
-              00:34:22 BST glucose                9.5 mmol/L
-              00:49:27 BST medication lantus     12.0 x10^-5 L
-              Average glucose: 6.96 mmol/L
+    insulin month DATE
+    insulin week DATE
+
+Example:
+
+    $ insulin day 2012-07-01
+    2012-07-01
+        09:41:47 BST | breakfast       | glucose    |               |  6.4 mmol/L
+        09:57:09 BST | breakfast       | medication | humalog       |  4.0 x10^-5 L
+        12:40:43 BST | lunch           | weight     |               | 59.0 kg
+        13:54:04 BST | lunch           | glucose    |               |  5.0 mmol/L
+        14:03:05 BST | lunch           | medication | humalog       |  4.0 x10^-5 L
+        18:56:25 BST | dinner          | glucose    |               |  4.9 mmol/L
+        19:03:37 BST | dinner          | medication | humalog       |  6.0 x10^-5 L
+        21:06:01 BST | after dinner    | glucose    |               |  3.5 mmol/L
+        22:32:32 BST | bedtime         | glucose    |               |  7.5 mmol/L
+        22:46:12 BST | bedtime         | medication | lantus        | 14.0 x10^-5 L
+
+        average glucose: 5.46 mmol/L
 
 You can also run the tests, if you're into that sort of thing:
 
@@ -63,6 +65,7 @@ Next steps
 
 * Get it generating custom CSVs for Spreadsheeting
 * Get it doing 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
 * 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,8 +1,10 @@
-* Executable needs to handle config somehow (~/.insulinrc maybe)
+* Default 'day' for executable doesn't make much sense
 * Indexes
 * Map/reduce somewhere?
 * Jenkins?
 * Food - combine available carbs data with meds object? or other way around?
 * Estimated HbA1c?
-* Have week and month options which default to the last week, last 30 days
-* https://github.com/svenfuchs/gem-release
+* https://github.com/svenfuchs/gem-release - put these into rake tasks?
+* empty time periods should return "nothing known" 
+* https://github.com/prawnpdf/prawn
+* Fully detailed output showing latest HbA1c, BP, etc

data/bin/insulin

@@ -7,8 +7,6 @@ module Insulin
   class I < Thor
     @@mongo = Insulin::MongoHandle.new ({"database" => "insulin"})
 
-#    map "-i" => :ingest
-
     desc "ingest FILE", "ingest OnTrack CSV export FILE"
     def ingest file
       csv = Insulin::OnTrack::CsvFile.new file
@@ -39,7 +37,15 @@ module Insulin
       puts w.to_s
     end
 
-    default_task :day
+    desc "month DATE", "show stats for 30-day period commencing DATE (defaults to previous 30 days)"
+    def month date = nil
+      if not date
+        require 'time'
+        date = (Time.new - (30 * 86400)).strftime "%F"
+      end
+      m = Insulin::Month.new date, @@mongo
+      puts m.to_s
+    end
   end
 end
 

data/lib/insulin.rb

@@ -3,7 +3,9 @@ require "insulin/config"
 require "insulin/mongo_handle"
 require "insulin/event"
 require "insulin/day"
+require "insulin/n_day_period"
 require "insulin/week"
+require "insulin/month"
 require "insulin/on_track/date"
 require "insulin/on_track/note"
 require "insulin/on_track/note_set"
@@ -16,5 +18,5 @@ require "insulin/on_track/csv_file"
 # OnTrack[https://play.google.com/store/apps/details?id=com.gexperts.ontrack&hl=en]
 # can export its data as a CSV. Insulin takes this data, parses it into
 # (possibly) useful formats, and stuffs it into MongoDB
-module Insulin
-end
+#module Insulin
+#end

data/lib/insulin/day.rb

@@ -2,6 +2,8 @@ require 'insulin'
 
 module Insulin
   class Day < Hash
+    attr_reader :glucose_units
+
     def initialize date, mongo
       @date = date
       @mongo = mongo
@@ -55,8 +57,9 @@ module Insulin
         s << "\n"
       end
 
+      s << "\n"
       s << "    "
-      s << "Average glucose: %4.2f %s" % [
+      s << "average glucose: %4.2f %s" % [
         self.average_glucose,
         @glucose_units
       ]
@@ -68,7 +71,6 @@ module Insulin
       s << @date
       s << "\n"
 
-# This needs a test!
       self["all"].each do |e|
         if ["breakfast", "lunch", "dinner", "bedtime"].include? e["tag"] and
           ["medication", "glucose"].include? e["type"]

data/lib/insulin/month.rb

@@ -0,0 +1,13 @@
+require 'insulin'
+
+module Insulin
+  class Month < NDayPeriod
+    def initialize date, mongo
+      super({
+        "start_date" => date,
+        "days" => 30,
+        "mongo" => mongo
+      })
+    end
+  end
+end

data/lib/insulin/n_day_period.rb

@@ -0,0 +1,62 @@
+require 'insulin'
+require 'time'
+
+module Insulin
+  class NDayPeriod < Array
+    def initialize hash
+      @start_date = hash["start_date"]
+      @days = hash["days"]
+      @mongo = hash["mongo"]
+
+      t = Time.parse @start_date
+      today = Time.new
+      @count = 0
+      @days.times do |i|
+        d = (t + (i * 86400))
+        if d <= today
+          day = Day.new d.strftime("%F"), @mongo
+          self << day
+          @count += 1
+        end
+      end
+
+      @descriptor = "%d-day period" % [
+        @count
+      ]
+
+    end
+
+    def average_glucose
+      total = 0
+      self.each do |d|
+        total += d.average_glucose
+      end
+
+      return total / self.size
+    end
+
+    def to_s
+      s = "%s commencing %s" % [
+        @descriptor,
+        @start_date
+      ]
+      s << "\n"
+      s << "\n"
+
+      self.each do |d|
+        s << d.minimal
+        s << "\n"
+      end
+
+      s << "    "
+      s << "average glucose for %s commencing %s: %0.2f %s" % [
+        @descriptor,
+        @start_date,
+        self.average_glucose,
+        self[0].glucose_units
+      ] 
+
+      s
+    end
+  end
+end

data/lib/insulin/version.rb

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

data/lib/insulin/week.rb

@@ -1,45 +1,15 @@
 require 'insulin'
-require 'time'
 
 module Insulin
-  class Week < Array
+  class Week < NDayPeriod
     def initialize date, mongo
-      @date = date
-      @mongo = mongo
+      super({
+        "start_date" => date,
+        "days" => 7,
+        "mongo" => mongo
+      })
 
-      t = Time.parse @date
-      6.times do |i|
-        d = (t + (i * 86400)).strftime "%F"
-        day = Day.new d, @mongo
-        self << day
-      end
-    end
-
-    def average_glucose
-      total = 0
-      self.each do |d|
-        total += d.average_glucose
-      end
-
-      return total / self.size
-    end
-
-    def to_s
-      s = "Week commencing %s" % @date
-      s << "\n"
-      s << "\n"
-
-      self.each do |d|
-        s << d.minimal
-        s << "\n"
-      end
-
-      s << "    "
-      s << "Average glucose for week commencing %s: %4.1f" % [
-        @date,
-        self.average_glucose
-      ]
-      s
+      @descriptor = "week"      
     end
   end
 end

data/spec/day_spec.rb

@@ -34,6 +34,7 @@ describe Insulin::Day do
 
   it "minimal display should be correct" do
     d.minimal.should_not include "exercise"
+    d.minimal.should_not include "after"
   end
 
   drop_test_db

data/spec/month_spec.rb

@@ -0,0 +1,28 @@
+require 'insulin'
+require "spec_helper.rb"
+
+describe Insulin::Month do
+  load_test_db
+
+  m = Insulin::Month.new "2012-06-29", @mongo
+
+  it "should contain something" do
+    m.size.should > 0
+  end
+
+  it "should have days" do
+    m.each do |d|
+      d.class.name.should == "Insulin::Day"
+    end
+  end
+
+  it "should have average glucose" 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

@@ -0,0 +1,51 @@
+require 'insulin'
+require 'spec_helper.rb'
+
+describe Insulin::NDayPeriod do
+  load_test_db
+
+  b = Insulin::NDayPeriod.new({
+    "start_date" => "2012-06-29",
+    "days" => 3,
+    "mongo" => @mongo
+  })
+
+  it "should contain 3 items" do
+    b.size.should == 3
+  end
+
+  it "items should be days" do
+    b.each do |d|
+      d.class.name.should == "Insulin::Day"
+    end
+  end
+
+  it "should have average glucose of 7.16" do
+    ("%0.2f" % b.average_glucose).to_f.should == 7.16
+  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
+  d = Insulin::NDayPeriod.new(
+    "start_date" => t.strftime("%F"),
+    "days" => 7,
+    "mongo" => @mongo
+  )
+
+  it "should have nothing if start_date is in the future" do
+    d.size.should == 0
+  end
+
+  drop_test_db
+
+end

data/spec/week_spec.rb

@@ -20,5 +20,9 @@ describe Insulin::Week do
     w.average_glucose.should_not == nil
   end
 
+  it "should say 'week commencing'" do
+    w.to_s.should include "week commencing"
+  end
+
   drop_test_db
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: insulin
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-10 00:00:00.000000000 Z
+date: 2012-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -168,6 +168,8 @@ files:
 - lib/insulin/day.rb
 - lib/insulin/event.rb
 - lib/insulin/mongo_handle.rb
+- lib/insulin/month.rb
+- lib/insulin/n_day_period.rb
 - lib/insulin/on_track/csv_file.rb
 - lib/insulin/on_track/csv_line.rb
 - lib/insulin/on_track/date.rb
@@ -180,6 +182,8 @@ files:
 - spec/day_spec.rb
 - spec/event_spec.rb
 - spec/mongo_handle_spec.rb
+- spec/month_spec.rb
+- spec/n_day_period_spec.rb
 - spec/on_track/csv_file_spec.rb
 - spec/on_track/csv_line_spec.rb
 - spec/on_track/date_spec.rb
@@ -216,6 +220,8 @@ test_files:
 - spec/day_spec.rb
 - spec/event_spec.rb
 - spec/mongo_handle_spec.rb
+- spec/month_spec.rb
+- spec/n_day_period_spec.rb
 - spec/on_track/csv_file_spec.rb
 - spec/on_track/csv_line_spec.rb
 - spec/on_track/date_spec.rb