1
0
Fork 0
mirror of https://github.com/mperham/sidekiq.git synced 2022-11-09 13:52:34 -05:00

Remove Hash#{stringify,symbolize}_keys, #3474

This commit is contained in:
Mike Perham 2017-05-12 22:03:32 -07:00
parent f9781e1bac
commit df99ca982e
5 changed files with 25 additions and 27 deletions

View file

@ -149,7 +149,11 @@ module Sidekiq
end
def self.default_worker_options=(hash)
@default_worker_options = default_worker_options.merge(hash.stringify_keys)
# stringify
hash.keys.each do |key|
hash[key.to_s] = hash.delete(key)
end
@default_worker_options = default_worker_options.merge(hash)
end
def self.default_worker_options
defined?(@default_worker_options) ? @default_worker_options : DEFAULT_WORKER_OPTIONS

View file

@ -73,24 +73,3 @@ rescue LoadError
end
end
begin
require 'active_support/core_ext/hash/keys'
rescue LoadError
class Hash
def stringify_keys
keys.each do |key|
self[key.to_s] = delete(key)
end
self
end if !{}.respond_to?(:stringify_keys)
def symbolize_keys
keys.each do |key|
self[(key.to_sym rescue key) || key] = delete(key)
end
self
end if !{}.respond_to?(:symbolize_keys)
end
end

View file

@ -8,7 +8,9 @@ module Sidekiq
class << self
def create(options={})
options = options.symbolize_keys
options.keys.each do |key|
options[key.to_sym] = options.delete(key)
end
options[:url] ||= determine_redis_provider

View file

@ -189,7 +189,11 @@ module Sidekiq
# Merge options with current params, filter safe params, and stringify to query string
def qparams(options)
options = options.stringify_keys
# stringify
options.keys.each do |key|
options[key.to_s] = options.delete(key)
end
params.merge(options).map do |key, value|
SAFE_QPARAMS.include?(key) ? "#{key}=#{CGI.escape(value.to_s)}" : next
end.compact.join("&")

View file

@ -118,7 +118,12 @@ module Sidekiq
# In practice, any option is allowed. This is the main mechanism to configure the
# options for a specific job.
def sidekiq_options(opts={})
self.sidekiq_options_hash = get_sidekiq_options.merge(opts.stringify_keys)
# stringify
opts.keys.each do |key|
opts[key.to_s] = opts.delete(key)
end
self.sidekiq_options_hash = get_sidekiq_options.merge(opts)
end
def sidekiq_retry_in(&block)
@ -135,8 +140,12 @@ module Sidekiq
def client_push(item) # :nodoc:
pool = Thread.current[:sidekiq_via_pool] || get_sidekiq_options['pool'.freeze] || Sidekiq.redis_pool
hash = item.stringify_keys
Sidekiq::Client.new(pool).push(hash)
# stringify
item.keys.each do |key|
item[key.to_s] = item.delete(key)
end
Sidekiq::Client.new(pool).push(item)
end
end