Skip to content

Commit

Permalink
Remove MultiJson dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
Cristian Dotta committed Oct 13, 2016
1 parent 9620734 commit db398ea
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 15 deletions.
8 changes: 4 additions & 4 deletions lib/sidekiq-scheduler/schedule.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
require 'hashie'
require 'multi_json'
require 'json'

module SidekiqScheduler
module Schedule
Expand Down Expand Up @@ -71,7 +71,7 @@ def get_schedule(name = nil)
get_all_schedules
else
encoded_schedule = Sidekiq.redis { |r| r.hget(:schedules, name) }
encoded_schedule.nil? ? nil : MultiJson.decode(encoded_schedule)
encoded_schedule.nil? ? nil : JSON(encoded_schedule)
end
end

Expand All @@ -83,7 +83,7 @@ def get_all_schedules

Sidekiq.redis { |r| r.hgetall(:schedules) }.tap do |h|
h.each do |name, config|
schedules[name] = MultiJson.decode(config)
schedules[name] = JSON(config)
end
end
end
Expand All @@ -103,7 +103,7 @@ def get_all_schedules
def set_schedule(name, config)
existing_config = get_schedule(name)
unless existing_config && existing_config == config
Sidekiq.redis { |r| r.hset(:schedules, name, MultiJson.encode(config)) }
Sidekiq.redis { |r| r.hset(:schedules, name, JSON(config)) }
Sidekiq.redis { |r| r.sadd(:schedules_changed, name) }
end
config
Expand Down
5 changes: 3 additions & 2 deletions lib/sidekiq/scheduler.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
require 'thwait'
require 'sidekiq/util'
require 'sidekiq-scheduler/manager'
require 'json'

module Sidekiq
class Scheduler
Expand Down Expand Up @@ -387,15 +388,15 @@ def sanitize_job_config(config)
def schedule_state(name)
state = Sidekiq.redis { |r| r.hget(schedules_state_key, name) }

state ? MultiJson.decode(state) : {}
state ? JSON(state) : {}
end

# Saves a schedule state
#
# @param name [String] with the schedule's name
# @param name [Hash] with the schedule's state
def set_schedule_state(name, state)
Sidekiq.redis { |r| r.hset(schedules_state_key, name, MultiJson.encode(state)) }
Sidekiq.redis { |r| r.hset(schedules_state_key, name, JSON(state)) }
end

end
Expand Down
1 change: 0 additions & 1 deletion sidekiq-scheduler.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ Gem::Specification.new do |s|
s.add_dependency 'sidekiq', '>= 3'
s.add_dependency 'redis', '~> 3'
s.add_dependency 'rufus-scheduler', '~> 3.1.8'
s.add_dependency 'multi_json', '~> 1'
s.add_dependency 'tilt', '>= 1.4.0'

s.add_development_dependency 'rake', '~> 10.0'
Expand Down
2 changes: 1 addition & 1 deletion spec/sidekiq-scheduler/schedule_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def only_cron_and_args

def job_from_redis(job_id)
if job = job_from_redis_without_decoding(job_id)
MultiJson.decode(job)
JSON(job)
end
end

Expand Down
12 changes: 6 additions & 6 deletions spec/sidekiq/scheduler_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -246,10 +246,10 @@
Sidekiq.redis { |r| r.del(:schedules) }
Sidekiq.redis do |r|
r.hset(:schedules, 'some_ivar_job2',
MultiJson.encode({
'cron' => '* * * * *',
'class' => 'SomeWorker',
'args' => '/tmp/2'
JSON({
'cron' => '* * * * *',
'class' => 'SomeWorker',
'args' => '/tmp/2'
})
)
end
Expand Down Expand Up @@ -832,7 +832,7 @@ def enqueued_jobs_registry

before do
Sidekiq.redis do |r|
r.hset(described_class.schedules_state_key, job_name, MultiJson.encode(state))
r.hset(described_class.schedules_state_key, job_name, JSON(state))
end
end

Expand Down Expand Up @@ -895,7 +895,7 @@ def enqueued_jobs_registry

before do
Sidekiq.redis do |r|
r.hset(described_class.schedules_state_key, job_name, MultiJson.encode(state))
r.hset(described_class.schedules_state_key, job_name, JSON(state))
end
end

Expand Down
2 changes: 1 addition & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
require 'sidekiq'
require 'sidekiq/testing'
require 'sidekiq-scheduler'
require 'multi_json'
require 'json'
require 'timecop'

# Load all support files
Expand Down

0 comments on commit db398ea

Please sign in to comment.