aranha-rails 0.8.4 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26eb70930f47095800bebbc88be94c5d44434dc018631e9f03a5783736fc322c
-  data.tar.gz: 86e7e889983b3d370924e79e8d9127f7fc55845a3bec8205a816493a74e0b522
+  metadata.gz: 1fac4b4415a0b0c6b57e859f927db71d2f774614a079948ac20c0b6fffa98dfe
+  data.tar.gz: 53158ba946e3084892549d6c05129cc07a564d2d9297964e688438a0d6b85363
 SHA512:
-  metadata.gz: f22e1064e807d5fdfcc42a6af3fb4322a7ee74e3824f6536f54d9d71cfb241254a5c74660b4f1123818eec65c34cb513657e7d5ddd3c27a1ccdd9e25af17ad28
-  data.tar.gz: a4671ab1a659124ce76fb0af5cb2a38933eac2dbba603d984e8b23c8556bfcd93c12e9e51acabcb3dc16dba937a924ee4cf3b238615f0d9136abfcdf0fb77364
+  metadata.gz: 3e9710b331f294a61fda19477d14f3f8da64b6402700defd075f1218ce6243207738eabcb3944d85a335481e8423ad244b50b584b7880c700a61ca15ce273434
+  data.tar.gz: 7b4d994930b0c115509a47eaaacb87df9f48d0ed0adf1b528674cda54355d108c8e7e804f108f0908723857fc17f4833573b4512f0df1d24caa1f368e35c624c

data/app/models/aranha/address/delayed_job.rb

@@ -9,7 +9,7 @@ module Aranha
       common_constructor :address_id
 
       def perform
-        ::Rails.logger.info("Processing \"#{address.url}\"")
+        ::Rails.logger.info("Processing \"#{address}\"")
         address_processor.successful? ? perform_on_success : perform_on_error
       end
 

data/app/models/aranha/address/scheduling.rb

@@ -11,6 +11,8 @@ module Aranha
     module Scheduling
       common_concern
 
+      DEFAULT_PRIORITY = 0
+
       module ClassMethods
         # @return [Array<Aranha::Address>]
         def expired(time = ::Time.zone.now)
@@ -24,7 +26,8 @@ module Aranha
 
           job = ::Delayed::Job.enqueue(
             ::Aranha::Address::DelayedJob.new(id),
-            queue: ::Aranha::Rails::Process::QUEUE
+            queue: ::Aranha::Rails::Process::QUEUE,
+            priority: priority
           )
           update!(delayed_job: job)
         end
@@ -43,6 +46,10 @@ module Aranha
         tries_count < ::Aranha::Processor::DEFAULT_MAX_TRIES
       end
 
+      def priority
+        processor_configuration.if_present(DEFAULT_PRIORITY, &:priority)
+      end
+
       def schedule?
         processed_at.blank? && allow_retry? && delayed_job.blank? && enabled?
       end

data/app/models/aranha/processor_configuration.rb

@@ -31,6 +31,7 @@ module Aranha
       end
     end
 
+    validates :priority, numericality: { only_integer: true }
     validates :processor_class, presence: true
     validate :processor_class_in_list
     validates :timeout_seconds, allow_blank: true,

data/db/migrate/20230602212759_add_priority_to_aranha_processor_configurations.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddPriorityToAranhaProcessorConfigurations < ActiveRecord::Migration[5.2]
+  def change
+    add_column :aranha_processor_configurations, :priority, :integer, default: 0, null: false
+  end
+end

data/lib/aranha/rails/manager.rb

@@ -9,7 +9,7 @@ module Aranha
       include ::Singleton
 
       def add_address(url, processor, extra_data = nil)
-        ::Rails.logger.info("Adding \"#{url}\"")
+        ::Rails.logger.info("Adding \"#{url} | #{processor} | #{extra_data}\"")
         a = ::Aranha::Address.find_or_initialize_by(url: ::Aranha::Address.sanitize_url(url))
         a.processor = processor
         a.extra_data = extra_data.to_yaml
@@ -43,7 +43,7 @@ module Aranha
       end
 
       def unprocessed_addresses
-        ::Aranha::Address.all.select(&:schedule?)
+        ::Aranha::Address.all.select(&:schedule?).sort_by { |a| [a.priority] }
       end
     end
   end

data/lib/aranha/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Aranha
   module Rails
-    VERSION = '0.8.4'
+    VERSION = '0.9.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aranha-rails
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.9.1
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-22 00:00:00.000000000 Z
+date: 2023-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha
@@ -16,54 +16,54 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.19'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.19.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.19'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.19.2
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: '0.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: '0.20'
 - !ruby/object:Gem::Dependency
   name: eac_active_scaffold
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: eac_rails_delayed_job
   requirement: !ruby/object:Gem::Requirement
@@ -73,7 +73,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -83,47 +83,41 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: eac_rails_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.107'
+        version: '0.117'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.107.1
+        version: 0.117.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.107'
+        version: '0.117'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.107.1
+        version: 0.117.1
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -190,6 +184,7 @@ files:
 - db/migrate/20210721185222_add_last_error_to_aranha_addresses.rb
 - db/migrate/20210814220540_create_aranha_processor_configurations.rb
 - db/migrate/20210815160543_add_enabled_to_aranha_processor_configurations.rb
+- db/migrate/20230602212759_add_priority_to_aranha_processor_configurations.rb
 - lib/aranha/rails.rb
 - lib/aranha/rails/engine.rb
 - lib/aranha/rails/fixtures_download.rb