nexo 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 762b84bd5b5d458091d881a7227c7680048e1ae206e4eef1e6d94246e7be238b
-  data.tar.gz: e5358a64b012b93ffbc7a2f67c21e5179df2d7a7a5581771c1ee97c2466b20e9
+  metadata.gz: bf53f0b9f6a1041943a11b96d6688fc0506528d29d855615fb651f56d7dfdb81
+  data.tar.gz: 1b707625c9f1f621daf84912c2bb2de01e008f4b7d7024c31dae0c7fa6019448
 SHA512:
-  metadata.gz: ecf2eb80621fdce1e6d137dc6d5122fe66db21d893349a86e75d1e4251f73dd120eb6cc3e7f2d899b461a118a20dee7e4fa60ed919819a15204a4787fcde7ca2
-  data.tar.gz: 2389d6ea2996feeeae34a3256ca89037f5d2b0acf658d6e02345d349b5e44712870fd32ed3e7e3421dcd37a1068be3aa83ecba5e74cf221ad312f4797659ca88
+  metadata.gz: 536a191c758d2ac7ccab8a5780a1d568820723571b9682382b71b5324de83109179882a1777b2a7380061e8289efec8c9c0e470c8f758ba2ec26a1c57117e575
+  data.tar.gz: 2f5509307f988bcf11bd57e7582713f7d2dd187f53a6e915ca43050c476363ea427c43cd811ce7a968c90422bf560e79f530aec7f4d4a4fcb001856a2e448514

data/app/jobs/nexo/api_clients.rb

@@ -7,6 +7,9 @@ module Nexo
 
       queue_as :api_clients
 
+      # TODO!: configure good job queues and thread pools
+      # https://github.com/bensheldon/good_job?tab=readme-ov-file#optimize-queues-threads-and-processes
+      # TODO: make this configurable, so other job backends are allowed
       good_job_control_concurrency_with(
         perform_limit: 1,
 
@@ -18,7 +21,10 @@ module Nexo
       retry_on(
         GoodJob::ActiveJobExtensions::Concurrency::ConcurrencyExceededError,
         attempts: Float::INFINITY,
-        wait: ->(executions) { ((executions**3) + (Kernel.rand * (executions**3) * 0.5)) + 2 }
+        wait: :polynomially_longer,
+        jitter: 0.99,
+        # wait: ->(executions) { ((executions**4) + (Kernel.rand * (executions**4) * jitter)) + 2 }
+        # wait: ->(executions) { ((executions**3) + (Kernel.rand * (executions**3) * 0.5)) + 2 }
       )
     end
   end

data/app/jobs/nexo/sync_element_job.rb

@@ -14,6 +14,8 @@ module Nexo
   class SyncElementJob < BaseJob
     limits_concurrency key: ->(element) { element.to_gid }
 
+    # TODO!: set priority based on date distance to today
+
     # discard_on Errors::SyncElementJobError
     # retry_on StandardError, wait: :polynomially_longer
 

data/app/jobs/nexo/update_remote_resource_job.rb

@@ -26,6 +26,18 @@ module Nexo
     private
 
     def validate_element_state!
+      if element.synchronizable.blank?
+        raise Errors::SynchronizableNotFound
+      end
+
+      if element.synchronizable.respond_to?(:discarded?) && element.synchronizable.discarded?
+        raise Errors::SynchronizableDiscarded
+      end
+
+      if element.folder.discarded?
+        raise Errors::FolderDiscarded
+      end
+
       if element.synchronizable.conflicted?
         raise Errors::ElementConflicted
       end

data/app/lib/nexo/errors.rb

@@ -7,6 +7,8 @@ module Nexo
     class ElementAlreadySynced < Error; end
     class MoreThanOneElementInFolderForSynchronizable < Error; end
     class InvalidFolderState < Error; end
+    class FolderDiscarded < Error; end
+    class SynchronizableDiscarded < Error; end
 
     # on ControllerHelper
     class InvalidParamsError < Error; end

data/app/models/nexo/client.rb

@@ -29,8 +29,7 @@ module Nexo
     enum :service, google: 0
     enum :tcp_status, authorized: 0, disabled: 1, expired: 2
 
-    validates :service, :user_integrations_allowed,
-              :tcp_status, :secret, presence: true
+    validates :service, :tcp_status, :secret, presence: true
 
     serialize :secret, coder: JSON
 

data/db/migrate/20250505192315_create_nexo_clients.rb

@@ -5,7 +5,6 @@ class CreateNexoClients < ActiveRecord::Migration[7.2]
       t.string :secret
       t.integer :tcp_status
       t.integer :brand_name
-      t.boolean :user_integrations_allowed
 
       t.timestamps
     end

data/db/seeds.rb

@@ -1,3 +1,28 @@
 module Nexo
-  # Nexo seeds
+  ENV.fetch('SEED_GOOGLE_APIS_CLIENT_SECRET', nil) || puts("WARN: env variable SEED_GOOGLE_APIS_CLIENT_SECRET not found")
+  ENV.fetch('SEED_GOOGLE_APIS_TOKEN', nil) || puts("WARN: env variable SEED_GOOGLE_APIS_TOKEN not found")
+
+  if ENV.fetch('SEED_GOOGLE_APIS_CLIENT_SECRET', nil)
+    client = Client.create!(
+      tcp_status: 0,
+      service: "google",
+      secret: JSON.parse(ENV.fetch('SEED_GOOGLE_APIS_CLIENT_SECRET'))
+    )
+    user = User.first
+    integration = Nexo::Integration.create!(
+      user:,
+      client:,
+      name: "Default integration",
+      scope: [ "auth_calendar_app_created" ]
+    )
+
+    if ENV.fetch('SEED_GOOGLE_APIS_TOKEN', nil)
+      Nexo::Token.create!(
+        integration:,
+        secret: ENV.fetch('SEED_GOOGLE_APIS_TOKEN'),
+        tpt_status: :active,
+        environment: "development"
+      )
+    end
+  end
 end

data/lib/nexo/version.rb

@@ -1,5 +1,5 @@
 # :nocov: non-viable
 module Nexo
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end
 # :nocov:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nexo
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Martín Rosso