worker_plugins 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1204dc5970fc5918fc39aa22e76fcf3fbfae7a040912eda7151ab59e85be415
-  data.tar.gz: 9e7a9916256ff3fa6775dcddbdde2c1ba1fa9f95b08edc5786d487809b17ef2d
+  metadata.gz: 2f77ed60aa6667fcc2fc18e2205e6e2a2c9dffd5fba9499750fc9dbcdea61bf5
+  data.tar.gz: 4292d9a83b73e309e731e00d393d7029750d1a7b6ddbe3685f7379af1efc61c6
 SHA512:
-  metadata.gz: 77b9f5d7e32386bdafa68225bb952c97d8c03c40b1d8c338940f56c3c8dc654b27747629e9018a40f2749a56d06752a7ee84e3bbf27f64c53d27fcf263c09135
-  data.tar.gz: 45c97e82cee0dda1f2d24279b77165843852d0f9d9a8f8c8fb41592cfeaf4c789b07481495abcc34ba8a8c1c1d697deeff26d70a6b0ad457f3b2677689e42193
+  metadata.gz: 6aa418455aa98b9068bfa46c71eaf12e9a9943c5f1591e015cd713e7bf0d034beff33d98c15506dadd348811834451958f8d11018407910e0da1c29580059430
+  data.tar.gz: 7e1a09482cca627de3794587a480be4f695e9422bec933abc514ddabd3546c2b05485c0da1c141ed4ae0356ab41943607875bed7e376787050ada52e25551b19

data/app/models/worker_plugins/workplace.rb

@@ -14,8 +14,14 @@ class WorkerPlugins::Workplace < WorkerPlugins::ApplicationRecord
     links_query = workplace_links.order(:id)
     links_query = links_query.where(resource_type: types) if types
     links_query.find_in_batches do |workplace_links|
+      resources_by_type_and_id = load_resources_by_type_and_id(workplace_links)
+
       workplace_links.each do |workplace_link|
-        yield workplace_link.resource
+        resource = resources_by_type_and_id
+          .fetch(workplace_link.resource_type)[workplace_link.resource_id.to_s]
+        next unless resource
+
+        yield resource
         count += 1
         return if limit && count >= limit # rubocop:disable Lint/NonLocalExitFromIterator
       end
@@ -23,15 +29,19 @@ class WorkerPlugins::Workplace < WorkerPlugins::ApplicationRecord
   end
 
   def each_query_for_resources
-    workplace_links.group("worker_plugins_workplace_links.resource_type").order("worker_plugins_workplace_links.id").each do |workplace_link|
-      resource_type = workplace_link.resource_type
+    resource_ids_by_type = workplace_links
+      .order(:id)
+      .pluck(:resource_type, :resource_id)
+      .each_with_object({}) do |(resource_type, resource_id), grouped_ids|
+        grouped_ids[resource_type] ||= []
+        grouped_ids[resource_type] << resource_id
+      end
+
+    resource_ids_by_type.each do |resource_type, ids|
       constant = Object.const_get(resource_type)
-      ids = workplace_links.where(resource_type: workplace_link.resource_type).pluck(:resource_id)
 
       ids.each_slice(500) do |ids_slice|
-        query = constant.where(id: ids_slice)
-
-        yield(query:, resource_type:)
+        yield(query: constant.where(id: ids_slice), resource_type:)
       end
     end
   end
@@ -61,6 +71,19 @@ private
     inserted_ids
   end
 
+  def load_resources_by_type_and_id(workplace_links)
+    workplace_links
+      .group_by(&:resource_type)
+      .transform_values do |links_for_type|
+        resource_class = Object.const_get(links_for_type.first.resource_type)
+        resource_ids = links_for_type.map(&:resource_id)
+
+        resource_class
+          .where(id: resource_ids)
+          .index_by { |resource| resource.id.to_s }
+      end
+  end
+
   def validate_owner
     if user.present? && session_id.present?
       errors.add(:base, "Workplace can't belong to both a user and a session")

data/app/services/worker_plugins/query_links_status.rb

@@ -4,7 +4,7 @@ class WorkerPlugins::QueryLinksStatus < WorkerPlugins::ApplicationService
   def perform
     checked_count = workplace
       .workplace_links
-      .where(resource_id: query.distinct.select(query.klass.primary_key))
+      .where(resource_type: query.klass.name, resource_id: query_with_selected_ids)
       .count
 
     query_count = query.count
@@ -16,4 +16,12 @@ class WorkerPlugins::QueryLinksStatus < WorkerPlugins::ApplicationService
       some_checked: checked_count.positive? && checked_count < query_count
     )
   end
+
+  def query_with_selected_ids
+    WorkerPlugins::SelectColumnWithTypeCast.execute!(
+      column_name_to_select: query.klass.primary_key,
+      column_to_compare_with: WorkerPlugins::WorkplaceLink.column_for_attribute(:resource_id),
+      query: query.distinct
+    )
+  end
 end

data/app/services/worker_plugins/select_column_with_type_cast.rb

@@ -46,6 +46,14 @@ class WorkerPlugins::SelectColumnWithTypeCast < WorkerPlugins::ApplicationServic
   end
 
   def same_type?
-    column_to_select.type == column_to_compare_with.type
+    column_to_select.type == column_to_compare_with.type || mysql_string_uuid_compatible_types?
+  end
+
+  def mysql_string_uuid_compatible_types?
+    return false unless mysql?
+
+    types = [column_to_select.type, column_to_compare_with.type]
+
+    types.include?(:string) && types.include?(:uuid)
   end
 end

data/app/services/worker_plugins/switch_query.rb

@@ -2,48 +2,20 @@ class WorkerPlugins::SwitchQuery < WorkerPlugins::ApplicationService
   arguments :query, :workplace
 
   def perform
-    if resources_to_add.none?
+    add_query_service = WorkerPlugins::AddQuery.new(query:, workplace:)
+    created = add_query_service.created
+
+    if created.empty?
       result = WorkerPlugins::RemoveQuery.execute!(query:, workplace:)
       succeed!(
         destroyed: result.fetch(:destroyed),
         mode: :destroyed
       )
     else
-      result = WorkerPlugins::AddQuery.execute!(query:, workplace:)
       succeed!(
-        created: result.fetch(:created),
+        created: add_query_service.tap(&:add_query_to_workplace).created,
         mode: :created
       )
     end
   end
-
-  def ids_added_already_query
-    workplace
-      .workplace_links
-      .where(resource_type: model_class.name, resource_id: query_with_selected_ids)
-  end
-
-  def ids_added_already
-    WorkerPlugins::SelectColumnWithTypeCast.execute!(
-      column_name_to_select: :resource_id,
-      column_to_compare_with: model_class.column_for_attribute(:id),
-      query: ids_added_already_query
-    )
-  end
-
-  def model_class
-    @model_class ||= query.klass
-  end
-
-  def query_with_selected_ids
-    WorkerPlugins::SelectColumnWithTypeCast.execute!(
-      column_name_to_select: :id,
-      column_to_compare_with: WorkerPlugins::WorkplaceLink.column_for_attribute(:resource_id),
-      query:
-    )
-  end
-
-  def resources_to_add
-    @resources_to_add ||= query.where.not(id: ids_added_already)
-  end
 end

data/db/migrate/20260325100902_ensure_session_id_exists_on_worker_plugins_workplaces.rb

@@ -0,0 +1,6 @@
+class EnsureSessionIdExistsOnWorkerPluginsWorkplaces < ActiveRecord::Migration[6.0]
+  def change
+    add_column :worker_plugins_workplaces, :session_id, :string unless column_exists?(:worker_plugins_workplaces, :session_id)
+    add_index :worker_plugins_workplaces, :session_id, unique: true unless index_exists?(:worker_plugins_workplaces, :session_id)
+  end
+end

data/db/migrate/20260415143000_change_workplace_id_to_bigint_on_worker_plugins_workplace_links.rb

@@ -0,0 +1,9 @@
+class ChangeWorkplaceIdToBigintOnWorkerPluginsWorkplaceLinks < ActiveRecord::Migration[6.0]
+  def up
+    change_column :worker_plugins_workplace_links, :workplace_id, :bigint, null: false
+  end
+
+  def down
+    change_column :worker_plugins_workplace_links, :workplace_id, :integer, null: false
+  end
+end

data/lib/tasks/release.rake

@@ -4,7 +4,7 @@ require "pathname"
 require "rubygems/version"
 require "shellwords"
 
-class WorkerPluginsRubygemsRelease # rubocop:disable Lint/ConstantDefinitionInBlock
+class WorkerPluginsRubygemsRelease
   VERSION_FILE = Pathname.new(File.expand_path("../worker_plugins/version.rb", __dir__)) unless const_defined?(:VERSION_FILE)
 
   def call
@@ -60,13 +60,15 @@ private
   end
 
   def bumped_version
+    major, minor, patch = version_segments
+
     case bump_type
     when "major"
-      [version_segments[0] + 1, 0, 0].join(".")
+      format_version(major + 1, 0, 0)
     when "minor"
-      [version_segments[0], version_segments[1] + 1, 0].join(".")
+      format_version(major, minor + 1, 0)
     when "patch"
-      [version_segments[0], version_segments[1], version_segments[2] + 1].join(".")
+      format_version(major, minor, patch + 1)
     else
       raise "Unsupported BUMP=#{bump_type.inspect}. Use patch, minor, major, or VERSION=x.y.z."
     end
@@ -81,7 +83,11 @@ private
   end
 
   def current_version
-    @current_version ||= VERSION_FILE.read[/VERSION = "([^"]+)"/, 1] || raise("Could not find current version")
+    @current_version ||= VERSION_FILE.read[/VERSION = "([^"]+)"\.freeze/, 1] || raise("Could not find current version")
+  end
+
+  def format_version(major, minor, patch)
+    [major, minor, patch].join(".")
   end
 
   def bump_version!(next_version)
@@ -89,12 +95,17 @@ private
 
     VERSION_FILE.write(
       VERSION_FILE.read.sub(
-        /VERSION = "[^"]+"/,
-        %(VERSION = "#{next_version}")
+        /VERSION = "[^"]+"\.freeze/,
+        %(VERSION = "#{next_version}".freeze)
       )
     )
 
-    run!("git", "add", VERSION_FILE.to_s)
+    sync_lockfile!
+    run!("git", "add", VERSION_FILE.to_s, "Gemfile.lock")
+  end
+
+  def sync_lockfile!
+    run!("bundle", "lock")
   end
 
   def commit!(next_version)
@@ -146,26 +157,26 @@ private
 end
 
 namespace :release do
-  desc "Release a patch version from master by fetching, fast-forward merging, bumping version, pushing, and publishing"
-  task :patch do
+  desc "Release a patch version from master by fetching, fast-forward merging, bumping version, refreshing Gemfile.lock, pushing, and publishing"
+  task patch: :environment do
     ENV["BUMP"] = "patch"
     WorkerPluginsRubygemsRelease.new.call
   end
 
-  desc "Release a minor version from master by fetching, fast-forward merging, bumping version, pushing, and publishing"
-  task :minor do
+  desc "Release a minor version from master by fetching, fast-forward merging, bumping version, refreshing Gemfile.lock, pushing, and publishing"
+  task minor: :environment do
     ENV["BUMP"] = "minor"
     WorkerPluginsRubygemsRelease.new.call
   end
 
-  desc "Release a major version from master by fetching, fast-forward merging, bumping version, pushing, and publishing"
-  task :major do
+  desc "Release a major version from master by fetching, fast-forward merging, bumping version, refreshing Gemfile.lock, pushing, and publishing"
+  task major: :environment do
     ENV["BUMP"] = "major"
     WorkerPluginsRubygemsRelease.new.call
   end
 
-  desc "Release the gem from master by fetching, fast-forward merging, bumping version, pushing, and publishing"
-  task :rubygems do
+  desc "Release the gem from master by fetching, fast-forward merging, bumping version, refreshing Gemfile.lock, pushing, and publishing"
+  task rubygems: :environment do
     WorkerPluginsRubygemsRelease.new.call
   end
 end

data/lib/worker_plugins/version.rb

@@ -1,3 +1,3 @@
 module WorkerPlugins
-  VERSION = "0.0.12".freeze
+  VERSION = "0.0.13".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worker_plugins
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Kasper Stöckel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-25 00:00:00.000000000 Z
+date: 2026-04-15 00:00:00.000000000 Z
 dependencies: []
 description: Rails framework for easily choosing and creating lists of objects and
   execute plugins against them.
@@ -41,7 +41,8 @@ files:
 - db/migrate/20200702072306_change_workplace_links_resource_id_to_string_to_support_uuids.rb
 - db/migrate/20210106190349_change_resource_id_to_string_to_support_uuid.rb
 - db/migrate/20260322194625_add_session_id_to_worker_plugins_workplaces.rb
-- db/migrate/20260325100902_add_session_id_to_worker_plugins_workplaces.rb
+- db/migrate/20260325100902_ensure_session_id_exists_on_worker_plugins_workplaces.rb
+- db/migrate/20260415143000_change_workplace_id_to_bigint_on_worker_plugins_workplace_links.rb
 - lib/tasks/release.rake
 - lib/tasks/worker_plugins_tasks.rake
 - lib/worker_plugins.rb

data/db/migrate/20260325100902_add_session_id_to_worker_plugins_workplaces.rb

@@ -1,6 +0,0 @@
-class AddSessionIdToWorkerPluginsWorkplaces < ActiveRecord::Migration[6.0]
-  def change
-    add_column :worker_plugins_workplaces, :session_id, :string
-    add_index :worker_plugins_workplaces, :session_id, unique: true
-  end
-end