fitgem_oauth2 1.0.6 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb51e84b554b9bfd42cf907270a1e106073df925
-  data.tar.gz: 5b8892fc431c2246761155624c34f41c3772803b
+  metadata.gz: c416d838d7d7c317ab66ac5eb9997a8bd7fab6b9
+  data.tar.gz: ec9445743a11afa6d4e593a914e3a58ec0763a19
 SHA512:
-  metadata.gz: 4a1607113fa93cc5ffdd266884101a8d857c5bee78b2c6d1c959006b83692c018b03044516f7ef320d0d17a2d89bc9e2db071dbf9b8538091ade106114aada4d
-  data.tar.gz: e106e723fd46fe78939a22c4904ca5126675155333f196c5ec091f50e734fb0f771176ad1f5b77d66d285ab192cd382375d18186a49cb05d5b0cf1e2e46aa632
+  metadata.gz: e1176e66831bdba9d9f812b77c3f15dd684f6a3074f5f3e99eea02ff532d85a3d2083c12fe735c47b7906ed37c9e69c165bfb81f2f1c91115f32161cbca51c02
+  data.tar.gz: 120483a98d665ededc548c593e71ef733c373ad28fb4e871f543e187bc37ea91d5a9cffc126f9cb27c0a072bb642b2e97f21272441386996f775a58b6b77a55c

data/lib/fitgem_oauth2/activity.rb

@@ -109,8 +109,16 @@ module FitgemOauth2
     end
 
     # retrieves activity list for the user
-    def activity_list
-      get_call("user/#{user_id}/activities/list.json")
+    def activity_list(date, sort, limit)
+      date_param = format_date(date)
+      if sort == "asc"
+        date_param = "afterDate=#{date_param}"
+      elsif sort == "desc"
+        date_param = "beforeDate=#{date_param}"
+      else
+        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
 
     # retrieves activity list in the tcx format

data/lib/fitgem_oauth2/client.rb

@@ -57,12 +57,27 @@ module FitgemOauth2
       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)
+      url = "1.2/#{url}"
+      response = connection.get(url) {|request| set_headers(request)}
+      parse_response(response)
+    end
+
     def post_call(url, params = {})
       url = "#{API_VERSION}/#{url}"
       response = connection.post(url, params) { |request| set_headers(request) }
       parse_response(response)
     end
 
+    def post_call_1_2(url, params = {})
+      url = "1.2/#{url}"
+      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) }
@@ -85,7 +100,10 @@ module FitgemOauth2
           200 => lambda {
             body = JSON.parse(response.body)
             body = {body: body} if body.is_a?(Array)
-            body.merge!(response.headers.slice(*headers_to_keep))
+            headers = response.headers.to_hash.keep_if { |k,v|
+              headers_to_keep.include? k
+            }
+            body.merge!(headers)
           },
           201 => lambda { },
           204 => lambda { },

data/lib/fitgem_oauth2/sleep.rb

@@ -8,7 +8,23 @@ 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("user/#{user_id}/sleep/date/#{format_date(date)}.json")
+      get_call_1_2("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")
+    end
+
+    def sleep_logs_list(date, sort, limit)
+      date_param = format_date(date)
+      if sort == "asc"
+        date_param = "afterDate=#{date_param}"
+      elsif sort == "desc"
+        date_param = "beforeDate=#{date_param}"
+      else
+        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
 
     # retrieve sleep goal for the user
@@ -54,7 +70,7 @@ module FitgemOauth2
     # log sleep
     # @param params POST params for creating sleep log
     def log_sleep(params)
-      post_call("user/#{user_id}/sleep.json", params)
+      post_call_1_2("user/#{user_id}/sleep.json", params)
     end
 
     # deleted sleep log
@@ -62,7 +78,5 @@ module FitgemOauth2
     def delete_logged_sleep(log_id)
       delete_call("user/#{user_id}/sleep/#{log_id}.json")
     end
-    
   end
-
 end

data/lib/fitgem_oauth2/version.rb

@@ -1,3 +1,3 @@
 module FitgemOauth2
-  VERSION = '1.0.6'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fitgem_oauth2
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.1
 platform: ruby
 authors:
 - Ankit Gupta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-14 00:00:00.000000000 Z
+date: 2017-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday