nexo 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf53f0b9f6a1041943a11b96d6688fc0506528d29d855615fb651f56d7dfdb81
-  data.tar.gz: 1b707625c9f1f621daf84912c2bb2de01e008f4b7d7024c31dae0c7fa6019448
+  metadata.gz: ba5c579264ba2dddff0d51feddf0f28a92947c507852131030f958bc3b4911a5
+  data.tar.gz: 2f1e9ef346625a560dbc98ee357684422b5d9170ae123f82130d2e5ced7e01bb
 SHA512:
-  metadata.gz: 536a191c758d2ac7ccab8a5780a1d568820723571b9682382b71b5324de83109179882a1777b2a7380061e8289efec8c9c0e470c8f758ba2ec26a1c57117e575
-  data.tar.gz: 2f5509307f988bcf11bd57e7582713f7d2dd187f53a6e915ca43050c476363ea427c43cd811ce7a968c90422bf560e79f530aec7f4d4a4fcb001856a2e448514
+  metadata.gz: abdd4355a1dab11e798acca2c37bda4c4b0c133fd8e6a36e6ae8eadbb79ea1c6522d325333ba2f54461e37383a042632fb3599bfb5fcfc0526c46b661b2d1ffc
+  data.tar.gz: 073eed8eac35693101915193ee7493581ca483c37cf297a6d7adbb9313bc13005184a697002d6a4fede2876d8e487b6b50fa6e971d386571f7ae338fe3077307

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

@@ -17,7 +17,7 @@ module Nexo
     def store(integration, token)
       ActiveRecord::Base.transaction do
         # Maybe these should be destroyed
-        integration.tokens.active.update_all(tpt_status: :expired)
+        integration.tokens.active.update_all(nt_status: :expired)
 
         Token.create!(integration:, secret: token)
       end
@@ -28,7 +28,7 @@ module Nexo
       token = find_by_id(id)
 
       if token.present?
-        token.update!(tpt_status: :revoked)
+        token.update!(nt_status: :revoked)
       else
         # TODO: pg_warn("Couldn't find token for revocation: #{id}")
       end
@@ -37,7 +37,7 @@ module Nexo
     private
 
     def find_by_id(id)
-      Token.where(environment: Rails.env, integration: id, tpt_status: :active).last
+      Token.where(environment: Rails.env, integration: id, nt_status: :active).last
     end
   end
 end

data/app/lib/nexo/api_client/google_auth_service.rb

@@ -53,9 +53,13 @@ module Nexo
     # Guarda el Token
     # Si el client tiene más permisos que los que el user solicitó
     def get_credentials(request = nil)
-      if request.present? && request.session["code_verifier"].present?
+      if request.present?
         # :nocov: tricky
-        authorizer.code_verifier = request.session["code_verifier"]
+        if request.session["code_verifier"].present?
+          authorizer.code_verifier = request.session["code_verifier"]
+        else
+          Rails.logger.warn("Request has no code_verifier")
+        end
         # :nocov:
       end
       authorizer.get_credentials @integration, request
@@ -63,11 +67,11 @@ module Nexo
       # TODO: log
     end
 
-    def get_authorization_url(request)
+    def get_authorization_url(request, login_hint: nil)
       request.session["code_verifier"] ||= Google::Auth::WebUserAuthorizer.generate_code_verifier
       authorizer.code_verifier = request.session["code_verifier"]
-      authorizer.get_authorization_url(request:)
-      # authorizer.get_authorization_url(request:, login_hint: "bla@gmail.com")
+      # authorizer.get_authorization_url(request:)
+      authorizer.get_authorization_url(request:, login_hint:)
     end
 
     private

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
     #
@@ -39,11 +41,26 @@ module Nexo
 
     # Create a Google calendar
     def insert_calendar(folder)
+      unless folder.integration.token?
+        raise Errors::Error, "folder has no token"
+      end
+
       cal = build_calendar(folder)
       response = client.insert_calendar(cal)
       ApiResponse.new(payload: response.to_json, status: :ok, etag: response.etag, id: response.id)
     end
 
+    # Create a Google calendar
+    def update_calendar(folder)
+      unless folder.integration.token?
+        raise Errors::Error, "folder has no token"
+      end
+
+      cal = build_calendar(folder)
+      response = client.update_calendar(folder.external_identifier, 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)
@@ -65,6 +82,10 @@ module Nexo
     private
 
     def validate_folder_state!(folder)
+      unless folder.integration.token?
+        raise Errors::Error, "folder has no token"
+      end
+
       if folder.external_identifier.blank?
         raise Errors::InvalidFolderState, folder
       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

@@ -2,14 +2,13 @@
 #
 # Table name: nexo_clients
 #
-#  id                        :bigint           not null, primary key
-#  service                   :integer
-#  secret                    :string
-#  tcp_status                :integer
-#  brand_name                :integer
-#  user_integrations_allowed :boolean
-#  created_at                :datetime         not null
-#  updated_at                :datetime         not null
+#  id         :bigint           not null, primary key
+#  service    :integer
+#  secret     :string
+#  nc_status  :integer
+#  brand_name :integer
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
 #
 require "google-apis-calendar_v3"
 require "google-apis-oauth2_v2"
@@ -27,9 +26,9 @@ module Nexo
     encrypts :secret
 
     enum :service, google: 0
-    enum :tcp_status, authorized: 0, disabled: 1, expired: 2
+    enum :nc_status, authorized: 0, disabled: 1, expired: 2
 
-    validates :service, :tcp_status, :secret, presence: true
+    validates :service, :nc_status, :secret, presence: true
 
     serialize :secret, coder: JSON
 

data/app/models/nexo/element.rb

@@ -7,8 +7,8 @@
 #  synchronizable_id   :integer          not null
 #  synchronizable_type :string           not null
 #  uuid                :string
-#  flag_deletion       :boolean          not null
-#  deletion_reason     :integer
+#  flagged_for_removal :boolean          not null
+#  removal_reason      :integer
 #  conflicted          :boolean          default(FALSE), not null
 #  discarded_at        :datetime
 #  created_at          :datetime         not null
@@ -22,12 +22,12 @@ module Nexo
 
     after_initialize do
       # TODO: https://api.rubyonrails.org/classes/ActiveRecord/Attributes/ClassMethods.html#method-i-attribute
-      self.flag_deletion = false if flag_deletion.nil?
+      self.flagged_for_removal = false if flagged_for_removal.nil?
     end
 
     scope :kept, -> { where(discarded_at: nil) }
 
-    enum :deletion_reason, no_longer_included_in_folder: 0, synchronizable_destroyed: 1
+    enum :removal_reason, no_longer_included_in_folder: 0, synchronizable_destroyed: 1
 
     scope :conflicted, -> { where(conflicted: true) }
 
@@ -47,12 +47,12 @@ module Nexo
       element_versions.where(sequence: nil).order(created_at: :desc).first
     end
 
-    def flag_for_deletion!(deletion_reason)
-      update!(flag_deletion: true, deletion_reason:)
+    def flag_for_deletion!(removal_reason)
+      update!(flagged_for_removal: true, removal_reason:)
     end
 
     def flagged_for_deletion?
-      flag_deletion?
+      flagged_for_removal?
     end
 
     # :nocov: TODO, not yet being called

data/app/models/nexo/folder.rb

@@ -4,7 +4,7 @@
 #
 #  id                  :bigint           not null, primary key
 #  integration_id      :bigint           not null
-#  protocol            :integer          not null
+#  nexo_protocol       :integer          not null
 #  external_identifier :string
 #  name                :string
 #  description         :string
@@ -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
 
@@ -52,6 +57,10 @@ module Nexo
       end
     end
 
+    def token?
+      token_status.in? [ :active_token, :expired_token ]
+    end
+
     def credentials
       service = ServiceBuilder.instance.build_auth_service(self)
       @credentials ||= service.get_credentials

data/app/models/nexo/token.rb

@@ -5,7 +5,7 @@
 #  id             :bigint           not null, primary key
 #  integration_id :bigint           not null
 #  secret         :string
-#  tpt_status     :integer          not null
+#  nt_status      :integer          not null
 #  environment    :string           not null
 #  created_at     :datetime         not null
 #  updated_at     :datetime         not null
@@ -16,14 +16,14 @@ module Nexo
 
     after_initialize do
       # TODO: https://api.rubyonrails.org/classes/ActiveRecord/Attributes/ClassMethods.html#method-i-attribute
-      self.tpt_status = :active if tpt_status.nil?
+      self.nt_status = :active if nt_status.nil?
       self.environment = Rails.env if environment.nil?
     end
 
     encrypts :secret
 
-    enum :tpt_status, active: 0, revoked: 1, expired: 2
+    enum :nt_status, active: 0, revoked: 1, expired: 2
 
-    validates :secret, :tpt_status, :environment, presence: true
+    validates :secret, :nt_status, :environment, presence: true
   end
 end

data/db/migrate/20250505192315_create_nexo_clients.rb

@@ -3,7 +3,7 @@ class CreateNexoClients < ActiveRecord::Migration[7.2]
     create_table :nexo_clients do |t|
       t.integer :service
       t.string :secret
-      t.integer :tcp_status
+      t.integer :nc_status
       t.integer :brand_name
 
       t.timestamps

data/db/migrate/20250506125057_create_nexo_tokens.rb

@@ -3,7 +3,7 @@ class CreateNexoTokens < ActiveRecord::Migration[7.2]
     create_table :nexo_tokens do |t|
       t.references :integration, null: false, foreign_key: { to_table: :nexo_integrations }
       t.string :secret
-      t.integer :tpt_status, null: false
+      t.integer :nt_status, null: false
       t.string :environment, null: false
 
       t.timestamps

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/migrate/20250512025950_create_nexo_elements.rb

@@ -5,8 +5,8 @@ class CreateNexoElements < ActiveRecord::Migration[7.2]
       t.integer :synchronizable_id, null: false, index: true
       t.string :synchronizable_type, null: false, index: true
       t.string :uuid
-      t.boolean :flag_deletion, null: false
-      t.integer :deletion_reason
+      t.boolean :flagged_for_removal, null: false
+      t.integer :removal_reason
       t.boolean :conflicted, null: false, default: false
       t.datetime :discarded_at, index: true
 

data/db/seeds.rb

@@ -4,7 +4,7 @@ module Nexo
 
   if ENV.fetch('SEED_GOOGLE_APIS_CLIENT_SECRET', nil)
     client = Client.create!(
-      tcp_status: 0,
+      nc_status: 0,
       service: "google",
       secret: JSON.parse(ENV.fetch('SEED_GOOGLE_APIS_CLIENT_SECRET'))
     )
@@ -20,7 +20,7 @@ module Nexo
       Nexo::Token.create!(
         integration:,
         secret: ENV.fetch('SEED_GOOGLE_APIS_TOKEN'),
-        tpt_status: :active,
+        nt_status: :active,
         environment: "development"
       )
     end

data/lib/nexo/version.rb

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

metadata

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