Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/views/mission_control/jobs/queues/_queue.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<tr class="queue">
<td>
<%= link_to queue.name, application_queue_path(@application, queue.name) %>
<%= link_to queue.name, application_queue_path(@application, queue) %>
<% if queue.paused? %>
<span class="ml-4 tag is-warning">Paused</span>
<% end %>
Expand Down
14 changes: 9 additions & 5 deletions lib/active_job/queues.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,21 @@ class ActiveJob::Queues
include Enumerable

delegate :each, to: :values
delegate :values, to: :queues_by_name, private: true
delegate :[], :size, :length, :to_s, :inspect, to: :queues_by_name
delegate :values, to: :queues_by_id, private: true
delegate :size, :length, :to_s, :inspect, to: :queues_by_id

def initialize(queues)
@queues_by_name = queues.index_by(&:name).with_indifferent_access
@queues_by_id = queues.index_by(&:id).with_indifferent_access
end

def to_h
queues_by_name.dup
queues_by_id.dup
end

def [](name)
queues_by_id[name.to_s.parameterize]
end

private
attr_reader :queues_by_name
attr_reader :queues_by_id
end
10 changes: 10 additions & 0 deletions test/active_job/queues_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,16 @@ class ActiveJob::QueuesTest < ActiveSupport::TestCase
assert_equal queue_2, queues["queue_2"]
end

test "direct access by name with special characters parameterized" do
queue = ActiveJob::Queue.new("My-Queue_With.Special@Chars! and spaces")
queues = ActiveJob::Queues.new([ queue ])

# Look-up queue by original name
assert_equal queue, queues["My-Queue_With.Special@Chars! and spaces"]
# Look-up queue by parameterized, URL-friendly name
assert_equal queue, queues["my-queue_with-special-chars-and-spaces"]
end

test "convert to hash" do
queue_1 = create_queue "queue_1"
queue_2 = create_queue "queue_2"
Expand Down
Loading