insulin 0.0.13 → 0.0.14

data/Gemfile.lock

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

data/bin/insulin

@@ -29,6 +29,16 @@ module Insulin
       end
     end
 
+    desc "week DATE", "show stats for week commencing DATE (defaults to previous 7 days)"
+    def week date = nil
+      if not date
+        require 'time'
+        date = (Time.new - (6 * 86400)).strftime "%F"
+      end
+      w = Insulin::Week.new date, @@mongo
+      puts w.to_s
+    end
+
     default_task :day
   end
 end

data/lib/insulin/day.rb

@@ -14,7 +14,7 @@ module Insulin
       self["all"] = []
 
       @mongo.db.collection(date).find().each do |e|
-        ev = Insulin::Event.new(e)
+        ev = Event.new(e)
         keys.each do |k|
           sub = ev[k]
           if self[sub]
@@ -31,10 +31,14 @@ module Insulin
     def average_glucose
       t = 0
       c = 0
-      self["glucose"].each do |g|
-        @glucose_units = g["units"]
-        t += g["value"]
-        c += 1
+      begin
+        self["glucose"].each do |g|
+          @glucose_units = g["units"]
+          t += g["value"]
+          c += 1
+        end
+      rescue NoMethodError
+        return 0
       end
 
       return t / c
@@ -46,11 +50,13 @@ module Insulin
       s << "\n"
 
       self["all"].each do |e|
+        s << "    "
         s << e.simple
         s << "\n"
       end
 
-      s << "          Average glucose: %4.2f %s" % [
+      s << "    "
+      s << "Average glucose: %4.2f %s" % [
         self.average_glucose,
         @glucose_units
       ]
@@ -64,6 +70,7 @@ module Insulin
 
       self["all"].each do |e|
         if ["breakfast", "lunch", "dinner", "bedtime"].include? e["tag"]
+          s << "    "
           s << e.simple
           s << "\n"
         end

data/lib/insulin/event.rb

@@ -59,7 +59,7 @@ module Insulin
     end
 
     def simple
-      s = "          %s %-10s %-10s %-10s %4.1f %s" % [
+      s = "%s | %-15s | %-10s | %-13s | %4.1f %s" % [
         self["time"],
         self["tag"],
         self["type"],

data/lib/insulin/on_track/csv_file.rb

@@ -0,0 +1,64 @@
+module Insulin
+# Author::  Sam (mailto:sam@cruft.co)
+# License:: MIT
+
+  module OnTrack
+
+    # This class represents a CSV file as exported by OnTrack
+    class CsvFile
+      attr_reader :file, :lines, :events
+
+      # Take the path to the CSV, open it, process it
+      def initialize csv_path
+        @csv_path = csv_path
+        @file = File.new @csv_path
+        self.read_lines
+        self.create_events
+      end
+
+      # Read the lines
+      def read_lines
+        @lines = []
+
+        # Where an event has more than one note, a 'line' will contain '\n's
+        l = ""
+        while line = @file.gets
+          # Stuff the line in to 'l'
+          l << line
+  
+          # A '"' at the end of the line closes the event
+          if line[-2] == '"'
+  
+            # Create a CsvLine, stripping the final '\n'
+            o = CsvLine.new l[0..-2]
+            @lines << o
+  
+            # Reset the placeholder
+            l = ""
+          end
+        end
+
+        # Sort the list by the serial numbers (required for a future feature)
+        @lines.sort_by! {|o| o["serial"]}
+      end
+
+      # Turn the lines into Events
+      def create_events
+        @events = []
+        @lines.each do |l|
+          e = Event.new l
+          @events << e
+        end
+      end
+
+      # Save the events to Mongo
+      def save_events mongo
+#        print "saving %d events to mongo... " % @events.count
+        @events.each do |e|
+          e.save mongo
+        end
+#        puts "done"
+      end
+    end
+  end
+end

data/lib/insulin/on_track/csv_line.rb

@@ -0,0 +1,42 @@
+module Insulin
+# Author::  Sam (mailto:sam@cruft.co)
+# License:: MIT
+
+  module OnTrack
+
+    # This class represents a single OnTrack CSV line
+    class CsvLine < Hash
+
+      # Parse the passed-in CSV line
+      def initialize line
+
+        # Split on commas 
+        bits = line.split ","
+        self["serial"] = bits[0].to_i
+
+        # OnTrack embeds commas in the dates of its CSVs. Duh 
+        self.update Date.new "%s%s" % [
+          bits[1],
+          bits[2]
+        ]
+        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
+
+        # Notes get complicated. Everything from field 7 to the end will be part
+        # of the notes
+        notes = bits[7..-1]
+
+        # We may have embedded commas
+        notes = notes.join ","
+  
+        # Strip the trailing '\n'
+        notes = notes[1..-2]
+
+        # See Insulin::OnTrack::NoteSet
+        self["notes"] = NoteSet.new notes if not notes == ""
+      end
+    end
+  end
+end

data/lib/insulin/on_track/date.rb

@@ -0,0 +1,27 @@
+require "time"
+
+module Insulin
+# Author::  Sam (mailto:sam@cruft.co)
+# License:: MIT
+  module OnTrack
+
+    # OnTrack uses really shitty date formats, including embedding a comma in
+    # the CSV export file. Christ on a crutch
+    class Date < Hash
+
+      # Parse the string 'd', looking for datetime information
+      def initialize d
+        t = Time.parse d
+
+        # We extract loads of stuff. Might be useful one day
+        self["timestamp"] = t
+        self["tzoffset"] = t.strftime "%z"
+        self["timezone"] = t.zone
+        self["unixtime"] = t.to_i
+        self["day"] = t.strftime("%A").downcase
+        self["date"] = t.strftime "%F"
+        self["time"] = t.strftime "%T #{self['timezone']}" 
+      end
+    end
+  end
+end

data/lib/insulin/on_track/note.rb

@@ -0,0 +1,49 @@
+module Insulin
+# Author::  Sam (mailto:sam@cruft.co)
+# License:: MIT
+
+  module OnTrack
+
+    # Class representing a single OnTrack note
+    class Note
+
+      # Lookups. We will only deal with notes of these types
+      @@keys = {
+        "F" => 'food',
+        "B" => 'booze',
+        "N" => 'note'
+      }
+
+      attr_reader :type, :content
+
+      # Parse the raw note 'n'
+      def initialize n
+
+        # Key/value splits on ':'
+        bits = n.split ":"
+  
+        # Remove leading/trailing cruft from key part
+        t = bits[0].strip
+  
+        # We only deal with the keys we know about
+        if @@keys.keys.include? t
+  
+          # Remove cruft from content, downcase
+          @content = bits[1].strip.downcase
+  
+          # These keys mean we turn the content into a list
+          if ["F", "B"].include? t
+            a = []
+            @content.split(",").each do |v|
+              a << v.strip
+            end
+            @content = a
+          end
+  
+          # Set key from lookup list
+          @type = @@keys[t]
+        end
+      end
+    end
+  end
+end

data/lib/insulin/on_track/note_set.rb

@@ -0,0 +1,48 @@
+module Insulin
+# Author::  Sam (mailto:sam@cruft.co)
+# License:: MIT
+
+  module OnTrack
+
+    # This class represents a set of notes
+    class NoteSet < Hash
+
+      # Parse the string 's'
+      def initialize s
+
+        # Notes separated by newlines
+        l = s.split"\n"
+
+        # For each line
+        l.each do |n|
+
+          # Make a note
+          x = Note.new n
+
+          # This field will only exists for notes of a valid type
+          if x.type
+
+            # If we don't yet have this key
+            if not self[x.type]
+
+              # If the content is a list
+              if x.content.class.name == "Array"
+
+                # This becomes our value
+                self[x.type] = x.content
+              else
+
+                # Otherwise make it onto a list
+                self[x.type] = [x.content]
+              end
+            else
+
+              # This key exists, so we append this value
+              self[x.type] << x.content
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/insulin/version.rb

@@ -1,5 +1,5 @@
 module Insulin
 
   # Current version
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

data/lib/insulin.rb

@@ -1,13 +1,14 @@
 require "insulin/version"
 require "insulin/config"
 require "insulin/mongo_handle"
-require "insulin/on_track_date"
-require "insulin/on_track_note"
-require "insulin/on_track_note_set"
-require "insulin/on_track_csv_line"
-require "insulin/on_track_csv_file"
 require "insulin/event"
 require "insulin/day"
+require "insulin/week"
+require "insulin/on_track/date"
+require "insulin/on_track/note"
+require "insulin/on_track/note_set"
+require "insulin/on_track/csv_line"
+require "insulin/on_track/csv_file"
 
 # Author::  Sam (mailto:sam@cruft.co)
 # License:: MIT

data/spec/{insulin_day_spec.rb → day_spec.rb}

@@ -29,14 +29,12 @@ 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:42 BST | dinner          | medication | humalog       |  6.0 x10^-5 L"
   end
 
   it "minimal display should be correct" do
     d.minimal.should_not include "exercise"
   end
 
-  puts d.minimal
-
   drop_test_db
 end

data/spec/{insulin_event_spec.rb → event_spec.rb}

@@ -1,7 +1,7 @@
 require 'insulin'
 
 describe Insulin::Event do
-  event = Insulin::Event.new Insulin::OnTrackCsvLine.new %q{266,"Jun 28, 2012 10:21:05 AM",Medication,Humalog,After Breakfast,4.0,"F:2 bacon, 2 toast
+  event = Insulin::Event.new Insulin::OnTrack::CsvLine.new %q{266,"Jun 28, 2012 10:21:05 AM",Medication,Humalog,After Breakfast,4.0,"F:2 bacon, 2 toast
 N:test note
 X:fail note
 N:other note"}

data/spec/{insulin_on_track_csv_file_spec.rb → on_track/csv_file_spec.rb}

@@ -1,14 +1,14 @@
 require 'insulin'
 
-describe Insulin::OnTrackCsvFile do
-  csv_file = Insulin::OnTrackCsvFile.new 'files/on_track.csv'
+describe Insulin::OnTrack::CsvFile do
+  csv_file = Insulin::OnTrack::CsvFile.new 'files/on_track.csv'
 
   it "should open the file" do
     csv_file.file.path.should == 'files/on_track.csv'
   end
 
   it "should create csv lines" do
-    csv_file.lines[0].class.name.should == "Insulin::OnTrackCsvLine"
+    csv_file.lines[0].class.name.should == "Insulin::OnTrack::CsvLine"
   end
 
   it "line with serial 342 should have proper noteset" do

data/spec/{insulin_on_track_csv_line_spec.rb → on_track/csv_line_spec.rb}

@@ -1,7 +1,7 @@
 require 'insulin'
 
-describe Insulin::OnTrackCsvLine do
-  csv = Insulin::OnTrackCsvLine.new %q{199,"Jun 22, 2012 8:01:39 AM",Glucose,,Breakfast,5.7,""} 
+describe Insulin::OnTrack::CsvLine do
+  csv = Insulin::OnTrack::CsvLine.new %q{199,"Jun 22, 2012 8:01:39 AM",Glucose,,Breakfast,5.7,""} 
 
   it "should have the correct serial" do
     csv["serial"].should == 199
@@ -35,7 +35,7 @@ describe Insulin::OnTrackCsvLine do
     csv["notes"].should == nil
   end
 
-  csv_with_note = Insulin::OnTrackCsvLine.new %q{266,"Jun 28, 2012 10:21:05 AM",Medication,Humalog,After Breakfast,4.0,"F:2 bacon, 2 toast
+  csv_with_note = Insulin::OnTrack::CsvLine.new %q{266,"Jun 28, 2012 10:21:05 AM",Medication,Humalog,After Breakfast,4.0,"F:2 bacon, 2 toast
 N:test note
 X:fail note
 N:other note"}

data/spec/{insulin_on_track_date_spec.rb → on_track/date_spec.rb}

@@ -1,7 +1,7 @@
 require 'insulin'
 
-describe Insulin::OnTrackDate do
-  otd = Insulin::OnTrackDate.new "Jun 22 2012 9:00:12 AM"
+describe Insulin::OnTrack::Date do
+  otd = Insulin::OnTrack::Date.new "Jun 22 2012 9:00:12 AM"
 
   it "should have the correct timestamp" do
     otd["timestamp"].to_s.should == "2012-06-22 09:00:12 +0100"
@@ -19,7 +19,7 @@ describe Insulin::OnTrackDate do
     otd["day"].should == "friday"
   end
 
-  otd_gmt = Insulin::OnTrackDate.new "Jan 22 2012 9:00:12 PM"
+  otd_gmt = Insulin::OnTrack::Date.new "Jan 22 2012 9:00:12 PM"
 
   it "should have the correct timestamp" do
     otd_gmt["timestamp"].to_s.should == "2012-01-22 21:00:12 +0000"

data/spec/{insulin_on_track_note_set_spec.rb → on_track/note_set_spec.rb}

@@ -1,7 +1,7 @@
 require 'insulin'
 
-describe Insulin::OnTrackNoteSet do
-  simple_note_set = Insulin::OnTrackNoteSet.new "F: turkey breast, salad"
+describe Insulin::OnTrack::NoteSet do
+  simple_note_set = Insulin::OnTrack::NoteSet.new "F: turkey breast, salad"
 
   it "should have the correct notes" do
     simple_note_set.should == {
@@ -12,7 +12,7 @@ describe Insulin::OnTrackNoteSet do
     }
   end
 
-  multiple_note_set = Insulin::OnTrackNoteSet.new "F: turkey breast, salad
+  multiple_note_set = Insulin::OnTrack::NoteSet.new "F: turkey breast, salad
     N:After wine. No overnight hypo.
     N:some other note
     B: glass of wine"
@@ -33,7 +33,7 @@ describe Insulin::OnTrackNoteSet do
     }
   end
 
-  failing_note_set = Insulin::OnTrackNoteSet.new "F: turkey breast, salad
+  failing_note_set = Insulin::OnTrack::NoteSet.new "F: turkey breast, salad
 X:This should fail"
 
   it "should have the correct notes" do

data/spec/{insulin_on_track_note_spec.rb → on_track/note_spec.rb}

@@ -1,21 +1,21 @@
 require 'insulin'
 
-describe Insulin::OnTrackNote do
-  note = Insulin::OnTrackNote.new "N:After wine. No overnight hypo."
+describe Insulin::OnTrack::Note do
+  note = Insulin::OnTrack::Note.new "N:After wine. No overnight hypo."
 
   it "should have the correct note" do
     note.type.should == "note"
     note.content.should == "after wine. no overnight hypo."
   end
 
-  list_note = Insulin::OnTrackNote.new "F: turkey breast, salad"
+  list_note = Insulin::OnTrack::Note.new "F: turkey breast, salad"
 
   it "should have the correct list-type note" do
     list_note.type.should == "food"
     list_note.content.should == ["turkey breast", "salad"]
   end
 
-  fail_note = Insulin::OnTrackNote.new "X: this one should fail"
+  fail_note = Insulin::OnTrack::Note.new "X: this one should fail"
 
   it "should handle the fail note correctly" do
     fail_note.type.should == nil

data/spec/spec_helper.rb

@@ -7,7 +7,7 @@ def load_test_db
   mconf = config.get_section "mongo"
   @mongo = Insulin::MongoHandle.new mconf
 
-  csv = Insulin::OnTrackCsvFile.new "files/on_track.csv"
+  csv = Insulin::OnTrack::CsvFile.new "files/on_track.csv"
   csv.save_events @mongo
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: insulin
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -168,22 +168,22 @@ files:
 - lib/insulin/day.rb
 - lib/insulin/event.rb
 - lib/insulin/mongo_handle.rb
-- lib/insulin/on_track_csv_file.rb
-- lib/insulin/on_track_csv_line.rb
-- lib/insulin/on_track_date.rb
-- lib/insulin/on_track_note.rb
-- lib/insulin/on_track_note_set.rb
+- lib/insulin/on_track/csv_file.rb
+- lib/insulin/on_track/csv_line.rb
+- lib/insulin/on_track/date.rb
+- 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
-- spec/insulin_on_track_csv_line_spec.rb
-- spec/insulin_on_track_date_spec.rb
-- spec/insulin_on_track_note_set_spec.rb
-- spec/insulin_on_track_note_spec.rb
+- spec/config_spec.rb
+- spec/day_spec.rb
+- spec/event_spec.rb
+- spec/mongo_handle_spec.rb
+- spec/on_track/csv_file_spec.rb
+- spec/on_track/csv_line_spec.rb
+- spec/on_track/date_spec.rb
+- spec/on_track/note_set_spec.rb
+- spec/on_track/note_spec.rb
 - spec/spec_helper.rb
 homepage: http://pikesley.github.com/insulin/
 licenses: []
@@ -210,13 +210,13 @@ signing_key:
 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
-- spec/insulin_on_track_csv_line_spec.rb
-- spec/insulin_on_track_date_spec.rb
-- spec/insulin_on_track_note_set_spec.rb
-- spec/insulin_on_track_note_spec.rb
+- spec/config_spec.rb
+- spec/day_spec.rb
+- spec/event_spec.rb
+- spec/mongo_handle_spec.rb
+- spec/on_track/csv_file_spec.rb
+- spec/on_track/csv_line_spec.rb
+- spec/on_track/date_spec.rb
+- spec/on_track/note_set_spec.rb
+- spec/on_track/note_spec.rb
 - spec/spec_helper.rb

data/lib/insulin/on_track_csv_file.rb

@@ -1,61 +0,0 @@
-module Insulin
-# Author::  Sam (mailto:sam@cruft.co)
-# License:: MIT
-
-  # This class represents a CSV file as exported by OnTrack
-  class OnTrackCsvFile
-    attr_reader :file, :lines, :events
-
-    # Take the path to the CSV, open it, process it
-    def initialize csv_path
-      @csv_path = csv_path
-      @file = File.new @csv_path
-      self.read_lines
-      self.create_events
-    end
-
-    # Read the lines
-    def read_lines
-      @lines = []
-
-      # Where an event has more than one note, a 'line' will contain '\n's
-      l = ""
-      while line = @file.gets
-        # Stuff the line in to 'l'
-        l << line
-
-        # A '"' at the end of the line closes the event
-        if line[-2] == '"'
-
-          # Create a CsvLine, stripping the final '\n'
-          o = Insulin::OnTrackCsvLine.new l[0..-2]
-          @lines << o
-
-          # Reset the placeholder
-          l = ""
-        end
-      end
-
-      # Sort the list by the serial numbers (required for a future feature)
-      @lines.sort_by! {|o| o["serial"]}
-    end
-
-    # Turn the lines into Events
-    def create_events
-      @events = []
-      @lines.each do |l|
-        e = Insulin::Event.new l
-        @events << e
-      end
-    end
-
-    # Save the events to Mongo
-    def save_events mongo
-#      print "saving %d events to mongo... " % @events.count
-      @events.each do |e|
-        e.save mongo
-      end
-#      puts "done"
-    end
-  end
-end

data/lib/insulin/on_track_csv_line.rb

@@ -1,39 +0,0 @@
-module Insulin
-# Author::  Sam (mailto:sam@cruft.co)
-# License:: MIT
-
-  # This class represents a single OnTrack CSV line
-  class OnTrackCsvLine < Hash
-
-    # Parse the passed-in CSV line
-    def initialize line
-
-      # Split on commas 
-      bits = line.split ","
-      self["serial"] = bits[0].to_i
-
-      # OnTrack embeds commas in the dates of its CSVs. Duh 
-      self.update OnTrackDate.new "%s%s" % [
-        bits[1],
-        bits[2]
-      ]
-      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
-
-      # Notes get complicated. Everything from field 7 to the end will be part
-      # of the notes
-      notes = bits[7..-1]
-
-      # We may have embedded commas
-      notes = notes.join ","
-
-      # Strip the trailing '\n'
-      notes = notes[1..-2]
-
-      # See Insulin::OnTrackNoteSet
-      self["notes"] = OnTrackNoteSet.new notes if not notes == ""
-    end
-  end
-end

data/lib/insulin/on_track_date.rb

@@ -1,25 +0,0 @@
-require "time"
-
-module Insulin
-# Author::  Sam (mailto:sam@cruft.co)
-# License:: MIT
-
-  # OnTrack uses really shitty date formats, including embedding a comma in the
-  # CSV export file. Christ on a crutch
-  class OnTrackDate < Hash
-
-    # Parse the strind 'd', looking for datetime information
-    def initialize d
-      t = Time.parse d
-
-      # We extract loads of stuff. Might be useful one day
-      self["timestamp"] = t
-      self["tzoffset"] = t.strftime "%z"
-      self["timezone"] = t.zone
-      self["unixtime"] = t.to_i
-      self["day"] = t.strftime("%A").downcase
-      self["date"] = t.strftime "%F"
-      self["time"] = t.strftime "%T #{self['timezone']}" 
-    end
-  end
-end

data/lib/insulin/on_track_note.rb

@@ -1,46 +0,0 @@
-module Insulin
-# Author::  Sam (mailto:sam@cruft.co)
-# License:: MIT
-
-  # Class representing a single OnTrack note
-  class OnTrackNote
-
-    # Lookups. We will only deal with notes of these types
-    @@keys = {
-      "F" => 'food',
-      "B" => 'booze',
-      "N" => 'note'
-    }
-
-    attr_reader :type, :content
-
-    # Parse the raw note 'n'
-    def initialize n
-
-      # Key/value splits on ':'
-      bits = n.split ":"
-
-      # Remove leading/trailing cruft from key part
-      t = bits[0].strip
-
-      # We only deal with the keys we know about
-      if @@keys.keys.include? t
-
-        # Remove cruft from content, downcase
-        @content = bits[1].strip.downcase
-
-        # These keys mean we turn the content into a list
-        if ["F", "B"].include? t
-          a = []
-          @content.split(",").each do |v|
-            a << v.strip
-          end
-          @content = a
-        end
-
-        # Set key from lookup list
-        @type = @@keys[t]
-      end
-    end
-  end
-end

data/lib/insulin/on_track_note_set.rb

@@ -1,45 +0,0 @@
-module Insulin
-# Author::  Sam (mailto:sam@cruft.co)
-# License:: MIT
-
-  # This class represents a set of notes
-  class OnTrackNoteSet < Hash
-
-    # Parse the string 's'
-    def initialize s
-
-      # Notes separated by newlines
-      l = s.split"\n"
-
-      # For each line
-      l.each do |n|
-
-        # Make a note
-        x = OnTrackNote.new n
-
-        # This field will only exists for notes of a valid type
-        if x.type
-
-          # If we don't yet have this key
-          if not self[x.type]
-
-            # If the content is a list
-            if x.content.class.name == "Array"
-
-              # This becomes our value
-              self[x.type] = x.content
-            else
-
-              # Otherwise make it onto a list
-              self[x.type] = [x.content]
-            end
-          else
-
-            # This key exists, so we append this value
-            self[x.type] << x.content
-          end
-        end
-      end
-    end
-  end
-end