fitgem_oauth2 0.0.8 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72e05988ee7b5c090becafe9dfd9345e1bee4aaa
-  data.tar.gz: 7ee833ab3f11ab43816a506bb722bc19a1d51945
+  metadata.gz: 2c0baa9844ef7be0f66170042cec30385ab5d2e5
+  data.tar.gz: e1ccdc69b6a1763cf642532dab7494655b075b28
 SHA512:
-  metadata.gz: 749bf116d19bf60c1f06aa7d95b7e4ec3783efa00a0653b2f26e8afac548a90d25bb266b20bebf81b57e135abfdf59993e3449d1dcfe799f763fc293f23971a2
-  data.tar.gz: 8aaefdea1dc62867bf2b9e13a1a68ac37cce7ab5eab36349fe0e524c7557318e0cd017c8c7ffcd96d6d1b6eaa15a009cb40ebbb026fa1ac7e2d7f06bc26a50d9
+  metadata.gz: cc2840e23217566f0e460b54d4d4ba4c9c88f4251a8ac387e3403aedb6db10d76298cd7db1e244cacc8e232b1431d434b6dbedef79cce1cca3df17571cc7be1a
+  data.tar.gz: 5364ff2b8515a6472cc4246397e39451400138d9aea9977d5e17137f96420e4e4e029f25107be69d41627a7dc8f076a3e0462bc46d70d6a8c50575e1b3171ea3

data/fitgem_oauth2.gemspec

@@ -6,17 +6,17 @@ require 'fitgem_oauth2/version'
 Gem::Specification.new do |s|
   s.name        = 'fitgem_oauth2'
   s.version     = FitgemOauth2::VERSION
-  s.summary     = "Fitbit API client library"
-  s.description = "This gem allows requesting data from Fitbit API using OAuth2"
-  s.authors     = ["Ankit Gupta"]
+  s.summary     = 'Fitbit API client library'
+  s.description = 'This gem allows requesting data from Fitbit API using OAuth2'
+  s.authors     = ['Ankit Gupta']
   s.email       = 'ankit.gupta2801@gmail.com'
-  s.files       = %w(fitgem_oauth2.gemspec) + `git ls-files -z`.split("\x0").select { |f| f.start_with?("lib/") }
+  s.files       = %w(fitgem_oauth2.gemspec) + `git ls-files -z`.split("\x0").select { |f| f.start_with?('lib/') }
   s.homepage    = 'http://rubygems.org/gems/fitgem_oauth2'
   s.license     = 'MIT'
 
   s.add_runtime_dependency 'faraday', '~> 0.9'
 
-  s.add_development_dependency "rspec", '~> 3.4'
-  s.add_development_dependency "factory_girl", '~> 4.5'
-  s.add_development_dependency "dotenv", '~> 2.1'
+  s.add_development_dependency 'rake', '~> 10.5'
+  s.add_development_dependency 'rspec', '~> 3.4'
+  s.add_development_dependency 'factory_girl', '~> 4.5'
 end

data/lib/fitgem_oauth2/activity.rb

@@ -1,128 +1,155 @@
 module FitgemOauth2
   class Client
 
-    # ======================================
-    #      Activities Retrieval Methods
-    # ======================================
-
-    allowed_activity_paths = %w("calories" "caloriesBMR" "steps" "distance" "floors" "elevation" "minutesSedentary" "minutesLightlyActive" "minutesFairlyActive" "minutesVeryActive" "activityCaloriestracker/calories" "tracker/steps" "tracker/distance" "tracker/floors" "tracker/elevation" "tracker/minutesSedentary" "tracker/minutesLightlyActive" "tracker/minutesFairlyActive" "tracker/minutesVeryActive" "tracker/activityCalories")
+    ACTIVITY_RESOURCES = %w(calories caloriesBMR steps distance floors elevation minutesSedentary minutesLightlyActive minutesFairlyActive minutesVeryActive activityCaloriestracker/calories tracker/steps tracker/distance tracker/floors tracker/elevation tracker/minutesSedentary tracker/minutesLightlyActive tracker/minutesFairlyActive tracker/minutesVeryActive tracker/activityCalories)
 
-    allowed_activity_periods = %w("1d" "7d" "30d" "1w" "1m" "3m" "6m" "1y" "max")
+    ACTIVITY_PERIODS = %w(1d 7d 30d 1w 1m 3m 6m 1y max)
 
-    def activities_on_date(date)
-      get_call("1/user/#{user_id}/activities/date/#{format_date(date)}.json")
+    def daily_activity_summary(date)
+      get_call("user/#{user_id}/activities/date/#{format_date(date)}.json")
     end
 
-    def activities_in_period(resource_path, date, period)
-      if activity_resource_path?(resource_path)
-        if activity_period?(period)
-          get_activities(resource_path, resource_path, period)
-        else
-          raise FitgemOauth2::InvalidArgumentError, "period should be one of #{allowed_activity_periods}"
-        end
-      else
-        raise FitgemOauth2::InvalidArgumentError, "resource_path should be one of #{allowed_activity_paths}"
+    # ==================================
+    #   Activity Time Series
+    # ==================================
+
+    def activity_time_series(resource: nil, start_date: nil, end_date: nil, period: nil)
+
+      unless resource && ACTIVITY_RESOURCES.include?(resource)
+        raise FitgemOauth2::InvalidArgumentError, "Invalid resource: #{resource}. Valid resources are #{ACTIVITY_RESOURCES}."
       end
-    end
 
-    def activities_in_range(resource_path, base_date, end_date)
-      if activity_resource_path?(resource_path)
-        get_activities(resource_path, format_date(base_date), format_dat(end_date))
-      else
-        raise FitgemOauth2::InvalidArgumentError, "resource_path should be one of #{allowed_activity_paths}"
+      unless start_date
+        raise FitgemOauth2::InvalidArgumentError, 'Start date must be specified.'
+      end
+
+      if period && end_date
+        raise FitgemOauth2::InvalidArgumentError, 'Both period and end_date are specified. Please specify only one.'
       end
-    end
 
-    # <b>DEPRECATED</b> Please use <b>activities_on_date</b> instead
-    def calories_on_date(date)
-      get_call("1/user/#{user_id}/activities/calories/date/#{format_date(date)}/1d.json")
+      if period && !ACTIVITY_PERIODS.include?(period)
+        raise FitgemOauth2::InvalidArgumentError, "Invalid period: #{period}. Valid periods are #{ACTIVITY_PERIODS}."
+      end
+
+      first = format_date(start_date)
+      second = period || format_date(end_date)
+      url = ['user', user_id, 'activities', resource, 'date', first, second].join('/')
+      get_call(url + '.json')
     end
 
-    # ======================================
-    #      Intraday Series
-    # ======================================
 
-    def intraday_time_series(opts)
-      unless opts[:resource] && [:calories, :steps, :distance, :floors, :elevation].include?(opts[:resource])
-        raise FitgemOauth2::InvalidArgumentError, 'Must specify resource to fetch intraday time series data for. One of (:calories, :steps, :distance, :floors, or :elevation) is required.'
+
+    def intraday_activity_time_series(resource: nil, start_date: nil, end_date: nil, detail_level: nil,
+                                      start_time: nil, end_time: nil)
+
+      # converting to symbol to allow developer to use either 'calories' or :calories
+      resource = resource.to_sym
+
+      unless %i[calories steps distance floors elevation].include?(resource)
+        raise FitgemOauth2::InvalidArgumentError,
+              'Must specify resource to fetch intraday time series data for.'\
+              ' One of (:calories, :steps, :distance, :floors, or :elevation) is required.'
       end
 
-      unless opts[:date]
-        raise FitgemOauth2::InvalidArgumentError, 'Must specify the date to fetch intraday time series data for.'
+      unless start_date
+        raise FitgemOauth2::InvalidArgumentError,
+              'Must specify the start_date to fetch intraday time series data'
       end
 
-      unless opts[:detailLevel] && %w(1min 15min).include?(opts[:detailLevel])
-        raise FitgemOauth2::InvalidArgumentError, 'Must specify the data resolution to fetch intraday time series data for. One of (\"1d\" or \"15min\") is required.'
+      end_date ||= '1d'
+
+      unless detail_level && %w(1min 15min).include?(detail_level)
+        raise FitgemOauth2::InvalidArgumentError,
+              'Must specify the data resolution to fetch intraday time series data for.'\
+              ' One of (\"1d\" or \"15min\") is required.'
       end
 
-      resource = opts.delete(:resource)
-      date = format_date(opts.delete(:date))
-      detail_level = opts.delete(:detailLevel)
-      time_window_specified = opts[:startTime] || opts[:endTime]
-      resource_path = "1/user/#{@user_id}/activities/"
-
-      if time_window_specified
-        start_time = format_time(opts.delete(:startTime))
-        end_time = format_time(opts.delete(:endTime))
-        resource_path += "#{resource}/date/#{date}/1d/#{detail_level}/time/#{start_time}/#{end_time}.json"
-      else
-        resource_path += "#{resource}/date/#{date}/1d/#{detail_level}.json"
+      resource_path = [
+          'user', @user_id,
+          'activities', resource,
+          'date', format_date(start_date),
+          end_date, detail_level
+      ].join('/')
+
+      if start_time || end_time
+        resource_path =
+            [resource_path, 'time', format_time(start_time), format_time(end_time)].join('/')
       end
-      get_call(resource_path)
+      get_call("#{resource_path}.json")
     end
 
+    # ======================================
+    #      Activity Logging Methods
+    # ======================================
+
+    def log_activity(params)
+      post_call("user/#{user_id}/activities.json", params)
+    end
+
+    def delete_logged_activity(id)
+      delete_call("user/#{user_id}/activities/#{id}.json")
+    end
+
+    def activity_list
+      get_call("user/#{user_id}/activities/list.json")
+    end
+
+    def activity_tcx(id)
+      get_call("user/#{user_id}/activities/#{id}.tcx")
+    end
+
+
     # ======================================
     #      Activity Types
     # ======================================
     def activities
-      get_call("1/activities.json")
+      get_call("activities.json")
     end
 
     def activity(id)
-      get_call("1/activities/#{id}.json")
+      get_call("activities/#{id}.json")
     end
 
     def frequent_activities
-      get_call("1/user/#{@user_id}/activities/frequent.json")
+      get_call("user/#{user_id}/activities/frequent.json")
     end
 
     def recent_activities
-      get_call("1/user/#{@user_id}/activities/recent.json")
+      get_call("user/#{user_id}/activities/recent.json")
     end
 
     def favorite_activities
-      get_call("1/user/#{@user_id}/activities/favorite.json")
+      get_call("user/#{user_id}/activities/favorite.json")
     end
 
-    # ======================================
-    #      Activity Goals
-    # ======================================
-
-    def goals(period)
-      unless period && [:daily, :weekly].include?(period)
-        raise FitgemOauth2::InvalidArgumentError, "Goal period should either be 'daily' or 'weekly'"
-      end
+    def add_favorite_activity(activity_id)
+      post_call("user/#{user_id}/activities/log/favorite/#{activity_id}.json")
     end
 
-    def lifetime_stats
-      get_call("1/user/#{@user_id}/activities.json")
+    def remove_favorite_activity(activity_id)
+      delete_call("user/#{user_id}/activities/log/favorite/#{activity_id}.json")
     end
 
     # ======================================
-    #      Private Methods
+    #      Activity Goals
     # ======================================
 
-    private
-    def get_activities(resource_path, first, second)
-      get_call("1/user/#{user_id}/#{resource_path}/date/#{first}/#{second}.json")
+    def goals(period)
+      unless period && %w(daily weekly).include?(period)
+        raise FitgemOauth2::InvalidArgumentError, "Goal period should either be 'daily' or 'weekly'"
+      end
+      get_call("user/#{user_id}/activities/goals/#{period}.json")
     end
 
-    def activity_resource_path?(resource_path)
-      return resource_path && allowed_activity_paths.include?(resource_path)
+    def update_activity_goals(period, params)
+      unless period && %w(daily weekly).include?(period)
+        raise FitgemOauth2::InvalidArgumentError, "Goal period should either be 'daily' or 'weekly'"
+      end
+      post_call("user/#{user_id}/activities/goals/#{period}.json", params)
     end
 
-    def activity_period?(period)
-      return period && allowed_activity_periods.include?(period)
+    def lifetime_stats
+      get_call("user/#{user_id}/activities.json")
     end
   end
 end

data/lib/fitgem_oauth2/body_measurements.rb

@@ -1,68 +1,135 @@
 module FitgemOauth2
   class Client
-    fat_periods = %w("1d" "7d" "1w" "1m")
-    weight_periods = %("1d" "7d" "30d" "1w" "1m")
-    body_goals = %("fat" "weight")
+    FAT_PERIODS = %w(1d 7d 1w 1m)
+    WEIGHT_PERIODS = %w(1d 7d 30d 1w 1m)
+    BODY_GOALS = %w(fat weight)
+    BODY_TIME_SERIES_PERIODS = %w(1d 7d 30d 1w 1m 3m 6m 1y max)
+
     # ======================================
-    #      Boday Fat API
+    #      Boday Fat
     # ======================================
 
-    def fat_on_date(date)
-      get_call("/1/user/#{@user_id}/body/log/fat/date/#{format_date(date)}.json")
-    end
+    def body_fat_logs(start_date: nil, end_date: nil, period: nil)
+      unless start_date
+        raise FitgemOauth2::InvalidArgumentError, 'must specify start_date'
+      end
+      url = ['user', user_id, 'body/log/fat/date', format_date(start_date)].join('/')
+      if end_date
+        url = [url, format_date(end_date)].join('/')
+      end
 
-    def fat_for_period(base_date, period)
-      if fat_period?(period)
-        get_call("1/user/#{@user_id}/body/log/fat/date/#{format_date(start_date)}/#{period}.json")
-      else
-        raise FitgemOauth2::InvalidArgumentError, "period should be one of #{fat_periods}"
+      if period
+        if FAT_PERIODS.include?(period)
+          url = [url, period].join('/')
+        else
+          raise FitgemOauth2::InvalidArgumentError, "period must be one in #{FAT_PERIODS}"
+        end
       end
+
+      url = url + '.json'
+
+      get_call(url)
     end
 
-    def fat_for_range(start_date, end_date)
-      get_call("1/user/#{@user_id}/body/log/fat/date/#{format_date(start_date)}/#{format_date(end_date)}.json")
+    def log_body_fat(params)
+      post_call("user/#{user_id}/body/log/fat.json", params)
     end
 
+    def delete_logged_body_fat(id)
+      delete_call("user/#{user_id}/body/log/fat/#{id}.json")
+    end
+
+
+    # ==================================
+    #   Body Time Series
+    # ==================================
+
+    def body_time_series(resource: nil, start_date: nil, end_date: nil, period: nil)
+      unless resource && start_date
+        raise FitgemOauth2::InvalidArgumentError, 'resource and start_date are required parameters. Please specify both.'
+      end
+
+      url = ['user', user_id, 'body', resource, 'date', format_date(start_date)].join('/')
+
+      second = ''
+      if end_date && period
+        raise FitgemOauth2::InvalidArgumentError, 'Please specify either period or end date, not both.'
+      end
+
+      if period
+        if BODY_TIME_SERIES_PERIODS.include?(period)
+          second = period
+        else
+          raise FitgemOauth2::InvalidArgumentError, "Invalid Period. Body time series period must be in #{BODY_TIME_SERIES_PERIODS}"
+        end
+      end
+
+      if end_date
+        second = format_date(end_date)
+      end
+
+      url = [url, second].join('/')
+
+      get_call(url + '.json')
+    end
+
+
     # ======================================
-    #      Body Goals API
+    #      Body Goals
     # ======================================
-    
-    def body_goal(type)
-      if type && body_goals.include?(type)
-        get_call("1/user/#{@user_id}/body/log/#{type}/goal.json")
+
+    def body_goals(type)
+      if type && BODY_GOALS.include?(type)
+        get_call("user/#{user_id}/body/log/#{type}/goal.json")
       else
-        raise FitgemOauth2::InvalidArgumentError, "goal type should be one of #{body_goals}"
+        raise FitgemOauth2::InvalidArgumentError, "invalid goal type : #{type}. must be one of #{BODY_GOALS}"
       end
     end
 
+    def update_body_fat_goal(params)
+      post_call("user/#{user_id}/body/log/fat/goal.json", params)
+    end
+
+    def update_weight_goal(params)
+      post_call("user/#{user_id}/body/log/weight/goal.json", params)
+    end
+
     # ======================================
-    #      Body Weight API
+    #      Body Weight
     # ======================================
 
-    def weight_on_date(date)
-      get_call("/1/user/#{@user_id}/body/log/weight/date/#{format_date(date)}.json")
-    end
+    def weight_logs(start_date: nil, end_date: nil, period: nil)
+      unless start_date
+        raise FitgemOauth2::InvalidArgumentError, 'start_date not specified.'
+      end
 
-    def weight_for_period(base_date, period)
-      if weight_period?(period)
-        get_call("1/user/#{@user_id}/body/log/weight/date/#{format_date(start_date)}/#{period}.json")
-      else
-        raise FitgemOauth2::InvalidArgumentError, "period should be one of #{weight_periods}"
+      if period && end_date
+        raise FitgemOauth2::InvalidArgumentError, 'both end_date and period specified. please provide only one.'
+      end
+
+      if period
+        unless WEIGHT_PERIODS.include?(period)
+          raise FitgemOauth2::InvalidArgumentError, "valid period not specified. please choose a period from #{WEIGHT_PERIODS}"
+        end
+      end
+
+      first = format_date(start_date)
+      url = ['user', user_id, 'body/log/weight/date', first].join('/')
+      if period || end_date
+        second = period || format_date(end_date)
+        url = [url, second].join('/')
       end
-    end
 
-    def weight_for_range(start_date, end_date)
-      get_call("1/user/#{@user_id}/body/log/weight/date/#{format_date(start_date)}/#{format_date(end_date)}.json")
+      get_call(url + '.json')
     end
 
 
-    private
-    def fat_period?(period)
-      return period && fat_periods.include?(period)
+    def log_weight(params)
+      post_call("user/#{user_id}/body/log/weight.json", params)
     end
 
-    def weight_period?(period)
-      return period && weight_periods.include?(period)
+    def delete_logged_weight(id)
+      delete_call("user/#{user_id}/body/log/weight/#{id}.json")
     end
 
   end

data/lib/fitgem_oauth2/client.rb

@@ -6,7 +6,6 @@ require 'fitgem_oauth2/food.rb'
 require 'fitgem_oauth2/friends.rb'
 require 'fitgem_oauth2/heartrate.rb'
 require 'fitgem_oauth2/sleep.rb'
-require 'fitgem_oauth2/steps.rb'
 require 'fitgem_oauth2/subscriptions.rb'
 require 'fitgem_oauth2/users.rb'
 require 'fitgem_oauth2/utils.rb'
@@ -19,6 +18,7 @@ module FitgemOauth2
   class Client
 
     DEFAULT_USER_ID = '-'
+    API_VERSION = '1'
 
     attr_reader :client_id
     attr_reader :client_secret
@@ -36,33 +36,36 @@ module FitgemOauth2
       @token = opts[:token]
       @user_id = (opts[:user_id] || DEFAULT_USER_ID)
 
-      @connection = Faraday.new("https://api.fitbit.com")
+      @connection = Faraday.new('https://api.fitbit.com')
     end
 
     def refresh_access_token(refresh_token)
       response = connection.post('/oauth2/token') do |request|
         encoded = Base64.strict_encode64("#{@client_id}:#{@client_secret}")
         request.headers['Authorization'] = "Basic #{encoded}"
-        request.headers['Content-Type'] = "application/x-www-form-urlencoded"
-        request.params['grant_type'] = "refresh_token"
+        request.headers['Content-Type'] = 'application/x-www-form-urlencoded'
+        request.params['grant_type'] = 'refresh_token'
         request.params['refresh_token'] = refresh_token
       end
-      return JSON.parse(response.body)
+      JSON.parse(response.body)
     end
 
     def get_call(url)
+      url = "#{API_VERSION}/#{url}"
       response = connection.get(url) { |request| set_headers(request) }
-      return parse_response(response)
+      parse_response(response)
     end
 
     def post_call(url, params = {})
+      url = "#{API_VERSION}/#{url}"
       response = connection.post(url, params) { |request| set_headers(request) }
-      return parse_response(response)
+      parse_response(response)
     end
 
     def delete_call(url)
+      url = "#{API_VERSION}/#{url}"
       response = connection.delete(url) { |request| set_headers(request) }
-      return parse_response(response)
+      parse_response(response)
     end
 
     private
@@ -70,21 +73,27 @@ module FitgemOauth2
 
     def set_headers(request)
       request.headers['Authorization'] = "Bearer #{token}"
-      request.headers['Content-Type'] = "application/x-www-form-urlencoded"
+      request.headers['Content-Type'] = 'application/x-www-form-urlencoded'
     end
 
     def parse_response(response)
-      headers_to_keep = ["fitbit-rate-limit-limit","fitbit-rate-limit-remaining","fitbit-rate-limit-reset"]
-
-      case response.status
-        when 200; return JSON.parse(response.body).merge!(response.headers.slice(*headers_to_keep))
-        when 400; raise FitgemOauth2::BadRequestError
-        when 401; raise FitgemOauth2::UnauthorizedError
-        when 403; raise FitgemOauth2::ForbiddenError
-        when 404; raise FitgemOauth2::NotFoundError
-        when 500..599; raise FitgemOauth2::ServerError
+      headers_to_keep = %w(fitbit-rate-limit-limit fitbit-rate-limit-remaining fitbit-rate-limit-reset)
+
+      error_handler = {
+          200 => lambda { JSON.parse(response.body).merge!(response.headers.slice(*headers_to_keep)) },
+          400 => lambda { raise FitgemOauth2::BadRequestError },
+          401 => lambda { raise FitgemOauth2::UnauthorizedError },
+          403 => lambda { raise FitgemOauth2::ForbiddenError },
+          404 => lambda { raise FitgemOauth2::NotFoundError },
+          500..599 => lambda { raise FitgemOauth2::ServerError }
+      }
+
+      fn = error_handler.detect { |k , _| k === response.status }
+      if fn === nil
+        raise StandardError, "Unexpected response status #{response.status}"
+      else
+        fn.last.call
       end
     end
-
   end
 end

data/lib/fitgem_oauth2/devices.rb

@@ -1,11 +1,30 @@
 module FitgemOauth2
   class Client
+
+    # ==================================
+    #   Devices
+    # ==================================
     def devices
-      get_call("1/user/#{@user_id}/devices.json")
+      get_call("user/#{user_id}/devices.json")
     end
 
+    # ==================================
+    #   Alarams
+    # ==================================
     def alarms(tracker_id)
-      get_call("1/user/#{@user_id}/devices/tracker/#{tracker_id}/alarms.json")
+      get_call("user/#{user_id}/devices/tracker/#{tracker_id}/alarms.json")
+    end
+
+    def add_alarm(tracker_id, params)
+      post_call("user/#{user_id}/devices/tracker/#{tracker_id}/alarms.json", params)
+    end
+
+    def update_alarm(tracker_id, alarm_id, params)
+      post_call("user/#{user_id}/devices/tracker/#{tracker_id}/alarms/#{alarm_id}.json", params)
+    end
+
+    def remove_alarm(tracker_id, alarm_id)
+      delete_call("user/#{user_id}/devices/tracker/#{tracker_id}/alarms/#{alarm_id}.json")
     end
   end
 end

data/lib/fitgem_oauth2/errors.rb

@@ -2,6 +2,10 @@ module FitgemOauth2
   class InvalidDateArgument < ArgumentError
   end
 
+  class InvalidTimeArgument < ArgumentError
+
+  end
+
   class InvalidArgumentError < ArgumentError
   end
 

data/lib/fitgem_oauth2/food.rb

@@ -1,58 +1,157 @@
 module FitgemOauth2
   class Client
-    def food_goal
-      get_call("1/user/#{@user_id}/foods/log/goal.json")
+
+    FOOD_SERIES_RESOURCES = %w( caloriesIn water )
+    FOOD_SERIES_PERIODS = %w( 1d 7d 30d 1w 1m 3m 6m 1y max )
+
+
+    # ==================================
+    #   Food or Water Series
+    # ==================================
+
+
+    def food_series(resource: nil, start_date: nil, end_date: nil, period: nil)
+
+      unless FOOD_SERIES_RESOURCES.include?(resource)
+        raise FitgemOauth2::InvalidArgumentError, "Invalid resource: #{resource}. Specify a valid resource from #{FOOD_SERIES_RESOURCES}"
+      end
+
+      if end_date && period
+        raise FitgemOauth2::InvalidArgumentError, 'Provide only one of end_date and period.'
+      end
+
+      if !end_date && !period
+        raise FitgemOauth2::InvalidArgumentError, 'Provide at least one of end_date and period.'
+      end
+
+      url = ['user', user_id, 'foods/log', resource, 'date', start_date].join('/')
+
+      if period
+        unless FOOD_SERIES_PERIODS.include?(period)
+          raise FitgemOauth2::InvalidArgumentError, "Invalid period: #{period}. Specify a valid period from #{FOOD_SERIES_PERIODS}"
+        end
+      end
+
+      second = period || format_date(end_date)
+      url = [url, second].join('/')
+
+      get_call(url + '.json')
     end
 
-    def foods_on_date(date)
-      get_call("1/user/#{@user_id}/foods/log/date/#{format_date(date)}.json")
+    # ==================================
+    #   Collection data
+    # ==================================
+
+    def food_goals
+      get_call("user/#{user_id}/foods/log/goal.json")
     end
 
-    def water_on_date(date)
-      get_call("1/user/#{@user_id}/foods/log/water/date/#{format_date(date)}.json")
+    def food_logs(date)
+      get_call("user/#{user_id}/foods/log/date/#{format_date(date)}.json")
+    end
+
+    def water_logs(date)
+      get_call("user/#{user_id}/foods/log/water/date/#{format_date(date)}.json")
     end
 
     def water_goal
-      get_call("1/user/#{@user_id}/foods/log/water/goal.json")
+      get_call("user/#{user_id}/foods/log/water/goal.json")
     end
 
-    def food_in_period(resource, date, period)
-      food_resources = ["foods/log/caloriesIn", "foods/log/water"]
-      food_periods = %w("1d" "7d" "30d" "1w" "1m" "3m" "6m" "1y" "max")
+    def log_food(params)
+      post_call("user/#{user_id}/foods/log.json", params)
+    end
 
-      unless resource && food_resources.include?(resource)
-        raise FitgemOauth2::InvalidArgumentError, "resource should be one of #{food_resources}"
-      end
+    def update_food_log(food_log_id, params)
+      post_call("user/#{user_id}/foods/log/#{food_log_id}.json", params)
+    end
 
-      unless period && food_periods.include?(period)
-        raise FitgemOauth2::InvalidArgumentError, "period should be one of #{food_periods}"
-      end
+    def log_water(params)
+      post_call("user/#{user_id}/foods/log/water.json", params)
+    end
+
+    def update_food_goal(params)
+      post_call("user/#{user_id}/foods/log/goal.json", params)
+    end
 
-      get_call("1/user/[user-id]/#{resource}/date/#{format_date(date)}/#{period}.json")
+    def update_water_goal(params)
+      post_call("user/#{user_id}/foods/log/water/goal.json", params)
+    end
 
+    def delete_food_log(food_log_id)
+      delete_call("user/#{user_id}/foods/log/#{food_log_id}.json")
     end
 
-    def food_in_range(resource, start_date, end_date)
-      food_resources = ["foods/log/caloriesIn", "foods/log/water"]
+    def update_water_log(water_log_id, params)
+      post_call("user/#{user_id}/foods/log/water/#{water_log_id}.json", params)
+    end
 
-      unless resource && food_resources.include?(resource)
-        raise FitgemOauth2::InvalidArgumentError, "resource should be one of #{food_resources}"
-      end
+    def delete_water_log(water_log_id)
+      delete_call("user/#{user_id}/foods/log/water/#{water_log_id}.json")
+    end
+
+    # ==================================
+    #   Collection Metadata
+    # ==================================
+
+    def add_favorite_food(food_id)
+      post_call("user/#{user_id}/foods/log/favorite/#{food_id}.json")
+    end
+
+    def delete_favorite_food(food_id)
+      delete_call("user/#{user_id}/foods/log/favorite/#{food_id}.json")
+    end
+
+    def recent_foods
+      get_call("user/#{user_id}/foods/recent.json")
+    end
+
+    def favorite_foods
+      get_call("user/#{user_id}/foods/log/favorite.json")
+    end
 
-      get_call("1/user/[user-id]/#{resource}/date/#{format_date(start_date)}/#{format_date(end_date)}.json")
+    def frequent_foods
+      get_call("user/#{user_id}/foods/log/frequent.json")
+    end
+
+    def meals
+      get_call("user/#{user_id}/meals.json")
+    end
+
+    def create_meal(params)
+      post_call("user/#{user_id}/meals.json", params)
+    end
+
+    def meal(meal_id)
+      get_call("user/#{user_id}/meals/#{meal_id}.json")
+    end
+
+    def update_meal(meal_id, params)
+      post_call("user/#{user_id}/meals/#{meal_id}.json", params)
+    end
+
+    def delete_meal(meal_id)
+      delete_call("user/#{user_id}/meals/#{meal_id}.json")
+    end
+
+    def create_food(params)
+      post_call("user/#{user_id}/foods.json", params)
+    end
 
+    def delete_food(food_id)
+      delete_call("user/#{user_id}/foods/#{food_id}.json")
     end
 
     def food(id)
-      get_call("1/foods/#{id}.json")
+      get_call("foods/#{id}.json")
     end
 
     def food_units
-      get_call("1/foods/units.json")
+      get_call('foods/units.json')
     end
 
-    def food_search
-      get_call("1/foods/search.json")
+    def search_foods(params)
+      post_call('foods/search.json', params)
     end
   end
 end

data/lib/fitgem_oauth2/friends.rb

@@ -1,19 +1,35 @@
 module FitgemOauth2
   class Client
     def friends
-      get_call("1/user/#{@user_id}/friends.json")
+      get_call("user/#{user_id}/friends.json")
     end
 
     def friends_leaderboard
-      get_call("1/user/#{@user_id}/friends/leaderboard.json")
+      get_call("user/#{user_id}/friends/leaderboard.json")
+    end
+
+    # ==================================
+    #   Friend Invitations
+    # ==================================
+
+    def invite_friend(params)
+      post_call("user/#{user_id}/friends/invitations.json", params)
     end
 
     def friend_invitations
-      get_call("1/user/#{@user_id}/friends/invitations.json")
+      get_call("user/#{user_id}/friends/invitations.json")
     end
 
+    def respond_to_invitation(from_user_id, params)
+      post_call("user/#{user_id}/friends/invitations/#{from_user_id}.json", params)
+    end
+
+    # ==================================
+    #   Badges
+    # ==================================
+
     def badges
-      get_call("1/user/#{@user_id}/badges.json")
+      get_call("user/#{user_id}/badges.json")
     end
   end
 end

data/lib/fitgem_oauth2/heartrate.rb

@@ -1,53 +1,55 @@
 module FitgemOauth2
   class Client
 
-    def hearrate_on_date(date)
-      get_call("1/user/#{@user_id}/activities/heart/date/#{format_date(date)}.json")
-    end
+    HR_PERIODS = %w(1d 7d 30d 1w 1m)
+    HR_DETAIL_LEVELS = %w(1sec 1min)
 
-    def hearrate_in_period(date, period)
-      periods = %w("1d" "7d" "30d" "1w" "1m")
-      unless period && periods.include?(period)
-        raise InvalidArgumentError, "period should be one of #{periods}"
+    def heartrate_time_series(start_date: nil, end_date: nil, period: nil)
+      unless start_date
+        raise FitgemOauth2::InvalidArgumentError, 'Start date not provided.'
       end
-      get_call("1/user/#{@user_id}/activities/heart/date/#{format_date(date)}/#{period}.json")
-    end
 
-    def hearrate_in_range(start_date, start_range)
-      get_call("1/user/#{@user_id}/activities/heart/date/#{format_date(start_date)}/#{format_date(end_date)}.json")
-    end
+      if end_date && period
+        raise FitgemOauth2::InvalidArgumentError, 'Both end_date and period specified. Specify only one.'
+      end
 
-    def heartrate_series_in_range(start_date, end_date, detail_level)
-      detail_levels = %w("1sec" "1min")
-      unless detail_level && detail_levels.include?(detail_level)
-        raise InvalidArgumentError, "detail level should be one of #{detail_levels}"
+      if !end_date && !period
+        raise FitgemOauth2::InvalidArgumentError, 'Neither end_date nor period specified. Specify at least one.'
       end
-      get_call("/1/user/#{@user_id}/activities/heart/date/#{format_date(start_date)}/#{format_date(end_date)}/#{detail_level}.json")
-    end
 
-    def heartrate_series_in_range_time(start_date, end_date, detail_level, start_time, end_time)
-      detail_levels = %w("1sec" "1min")
-      unless detail_level && detail_levels.include?(detail_level)
-        raise InvalidArgumentError, "detail level should be one of #{detail_levels}"
+      if period && !HR_PERIODS.include?(period)
+        raise FitgemOauth2::InvalidArgumentError, "Invalid period: #{period}. Valid periods are #{HR_PERIODS}."
       end
-      get_call("1/user/#{@user_id}/activities/heart/date/#{format_date(start_date)}/#{format_date(end_date)}/#{detail_level}/time/#{start_time}/#{end_time}.json")
+
+      second = period || format_date(end_date)
+
+      url = ['user', user_id, 'activities/heart/date', format_date(start_date), second].join('/')
+
+      get_call(url + '.json')
     end
 
-    def hearrate_daily_series_in_range(start_date, detail_level)
-      detail_levels = %w("1sec" "1min")
-      unless detail_level && detail_levels.include?(detail_level)
-        raise InvalidArgumentError, "detail level should be one of #{detail_levels}"
+    def intraday_heartrate_time_series(start_date: nil, end_date: nil, detail_level: nil, start_time: nil, end_time: nil)
+      unless start_date
+        raise FitgemOauth2::InvalidArgumentError, 'Start date not provided.'
       end
-      get_call("1/user/#{@user_id}/activities/heart/date/#{format_date(start_date)}/1d/#{detail_level}.json")
-    end
 
-    def heartrate_daily_series_in_range_time(start_date, detail_level, start_time, end_time)
-      detail_levels = %w("1sec" "1min")
-      unless detail_level && detail_levels.include?(detail_level)
-        raise InvalidArgumentError, "detail level should be one of #{detail_levels}"
+      unless detail_level && HR_DETAIL_LEVELS.include?(detail_level)
+        raise FitgemOauth2::InvalidArgumentError, "Please specify the defail level. Detail level should be one of #{HR_DETAIL_LEVELS}."
+      end
+
+      end_date = format_date(end_date) || '1d'
+
+      url = ['user', user_id, 'activities/heart/date', format_date(start_date), end_date, detail_level].join('/')
+
+      if (start_time && !end_time) || (end_time && !start_time)
+        raise FitgemOauth2::InvalidArgumentError, 'Either specify both the start_time and end_time or specify neither.'
+      end
+
+      if start_time && end_time
+        url = [url, 'time', format_time(start_time), format_time(end_time)].join('/')
       end
-      get_call("1/user/#{@user_id}/activities/heart/date/#{format_date(start_date)}/1d/#{detail_level}/time/#{start_time}/#{end_time}.json")
-    end
 
+      get_call(url + '.json')
+    end
   end
 end

data/lib/fitgem_oauth2/sleep.rb

@@ -2,8 +2,51 @@ module FitgemOauth2
 
   class Client
 
-    def sleep_on_date(date)
-      get_call("1/user/#{user_id}/sleep/date/#{format_date(date)}.json")
+    SLEEP_RESOURCES = %w(startTime  timeInBed  minutesAsleep  awakeningsCount  minutesAwake  minutesToFallAsleep  minutesAfterWakeup  efficiency)
+    SLEEP_PERIODS = %w(1d 7d 30d 1w 1m 3m 6m 1y max)
+
+    def sleep_logs(date)
+      get_call("user/#{user_id}/sleep/date/#{format_date(date)}.json")
+    end
+
+    def sleep_goal
+      get_call("user/#{user_id}/sleep/goal.json")
+    end
+
+    def update_sleep_goal(params)
+      post_call("user/#{user_id}/sleep/goal.json", params)
+    end
+
+    def sleep_time_series(resource: nil, start_date: nil, end_date: nil, period: nil)
+      unless start_date
+        raise FitgemOauth2::InvalidArgumentError, 'Start date not provided.'
+      end
+
+      unless resource && SLEEP_RESOURCES.include?(resource)
+        raise FitgemOauth2::InvalidArgumentError, "Invalid resource: #{resource}. Valid resources are #{SLEEP_RESOURCES}."
+      end
+
+      if period && end_date
+        raise FitgemOauth2::InvalidArgumentError, 'Both end_date and period specified. Specify only one.'
+      end
+
+      if period && !SLEEP_PERIODS.include?(period)
+        raise FitgemOauth2::InvalidArgumentError, "Invalid period: #{period}. Valid periods are #{SLEEP_PERIODS}."
+      end
+
+      second = period || format_date(end_date)
+
+      url = ['user', user_id, 'sleep', resource, 'date', format_date(start_date), second].join('/')
+
+      get_call(url + '.json')
+    end
+
+    def log_sleep(params)
+      post_call("user/#{user_id}/sleep.json", params)
+    end
+
+    def delete_logged_sleep(log_id)
+      delete_call("user/#{user_id}/sleep/#{log_id}.json")
     end
     
   end

data/lib/fitgem_oauth2/subscriptions.rb

@@ -21,7 +21,7 @@ module FitgemOauth2
       type = opts[ :type ] || :all
       subscription_id = opts[:subscription_id]
 
-      url = [ '1', 'user', user_id ]
+      url = [ 'user', user_id ]
       url << type unless type == :all
       url << 'apiSubscriptions'
       url << subscription_id if subscription_id

data/lib/fitgem_oauth2/users.rb

@@ -1,7 +1,7 @@
 module FitgemOauth2
   class Client
     def user_info()
-      get_call("1/user/#{user_id}/profile.json")
+      get_call("user/#{user_id}/profile.json")
     end
   end
 end

data/lib/fitgem_oauth2/utils.rb

@@ -1,38 +1,42 @@
 module FitgemOauth2
   class Client
-    # This function was copied from the Fitgem project (https://github.com/whazzmaster/fitgem/blob/master/lib/fitgem/helpers.rb)
-    # Format any of a variety of date types into the formatted string
-    # required when using the fitbit API.
-    #
-    # The date parameter can take several different kind of objects: a
-    # DateTime object, a Date object, a Time object or a String object.  Furthermore,
-    # the string object may be either the date in a preformatted string
-    # ("yyyy-MM-dd"), or it may be the string values "today" or
-    # "tomorrow".
-    #
-    # @param [DateTime, Date, Time, String] date The object to format into a
-    #   date string
-    # @raise [Fitgem::InvalidDateArgument] Raised when the object is
-    #   not a DateTime, Date, Time or a valid (yyyy-MM-dd) String object
-    # @return [String] Date in "yyyy-MM-dd" string format
+
     def format_date(date)
-      if date.is_a? String
-        case date
-        when 'today'
-          return Date.today.strftime("%Y-%m-%d")
-        when 'yesterday'
-          return (Date.today-1).strftime("%Y-%m-%d")
-        else
-          unless date =~ /\d{4}\-\d{2}\-\d{2}/
-            raise FitgemOauth2::InvalidDateArgument, "Invalid date (#{date}), must be in yyyy-MM-dd format"
-          end
-          return date
-        end
+
+      if !date
+        return nil
+      end
+
+      valid_semantic_date = %w(today yesterday).include? date
+      valid_date_string = ((date =~ /\d{4}\-\d{2}\-\d{2}/) == 0)
+      if valid_date_string
+        date
+      elsif valid_semantic_date
+        date_from_semantic(date)
       elsif Date === date || Time === date || DateTime === date
-        return date.strftime("%Y-%m-%d")
+        date.strftime('%Y-%m-%d')
       else
         raise FitgemOauth2::InvalidDateArgument, "Date used must be a date/time object or a string in the format YYYY-MM-DD; supplied argument is a #{date.class}"
       end
     end
+
+    def format_time(time)
+      if ( (time =~ /\d{2}:\d{2}/) == 0)
+        time
+      elsif DateTime === time || Time === time
+        time.strftime('%H:%M')
+      else
+        raise FitgemOauth2::InvalidTimeArgument, "Time used must be a DateTime/Time object or a string in the format hh:mm; supplied argument is a #{time.class}"
+      end
+    end
+
+    private
+    def date_from_semantic(semantic)
+      if semantic === 'yesterday'
+        (Date.today-1).strftime('%Y-%m-%d')
+      elsif semantic == 'today'
+        Date.today.strftime('%Y-%m-%d')
+      end
+    end
   end
 end

data/lib/fitgem_oauth2/version.rb

@@ -1,3 +1,3 @@
 module FitgemOauth2
-  VERSION = '0.0.8'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fitgem_oauth2
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 1.0.2
 platform: ruby
 authors:
 - Ankit Gupta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2016-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -25,47 +25,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '10.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '10.5'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: dotenv
+  name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '4.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '4.5'
 description: This gem allows requesting data from Fitbit API using OAuth2
 email: ankit.gupta2801@gmail.com
 executables: []
@@ -83,7 +83,6 @@ files:
 - lib/fitgem_oauth2/friends.rb
 - lib/fitgem_oauth2/heartrate.rb
 - lib/fitgem_oauth2/sleep.rb
-- lib/fitgem_oauth2/steps.rb
 - lib/fitgem_oauth2/subscriptions.rb
 - lib/fitgem_oauth2/users.rb
 - lib/fitgem_oauth2/utils.rb
@@ -113,4 +112,3 @@ signing_key:
 specification_version: 4
 summary: Fitbit API client library
 test_files: []
-has_rdoc: 

data/lib/fitgem_oauth2/steps.rb

@@ -1,11 +0,0 @@
-module FitgemOauth2
-
-  class Client
-
-    def steps_on_date(date)
-      get_call("1/user/#{user_id}/activities/steps/date/#{format_date(date)}/1d.json")
-    end
-
-  end
-
-end