nexo 0.1.5 → 0.1.7

data/app/views/nexo/element_versions/show.html.erb

@@ -0,0 +1,16 @@
+<h1>Element version</h1>
+<%= link_to "Back to element", element_path(@element_version.element) %>
+
+<%= form_with(url: sync_element_version_path(@element_version)) do |f| %>
+  <%= hidden_field_tag "operation", "import" %>
+  <%= f.submit "Import" %>
+<% end %>
+
+<%= form_with(url: sync_element_version_path(@element_version)) do |f| %>
+  <%= hidden_field_tag "operation", "update_remote" %>
+  <%= f.submit "Update remote" %>
+<% end %>
+
+<pre>
+<%= JSON.pretty_generate @element_version.as_json %>
+</pre>

data/app/views/nexo/elements/index.html.erb

@@ -0,0 +1,40 @@
+<%= link_to "All", "?" %>
+<%= link_to "Not synced", "?not_synced=1" %>
+<%= link_to "Without synchronizable", "?without_synchronizable=1" %>
+<h1>Elements</h1>
+<table>
+  <tr>
+    <th></th>
+    <th>ID</th>
+    <th>User</th>
+    <th>Folder</th>
+    <th>Synchronizable</th>
+    <th>Status</th>
+    <th>Updated at</th>
+    <th>Created at</th>
+    <th>Remote status</th>
+    <th>Flagged for removal?</th>
+    <th>Discarded at</th>
+  </tr>
+  <% @elements.each do |element| %>
+    <tr>
+      <td><%= link_to "Show", element_path(element) %></td>
+      <td><%= element.id %></td>
+      <td><%= element.folder.integration.user %></td>
+      <td><%= element.folder %></td>
+      <td><%= truncate "#{element.synchronizable_type}: #{element.synchronizable}", length: 50 %></td>
+      <td><%= element.ne_status %></td>
+      <td><%= element.updated_at %></td>
+      <td><%= element.created_at %></td>
+      <td><%= element.last_remote_version&.remote_status %></td>
+      <td><%= element.flagged_for_removal %></td>
+      <td><%= element.discarded_at %></td>
+    </tr>
+  <% end %>
+</table>
+
+<div class="paginator">
+  <%= page_entries_info @elements %>
+  <%= paginate @elements %>
+  <%#= paginate @elements, theme: 'kaminari' %>
+</div>

data/app/views/nexo/elements/show.html.erb

@@ -0,0 +1,60 @@
+<h1>Element: <%= @element.synchronizable %></h1>
+
+<%= link_to "Back to list", elements_path %>
+<br>
+<%= form_with(url: fetch_remote_element_path(@element)) do |f| %>
+  <%= f.submit "Fetch remote" %>
+<% end %>
+
+<%= form_with(url: resolve_conflict_element_path(@element)) do |f| %>
+  <%= f.submit "Resolve conflict" %>
+<% end %>
+
+<%= form_with(url: modify_local_element_path(@element)) do |f| %>
+  <%= f.submit "Modify" %>
+<% end %>
+
+<%= form_with(url: update_status_element_path(@element)) do |f| %>
+  <%= f.submit "Update status" %>
+<% end %>
+
+<%= form_with(url: modify_element_path(@element)) do |f| %>
+  <%= f.button(:operation, value: "delete") { "Delete" } %>
+<% end %>
+<br>
+
+<h4>Element</h4>
+<pre>
+<%= JSON.pretty_generate @element.as_json %>
+</pre>
+
+<h4><%= @element.synchronizable_type %></h4>
+<pre>
+<%= JSON.pretty_generate @element.synchronizable.as_json %>
+</pre>
+
+<h3>Versions</h3>
+<table>
+  <tr>
+    <th></th>
+    <th>Origin</th>
+    <th>nev_status</th>
+    <th>Sequence</th>
+    <th>Payload status</th>
+    <th>ETag</th>
+    <th>Created at</th>
+    <th>Updated at</th>
+  </tr>
+  <% @element.element_versions.order(id: :desc).each do |version| %>
+    <tr>
+      <td><%= link_to "Show", element_version_path(version) %></td>
+      <td><%= version.origin %></td>
+      <td><%= version.nev_status %></td>
+      <td><%= version.sequence %></td>
+      <td><%= version.remote_status %></td>
+      <td><%= version.etag %></td>
+      <td><%= version.created_at %></td>
+      <td><%= version.updated_at %></td>
+    </tr>
+  <% end %>
+</table>

data/app/views/nexo/folders/index.html.erb

@@ -0,0 +1,22 @@
+<h1>Folders</h1>
+Showing <%= @folders.count %> folders from a total of <%= Nexo::Folder.count %>
+<table>
+  <tr>
+    <th></th>
+    <th>User</th>
+    <th>Name</th>
+    <th>Status</th>
+    <th>Updated at</th>
+    <th>Created at</th>
+  </tr>
+  <% @folders.each do |folder| %>
+    <tr>
+      <td><%= link_to "Show", folder_path(folder) %></td>
+      <td><%= folder.integration.user %></td>
+      <td><%= folder.name %></td>
+      <td><%= folder.nf_status %></td>
+      <td><%= folder.updated_at %></td>
+      <td><%= folder.created_at %></td>
+    </tr>
+  <% end %>
+</table>

data/app/views/nexo/folders/show.html.erb

@@ -0,0 +1,22 @@
+<h1>Folder: <%= @folder.name %></h1>
+
+<%= link_to "Back to list", folders_path %>
+<br>
+<!--
+<%= form_with(url: full_sync_folder_path(@folder)) do |f| %>
+  <%= f.submit "Full sync" %>
+<% end %>
+<%= form_with(url: incremental_sync_folder_path(@folder)) do |f| %>
+  <%= f.submit "Incremental sync" %>
+<% end %>
+-->
+<%= form_with(url: sync_folder_path(@folder)) do |f| %>
+  <%= f.submit "Sync" %>
+<% end %>
+<%= form_with(url: check_status_folder_path(@folder)) do |f| %>
+  <%= f.submit "Check status" %>
+<% end %>
+
+<pre>
+<%= JSON.pretty_generate @folder.as_json %>
+</pre>

data/config/environment.rb

@@ -0,0 +1 @@
+# for vim-rails to get its a rails project

data/config/routes.rb

@@ -1,2 +1,28 @@
 Nexo::Engine.routes.draw do
+  resources :folders do
+    member do
+      post :sync
+      post :full_sync
+      post :incremental_sync
+      post :check_status
+    end
+  end
+
+  resources :elements do
+    member do
+      post :fetch_remote
+      post :resolve_conflict
+      post :modify_local
+      post :update_status
+      post :modify
+    end
+  end
+
+  resources :element_versions do
+    member do
+      post :sync
+    end
+  end
+
+  root to: redirect('elements')
 end

data/config/spring.rb

@@ -0,0 +1 @@
+Spring.application_root = 'spec/dummy'

data/db/migrate/20250604124821_element_sync_status.rb

@@ -0,0 +1,13 @@
+class ElementSyncStatus < ActiveRecord::Migration[7.2]
+  def change
+    add_column :nexo_elements, :ne_status, :integer
+    change_column_null :nexo_elements, :ne_status, false, -1
+    remove_column :nexo_elements, :conflicted, :boolean, default: false, null: false
+
+    add_column :nexo_element_versions, :nev_status, :integer
+    change_column_null :nexo_element_versions, :nev_status, false, -1
+
+    add_index :nexo_element_versions, [:element_id, :sequence], unique: true, where: "sequence IS NOT NULL"
+    add_index :nexo_element_versions, [:element_id, :etag], unique: true, where: "etag IS NOT NULL"
+  end
+end

data/db/migrate/20250612002919_google_sync_tokens.rb

@@ -0,0 +1,5 @@
+class GoogleSyncTokens < ActiveRecord::Migration[7.2]
+  def change
+    add_column :nexo_folders, :google_next_sync_token, :string
+  end
+end

data/db/migrate/20250623132502_folder_sync_direction.rb

@@ -0,0 +1,8 @@
+class FolderSyncDirection < ActiveRecord::Migration[7.2]
+  def change
+    add_column :nexo_folders, :sync_direction, :integer
+    change_column_null :nexo_folders, :sync_direction, false, 0
+
+    add_column :nexo_folders, :nf_status, :integer, null: false, default: 0
+  end
+end

data/db/migrate/20250718012839_synchronizable_nullable.rb

@@ -0,0 +1,6 @@
+class SynchronizableNullable < ActiveRecord::Migration[7.2]
+  def change
+    change_column_null :nexo_elements, :synchronizable_id, true
+    change_column_null :nexo_elements, :synchronizable_type, true
+  end
+end

data/db/seeds.rb

@@ -8,7 +8,7 @@ module Nexo
       service: "google",
       secret: JSON.parse(ENV.fetch('SEED_GOOGLE_APIS_CLIENT_SECRET'))
     )
-    user = User.first
+    user = User.first || FactoryBot.create(:user)
     integration = Nexo::Integration.create!(
       user:,
       client:,
@@ -21,8 +21,9 @@ module Nexo
         integration:,
         secret: ENV.fetch('SEED_GOOGLE_APIS_TOKEN'),
         nt_status: :active,
-        environment: "development"
+        environment: Rails.env
       )
+      puts "WARN: token not valid" unless integration.token?
     end
   end
 end

data/lib/nexo/engine.rb

@@ -1,13 +1,29 @@
 require "googleauth"
 require "google-apis-oauth2_v2"
 require "google-apis-calendar_v3"
+require "kaminari"
 
 module Nexo
-  def self.folder_policies
+  def self.folder_rules
     ::Nexo::PolicyService.instance
   end
 
+  def self.plain_logger
+    @plain_logger ||=
+      ActiveSupport::Logger.new(Rails.root.join("log/nexo-#{Rails.env}.log"))
+        .tap  { |logger| logger.formatter = ::Logger::Formatter.new }
+        .tap  { |logger| logger.level = ENV.fetch("NEXO_LOG_LEVEL", "debug") }
+        .then { |logger| ActiveSupport::TaggedLogging.new(logger) }
+  end
+
+  def self.logger
+    @logger ||= ActiveSupport::BroadcastLogger.new(plain_logger, Rails.logger)
+  end
+
   mattr_accessor :api_jobs_throttle
+  mattr_accessor :admin_controller_parent_class
+
+  self.admin_controller_parent_class = ActionController::Base
 
   # @!visibility private
   class Engine < ::Rails::Engine
@@ -19,10 +35,11 @@ module Nexo
     end
 
     initializer "nexo.setup_google_logger" do
-      Google::Apis.logger = ActiveSupport::Logger.new(Rails.root.join("log/google_apis.log"))
-        .tap  { |logger| logger.formatter = ::Logger::Formatter.new }
-        .then { |logger| ActiveSupport::TaggedLogging.new(logger) }
-      # .tap  { |logger| logger.push_tags("FOO") }
+      # Google::Apis.logger = Nexo.plain_logger
+      Google::Apis.logger =
+        ActiveSupport::Logger.new(Rails.root.join("log/google_apis.log"))
+          .tap  { |logger| logger.formatter = ::Logger::Formatter.new }
+          .then { |logger| ActiveSupport::TaggedLogging.new(logger) }
     end
 
     initializer "configurar_generators" do
@@ -31,5 +48,9 @@ module Nexo
         g.orm :active_record
       end
     end
+
+    initializer "nexo.set_factory_paths", after: "factory_bot.set_factory_paths" do
+      FactoryBot.definition_file_paths << "#{root}/spec/factories"
+    end
   end
 end

data/lib/nexo/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nexo
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-05-27 00:00:00.000000000 Z
+date: 2025-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
+- !ruby/object:Gem::Dependency
+  name: kaminari
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 description: 
 email:
 - mrosso10@gmail.com
@@ -76,13 +90,19 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/controllers/nexo/element_versions_controller.rb
+- app/controllers/nexo/elements_controller.rb
+- app/controllers/nexo/folders_controller.rb
+- app/controllers/nexo/nexo_controller.rb
 - app/helpers/nexo/controller_helper.rb
 - app/jobs/nexo/api_clients.rb
 - app/jobs/nexo/base_job.rb
 - app/jobs/nexo/delete_remote_resource_job.rb
+- app/jobs/nexo/fetch_remote_resource_job.rb
+- app/jobs/nexo/folder_check_status_job.rb
 - app/jobs/nexo/folder_destroy_job.rb
+- app/jobs/nexo/folder_download_job.rb
 - app/jobs/nexo/folder_sync_job.rb
-- app/jobs/nexo/sync_element_job.rb
 - app/jobs/nexo/synchronizable_changed_job.rb
 - app/jobs/nexo/update_remote_resource_job.rb
 - app/lib/nexo/active_record_google_token_store.rb
@@ -90,14 +110,16 @@ files:
 - app/lib/nexo/api_client/calendar_service.rb
 - app/lib/nexo/api_client/google_auth_service.rb
 - app/lib/nexo/api_client/google_calendar_service.rb
+- app/lib/nexo/api_client/google_calendar_sync_service.rb
 - app/lib/nexo/api_client/google_dummy_calendar_service.rb
+- app/lib/nexo/element_service.rb
 - app/lib/nexo/errors.rb
 - app/lib/nexo/event_receiver.rb
 - app/lib/nexo/folder_service.rb
+- app/lib/nexo/import_remote_element_version.rb
 - app/lib/nexo/policy_service.rb
 - app/lib/nexo/service_builder.rb
 - app/models/concerns/nexo/calendar_event.rb
-- app/models/concerns/nexo/folder_policy.rb
 - app/models/concerns/nexo/synchronizable.rb
 - app/models/nexo/application_record.rb
 - app/models/nexo/client.rb
@@ -106,13 +128,26 @@ files:
 - app/models/nexo/folder.rb
 - app/models/nexo/integration.rb
 - app/models/nexo/token.rb
+- app/views/layouts/error.html.erb
+- app/views/layouts/nexo.html.erb
+- app/views/nexo/element_versions/show.html.erb
+- app/views/nexo/elements/index.html.erb
+- app/views/nexo/elements/show.html.erb
+- app/views/nexo/folders/index.html.erb
+- app/views/nexo/folders/show.html.erb
+- config/environment.rb
 - config/routes.rb
+- config/spring.rb
 - db/migrate/20250505192315_create_nexo_clients.rb
 - db/migrate/20250505195429_create_nexo_integrations.rb
 - db/migrate/20250506125057_create_nexo_tokens.rb
 - db/migrate/20250512025423_create_nexo_folders.rb
 - db/migrate/20250512025950_create_nexo_elements.rb
 - db/migrate/20250512030530_create_nexo_element_versions.rb
+- db/migrate/20250604124821_element_sync_status.rb
+- db/migrate/20250612002919_google_sync_tokens.rb
+- db/migrate/20250623132502_folder_sync_direction.rb
+- db/migrate/20250718012839_synchronizable_nullable.rb
 - db/seeds.rb
 - lib/nexo.rb
 - lib/nexo/engine.rb

data/app/jobs/nexo/sync_element_job.rb

@@ -1,93 +0,0 @@
-module Nexo
-  # Handles synchronization of an Element. Its called anytime there is an internal or external change
-  #
-  # Always must be executed asynchronously to ensure the concurrency limit applies
-  #
-  # Responsabilities:
-  # - Triggering the DeleteRemoteResourceJob
-  # - Triggering the UpdateRemoteResourceJob
-  # - Removing/discarding Element's
-  # - Flagging Synchronizable's as conflicted
-  # - Updating Synchronizable's on external incoming changes
-  #
-  # TODO: implement external ElementVersion creation, not here, on another place
-  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
-
-    def perform(element)
-      validate_element_state!(element)
-
-      if element.flagged_for_deletion?
-        DeleteRemoteResourceJob.perform_later(element)
-
-        element.discard!
-      else
-        current_sequence = element.synchronizable.sequence
-        last_synced_sequence = element.last_synced_sequence
-
-        if element.external_unsynced_change?
-          # :nocov: TODO
-          raise Errors::SyncElementJobError, "not yet implemented"
-          # :nocov:
-
-          # if current_sequence == last_synced_sequence
-          #   sync_to_local_element(element)
-          # elsif current_sequence > last_synced_sequence
-          #   element.flag_as_conflicted!
-          # else
-          #   # :nocov: type: borderline
-          #   report_sequence_bigger_than_current_one!
-          #   # :nocov:
-          # end
-        else
-          if current_sequence == last_synced_sequence
-            # TODO: log "Element already synced: #{element.to_gid}"
-          elsif current_sequence > last_synced_sequence
-            UpdateRemoteResourceJob.perform_later(element)
-          else
-            # :nocov: borderline
-            raise Errors::LastSyncedSequenceBiggerThanCurrentOne, element
-            # :nocov:
-          end
-        end
-      end
-    end
-
-    private
-
-    def validate_element_state!(element)
-      if element.discarded?
-        # TODO: maybe check the case of external incoming changes to flag the element as conflicted
-        raise Errors::ElementDiscarded, element
-      end
-
-      if element.synchronizable.blank? && !element.flagged_for_deletion?
-        # element should have been flagged for deletion
-        raise Errors::SynchronizableNotFound, element
-      end
-
-      if element.conflicted?
-        raise Errors::ElementConflicted, element
-      end
-
-      if element.synchronizable.present? && element.synchronizable.conflicted?
-        raise Errors::SynchronizableConflicted, element
-      end
-
-      if element.synchronizable.present? && element.synchronizable.sequence.nil?
-        raise Errors::SynchronizableSequenceIsNull, element
-      end
-    end
-
-    # def sync_to_local_element(element)
-    #   last_external_unsynced_version = element.last_external_unsynced_version
-
-    #   element.synchronizable.update_from!(last_external_unsynced_version)
-    # end
-  end
-end

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

@@ -1,24 +0,0 @@
-module Nexo
-  module FolderPolicy
-    extend ActiveSupport::Concern
-    # include ActiveModel::Model
-    include ActiveModel::Validations
-
-    # TODO: add belongs_to :folder ?
-
-    # validates_inclusion_of :sync_policy, in: %w( include exclude )
-    # TODO!: check if this is being used
-    included do
-      validates :sync_policy, inclusion: { in: %w[ bla ] }
-      validates :priority, numericality: true
-    end
-
-    def match?(synchronizable)
-      # :nocov: borderline
-      raise "must be implemented in subclass"
-      # :nocov:
-    end
-
-    attr_reader :priority, :sync_policy
-  end
-end