eac_rails_remotes 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20d00ca632f9889c6bb6158d9931d28de7d0fb41f5a803f9b375322c40f22185
-  data.tar.gz: 2549430c7a500b0faa2ba60ea86e110a081dcc27a30f24c501506163eeb66cdf
+  metadata.gz: b12a302c21f1a69b8e03576b69b3920f97c1feca24cfba1b98660ca9444da77d
+  data.tar.gz: dcd50e1ceea808433376d06d1dccd7c72959335e242c2e162b8af4216c3fd018
 SHA512:
-  metadata.gz: ca3bfc3d8dcbe6d927b8a660ec2b4ef8fe1b16cf3885a34e1bdf42fe7ab8bc2b12e577342b523dcd7c4fa21be6ed9fb170b30e27f3b9b74943f71afe4b5d7303
-  data.tar.gz: 8db027139ca17da7d9149cc9bd4ea22b3ba82051358e46ae1ddfe8587153928c1e48e06014fb07c344bd220ac15564c79a7e3b6cbeb9ece9937bac27de7e814f
+  metadata.gz: c422d2c1b729540570886c2c9ea98613f4dbeaa865538c67afb69cbfb66303cec22be1bb6933789b6e3e33b905de03d3a40a1c0ddf4b144c507c3361c7d2bf6f
+  data.tar.gz: a674d9384cf95c83dbe7ea118cce32283a10b5845f4b3a593688d27f30538cd17999b1a610e2c123a8f05ae928c7de5ed7c1f9a1d5430d96088e7ca148f92c38

data/app/controllers/eac_rails_remotes/instances_controller.rb

@@ -6,8 +6,11 @@ module EacRailsRemotes
 
     active_scaffold :'eac_rails_remotes/instance' do |conf|
       conf.actions.exclude :create, :update
+      conf.list.columns = %i[entity source code export_status target created_at
+                             updated_at]
       conf.columns[:export_status].form_ui = :select
       conf.columns[:entity].form_ui = :select
+      conf.columns[:target].clear_link
       conf.actions.swap :search, :field_search
       conf.field_search.columns = :entity, :export_status
     end

data/app/models/eac_rails_remotes/instance/class_methods.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacRailsRemotes
+  class Instance < ::ActiveRecord::Base
+    module ClassMethods
+      common_concern
+      class_methods do
+        # @param record [Hash]
+        # @return [EacRailsRemotes::Instance]
+        def import(record)
+          ri = where(source: record.fetch(:source), entity: sanitize_entity(record.fetch(:entity)),
+                     code: record.fetch(:code)).first_or_initialize
+          ri.parsed_data = record.fetch(:data)
+          if ri.data_changed?
+            ri.export_status = EXPORT_STATUS_NEW_DATA
+            ri.save!
+          end
+          ri
+        end
+
+        # @oaram entity [Object]
+        # @return [String]
+        def sanitize_entity(entity)
+          entity.is_a?(::Module) ? entity.name : entity.to_s
+        end
+      end
+    end
+  end
+end

data/app/models/eac_rails_remotes/instance/export.rb

@@ -6,21 +6,26 @@ module EacRailsRemotes
   class Instance < ::ActiveRecord::Base
     class Export < ::SimpleDelegator
       acts_as_instance_method
+      enable_simple_cache
 
       def result
         Rails.logger.info("Exporting #{self}")
-        t = target || entity_class.new
-        t.attributes = target_attributes
-        if t.save
-          update!(export_status: EXPORT_STATUS_OK, export_message: '', target: t)
-        else
-          update!(export_status: EXPORT_STATUS_ERROR,
-                  export_message: target_export_message(t))
+        begin
+          filled_target.save ? update_as_ok : update_as_error
+        rescue ::EacRailsRemotes::Errors::TargetAssociationExport => e
+          update_as_association_error(e)
         end
       end
 
       protected
 
+      # @return [ActiveRecord::Base]
+      def filled_target_uncached
+        t = target || entity_class.new
+        t.attributes = target_attributes
+        t
+      end
+
       # @return [Hash]
       def target_attributes
         parsed_data.map { |k, v| export_target_attribute(k, v) }.compact_blank.to_h
@@ -30,6 +35,24 @@ module EacRailsRemotes
       def target_export_message(target)
         "ATTRIBUTES: #{target.attributes}\nERRORS: #{target.errors.messages}\n"
       end
+
+      # @param error [EacRailsRemotes::Errors::TargetAssociationExport]
+      # @return [void]
+      def update_as_association_error(error)
+        update!(export_status: EXPORT_STATUS_ERROR,
+                export_message: target_export_message(error.record))
+      end
+
+      # @return [void]
+      def update_as_error
+        update!(export_status: EXPORT_STATUS_ERROR,
+                export_message: target_export_message(filled_target))
+      end
+
+      # @return [void]
+      def update_as_ok
+        update!(export_status: EXPORT_STATUS_OK, export_message: '', target: filled_target)
+      end
     end
   end
 end

data/app/models/eac_rails_remotes/instance/export_target_attribute.rb

@@ -19,6 +19,13 @@ module EacRailsRemotes
 
       protected
 
+      # @return [EacRailsRemotes::Instance]
+      def association_record_uncached
+        instance.class.find_by(
+          source: instance.source, entity: entity_association_class.klass.name, code: value
+        )
+      end
+
       # @return [ActiveRecord::Reflection::BelongsToReflection, nil]
       def entity_association_class_uncached
         instance.entity_class.reflect_on_all_associations(:belongs_to)
@@ -27,10 +34,11 @@ module EacRailsRemotes
 
       # @return [Array]
       def result_by_association
-        ri = instance.class.find_by(
-          source: instance.source, entity: entity_association_class.klass.name, code: value
+        [entity_association_class.name, association_record&.assert_target]
+      rescue ::EacRailsRemotes::Errors::TargetExport => e
+        raise ::EacRailsRemotes::Errors::TargetAssociationExport.new(
+          instance, entity_association_class.name, e.record
         )
-        [entity_association_class.name, ri&.assert_target]
       end
 
       # @return [Boolean]

data/app/models/eac_rails_remotes/instance.rb

@@ -16,7 +16,7 @@ module EacRailsRemotes
 
     belongs_to :target, polymorphic: true, optional: true
 
-    scope :pendent, lambda {
+    scope :pending, lambda {
       where.not(export_status: EXPORT_STATUS_OK)
     }
 
@@ -41,7 +41,7 @@ module EacRailsRemotes
       export if export_status != EXPORT_STATUS_ERROR
       return target if target.present?
 
-      raise "Export failed (ID: #{id}, export message: \"#{export_message}\""
+      raise ::EacRailsRemotes::Errors::TargetExport, self
     end
 
     # @return [Class<ActiveRecord::Base>]
@@ -49,27 +49,6 @@ module EacRailsRemotes
       entity.constantize
     end
 
-    class << self
-      # @param record [Hash]
-      # @return [EacRailsRemotes::Instance]
-      def import(record)
-        ri = where(source: record.fetch(:source), entity: sanitize_entity(record.fetch(:entity)),
-                   code: record.fetch(:code)).first_or_initialize
-        ri.parsed_data = record.fetch(:data)
-        if ri.data_changed?
-          ri.export_status = EXPORT_STATUS_NEW_DATA
-          ri.save!
-        end
-        ri
-      end
-
-      # @oaram entity [Object]
-      # @return [String]
-      def sanitize_entity(entity)
-        entity.is_a?(::Module) ? entity.name : entity.to_s
-      end
-    end
-
-    require_sub __FILE__, require_mode: :kernel
+    require_sub __FILE__, require_mode: :kernel, include_modules: true
   end
 end

data/lib/eac_rails_remotes/errors/target_association_export.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module EacRailsRemotes
+  module Errors
+    class TargetAssociationExport < ::EacRailsRemotes::Errors::TargetExport
+      attr_reader :association_name, :owner_record
+
+      def initialize(association_record, association_name, owner_record)
+        super(association_record)
+        @association_name = association_name
+        @owner_record = owner_record
+      end
+    end
+  end
+end

data/lib/eac_rails_remotes/errors/target_export.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module EacRailsRemotes
+  module Errors
+    class TargetExport < ::RuntimeError
+      attr_reader :record
+
+      def initialize(record)
+        super("Export failed (ID: #{record.id}, export message: \"#{record.export_message}\")")
+        @record = record
+      end
+    end
+  end
+end

data/lib/eac_rails_remotes/export_all.rb

@@ -3,7 +3,7 @@
 module EacRailsRemotes
   class ExportAll
     def perform
-      ::EacRailsRemotes::Instance.pendent.each(&:export)
+      ::EacRailsRemotes::Instance.pending.each(&:export)
     end
   end
 end

data/lib/eac_rails_remotes/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRailsRemotes
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/lib/eac_rails_remotes.rb

@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils'
+EacRubyUtils::RootModuleSetup.perform __FILE__
 
 module EacRailsRemotes
-  require_sub __FILE__
 end
+
+require 'eac_active_scaffold'
+require 'eac_rails_utils'
+
+require 'eac_rails_remotes/engine'

data/lib/tasks/eac_rails_remotes.rake

@@ -8,6 +8,6 @@ namespace :eac_rails_remotes do
 
   desc 'Export pending remote instances'
   task export_all: :environment do |_t, _args|
-    EacRailsRemotes::Instance.pendent.each(&:export)
+    EacRailsRemotes::Instance.pending.each(&:export)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_rails_remotes
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-22 00:00:00.000000000 Z
+date: 2025-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_active_scaffold
@@ -16,68 +16,62 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: eac_rails_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0.26'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0.26'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.123'
+        version: '0.128'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.128.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.123'
+        version: '0.128'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.128.3
 - !ruby/object:Gem::Dependency
   name: eac_rails_gem_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: '0.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: '0.11'
 description: 
 email: 
 executables: []
@@ -88,6 +82,7 @@ files:
 - app/assets/stylesheets/eac_rails_remotes/application.scss
 - app/controllers/eac_rails_remotes/instances_controller.rb
 - app/models/eac_rails_remotes/instance.rb
+- app/models/eac_rails_remotes/instance/class_methods.rb
 - app/models/eac_rails_remotes/instance/export.rb
 - app/models/eac_rails_remotes/instance/export_target_attribute.rb
 - config/initializers/menus.rb
@@ -97,6 +92,8 @@ files:
 - db/migrate/20230521002623_create_eac_rails_remotes_instances.rb
 - lib/eac_rails_remotes.rb
 - lib/eac_rails_remotes/engine.rb
+- lib/eac_rails_remotes/errors/target_association_export.rb
+- lib/eac_rails_remotes/errors/target_export.rb
 - lib/eac_rails_remotes/export_all.rb
 - lib/eac_rails_remotes/import_file.rb
 - lib/eac_rails_remotes/version.rb