ruby-fitbit 0.2.3 → 0.3.1

data/lib/ruby-fitbit.rb

@@ -1,11 +1,10 @@
 require 'rubygems'
 require 'mechanize'
 require 'nokogiri'
+require 'json'
 
 class RubyFitbit
 
-  attr_reader :calories, :steps, :miles_walked, :sedentary_active, :lightly_active, :fairly_active, :very_active
-
   #TODO change tests so reader isn't needed
   attr_reader :logged_in
 
@@ -15,10 +14,8 @@ class RubyFitbit
     @agent = WWW::Mechanize.new #{|a| a.log = Logger.new(STDERR) } #turn on if debugging
     @logged_in = false 
     @cached_data = {}
-    get_data
   end
 
-  #todo only login once
   def login
     unless @logged_in
       page = @agent.get 'https://www.fitbit.com/login'
@@ -37,6 +34,93 @@ class RubyFitbit
     end
   end
 
+  def submit_food_log(options = {})
+    login
+
+    date = options.fetch(:date) {Time.now}
+    date = get_fitbit_date_format(date)
+    meal_type = options.fetch(:meal_type){'7'}
+    food_id = options[:food_id]
+    food = options[:food]
+    raise "food_id or food required to submit food log" unless food_id || food
+    unless food_id
+      food_recommendation = get_food_items(food)
+      if food_recommendation.length > 0
+        food_recommendation = food_recommendation.first
+        food = food_recommendation['name']
+        food_id = food_recommendation['id']
+      end
+    end
+
+    unit_id = options[:unit_id]
+    unit = options[:unit]
+    raise "unit_id or unit required to submit food log" unless unit_id || unit
+    unless unit_id
+      unit_id = get_unit_id_for_unit(unit)
+    end
+
+    page = @agent.get 'http://www.fitbit.com/foods/log'
+
+    form = page.forms[1]
+
+    form.action="/foods/log/foodLog?apiFormat=htmljson&log=on&date=#{date}"
+    form.foodId = food_id
+    form.foodselectinput = food
+    form.unitId = unit_id
+    form.quantityselectinput = unit
+    form.quantityConsumed = unit
+    form.mealTypeId = meal_type
+    
+    result = @agent.submit(form, form.buttons.first)
+  end
+
+  def get_unit_id_for_unit(unit)
+    unit_id   = nil
+    unit_type = unit.match(/\d+ (.*)/)[1]
+
+    type_map = {'oz' => '226',
+                'lb' => '180',
+                'gram' => '147',
+                'kilogram' => '389',
+                'roll' => '290',
+                'serving' => '304',
+                'link' => '188',
+                'piece' => '251',
+                'fl oz' => '128',
+                'ml' => '209',
+                'tsp' => '364',
+                'tbsp' => '349',
+                'cup' => '91',
+                'pint' => '256',
+                'slice' => '311',
+                'liter' => '189',
+                'quart' => '279',
+                'entree' => '117',
+                'portion' => '270'
+    }
+
+    unit_id   = type_map[unit_type]
+    unit_id
+  end
+
+  def get_food_items(food="Coffe")
+    login
+    result = @agent.get "http://www.fitbit.com/solr/food/select?q=#{food}&wt=foodjson&qt=food"
+    foods = JSON.parse(result.body).first[1]["foods"]
+    foods
+  end
+
+  def get_eaten_calories(date = Time.now)
+    login
+
+    date = get_fitbit_date_format(date).gsub('-','/')
+    page = @agent.get "https://www.fitbit.com/foods/log/#{date}"
+    calories_data = page.search("//div[@id='dailyTotals']").first
+    calories_xml = calories_data.to_xml
+    calories_text = calories_data.text
+    {:calories_xml => calories_xml, :calories_text => calories_text}
+  end
+
   def get_data(date = Time.now)
     login
 
@@ -45,21 +129,21 @@ class RubyFitbit
 
     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
+    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'] = 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
     @cached_data[date] = data
     data
   end

data/ruby-fitbit.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby-fitbit}
-  s.version = "0.2.3"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Mayer"]
-  s.date = %q{2010-07-24}
+  s.date = %q{2010-10-14}
   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}
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "bin/ruby-fitbit",
+     "fixtures/vcr_cassettes/fitbit_get_data.yml",
      "lib/ruby-fitbit.rb",
      "ruby-fitbit.gemspec",
      "test/helper.rb",

data/test/test_ruby-fitbit.rb

@@ -1,16 +1,16 @@
 require File.expand_path('./helper', File.dirname(__FILE__))
 require 'webmock/test_unit'
-#require 'vcr'
+require 'vcr'
 require 'ruby-fitbit'
 require 'mocha'
 
 class TestRubyFitbit < Test::Unit::TestCase
   include WebMock
 
-#VCR.config do |c|
-#  c.cassette_library_dir = 'fixtures/vcr_cassettes'
-#  c.http_stubbing_library = :webmock
-#end
+VCR.config do |c|
+  c.cassette_library_dir = 'fixtures/vcr_cassettes'
+  c.http_stubbing_library = :webmock
+end
 
 #TODO this is a mess it took awhile to figure out a way to make the tests work at all clean this up
 
@@ -62,7 +62,9 @@ END
     data = File.read("./test/responses/data.txt")
     response = "#{HEADERS} #{data}"
 
-    stub_request(:get, "https://www.fitbit.com/2010/07/18").to_return(response)
+    date = Time.now()
+    date = date.strftime("%Y/%m/%d")
+    stub_request(:get, "https://www.fitbit.com/#{date}").to_return(response)
 
     RubyFitbit.any_instance.stubs(:login)
     fitbit = RubyFitbit.new("fake@fake.com","pass")
@@ -70,15 +72,32 @@ END
       @logged_in = val
     end
     fitbit.set_logged_in(true)
+    data = fitbit.get_data
     
-    assert_equal "1928", fitbit.calories, "wrong calories"
-    assert_equal "7821", fitbit.steps, "wrong steps"
-    assert_equal "3.38", fitbit.miles_walked, "wrong miles"
-    assert_equal "16hrs 58min", fitbit.sedentary_active, "wrong sedentary"
-    assert_equal "1hr 42min", fitbit.lightly_active, "wrong lightly"
-    assert_equal "1hr 51min", fitbit.fairly_active, "wrong fairly"
-    assert_equal "17min", fitbit.very_active, "wrong very"
+    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 "17min", data['very_active'], "wrong very"
+  end
+
+  should "use VCR successfully" do
+    fitbit = nil
+    data = nil
+    VCR.use_cassette('fitbit_get_data', :record => :new_episodes) do
+      fitbit = RubyFitbit.new("fake@fake.com","fake")
+      data = fitbit.get_data(Time.parse("2010/08/03"))
+    end
 
+    assert_equal 2084, data['calories'], "wrong calories"
+    assert_equal 10018, data['steps'], "wrong steps"
+    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 "42min", data['very_active'], "wrong very"
   end
 
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
   - 3
-  version: 0.2.3
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Dan Mayer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-24 00:00:00 -04:00
+date: 2010-10-14 00:00:00 -04:00
 default_executable: ruby-fitbit
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -88,6 +88,7 @@ files:
 - Rakefile
 - VERSION
 - bin/ruby-fitbit
+- fixtures/vcr_cassettes/fitbit_get_data.yml
 - lib/ruby-fitbit.rb
 - ruby-fitbit.gemspec
 - test/helper.rb