fitgem_oauth2 2.2.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d549d93c4f0c6e8c6c217f6d18ad69b11f5b90ed3ee42e39fe19ed25ca12a27a
-  data.tar.gz: 0d5d8ecf9c0bb6563cd1ecba8d65f1458076113f2ba79d2e3d98b54fc5b0ed3c
+  metadata.gz: cb6abab3890862d921de4c7f36128afc601bbb2579382f67164929cbd4deba3e
+  data.tar.gz: 740cb87e8fdfdae9a3437b59d63486e85bb58567cdad1d22cdb5a90e7daa2b55
 SHA512:
-  metadata.gz: 13211f94cbf789323aa48718019c6831022dd099e8926c20f3cd5c1fcb1382b61e111d3403253399bbce0d8a75b2f69ce8860c2002f810f9e95095fac44186b8
-  data.tar.gz: 26ef31364d04f7fc7c8c218ffd669952712271204d415492d5d72650ada09a5cf3ba2542eb011c71f6cbec06a66a7d1603813f374da1612e9b655796f90ef1b5
+  metadata.gz: 94a1a3f44eef697b5de5a67a992322995e3184fd5142b9896b8e2827d97abf5949aaa5bd07dd88503787bc13defad8ae1215460bfd3a026bcbf3cb41504fd2b8
+  data.tar.gz: c85fab5f3b82b37fca9302fcf55f36c1e0f0b83be4f00a743919caafe879d97a1dd9d5df94c4336de221d063b2bd5923ccd08b654a6a01b30f4fa41d6ca9ab8b

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,16 @@ 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.metadata    = {'rubygems_mfa_required' => 'true'}
 
-  s.add_runtime_dependency 'faraday', '~> 1.0.1'
+  s.required_ruby_version = '>= 3.2.0'
 
-  s.add_development_dependency 'rake', '~> 13.0.1'
+  s.add_dependency 'faraday', '~> 2.0'
+
+  s.add_development_dependency 'factory_bot', '~> 6.0'
+  s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'rspec', '~> 3.4'
-  s.add_development_dependency 'factory_girl', '~> 4.5'
 end

data/lib/fitgem_oauth2/activity.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module FitgemOauth2
   class Client
-
     ACTIVITY_RESOURCES = %w[
       calories caloriesBMR steps distance floors elevation minutesSedentary
       minutesLightlyActive minutesFairlyActive minutesVeryActive
@@ -25,18 +26,16 @@ module FitgemOauth2
     # retrieves activity time series, based on the arguments provided
     # @param resource the resource for which the series needs to be retrieved. one of ALLOWED_RESOURCES
     # @param start_date the start date for the series
-    # @param end_date the end date for the series. If specifying end_date, do not specify period
-    # @param period the period starting from start_date for which the series needs to be retrieved. If specifying period,
-    #             do not use end_date
+    # @param end_date the end date for the series. do not specify period
+    # @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}."
+        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.'
@@ -49,26 +48,27 @@ module FitgemOauth2
       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')
+      get_call("#{url}.json")
     end
 
     # retrieves intraday activity time series.
-    # @param resource (required) for which the intrady series is retrieved. one of 'calories', 'steps', 'distance', 'floors', 'elevation'
+    # @param resource (required) for which the intrady series is retrieved.
+    #   one of 'calories', 'steps', 'distance', 'floors', 'elevation'
     # @param start_date (required) start date for the series
     # @param end_date (optional) end date for the series, if not specified, the series is for 1 day
     # @param detail_level (required) level of detail for the series
     # @param start_time (optional)start time for the series
     # @param end_time the (optional)end time for the series. specify both start_time and end_time, if using either
+    # rubocop:disable Metrics/ParameterLists
     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.'
+              'Must specify resource to fetch intraday time series data for. ' \
+              'One of (:calories, :steps, :distance, :floors, or :elevation) is required.'
       end
 
       unless start_date
@@ -78,25 +78,26 @@ 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.'
+              '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
+    # rubocop:enable Metrics/ParameterLists
 
     # ======================================
     #      Activity Logging Methods
@@ -118,12 +119,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
@@ -133,7 +134,6 @@ module FitgemOauth2
       get_call("user/#{user_id}/activities/#{id}.tcx")
     end
 
-
     # ======================================
     #      Activity Types
     # ======================================
@@ -185,9 +185,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
 
@@ -195,9 +196,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,23 +17,21 @@ 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)
-          url = [url, period].join('/')
-        else
+        unless FAT_PERIODS.include?(period)
           raise FitgemOauth2::InvalidArgumentError, "period must be one in #{FAT_PERIODS}"
         end
+
+        url = [url, period].join('/')
+
       end
 
-      url = url + '.json'
+      url += '.json'
 
       get_call(url)
     end
@@ -48,7 +48,6 @@ module FitgemOauth2
       delete_call("user/#{user_id}/body/log/fat/#{id}.json")
     end
 
-
     # ==================================
     #   Body Time Series
     # ==================================
@@ -60,7 +59,8 @@ module FitgemOauth2
     # @param period (optional)period for the time series. valid periods are BODY_TIME_SERIES_PERIODS
     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.'
+        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('/')
@@ -74,20 +74,18 @@ module FitgemOauth2
         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}"
+          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
+      second = format_date(end_date) if end_date
 
       url = [url, second].join('/')
 
-      get_call(url + '.json')
+      get_call("#{url}.json")
     end
 
-
     # ======================================
     #      Body Goals
     # ======================================
@@ -95,11 +93,11 @@ module FitgemOauth2
     # retrieves body goals based on the type specified
     # @param type 'fat' or 'weight'
     def body_goals(type)
-      if type && BODY_GOALS.include?(type)
-        get_call("user/#{user_id}/body/log/#{type}/goal.json")
-      else
+      unless type && BODY_GOALS.include?(type)
         raise FitgemOauth2::InvalidArgumentError, "invalid goal type : #{type}. must be one of #{BODY_GOALS}"
       end
+
+      get_call("user/#{user_id}/body/log/#{type}/goal.json")
     end
 
     # update body fat goal
@@ -123,18 +121,15 @@ 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.'
       end
 
-      if period
-        unless WEIGHT_PERIODS.include?(period)
-          raise FitgemOauth2::InvalidArgumentError, "valid period not specified. please choose a period from #{WEIGHT_PERIODS}"
-        end
+      if period && !WEIGHT_PERIODS.include?(period)
+        raise FitgemOauth2::InvalidArgumentError,
+              "valid period not specified. please choose a period from #{WEIGHT_PERIODS}"
       end
 
       first = format_date(start_date)
@@ -144,7 +139,7 @@ module FitgemOauth2
         url = [url, second].join('/')
       end
 
-      get_call(url + '.json')
+      get_call("#{url}.json")
     end
 
     # logs weight for the user
@@ -158,6 +153,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,41 +1,36 @@
-require 'fitgem_oauth2/activity.rb'
-require 'fitgem_oauth2/body_measurements.rb'
-require 'fitgem_oauth2/devices.rb'
-require 'fitgem_oauth2/errors.rb'
-require 'fitgem_oauth2/food.rb'
-require 'fitgem_oauth2/friends.rb'
-require 'fitgem_oauth2/heartrate.rb'
-require 'fitgem_oauth2/sleep.rb'
-require 'fitgem_oauth2/subscriptions.rb'
-require 'fitgem_oauth2/users.rb'
-require 'fitgem_oauth2/utils.rb'
-require 'fitgem_oauth2/version.rb'
+# frozen_string_literal: true
+
+require 'fitgem_oauth2/activity'
+require 'fitgem_oauth2/body_measurements'
+require 'fitgem_oauth2/devices'
+require 'fitgem_oauth2/errors'
+require 'fitgem_oauth2/food'
+require 'fitgem_oauth2/friends'
+require 'fitgem_oauth2/heartrate'
+require 'fitgem_oauth2/sleep'
+require 'fitgem_oauth2/subscriptions'
+require 'fitgem_oauth2/users'
+require 'fitgem_oauth2/utils'
+require 'fitgem_oauth2/version'
 
 require 'base64'
 require 'faraday'
 
 module FitgemOauth2
   class Client
-
     DEFAULT_USER_ID = '-'
     API_VERSION = '1'
 
-    attr_reader :client_id
-    attr_reader :client_secret
-    attr_reader :token
-    attr_reader :user_id
-    attr_reader :unit_system
+    attr_reader :client_id, :client_secret, :token, :user_id, :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]
       @token = opts[:token]
-      @user_id = (opts[:user_id] || DEFAULT_USER_ID)
+      @user_id = opts[:user_id] || DEFAULT_USER_ID
       @unit_system = opts[:unit_system]
       @connection = Faraday.new('https://api.fitbit.com')
     end
@@ -51,76 +46,87 @@ module FitgemOauth2
       JSON.parse(response.body)
     end
 
+    def revoke_token(token)
+      response = connection.post('/oauth2/revoke') 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['token'] = token
+      end
+      JSON.parse(response.body)
+    end
+
     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
 
     # This method is a helper method (like get_call) for 1.2 version of the API_VERSION
     # This method is needed because Fitbit API supports both versions as of current
     # date (Nov 5, 2017)
-    def get_call_1_2(url)
+    def get_call12(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_call12(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
 
+    # rubocop:disable Naming/AccessorMethodName
     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
+    # rubocop:enable Naming/AccessorMethodName
 
     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 },
-          429 => lambda { raise FitgemOauth2::ApiLimitError },
-          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
-        raise StandardError, "Unexpected response status #{response.status}"
-      else
-        fn.last.call
-      end
+      fn = error_handler.find {|k, _| k == response.status }
+      raise StandardError, "Unexpected response status #{response.status}" if fn.nil?
+
+      fn.last.call
     end
   end
 end

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

data/lib/fitgem_oauth2/food/collection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module FitgemOauth2
   class Client
     def food_goals

data/lib/fitgem_oauth2/food/metadata.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module FitgemOauth2
   class Client
     def add_favorite_food(food_id)

data/lib/fitgem_oauth2/food/series.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module FitgemOauth2
   class Client
     def food_series_for_date_range(start_date, end_date)
@@ -23,33 +25,5 @@ module FitgemOauth2
       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
   end
 end

data/lib/fitgem_oauth2/food.rb

@@ -1,27 +1,29 @@
-require 'fitgem_oauth2/food/collection.rb'
-require 'fitgem_oauth2/food/series.rb'
-require 'fitgem_oauth2/food/metadata.rb'
+# frozen_string_literal: true
+
+require 'fitgem_oauth2/food/collection'
+require 'fitgem_oauth2/food/series'
+require 'fitgem_oauth2/food/metadata'
 
 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
+      return if FOOD_SERIES_PERIODS.include?(period)
+
+      raise FitgemOauth2::InvalidArgumentError,
+            "Invalid period: #{period}. Specify a valid period from #{FOOD_SERIES_PERIODS}"
     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'
+      "#{['user', user_id, 'foods/log/caloriesIn', 'date', start_date, end_date_or_period].join('/')}.json"
     end
 
     def water_series_url(user_id, start_date, end_date_or_period)
-      ['user', user_id, 'foods/log/water', 'date', start_date, end_date_or_period].join('/') + '.json'
+      "#{['user', user_id, 'foods/log/water', 'date', start_date, end_date_or_period].join('/')}.json"
     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,6 +1,7 @@
+# frozen_string_literal: true
+
 module FitgemOauth2
   class Client
-
     HR_PERIODS = %w[1d 7d 30d 1w 1m].freeze
     HR_DETAIL_LEVELS = %w[1sec 1min].freeze
 
@@ -9,7 +10,7 @@ module FitgemOauth2
       validate_end_date(end_date)
 
       url = ['user', user_id, 'activities/heart/date', format_date(start_date), format_date(end_date)].join('/')
-      get_call(url + '.json')
+      get_call("#{url}.json")
     end
 
     def hr_series_for_period(start_date, period)
@@ -17,31 +18,14 @@ module FitgemOauth2
       validate_hr_period(period)
 
       url = ['user', user_id, 'activities/heart/date', format_date(start_date), period].join('/')
-      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')
+      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)
+    def intraday_heartrate_time_series(start_date: nil, end_date: nil, detail_level: nil, start_time: nil,
+                                       end_time: nil)
       intraday_series_guard(
         start_date: start_date,
-        end_date: end_date,
         detail_level: detail_level,
         start_time: start_time,
         end_time: end_time
@@ -51,35 +35,30 @@ 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')
+      get_call("#{url}.json")
     end
 
     private
 
     def validate_hr_period(period)
-      raise FitgemOauth2::InvalidArgumentError, "Invalid period: #{period}. Valid periods are #{HR_PERIODS}." unless period && HR_PERIODS.include?(period)
-    end
-
-    def regular_time_series_guard(start_date:, end_date:, period:)
-      validate_start_date(start_date)
+      return if period && HR_PERIODS.include?(period)
 
-      raise FitgemOauth2::InvalidArgumentError, 'Both end_date and period specified. Specify only one.' if end_date && period
-
-      raise FitgemOauth2::InvalidArgumentError, 'Neither end_date nor period specified. Specify at least one.' if !end_date && !period
-
-      validate_hr_period(period) if period
+      raise FitgemOauth2::InvalidArgumentError, "Invalid period: #{period}. Valid periods are #{HR_PERIODS}."
     end
 
-    def intraday_series_guard(start_date:, end_date:, detail_level:, start_time:, end_time:)
-      raise FitgemOauth2::InvalidArgumentError, 'Start date not provided.' unless  start_date
+    def intraday_series_guard(start_date:, detail_level:, start_time:, end_time:)
+      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}."
+      end
 
-      raise FitgemOauth2::InvalidArgumentError, "Please specify the defail level. Detail level should be one of #{HR_DETAIL_LEVELS}." unless detail_level && HR_DETAIL_LEVELS.include?(detail_level)
+      return unless (start_time && !end_time) || (end_time && !start_time)
 
-      raise FitgemOauth2::InvalidArgumentError, 'Either specify both the start_time and end_time or specify neither.' 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
   end
 end

data/lib/fitgem_oauth2/sleep.rb

@@ -1,7 +1,7 @@
-module FitgemOauth2
+# frozen_string_literal: true
 
+module FitgemOauth2
   class Client
-
     SLEEP_RESOURCES = %w[
       startTime timeInBed minutesAsleep awakeningsCount minutesAwake
       minutesToFallAsleep minutesAfterWakeup efficiency
@@ -12,11 +12,11 @@ module FitgemOauth2
     # retrieve sleep logs for a date
     # @param date date for which sleep logs needs to be accessed
     def sleep_logs(date)
-      get_call_1_2("user/#{user_id}/sleep/date/#{format_date(date)}.json")
+      get_call12("user/#{user_id}/sleep/date/#{format_date(date)}.json")
     end
 
     def sleep_logs_by_date_range(start_date, end_date)
-      get_call_1_2("user/#{user_id}/sleep/date/#{format_date(start_date)}/#{format_date(end_date)}.json")
+      get_call12("user/#{user_id}/sleep/date/#{format_date(start_date)}/#{format_date(end_date)}.json")
     end
 
     def sleep_logs_list(date, sort, limit)
@@ -26,9 +26,9 @@ module FitgemOauth2
       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}")
+      get_call12("user/#{user_id}/sleep/list.json?#{date_param}&offset=0&sort=#{sort}&limit=#{limit}")
     end
 
     # retrieve sleep goal for the user
@@ -48,12 +48,11 @@ 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}."
+        raise FitgemOauth2::InvalidArgumentError,
+              "Invalid resource: #{resource}. Valid resources are #{SLEEP_RESOURCES}."
       end
 
       if period && end_date
@@ -68,13 +67,13 @@ module FitgemOauth2
 
       url = ['user', user_id, 'sleep', resource, 'date', format_date(start_date), second].join('/')
 
-      get_call(url + '.json')
+      get_call("#{url}.json")
     end
 
     # log sleep
     # @param params POST params for creating sleep log
     def log_sleep(params)
-      post_call_1_2("user/#{user_id}/sleep.json", params)
+      post_call12("user/#{user_id}/sleep.json", params)
     end
 
     # deleted sleep log

data/lib/fitgem_oauth2/subscriptions.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module FitgemOauth2
   class Client
-
     SUBSCRIBABLE_TYPES = %i[sleep body activities foods all].freeze
 
     def subscriptions(opts)
@@ -26,7 +27,7 @@ module FitgemOauth2
       url << 'apiSubscriptions'
       url << subscription_id if subscription_id
 
-      url.join('/') + '.json'
+      "#{url.join('/')}.json"
     end
   end
 end

data/lib/fitgem_oauth2/users.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module FitgemOauth2
   class Client
     def user_info

data/lib/fitgem_oauth2/utils.rb

@@ -1,29 +1,32 @@
+# frozen_string_literal: true
+
 module FitgemOauth2
   class Client
     def format_date(date)
-
       return nil if date.nil?
 
-      valid_semantic_date = %w[today yesterday].include? date
-      valid_date_string = (date =~ /\d{4}\-\d{2}\-\d{2}/) == 0
-      if valid_date_string
+      if date.is_a?(String) && date.match?(/\A\d{4}-\d{2}-\d{2}\z/)
         date
-      elsif valid_semantic_date
+      elsif date.is_a?(String) && %w[today yesterday].include?(date)
         date_from_semantic(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}"
+        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
+      if time.is_a?(String) && time.match?(/\A\d{2}:\d{2}\z/)
         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}"
+        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
 
@@ -38,7 +41,7 @@ module FitgemOauth2
     private
 
     def date_from_semantic(semantic)
-      if semantic === 'yesterday'
+      if semantic == 'yesterday'
         (Date.today - 1).strftime('%Y-%m-%d')
       elsif semantic == 'today'
         Date.today.strftime('%Y-%m-%d')

data/lib/fitgem_oauth2/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module FitgemOauth2
-  VERSION = '2.2.0'.freeze
+  VERSION = '4.0.0'
 end

data/lib/fitgem_oauth2.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fitgem_oauth2
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Ankit Gupta
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-26 00:00:00.000000000 Z
+date: 2026-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '13.0'
 - !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: []
@@ -93,8 +93,9 @@ files:
 homepage: http://rubygems.org/gems/fitgem_oauth2
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -102,15 +103,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Fitbit API client library
 test_files: []