Cover ParamsRenderer, minor fixes

zhulik · Feb 10, 2023 · 38d1fec · 38d1fec
1 parent 62aef82
commit 38d1fec
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/lib/nats_streamer/listener.rb b/lib/nats_streamer/listener.rb
@@ -21,7 +21,7 @@ def run
 
   private
 
-  memoize def params_renderer = NatsStreamer::ParamsRenderer.new(subject:, subscriber:)
+  memoize def params_renderer = NatsStreamer::ParamsRenderer.new(subject:, params: subscriber.params)
   memoize def deliverer(subscriber) = NatsStreamer::Deliverer.new(subscriber:)
 
   def pull(&)

diff --git a/lib/nats_streamer/logger.rb b/lib/nats_streamer/logger.rb
@@ -12,9 +12,9 @@ module NatsStreamer::Logger
         Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
       end
 
-      return Console.logger.public_send(name, self, msg) { block.call(elapsed) } unless block.nil?
+      return public_send(name, msg) { block.call(elapsed) } unless block.nil?
 
-      Console.logger.public_send(name, self, msg)
+      public_send(name, msg)
     end
   end
 end
diff --git a/lib/nats_streamer/params_renderer.rb b/lib/nats_streamer/params_renderer.rb
@@ -7,10 +7,10 @@ class NatsStreamer::ParamsRenderer
   include Memery
 
   option :subject
-  option :subscriber
+  option :params
 
   def render(event)
-    subscriber.params.transform_values do |v|
+    params.transform_values do |v|
       binding.local_variable_set(:event, event)
       ERB.new(v).result(binding)
     end.merge(event:, subject:)

diff --git a/spec/nats_streamer/params_renderer_spec.rb b/spec/nats_streamer/params_renderer_spec.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+RSpec.describe NatsStreamer::ParamsRenderer do
+  let(:renderer) { described_class.new(subject: subject_name, params:) }
+
+  let(:subject_name) { "foo.bar" }
+  let(:params) { { template: "The template, payload=<%= event[:payload] %>" } }
+
+  describe "#render" do
+    subject { renderer.render({ payload: "test" }) }
+
+    it "returns rendered parameters" do
+      expect(subject).to eq({
+                              template: "The template, payload=test",
+                              event: { payload: "test" },
+                              subject: "foo.bar"
+                            })
+    end
+  end
+end