fitgem_oauth2 1.2.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ae7eec9fd825f4fc19feafe55ca51d3b6e176fdd
-  data.tar.gz: 0b1d4f6fb319465919049c96c8d4e2f731ad22c8
+SHA256:
+  metadata.gz: a4195903df9731ae5176aa7577c7320322e4adbaa9f7ac68234a36716a536c85
+  data.tar.gz: 28b46788c80bd68e8a16c14caadbbe2d9a961640c67fb3a1011c6fc7977db51b
 SHA512:
-  metadata.gz: 49b06536b0b23e8645666d85c67081a047ca2b125b1398fa1cde532f441a65cdd10c1f5d2c657df14fed795e6ffaccbbb6690a92d81f77039616e960a1000931
-  data.tar.gz: '0691da40e4d1dcf14757ecd6656a5b391d537223bb00f09d8028327b7f79e201711d71f0538619578cc1d467a50041ddb428366c6ab73200ed3abda847baa7c5'
+  metadata.gz: e44efb1b76d77d3bdf42d44709ec7c3683e95060e3387cb896ac9ca9317920880bd530421418cde9995cbd6a08e756828c07bc244f2a5c5dc3cc33b10ff91c8e
+  data.tar.gz: c012c4d7f421ddfd44ac782de4294bc5ea94d96f154ae7b1f1dc1dedae5db07ad2821f9576a2bea6af7667f995d9e507db94c47808393e0cef643997399128dc

data/fitgem_oauth2.gemspec

@@ -1,6 +1,6 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
-$:.unshift File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('lib', __dir__)
 require 'fitgem_oauth2/version'
 
 Gem::Specification.new do |s|
@@ -10,13 +10,13 @@ Gem::Specification.new do |s|
   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_runtime_dependency 'faraday', '~> 1.0.1'
 
-  s.add_development_dependency 'rake', '~> 10.5'
+  s.add_development_dependency 'factory_bot', '~> 4.5'
+  s.add_development_dependency 'rake', '~> 13.0.1'
   s.add_development_dependency 'rspec', '~> 3.4'
-  s.add_development_dependency 'factory_girl', '~> 4.5'
 end

data/lib/fitgem_oauth2.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 require 'fitgem_oauth2/client.rb'
 
+# Top level module for the classes for this gem
 module FitgemOauth2
-
 end

data/lib/fitgem_oauth2/activity.rb

@@ -1,9 +1,17 @@
+# frozen_string_literal: true
+
 module FitgemOauth2
   class Client
+    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
+    ].freeze
 
-    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)
-
-    ACTIVITY_PERIODS = %w(1d 7d 30d 1w 1m 3m 6m 1y max)
+    ACTIVITY_PERIODS = %w[1d 7d 30d 1w 1m 3m 6m 1y max].freeze
 
     # retrieves daily activity summary for a date
     # @param date the date for which the summary is retrieved
@@ -22,14 +30,11 @@ module FitgemOauth2
     # @param period the period starting from start_date for which the series needs to be retrieved. If specifying period,
     #             do not use end_date
     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
 
-      unless start_date
-        raise FitgemOauth2::InvalidArgumentError, 'Start date must be specified.'
-      end
+      raise FitgemOauth2::InvalidArgumentError, 'Start date must be specified.' unless start_date
 
       if period && end_date
         raise FitgemOauth2::InvalidArgumentError, 'Both period and end_date are specified. Please specify only one.'
@@ -71,22 +76,22 @@ module FitgemOauth2
 
       end_date ||= '1d'
 
-      unless detail_level && %w(1min 15min).include?(detail_level)
+      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_path = [
-          'user', @user_id,
-          'activities', resource,
-          'date', format_date(start_date),
-          end_date, detail_level
+        '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('/')
+          [resource_path, 'time', format_time(start_time), format_time(end_time)].join('/')
       end
       get_call("#{resource_path}.json")
     end
@@ -111,12 +116,12 @@ module FitgemOauth2
     # retrieves activity list for the user
     def activity_list(date, sort, limit)
       date_param = format_date(date)
-      if sort == "asc"
+      if sort == 'asc'
         date_param = "afterDate=#{date_param}"
-      elsif sort == "desc"
+      elsif sort == 'desc'
         date_param = "beforeDate=#{date_param}"
       else
-        raise FitgemOauth2::InvalidArgumentError, "sort can either be asc or desc"
+        raise FitgemOauth2::InvalidArgumentError, 'sort can either be asc or desc'
       end
       get_call("user/#{user_id}/activities/list.json?offset=0&limit=#{limit}&sort=#{sort}&#{date_param}")
     end
@@ -126,7 +131,6 @@ module FitgemOauth2
       get_call("user/#{user_id}/activities/#{id}.tcx")
     end
 
-
     # ======================================
     #      Activity Types
     # ======================================
@@ -178,9 +182,10 @@ module FitgemOauth2
     # retrieve activity goals for a period
     # @period the period for which the goals need to be retrieved. either 'weekly' or 'daily'
     def goals(period)
-      unless period && %w(daily weekly).include?(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
 
@@ -188,9 +193,10 @@ module FitgemOauth2
     # @param period period for the goal ('weekly' or 'daily')
     # @param params the POST params for the request. Refer to Fitbit documentation for accepted format
     def update_activity_goals(period, params)
-      unless period && %w(daily weekly).include?(period)
+      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
 

data/lib/fitgem_oauth2/body_measurements.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module FitgemOauth2
   class Client
-    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)
+    FAT_PERIODS = %w[1d 7d 1w 1m].freeze
+    WEIGHT_PERIODS = %w[1d 7d 30d 1w 1m].freeze
+    BODY_GOALS = %w[fat weight].freeze
+    BODY_TIME_SERIES_PERIODS = %w[1d 7d 30d 1w 1m 3m 6m 1y max].freeze
 
     # ======================================
     #      Boday Fat
@@ -15,13 +17,10 @@ module FitgemOauth2
     # @param end_date (optional)end date for the logs
     # @param period (optional) period for the logs
     def body_fat_logs(start_date: nil, end_date: nil, period: nil)
-      unless start_date
-        raise FitgemOauth2::InvalidArgumentError, 'must specify start_date'
-      end
+      raise FitgemOauth2::InvalidArgumentError, 'must specify start_date' unless start_date
+
       url = ['user', user_id, 'body/log/fat/date', format_date(start_date)].join('/')
-      if end_date
-        url = [url, format_date(end_date)].join('/')
-      end
+      url = [url, format_date(end_date)].join('/') if end_date
 
       if period
         if FAT_PERIODS.include?(period)
@@ -31,7 +30,7 @@ module FitgemOauth2
         end
       end
 
-      url = url + '.json'
+      url += '.json'
 
       get_call(url)
     end
@@ -48,7 +47,6 @@ module FitgemOauth2
       delete_call("user/#{user_id}/body/log/fat/#{id}.json")
     end
 
-
     # ==================================
     #   Body Time Series
     # ==================================
@@ -78,16 +76,13 @@ module FitgemOauth2
         end
       end
 
-      if end_date
-        second = format_date(end_date)
-      end
+      second = format_date(end_date) if end_date
 
       url = [url, second].join('/')
 
       get_call(url + '.json')
     end
 
-
     # ======================================
     #      Body Goals
     # ======================================
@@ -123,9 +118,7 @@ module FitgemOauth2
     # @param end_date (optional)end_date for the logs
     # @param period (optional)period for the logs
     def weight_logs(start_date: nil, end_date: nil, period: nil)
-      unless start_date
-        raise FitgemOauth2::InvalidArgumentError, 'start_date not specified.'
-      end
+      raise FitgemOauth2::InvalidArgumentError, 'start_date not specified.' unless start_date
 
       if period && end_date
         raise FitgemOauth2::InvalidArgumentError, 'both end_date and period specified. please provide only one.'
@@ -158,6 +151,5 @@ module FitgemOauth2
     def delete_logged_weight(id)
       delete_call("user/#{user_id}/body/log/weight/#{id}.json")
     end
-
   end
 end

data/lib/fitgem_oauth2/client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fitgem_oauth2/activity.rb'
 require 'fitgem_oauth2/body_measurements.rb'
 require 'fitgem_oauth2/devices.rb'
@@ -16,7 +18,6 @@ require 'faraday'
 
 module FitgemOauth2
   class Client
-
     DEFAULT_USER_ID = '-'
     API_VERSION = '1'
 
@@ -27,10 +28,8 @@ module FitgemOauth2
     attr_reader :unit_system
 
     def initialize(opts)
-      missing = [:client_id, :client_secret, :token] - opts.keys
-      if missing.size > 0
-        raise FitgemOauth2::InvalidArgumentError, "Missing required options: #{missing.join(',')}"
-      end
+      missing = %i[client_id client_secret token] - opts.keys
+      raise FitgemOauth2::InvalidArgumentError, "Missing required options: #{missing.join(',')}" unless missing.empty?
 
       @client_id = opts[:client_id]
       @client_secret = opts[:client_secret]
@@ -53,7 +52,7 @@ module FitgemOauth2
 
     def get_call(url)
       url = "#{API_VERSION}/#{url}"
-      response = connection.get(url) { |request| set_headers(request) }
+      response = connection.get(url) {|request| set_headers(request) }
       parse_response(response)
     end
 
@@ -62,60 +61,62 @@ module FitgemOauth2
     # date (Nov 5, 2017)
     def get_call_1_2(url)
       url = "1.2/#{url}"
-      response = connection.get(url) {|request| set_headers(request)}
+      response = connection.get(url) {|request| set_headers(request) }
       parse_response(response)
     end
 
-    def post_call(url, params = {})
+    def post_call(url, params={})
       url = "#{API_VERSION}/#{url}"
-      response = connection.post(url, params) { |request| set_headers(request) }
+      response = connection.post(url, params) {|request| set_headers(request) }
       parse_response(response)
     end
 
-    def post_call_1_2(url, params = {})
+    def post_call_1_2(url, params={})
       url = "1.2/#{url}"
-      response = connection.post(url, params) { |request| set_headers(request) }
+      response = connection.post(url, params) {|request| set_headers(request) }
       parse_response(response)
     end
 
     def delete_call(url)
       url = "#{API_VERSION}/#{url}"
-      response = connection.delete(url) { |request| set_headers(request) }
+      response = connection.delete(url) {|request| set_headers(request) }
       parse_response(response)
     end
 
     private
+
     attr_reader :connection
 
     def set_headers(request)
       request.headers['Authorization'] = "Bearer #{token}"
       request.headers['Content-Type'] = 'application/x-www-form-urlencoded'
-      request.headers['Accept-Language'] = unit_system unless unit_system == nil
+      request.headers['Accept-Language'] = unit_system unless unit_system.nil?
     end
 
     def parse_response(response)
-      headers_to_keep = %w(fitbit-rate-limit-limit fitbit-rate-limit-remaining fitbit-rate-limit-reset)
+      headers_to_keep = %w[fitbit-rate-limit-limit fitbit-rate-limit-remaining fitbit-rate-limit-reset]
 
       error_handler = {
-          200 => lambda {
-            body = JSON.parse(response.body)
-            body = {body: body} if body.is_a?(Array)
-            headers = response.headers.to_hash.keep_if { |k,v|
-              headers_to_keep.include? k
-            }
-            body.merge!(headers)
-          },
-          201 => lambda { },
-          204 => lambda { },
-          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 }
+        200 => lambda {
+          body = JSON.parse(response.body)
+          body = {body: body} if body.is_a?(Array)
+          headers = response.headers.to_hash.keep_if do |k, _v|
+            headers_to_keep.include? k
+          end
+          body.merge!(headers)
+        },
+        201 => -> {},
+        204 => -> {},
+        400 => -> { raise FitgemOauth2::BadRequestError },
+        401 => -> { raise FitgemOauth2::UnauthorizedError },
+        403 => -> { raise FitgemOauth2::ForbiddenError },
+        404 => -> { raise FitgemOauth2::NotFoundError },
+        429 => -> { raise FitgemOauth2::ApiLimitError },
+        500..599 => -> { raise FitgemOauth2::ServerError }
       }
 
-      fn = error_handler.detect { |k, _| k === response.status }
-      if fn === nil
+      fn = error_handler.find {|k, _| k === response.status }
+      if fn.nil?
         raise StandardError, "Unexpected response status #{response.status}"
       else
         fn.last.call

data/lib/fitgem_oauth2/devices.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module FitgemOauth2
   class Client
-
     # ==================================
     #   Devices
     # ==================================

data/lib/fitgem_oauth2/errors.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 module FitgemOauth2
   class InvalidDateArgument < ArgumentError
   end
 
   class InvalidTimeArgument < ArgumentError
-
   end
 
   class InvalidArgumentError < ArgumentError
@@ -22,6 +23,9 @@ module FitgemOauth2
   class NotFoundError < StandardError
   end
 
+  class ApiLimitError < StandardError
+  end
+
   class ServerError < StandardError
   end
 end

data/lib/fitgem_oauth2/food.rb

@@ -1,190 +1,22 @@
-module FitgemOauth2
-  class Client
-
-    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_for_date_range(start_date, end_date)
-      validate_start_date(start_date)
-      validate_end_date(end_date)
-      get_call(food_series_url(user_id, format_date(start_date), format_date(end_date)))
-    end
-
-    def food_series_for_period(start_date, period)
-      validate_start_date(start_date)
-      validate_food_series_period(period)
-      get_call(food_series_url(user_id, format_date(start_date), period))
-    end
-
-    def water_series_for_date_range(start_date, end_date)
-      validate_start_date(start_date)
-      validate_end_date(end_date)
-      get_call(water_series_url(user_id, format_date(start_date), format_date(end_date)))
-    end
-
-    def water_series_for_period(start_date, period)
-      validate_start_date(start_date)
-      validate_food_series_period(period)
-      get_call(water_series_url(user_id, format_date(start_date), period))
-    end
-
-    def food_series(resource: nil, start_date: nil, end_date: nil, period: nil)
-      warn '[DEPRECATED] use `food_series_for_date_range`, `food_series_for_period`, `water_series_for_date_range`, or `water_series_for_period` instead.'
-      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
-
-    # ==================================
-    #   Collection data
-    # ==================================
+# frozen_string_literal: true
 
-    def food_goals
-      get_call("user/#{user_id}/foods/log/goal.json")
-    end
+require 'fitgem_oauth2/food/collection.rb'
+require 'fitgem_oauth2/food/series.rb'
+require 'fitgem_oauth2/food/metadata.rb'
 
-    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("user/#{user_id}/foods/log/water/goal.json")
-    end
-
-    def log_food(params)
-      post_call("user/#{user_id}/foods/log.json", params)
-    end
-
-    def update_food_log(food_log_id, params)
-      post_call("user/#{user_id}/foods/log/#{food_log_id}.json", params)
-    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
-
-    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 update_water_log(water_log_id, params)
-      post_call("user/#{user_id}/foods/log/water/#{water_log_id}.json", params)
-    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
-
-    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("foods/#{id}.json")
-    end
-
-    def food_units
-      get_call('foods/units.json')
-    end
-
-    def search_foods(params)
-      post_call('foods/search.json', params)
-    end
+module FitgemOauth2
+  class Client
+    FOOD_SERIES_RESOURCES = %w[caloriesIn water].freeze
+    FOOD_SERIES_PERIODS = %w[1d 7d 30d 1w 1m 3m 6m 1y max].freeze
 
     private
+
     def validate_food_series_period(period)
       unless FOOD_SERIES_PERIODS.include?(period)
         raise FitgemOauth2::InvalidArgumentError, "Invalid period: #{period}. Specify a valid period from #{FOOD_SERIES_PERIODS}"
       end
     end
 
-
     def food_series_url(user_id, start_date, end_date_or_period)
       ['user', user_id, 'foods/log/caloriesIn', 'date', start_date, end_date_or_period].join('/') + '.json'
     end

data/lib/fitgem_oauth2/food/collection.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module FitgemOauth2
+  class Client
+    def food_goals
+      get_call("user/#{user_id}/foods/log/goal.json")
+    end
+
+    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("user/#{user_id}/foods/log/water/goal.json")
+    end
+
+    def log_food(params)
+      post_call("user/#{user_id}/foods/log.json", params)
+    end
+
+    def update_food_log(food_log_id, params)
+      post_call("user/#{user_id}/foods/log/#{food_log_id}.json", params)
+    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
+
+    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 update_water_log(water_log_id, params)
+      post_call("user/#{user_id}/foods/log/water/#{water_log_id}.json", params)
+    end
+
+    def delete_water_log(water_log_id)
+      delete_call("user/#{user_id}/foods/log/water/#{water_log_id}.json")
+    end
+  end
+end

data/lib/fitgem_oauth2/food/metadata.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+module FitgemOauth2
+  class Client
+    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
+
+    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("foods/#{id}.json")
+    end
+
+    def food_units
+      get_call('foods/units.json')
+    end
+
+    def search_foods(params)
+      post_call('foods/search.json', params)
+    end
+  end
+end

data/lib/fitgem_oauth2/food/series.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module FitgemOauth2
+  class Client
+    def food_series_for_date_range(start_date, end_date)
+      validate_start_date(start_date)
+      validate_end_date(end_date)
+      get_call(food_series_url(user_id, format_date(start_date), format_date(end_date)))
+    end
+
+    def food_series_for_period(start_date, period)
+      validate_start_date(start_date)
+      validate_food_series_period(period)
+      get_call(food_series_url(user_id, format_date(start_date), period))
+    end
+
+    def water_series_for_date_range(start_date, end_date)
+      validate_start_date(start_date)
+      validate_end_date(end_date)
+      get_call(water_series_url(user_id, format_date(start_date), format_date(end_date)))
+    end
+
+    def water_series_for_period(start_date, period)
+      validate_start_date(start_date)
+      validate_food_series_period(period)
+      get_call(water_series_url(user_id, format_date(start_date), period))
+    end
+  end
+end

data/lib/fitgem_oauth2/friends.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module FitgemOauth2
   class Client
     # retrieves list of friends for the current user

data/lib/fitgem_oauth2/heartrate.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 module FitgemOauth2
   class Client
-
-    HR_PERIODS = %w(1d 7d 30d 1w 1m)
-    HR_DETAIL_LEVELS = %w(1sec 1min)
+    HR_PERIODS = %w[1d 7d 30d 1w 1m].freeze
+    HR_DETAIL_LEVELS = %w[1sec 1min].freeze
 
     def hr_series_for_date_range(start_date, end_date)
       validate_start_date(start_date)
@@ -20,23 +21,6 @@ module FitgemOauth2
       get_call(url + '.json')
     end
 
-    # retrieve heartrate time series
-    def heartrate_time_series(start_date: nil, end_date: nil, period: nil)
-      warn "[DEPRECATION] `heartrate_time_series` is deprecated.  Please use `hr_series_for_date_range` or `hr_series_for_period` instead."
-
-      regular_time_series_guard(
-        start_date: start_date,
-        end_date: end_date,
-        period: period
-      )
-
-      second = period || format_date(end_date)
-
-      url = ['user', user_id, 'activities/heart/date', format_date(start_date), second].join('/')
-
-      get_call(url + '.json')
-    end
-
     # retrieve intraday series for heartrate
     def intraday_heartrate_time_series(start_date: nil, end_date: nil, detail_level: nil, start_time: nil, end_time: nil)
       intraday_series_guard(
@@ -51,39 +35,21 @@ module FitgemOauth2
 
       url = ['user', user_id, 'activities/heart/date', format_date(start_date), end_date, detail_level].join('/')
 
-      if start_time && end_time
-        url = [url, 'time', format_time(start_time), format_time(end_time)].join('/')
-      end
+      url = [url, 'time', format_time(start_time), format_time(end_time)].join('/') if start_time && end_time
 
       get_call(url + '.json')
     end
 
     private
+
     def validate_hr_period(period)
       unless period && HR_PERIODS.include?(period)
         raise FitgemOauth2::InvalidArgumentError, "Invalid period: #{period}. Valid periods are #{HR_PERIODS}."
       end
     end
 
-    def regular_time_series_guard(start_date:, end_date:, period:)
-      validate_start_date(start_date)
-
-      if end_date && period
-        raise FitgemOauth2::InvalidArgumentError, 'Both end_date and period specified. Specify only one.'
-      end
-
-      if !end_date && !period
-        raise FitgemOauth2::InvalidArgumentError, 'Neither end_date nor period specified. Specify at least one.'
-      end
-
-      validate_hr_period(period) if period
-    end
-
-
     def intraday_series_guard(start_date:, end_date:, detail_level:, start_time:, end_time:)
-      unless start_date
-        raise FitgemOauth2::InvalidArgumentError, 'Start date not provided.'
-      end
+      raise FitgemOauth2::InvalidArgumentError, 'Start date not provided.' unless start_date
 
       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}."

data/lib/fitgem_oauth2/sleep.rb

@@ -1,9 +1,13 @@
-module FitgemOauth2
+# frozen_string_literal: true
 
+module FitgemOauth2
   class Client
+    SLEEP_RESOURCES = %w[
+      startTime timeInBed minutesAsleep awakeningsCount minutesAwake
+      minutesToFallAsleep minutesAfterWakeup efficiency
+    ].freeze
 
-    SLEEP_RESOURCES = %w(startTime  timeInBed  minutesAsleep  awakeningsCount  minutesAwake  minutesToFallAsleep  minutesAfterWakeup  efficiency)
-    SLEEP_PERIODS = %w(1d 7d 30d 1w 1m 3m 6m 1y max)
+    SLEEP_PERIODS = %w[1d 7d 30d 1w 1m 3m 6m 1y max].freeze
 
     # retrieve sleep logs for a date
     # @param date date for which sleep logs needs to be accessed
@@ -17,12 +21,12 @@ module FitgemOauth2
 
     def sleep_logs_list(date, sort, limit)
       date_param = format_date(date)
-      if sort == "asc"
+      if sort == 'asc'
         date_param = "afterDate=#{date_param}"
-      elsif sort == "desc"
+      elsif sort == 'desc'
         date_param = "beforeDate=#{date_param}"
       else
-        raise FitgemOauth2::InvalidArgumentError, "sort can either be asc or desc"
+        raise FitgemOauth2::InvalidArgumentError, 'sort can either be asc or desc'
       end
       get_call_1_2("user/#{user_id}/sleep/list.json?#{date_param}&offset=0&sort=#{sort}&limit=#{limit}")
     end
@@ -44,9 +48,7 @@ module FitgemOauth2
     # @param end_date ending date for sleep time series
     # @param period period for sleep time series
     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
+      raise FitgemOauth2::InvalidArgumentError, 'Start date not provided.' unless start_date
 
       unless resource && SLEEP_RESOURCES.include?(resource)
         raise FitgemOauth2::InvalidArgumentError, "Invalid resource: #{resource}. Valid resources are #{SLEEP_RESOURCES}."

data/lib/fitgem_oauth2/subscriptions.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 module FitgemOauth2
   class Client
-
-    SUBSCRIBABLE_TYPES = [:sleep, :body, :activities, :foods, :all]
+    SUBSCRIBABLE_TYPES = %i[sleep body activities foods all].freeze
 
     def subscriptions(opts)
       get_call(subscription_url(opts))
@@ -18,15 +19,15 @@ module FitgemOauth2
     protected
 
     def subscription_url(opts)
-      type = opts[ :type ] || :all
+      type = opts[:type] || :all
       subscription_id = opts[:subscription_id]
 
-      url = [ 'user', user_id ]
+      url = ['user', user_id]
       url << type unless type == :all
       url << 'apiSubscriptions'
       url << subscription_id if subscription_id
 
-      return url.join('/') + '.json'
+      url.join('/') + '.json'
     end
   end
-end
+end

data/lib/fitgem_oauth2/users.rb

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

data/lib/fitgem_oauth2/utils.rb

@@ -1,18 +1,17 @@
+# frozen_string_literal: true
+
 module FitgemOauth2
   class Client
-
     def format_date(date)
-      if !date
-        return nil
-      end
+      return nil if date.nil?
 
-      valid_semantic_date = %w(today yesterday).include? date
-      valid_date_string = ((date =~ /\d{4}\-\d{2}\-\d{2}/) == 0)
+      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
+      elsif date.is_a?(Date) || date.is_a?(Time) || date.is_a?(DateTime)
         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}"
@@ -20,9 +19,9 @@ module FitgemOauth2
     end
 
     def format_time(time)
-      if ( (time =~ /\d{2}:\d{2}/) == 0)
+      if (time =~ /\d{2}:\d{2}/) == 0
         time
-      elsif DateTime === time || Time === time
+      elsif time.is_a?(DateTime) || time.is_a?(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}"
@@ -30,21 +29,18 @@ module FitgemOauth2
     end
 
     def validate_start_date(start_date)
-      unless start_date
-        raise FitgemOauth2::InvalidArgumentError, 'Please specify a valid start date.'
-      end
+      raise FitgemOauth2::InvalidArgumentError, 'Please specify a valid start date.' unless start_date
     end
 
     def validate_end_date(end_date)
-      unless end_date
-        raise FitgemOauth2::InvalidArgumentError, 'Please specify a valid end date.'
-      end
+      raise FitgemOauth2::InvalidArgumentError, 'Please specify a valid end date.' unless end_date
     end
 
     private
+
     def date_from_semantic(semantic)
       if semantic === 'yesterday'
-        (Date.today-1).strftime('%Y-%m-%d')
+        (Date.today - 1).strftime('%Y-%m-%d')
       elsif semantic == 'today'
         Date.today.strftime('%Y-%m-%d')
       end

data/lib/fitgem_oauth2/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module FitgemOauth2
-  VERSION = '1.2.0'
+  VERSION = '3.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fitgem_oauth2
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Ankit Gupta
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-08-27 00:00:00.000000000 Z
+date: 2021-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: '4.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: '4.5'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 13.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 13.0.1
 - !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'
 description: This gem allows requesting data from Fitbit API using OAuth2
 email: ankit.gupta2801@gmail.com
 executables: []
@@ -80,6 +80,9 @@ files:
 - lib/fitgem_oauth2/devices.rb
 - lib/fitgem_oauth2/errors.rb
 - lib/fitgem_oauth2/food.rb
+- lib/fitgem_oauth2/food/collection.rb
+- lib/fitgem_oauth2/food/metadata.rb
+- lib/fitgem_oauth2/food/series.rb
 - lib/fitgem_oauth2/friends.rb
 - lib/fitgem_oauth2/heartrate.rb
 - lib/fitgem_oauth2/sleep.rb
@@ -91,7 +94,7 @@ homepage: http://rubygems.org/gems/fitgem_oauth2
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -106,9 +109,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Fitbit API client library
 test_files: []