fitgem_oauth2 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a44729eac25ad59456fd80349a81601d3cfb0b1d
-  data.tar.gz: e25cdbdb1aa13afbee75be71346cedd79017f5e2
+  metadata.gz: ae7eec9fd825f4fc19feafe55ca51d3b6e176fdd
+  data.tar.gz: 0b1d4f6fb319465919049c96c8d4e2f731ad22c8
 SHA512:
-  metadata.gz: 57e3f6d902486eb0cccdd97287679ada85f37292a23d919c2609e8b8d25b2e094208db0787c0ef848f6f764fd22d976ad266494f31fd4b687150f1f7297b1d05
-  data.tar.gz: b78b7552f6cff0b355d6a90a9d7fc349a2499a9a195066d7ae744158b1906d948518438285070fa5a9c163ce6b5c163330d248aaaca059e6178ff333ba7f87ba
+  metadata.gz: 49b06536b0b23e8645666d85c67081a047ca2b125b1398fa1cde532f441a65cdd10c1f5d2c657df14fed795e6ffaccbbb6690a92d81f77039616e960a1000931
+  data.tar.gz: '0691da40e4d1dcf14757ecd6656a5b391d537223bb00f09d8028327b7f79e201711d71f0538619578cc1d467a50041ddb428366c6ab73200ed3abda847baa7c5'

data/lib/fitgem_oauth2/client.rb

@@ -107,10 +107,10 @@ module FitgemOauth2
           },
           201 => lambda { },
           204 => lambda { },
-          400 => lambda { raise FitgemOauth2::BadRequestError, JSON.parse(response.body) },
-          401 => lambda { raise FitgemOauth2::UnauthorizedError, JSON.parse(response.body) },
-          403 => lambda { raise FitgemOauth2::ForbiddenError, JSON.parse(response.body) },
-          404 => lambda { raise FitgemOauth2::NotFoundError, JSON.parse(response.body) },
+          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 }
       }
 

data/lib/fitgem_oauth2/food.rb

@@ -9,9 +9,32 @@ module FitgemOauth2
     #   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(resource: nil, start_date: nil, end_date: nil, period: nil)
+    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
@@ -153,5 +176,21 @@ module FitgemOauth2
     def search_foods(params)
       post_call('foods/search.json', params)
     end
+
+    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
+
+    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'
+    end
   end
 end

data/lib/fitgem_oauth2/heartrate.rb

@@ -4,12 +4,70 @@ module FitgemOauth2
     HR_PERIODS = %w(1d 7d 30d 1w 1m)
     HR_DETAIL_LEVELS = %w(1sec 1min)
 
+    def hr_series_for_date_range(start_date, end_date)
+      validate_start_date(start_date)
+      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')
+    end
+
+    def hr_series_for_period(start_date, period)
+      validate_start_date(start_date)
+      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)
-      unless start_date
-        raise FitgemOauth2::InvalidArgumentError, 'Start date not provided.'
+      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(
+        start_date: start_date,
+        end_date: end_date,
+        detail_level: detail_level,
+        start_time: start_time,
+        end_time: end_time
+      )
+
+      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
+        url = [url, 'time', format_time(start_time), format_time(end_time)].join('/')
       end
 
+      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
@@ -18,19 +76,11 @@ module FitgemOauth2
         raise FitgemOauth2::InvalidArgumentError, 'Neither end_date nor period specified. Specify at least one.'
       end
 
-      if period && !HR_PERIODS.include?(period)
-        raise FitgemOauth2::InvalidArgumentError, "Invalid period: #{period}. Valid periods are #{HR_PERIODS}."
-      end
-
-      second = period || format_date(end_date)
-
-      url = ['user', user_id, 'activities/heart/date', format_date(start_date), second].join('/')
-
-      get_call(url + '.json')
+      validate_hr_period(period) if period
     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_series_guard(start_date:, end_date:, detail_level:, start_time:, end_time:)
       unless start_date
         raise FitgemOauth2::InvalidArgumentError, 'Start date not provided.'
       end
@@ -39,19 +89,9 @@ module FitgemOauth2
         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(url + '.json')
     end
   end
 end

data/lib/fitgem_oauth2/utils.rb

@@ -2,7 +2,6 @@ module FitgemOauth2
   class Client
 
     def format_date(date)
-
       if !date
         return nil
       end
@@ -30,6 +29,18 @@ module FitgemOauth2
       end
     end
 
+    def validate_start_date(start_date)
+      unless start_date
+        raise FitgemOauth2::InvalidArgumentError, 'Please specify a valid start date.'
+      end
+    end
+
+    def validate_end_date(end_date)
+      unless end_date
+        raise FitgemOauth2::InvalidArgumentError, 'Please specify a valid end date.'
+      end
+    end
+
     private
     def date_from_semantic(semantic)
       if semantic === 'yesterday'

data/lib/fitgem_oauth2/version.rb

@@ -1,3 +1,3 @@
 module FitgemOauth2
-  VERSION = '1.1.2'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fitgem_oauth2
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Ankit Gupta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-08 00:00:00.000000000 Z
+date: 2018-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -107,9 +107,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Fitbit API client library
 test_files: []
-has_rdoc: