merge upstream

.gitignore

@@ -1,5 +1,5 @@
 Gemfile.lock
-health-graph-*.gem
+health_graph-*.gem
 # rcov generated
 coverage
 

.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+gemfile:
+   - test/support/Gemfile
+rvm:
+  - 1.9.2
+  - 1.9.3
+script: 
+  - bundle exec rake test
+
+

README.rdoc

@@ -1,5 +1,6 @@
 = health_graph
 
+[![Build Status](https://secure.travis-ci.org/kennyma/health_graph.png?branch=master)](http://travis-ci.org/kennyma/health_graph?branch=master)
 Ruby gem to work with RunKeeper Health Graph API.  More information about RunKeeper Health Graph API http://developer.runkeeper.com/healthgraph.
 
 == Usage

Rakefile

@@ -1,42 +1,6 @@
-# encoding: utf-8
+require "bundler/gem_tasks"
 
-task :default => :test
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  gem.name = "health_graph"
-  gem.homepage = "http://github.com/kennyma/health_graph"
-  gem.license = "MIT"
-  gem.summary = "Ruby gem for RunKeeper Health Graph API"
-  gem.description = "This is a wrapper for RunKeeper Health Graph RESTful API."
-  gem.email = "kenny@kennyma.me"
-  gem.authors = ["Kenny Ma"]
-
-  gem.add_dependency "oauth2", ">= 0.5.2"
-  gem.add_dependency "faraday", ">= 0.7.4"
-  gem.add_dependency "faraday_middleware", ">= 0.7.8"
-  gem.add_dependency "hashie", ">= 1.2"
-  gem.add_dependency "webmock", ">= 1.7.6"
-
-  gem.add_development_dependency "shoulda"
-  gem.add_development_dependency "simplecov"
-  gem.add_development_dependency "jeweler"
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "health_graph #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+desc "Run all tests"
+task :test do
+  ruby("test/test_health_graph.rb")
 end

health_graph.gemspec

@@ -3,140 +3,33 @@
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
-Gem::Specification.new do |s|
-  s.name = "health_graph"
-  s.version = "0.6.0"
+Gem::Specification.new do |spec|
+  spec.name = "health_graph"
+  spec.version = "0.7.1"
+  spec.authors = ["Kenny Ma"]
+  spec.email = "kenny@kennyma.me"
+  spec.date = "2015-12-31"
+  spec.description = "This is a wrapper for RunKeeper Health Graph RESTful API."
+  spec.summary = "Ruby gem for RunKeeper Health Graph API"
+  spec.homepage = "http://github.com/kennyma/health_graph"
+  spec.licenses = ["MIT"]
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Kenny Ma"]
-  s.date = "2012-07-17"
-  s.description = "This is a wrapper for RunKeeper Health Graph RESTful API."
-  s.email = "kenny@kennyma.me"
-  s.extra_rdoc_files = [
+  spec.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
   ]
-  s.files = [
-    ".document",
-    "Gemfile",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "health_graph.gemspec",
-    "lib/health_graph.rb",
-    "lib/health_graph/api.rb",
-    "lib/health_graph/authentication.rb",
-    "lib/health_graph/configuration.rb",
-    "lib/health_graph/model.rb",
-    "lib/health_graph/models/fitness_activities_feed.rb",
-    "lib/health_graph/models/fitness_activity_delete.rb",
-    "lib/health_graph/models/fitness_activity_update.rb",
-    "lib/health_graph/models/new_fitness_activity.rb",
-    "lib/health_graph/models/profile.rb",
-    "lib/health_graph/models/settings.rb",
-    "lib/health_graph/models/sleep_feed.rb",
-    "lib/health_graph/models/strength_training_activities_feed.rb",
-    "lib/health_graph/models/strength_training_activity.rb",
-    "lib/health_graph/models/user.rb",
-    "lib/health_graph/models/weight_feed.rb",
-    "test/fixtures/background_activities_feed.json",
-    "test/fixtures/background_activity.json",
-    "test/fixtures/fitness_activities_feed.json",
-    "test/fixtures/fitness_activity.json",
-    "test/fixtures/new_fitness_activity_params.json",
-    "test/fixtures/profile_get.json",
-    "test/fixtures/records.json",
-    "test/fixtures/sleep_feed_get.json",
-    "test/fixtures/team_get_empty.json",
-    "test/fixtures/user_get.json",
-    "test/fixtures/weight_feed_get.json",
-    "test/fixtures/weight_get_empty.json",
-    "test/health_graph/test_fitness_activities_feed.rb",
-    "test/health_graph/test_new_fitness_activity.rb",
-    "test/health_graph/test_profile.rb",
-    "test/health_graph/test_sleep_feed.rb",
-    "test/health_graph/test_user.rb",
-    "test/health_graph/test_weight_feed.rb",
-    "test/helper.rb",
-    "test/test_health_graph.rb"
-  ]
-  s.homepage = "http://github.com/kennyma/health_graph"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.13"
-  s.summary = "Ruby gem for RunKeeper Health Graph API"
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  spec.add_dependency "oauth2", ">= 0.5.2"
+  spec.add_dependency "faraday", ">= 0.7.4"
+  spec.add_dependency "faraday_middleware", ">= 0.7.8"
+  spec.add_dependency "hashie", ">= 1.2"
+  spec.add_dependency "webmock", ">= 1.7.6"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<health_graph>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_runtime_dependency(%q<oauth2>, [">= 0.5.2"])
-      s.add_runtime_dependency(%q<faraday>, [">= 0.7.4"])
-      s.add_runtime_dependency(%q<faraday_middleware>, [">= 0.7.8"])
-      s.add_runtime_dependency(%q<hashie>, [">= 1.2"])
-      s.add_runtime_dependency(%q<webmock>, [">= 1.7.6"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-    else
-      s.add_dependency(%q<health_graph>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<oauth2>, [">= 0.5.2"])
-      s.add_dependency(%q<faraday>, [">= 0.7.4"])
-      s.add_dependency(%q<faraday_middleware>, [">= 0.7.8"])
-      s.add_dependency(%q<hashie>, [">= 1.2"])
-      s.add_dependency(%q<webmock>, [">= 1.7.6"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<health_graph>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<oauth2>, [">= 0.5.2"])
-    s.add_dependency(%q<faraday>, [">= 0.7.4"])
-    s.add_dependency(%q<faraday_middleware>, [">= 0.7.8"])
-    s.add_dependency(%q<hashie>, [">= 1.2"])
-    s.add_dependency(%q<webmock>, [">= 1.7.6"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-  end
+  spec.add_development_dependency "shoulda"
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "pry"
 end
-

test/helper.rb

@@ -11,14 +11,14 @@
 
 class Test::Unit::TestCase
   TEST_USER_TOKEN = "b9aaf2581480432a939a72f894bf".freeze
-  
+
   def fixture(file)
     path = File.expand_path("../fixtures", __FILE__)
     File.new(path + '/' + file)
   end
-  
+
   def json_fixture(file)
     file = fixture(file)
-    JSON.load(file)    
+    JSON.load(file)
   end
 end