aranha-rails 0.8.3 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4546fc37349ab787296582e2b386dc4d46480153c6e1b57eabb713bba0b7d780
-  data.tar.gz: f9ea21b8995475f02ca4681c5e37a23120b76518a989d5431db75c3aef6f5926
+  metadata.gz: df34de5939413cf8b0a8ac9a8185e06551953226a69ac9fafb08ed04b9ac8679
+  data.tar.gz: 8494ebfc1b7038fb91e076f50607eeb4543f47d128401b66ffd85b332e8094ff
 SHA512:
-  metadata.gz: 9bdca2a251072342e3848461faaabff5f65d233bb1093b3c10e1f2df791fb0b56ce5258c5fced59213f201c0b639e92f5ce7109edf909cf4c501d9936b73d43c
-  data.tar.gz: fb3df58fbe7d46f971be3143211c914215217258ff421acdf58872513a885c6cb647350b78b8310b3f82dace20cb146b93802695f00a83c9dc90b65adbbde0e7
+  metadata.gz: 7a4cd710166a2d1ed26c3e10f6b60821cc59b04884e4348ed1065230dbe958f7e1fe6075230432336770a3e0e31b6408de9cb89e542a484d0e6a7f7509f688c2
+  data.tar.gz: 02d01c2175b85069755f45a2c59e1043d7f49922d8a8dd0eaec687a34d1cb496e54d4b1363893029d404d8727bca2549c8f91ca4b5d68f917c5f3f24177433f1

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'aranha/address_processor'
 require 'eac_ruby_utils/core_ext'
 
 module Aranha

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

@@ -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.3'
+    VERSION = '0.9.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aranha-rails
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.9.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-30 00:00:00.000000000 Z
+date: 2023-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha
@@ -16,60 +16,48 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '0.19'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: 0.19.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '0.19'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        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.3
+        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.3
+        version: '0.20'
 - !ruby/object:Gem::Dependency
   name: eac_active_scaffold
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: eac_rails_delayed_job
   requirement: !ruby/object:Gem::Requirement
@@ -79,7 +67,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
@@ -89,41 +77,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.18'
   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.18'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.104'
+        version: '0.117'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.117.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.104'
+        version: '0.117'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.117.1
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -190,6 +178,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