nexo 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 762b84bd5b5d458091d881a7227c7680048e1ae206e4eef1e6d94246e7be238b
-  data.tar.gz: e5358a64b012b93ffbc7a2f67c21e5179df2d7a7a5581771c1ee97c2466b20e9
+  metadata.gz: 8e9cc07511456093aa96d53df983acf4bfc770ba3de05df5bacfb683f80840ca
+  data.tar.gz: 5b1918e753e917ac5e0331aa5d49fe03a5d0fcb87d64fc36bab85af638b79246
 SHA512:
-  metadata.gz: ecf2eb80621fdce1e6d137dc6d5122fe66db21d893349a86e75d1e4251f73dd120eb6cc3e7f2d899b461a118a20dee7e4fa60ed919819a15204a4787fcde7ca2
-  data.tar.gz: 2389d6ea2996feeeae34a3256ca89037f5d2b0acf658d6e02345d349b5e44712870fd32ed3e7e3421dcd37a1068be3aa83ecba5e74cf221ad312f4797659ca88
+  metadata.gz: 973db6311a60eb0534b3ca072976190bb3b5be953bc3b8f6cbb6e39207ba127b54711dd5ec0adbcc3f2c5cc4c4272302ca558ad0572c687f6864402e7bec4bde
+  data.tar.gz: 79ba89ed8a6dbbd17bdf8c6c055df802fb9ec4cca686075d2f5e2653c776d1b38599371158bd58fb3779aef6dffd8718bd9ea8b5c42e2403a30d917a5aa72505

data/README.md

@@ -21,6 +21,11 @@ Or install it yourself as:
 $ gem install nexo
 ```
 
+Install good_job
+Configure good_job
+    max_threads:
+    queues:
+
 ## Contributing
 Contribution directions go here.
 

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/folder_destroy_job.rb

@@ -4,6 +4,8 @@ module Nexo
       if folder.external_identifier.present?
         protocol_service = ServiceBuilder.instance.build_protocol_service(folder)
         response = protocol_service.remove_calendar(folder)
+      else
+        Rails.logger.info("Folder doesn't have external_identifier: #{folder.to_gid}")
       end
     end
   end

data/app/jobs/nexo/folder_sync_job.rb

@@ -1,10 +1,12 @@
 module Nexo
   class FolderSyncJob < BaseJob
     def perform(folder)
+      protocol_service = ServiceBuilder.instance.build_protocol_service(folder)
       if folder.external_identifier.blank?
-        protocol_service = ServiceBuilder.instance.build_protocol_service(folder)
         response = protocol_service.insert_calendar(folder)
         folder.update(external_identifier: response.id)
+      else
+        protocol_service.update_calendar(folder)
       end
 
       policies = PolicyService.instance.policies_for(folder)

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/api_client/google_calendar_service.rb

@@ -3,8 +3,10 @@ module Nexo
   #
   # @raise [Google::Apis::ClientError] possible messages:
   #   - duplicate: The requested identifier already exists.
-  #   - notFound: Not Found
-  #   - forbidden: Forbidden (cuando se intenta updatear un evento que ya fue borrado)
+  #   - notFound: Not Found (calendar not exists or was deleted)
+  #   - forbidden: Forbidden (event to update was deleted)
+  #
+  # TODO! when event to update was deleted, create a new one and warn
   class GoogleCalendarService < CalendarService
     # Create an event in a Google Calendar
     #
@@ -44,6 +46,13 @@ module Nexo
       ApiResponse.new(payload: response.to_json, status: :ok, etag: response.etag, id: response.id)
     end
 
+    # Create a Google calendar
+    def update_calendar(folder)
+      cal = build_calendar(folder)
+      response = client.update_calendar(cal)
+      ApiResponse.new(payload: response.to_json, status: :ok, etag: response.etag, id: response.id)
+    end
+
     def remove_calendar(folder)
       client.delete_calendar(folder.external_identifier)
       ApiResponse.new(status: :ok)

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/lib/nexo/service_builder.rb

@@ -10,7 +10,7 @@ module Nexo
     end
 
     def build_protocol_service(folder)
-      service_klass_name = "#{folder.integration.client.service}_#{folder.protocol}_service".camelcase
+      service_klass_name = "#{folder.integration.client.service}_#{folder.nexo_protocol}_service".camelcase
       build_service(service_klass_name, folder.integration)
     end
 

data/app/models/concerns/nexo/synchronizable.rb

@@ -62,7 +62,7 @@ module Nexo
     def update_from!(element_version)
       transaction do
         # TODO: parse the element_version.payload
-        # and set the Synchronizable fields according to the Folder#protocol
+        # and set the Synchronizable fields according to the Folder#nexo_protocol
 
         new_sequence = increment_sequence!
         element_version.update_sequence!(new_sequence)

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/app/models/nexo/folder.rb

@@ -18,14 +18,14 @@ module Nexo
     has_many :elements, class_name: "Nexo::Element"
 
     if respond_to?(:enumerize)
-      enumerize :protocol, in: { calendar: 0, dummy_calendar: 1 }
+      enumerize :nexo_protocol, in: { calendar: 0, dummy_calendar: 1 }
     else
-      enum :protocol, calendar: 0, dummy_calendar: 1
+      enum :nexo_protocol, calendar: 0, dummy_calendar: 1
     end
 
     scope :kept, -> { where(discarded_at: nil) }
 
-    validates :protocol, :name, presence: true
+    validates :nexo_protocol, :name, presence: true
 
     # TODO!: find better name
     # maybe policy_applies?

data/app/models/nexo/integration.rb

@@ -21,6 +21,11 @@ module Nexo
     belongs_to :user
     belongs_to :client, class_name: "Nexo::Client"
     has_many :tokens, class_name: "Nexo::Token"
+    has_many :folders, class_name: "Nexo::Folder"
+
+    before_validation do
+      self.scope = scope.select(&:present?)
+    end
 
     validates :scope, presence: true
 

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/migrate/20250512025423_create_nexo_folders.rb

@@ -2,7 +2,7 @@ class CreateNexoFolders < ActiveRecord::Migration[7.2]
   def change
     create_table :nexo_folders do |t|
       t.references :integration, null: false, foreign_key: { to_table: :nexo_integrations }
-      t.integer :protocol, null: false
+      t.integer :nexo_protocol, null: false
       t.string :external_identifier
       t.string :name
       t.string :description

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.4"
 end
 # :nocov:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nexo
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-05-21 00:00:00.000000000 Z
+date: 2025-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails