huginn_strava_agent 0.1.0 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a55c6b9aa8da90dfc00921d4abdb3d6d4d2fbb5eb4be4d900f2d6b190212cd2f
-  data.tar.gz: f0b692a9c4f0b4190bca1127548d7d8c47309c94577399e4d52696fbcc59baaa
+  metadata.gz: cc6684033edfcf1fa8b4b600fc5eac5d6f217bccb063c45972a5d4295d6d23d1
+  data.tar.gz: f9549083e22ad194108b71a30eb99f261807cbb60a4fa0c4d90302bc91f0b902
 SHA512:
-  metadata.gz: 6068f85287987fd86efd7596d8b2b926eca883375ae47c55b561dd86e47f358b3c5c51da2ab5f010717040f3a26527b9f80f4dbc3a6c36ac3172d73b18af7383
-  data.tar.gz: 256fca42c3a56f193a4c2f3bfb436f7b6772448c9cd24ceb2c0c46ffd020751c238d039a709b6a70cbf7c99411839925aab7e501309291ca79f22a8109edce26
+  metadata.gz: f4d13b291a2220746b6c6a9244502301806ded70cafcaa5e4c9d686b18da69de85b4e13ccb7d1b06f2409ce961ac6edf03103ffc42295e03e9e0b988412b546e
+  data.tar.gz: 49901394e2ed814d70742704ca17986de380123a70c68545a3679d337c744027293df23e2c0a71ce332c2e95860d8da93120b503619c107001321291d0f91406

data/lib/huginn_strava_agent/strava_agent.rb

@@ -17,6 +17,8 @@ module Agents
 
       `refresh_token` is needed to refresh your token.
 
+      `per_page` is the number of result per page when possible.
+
       `client_id` is mandatory for authentication.
 
       `client_secret` is mandatory for authentication.
@@ -101,6 +103,7 @@ module Agents
         'client_secret' => '',
         'refresh_token' => '',
         'bearer_token' => '',
+        'per_page' => '5',
         'debug' => 'false',
         'expected_receive_period_in_days' => '2',
       }
@@ -111,11 +114,16 @@ module Agents
     form_configurable :client_secret, type: :string
     form_configurable :refresh_token, type: :string
     form_configurable :bearer_token, type: :string
+    form_configurable :per_page, type: :string
     form_configurable :debug, type: :boolean
     form_configurable :expected_receive_period_in_days, type: :string
     def validate_options
       errors.add(:base, "type has invalid value: should be 'token_refresh' 'get_activities'") if interpolated['type'].present? && !%w(token_refresh get_activities).include?(interpolated['type'])
 
+      unless options['per_page'].present? || !['get_activities'].include?(options['type'])
+        errors.add(:base, "per_page is a required field")
+      end
+
       unless options['client_id'].present?
         errors.add(:base, "client_id is a required field")
       end
@@ -194,22 +202,23 @@ module Agents
       log_curl_output(response.code,response.body)
 
       payload = JSON.parse(response.body)
-      memory['expires_at'] = payload['expires_at']
+      memory['credentials'] = payload
 
     end
     
     def check_token_validity()
 
-      timestamp_to_compare = memory['expires_at']
-      
-      current_timestamp = Time.now.to_i
-      
-      difference_in_hours = (timestamp_to_compare - current_timestamp) / 3600.0
-      
-      if difference_in_hours < 2
+      if memory['credentials'].nil?
         token_refresh()
       else
-        log "refresh not needed"
+        timestamp_to_compare = memory['credentials']['expires_at']
+        current_timestamp = Time.now.to_i
+        difference_in_hours = (timestamp_to_compare - current_timestamp) / 3600.0
+        if difference_in_hours < 2
+          token_refresh()
+        else
+          log "refresh not needed"
+        end
       end
 
     end
@@ -217,7 +226,7 @@ module Agents
     def get_activities()
 
       check_token_validity()
-      uri = URI.parse("https://www.strava.com/api/v3/athlete/activities")
+      uri = URI.parse("https://www.strava.com/api/v3/athlete/activities?per_page=#{interpolated['per_page']}")
       request = Net::HTTP::Get.new(uri)
       request["Authorization"] = "Bearer #{interpolated['bearer_token']}"
       
@@ -236,7 +245,7 @@ module Agents
       if payload != memory['last_status']
         payload.each do |activity|        
           found = false
-          if !memory['last_status'].nil? and memory['last_status']['activity'].present?
+          if !memory['last_status'].nil? and memory['last_status'].present?
             last_status = memory['last_status']
             if interpolated['debug'] == 'true'
               log "last_status"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: huginn_strava_agent
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.11
 platform: ruby
 authors:
 - Nicolas Germain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-25 00:00:00.000000000 Z
+date: 2023-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler