ruby-fitbit 0.4.1 → 0.5.0

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.5.0

data/bin/ruby-fitbit

@@ -7,7 +7,8 @@ if(ARGV[0]!=nil && ARGV[1]!=nil)
   fitbit = RubyFitbit.new(ARGV[0],ARGV[1])
 
   #testing some in progress API methods
-  fitbit.submit_food_log({:food => 'wrap', :unit => '1 serving'})
+  #fitbit.submit_food_log({:food => 'wrap', :unit => '1 serving'})
+  #puts fitbit.submit_weight_log({:unit => 'lbs', :weight => '131'})
   #fitbit.get_food_items
   #puts fitbit.get_eaten_calories[:calories_xml]
   #exit 1
@@ -45,6 +46,8 @@ if ARGV[2]!=nil
   when 'activity' 
     puts "calorie data for data #{date}"
     data = fitbit.get_activity_score_data(date)
+  when 'weight'
+    puts "logging weight"
   when 'summary'
     #do nothing just print the summary above
   else

data/lib/ruby-fitbit.rb

@@ -72,7 +72,30 @@ class RubyFitbit
     form.mealTypeId = meal_type
     result = @agent.submit(form, form.buttons.first)
   end
-
+  
+  def submit_weight_log(options = {})
+    login
+    
+    weight_units = {:lbs => "US", :stone => "UK", :kg => "METRIC"}
+    
+    date = options.fetch(:date) {Time.now}
+    date = get_fitbit_date_format(date)
+    
+    unit = options[:unit]
+    unit_id = weight_units[unit.to_sym]
+    raise "#{unit} isn't one of Fitbit's units. Try #{weight_units.keys.join(", ")} instead." unless unit_id
+    
+    page = @agent.get 'http://www.fitbit.com/weight'
+    
+    form = page.forms[1]
+    form.action="/measure/measurements?apiFormat=json&log=on&date=#{date}"
+    form.send(options[:unit].to_sym, options[:weight])
+    form.weightState = unit_id
+    form.bodyFat = options[:percentage_fat]
+    
+    result = @agent.submit(form, form.buttons.first)
+  end
+  
   def get_unit_id_for_unit(unit)
     unit_id   = nil
     unit_type = unit.match(/\d+ (.*)/)[1]
@@ -127,22 +150,33 @@ class RubyFitbit
     return @cached_data[date] if @cached_data[date]
 
     page = @agent.get "https://www.fitbit.com/#{date}"
-
-    calories = page.search("//div[@class='data']").search("span").children[0].text
-    steps = page.search("//div[@class='data']").search("span").children[2].text.strip
-    miles_walked = page.search("//div[@class='data']").search("span").children[3].text.strip
-    sedentary_active = page.search("//div[@class='sedentary caption']/div[@class='number']").text.strip
-    lightly_active = page.search("//div[@class='lightly caption']/div[@class='number']").text.strip
-    fairly_active = page.search("//div[@class='caption fairly']/div[@class='number']").text.strip
-    very_active = page.search("//div[@class='caption very']/div[@class='number']").text.strip
+    
     data = {}
-    data['calories'] = calories.to_i
-    data['steps'] = steps.to_i
-    data['miles_walked'] = miles_walked.to_f
-    data['sedentary_active'] = sedentary_active
-    data['lightly_active'] = lightly_active
-    data['fairly_active'] = fairly_active
-    data['very_active'] = very_active
+    data['calories'] = 0
+    data['steps'] = 0
+    data['miles_walked'] = 0.0
+
+    page.search("//div[@class='data']").each do |datadiv|
+      if datadiv.text.match(/calories burned$/)
+        data['calories'] = datadiv.search("span").first.text.to_i
+      elsif datadiv.text.match(/calories eaten/)
+        data['calories_eaten'] = datadiv.search("span").first.text.to_i
+      elsif datadiv.text.match(/steps taken/)
+        data['steps'] = datadiv.search("span").first.text.to_i
+      elsif datadiv.text.match(/miles traveled/)
+        data['miles_walked'] = datadiv.search("span").first.text.to_f
+      end
+    end
+
+    data['sedentary_active'] = page.search("//div[@class='sedentary caption']/div[@class='number']").text.strip
+    data['lightly_active'] = page.search("//div[@class='lightly caption']/div[@class='number']").text.strip
+    data['fairly_active'] = page.search("//div[@class='caption fairly']/div[@class='number']").text.strip
+    data['very_active'] = page.search("//div[@class='caption very']/div[@class='number']").text.strip
+    data['sedentary_active_in_minutes'] = get_minutes_from_time(data['sedentary_active'])
+    data['lightly_active_in_minutes'] = get_minutes_from_time(data['lightly_active'])
+    data['fairly_active_in_minutes'] = get_minutes_from_time(data['fairly_active'])
+    data['very_active_in_minutes'] = get_minutes_from_time(data['very_active'])
+
     @cached_data[date] = data
     data
   end
@@ -167,11 +201,10 @@ class RubyFitbit
     data['calories'] = 0
     data['steps'] = 0
     data['miles_walked'] = 0
-    # TODO these aren't numbers but times need to convert all to minutes and then back
-    #data['sedentary_active'] = 0
-    #data['lightly_active'] = 0
-    #data['fairly_active'] = 0
-    #data['very_active'] = 0
+    data['sedentary_active_in_minutes'] = 0
+    data['lightly_active_in_minutes'] = 0
+    data['fairly_active_in_minutes'] = 0
+    data['very_active_in_minutes'] = 0
     days = 0
     
     days_data = get_aggregated_data(start_date, end_date) 
@@ -236,4 +269,14 @@ class RubyFitbit
     date = date.strftime("%Y-%m-%d")
   end
 
+  def get_minutes_from_time(str)
+    if m = str.to_s.strip.match(/^((\d+)hrs?)? ?((\d+)min)?$/)
+      hrs = m[1].to_i * 60
+      mins = m[3].to_i
+      return (hrs + mins)
+    end
+
+    return 0
+  end
+
 end

data/ruby-fitbit.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby-fitbit}
-  s.version = "0.4.1"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Mayer"]
-  s.date = %q{2011-01-02}
+  s.date = %q{2011-02-13}
   s.default_executable = %q{ruby-fitbit}
   s.description = %q{This is a Ruby API for Fitbit.com, currently scraping, but soon will use the officail API (when released)}
   s.email = %q{Danmayer@gmail.com}

data/test/test_ruby-fitbit.rb

@@ -77,10 +77,16 @@ END
     assert_equal 1928, data['calories'], "wrong calories"
     assert_equal 7821, data['steps'], "wrong steps"
     assert_equal 3.38, data['miles_walked'], "wrong miles"
-    assert_equal "16hrs 58min", data['sedentary_active'], "wrong sedentary"
-    assert_equal "1hr 42min", data['lightly_active'], "wrong lightly"
-    assert_equal "1hr 51min", data['fairly_active'], "wrong fairly"
+
+
+    assert_equal "16hrs 58min", data['sedentary_active'], "wrong sedentary" 	
+    assert_equal "1hr 42min", data['lightly_active'], "wrong lightly" 	
+    assert_equal "1hr 51min", data['fairly_active'], "wrong fairly"	
     assert_equal "17min", data['very_active'], "wrong very"
+    assert_equal 1018, data['sedentary_active_in_minutes'], "wrong sedentary"
+    assert_equal 102, data['lightly_active_in_minutes'], "wrong lightly"
+    assert_equal 111, data['fairly_active_in_minutes'], "wrong fairly"
+    assert_equal 17, data['very_active_in_minutes'], "wrong very"
   end
 
   should "use VCR successfully" do
@@ -96,8 +102,25 @@ END
     assert_equal 4.61, data['miles_walked'], "wrong miles"
     assert_equal "18hrs 26min", data['sedentary_active'], "wrong sedentary"
     assert_equal "1hr 17min", data['lightly_active'], "wrong lightly"
-    assert_equal "1hr 29min", data['fairly_active'], "wrong fairly"
+    assert_equal "1hr 29min", data['fairly_active'], "wrong fairly"	
     assert_equal "42min", data['very_active'], "wrong very"
+    assert_equal 1106, data['sedentary_active_in_minutes'], "wrong sedentary"
+    assert_equal 77, data['lightly_active_in_minutes'], "wrong lightly"
+    assert_equal 89, data['fairly_active_in_minutes'], "wrong fairly"
+    assert_equal 42, data['very_active_in_minutes'], "wrong very"
+  end
+
+  should "convert times properly" do
+    {
+      "18hrs 26min" => 1106,
+      "1hr 17min" => 77,
+      "42min" => 42,
+      "3hrs " => 180,
+    }.each do |t,m|
+      fitbit = RubyFitbit.new("fake@fake.com","pass")
+      mins = fitbit.get_minutes_from_time(t)
+      assert_equal m, mins, "wrong minutes for #{t}"
+    end
   end
 
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 1
-  version: 0.4.1
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Dan Mayer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-02 00:00:00 -05:00
+date: 2011-02-13 00:00:00 -05:00
 default_executable: ruby-fitbit
 dependencies: 
 - !ruby/object:Gem::Dependency