Skip to content

Commit 367a894

Browse files
committed
base64 encoding for payload and new redis key
1 parent ad022a6 commit 367a894

6 files changed

Lines changed: 10 additions & 37 deletions

File tree

active_publisher.gemspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,4 @@ Gem::Specification.new do |spec|
3737
spec.add_development_dependency "pry"
3838
spec.add_development_dependency "rake"
3939
spec.add_development_dependency "rspec", "~> 3.2"
40-
spec.add_development_dependency "rspec-benchmark"
4140
end

lib/active_publisher/async/redis_adapter.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
module ActivePublisher
77
module Async
88
module RedisAdapter
9-
REDIS_LIST_KEY = "ACTIVE_PUBLISHER_LIST".freeze
9+
REDIS_LIST_KEY = "ACTIVE_PUBLISHER_LIST.V2".freeze
1010

1111
def self.new(*args)
1212
::ActivePublisher::Async::RedisAdapter::Adapter.new(*args)

lib/active_publisher/async/redis_adapter/redis_multi_pop_queue.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,6 @@ def shift(number)
9797

9898
messages.each do |message|
9999
next if message.nil?
100-
# TODO: This should probably attempt to ::Marshal.load and fall back to JSON for
101-
# apps cutting over to new serialization.
102100
shifted_messages << ::ActivePublisher::Message.from_json(message)
103101
end
104102

lib/active_publisher/message.rb

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,27 @@
1+
require "base64"
12
require "json"
3+
24
module ActivePublisher
35
class Message < Struct.new(:route, :payload, :exchange_name, :options)
46
class << self
57
def from_json(payload)
68
parsed = JSON.load(payload)
79
self.new(
810
parsed["route"],
9-
parsed["payload"],
11+
Base64.decode64(parsed["payload"]),
1012
parsed["exchange_name"],
1113
parsed["options"],
1214
)
1315
end
1416
end
1517

1618
def to_json
17-
self.to_h.to_json
19+
{
20+
route: self.route,
21+
payload: Base64.encode64(self.payload),
22+
exchange_name: self.exchange_name,
23+
options: self.options,
24+
}.to_json
1825
end
1926
end
2027
end

spec/lib/active_publisher/async/redis_adapter/redis_adapter_benchmark_spec.rb

Lines changed: 0 additions & 26 deletions
This file was deleted.

spec/spec_helper.rb

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,12 @@
44
require "fakeredis/rspec"
55
require "active_publisher/async/redis_adapter"
66
require "connection_pool"
7-
require "rspec-benchmark"
87

98
::ActivePublisher::Async.publisher_adapter = ::ActivePublisher::Async::InMemoryAdapter::Adapter.new
109
# Silence the logger
1110
$TESTING = true
1211
::ActivePublisher::Logging.initialize_logger(nil)
1312

14-
RSpec.configure do |config|
15-
config.include RSpec::Benchmark::Matchers
16-
end
17-
1813
def verify_expectation_within(number_of_seconds, check_every = 0.02)
1914
waiting_since = ::Time.now
2015
begin

0 commit comments

Comments
 (0)