waithook 0.4.2 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3df6454a557d19f38729b89f1874b43111ab2d367c9f6f018064ad012d3ff2a
-  data.tar.gz: f933b2e75524e3301afbe50c8e56bbb525cea7a5503a15071cfad2ab4bd7ff59
+  metadata.gz: 4b1713a71f7f6f0af1e0c8a9201553bbc64100d0031b504ed124e314ca36b4d5
+  data.tar.gz: 8864b3ecd7c86acb2f85cd969df9571cfd22160588e41a888db22baeae720931
 SHA512:
-  metadata.gz: 8f6403f65b5bf735376deea1d9eb4157b66d87428e1c13717c71b80045bfa898487863e15d9a206c59575652cfaa6003dc14885746f1dcd22a2f6ebec03eac1a
-  data.tar.gz: b7f95a852f39039a4832f5a0f5889163e92fb855ade1b7e33a9c5b3ad5dbd0d587f393f8925156d5e8102f055eef0f7843e93be2f5122c1d9934bdbfca0ba70d
+  metadata.gz: 1a2936f26693ddb36a68e42f49bc551d191e2f21c95264d0a5dd2038db5c19a407ce88e51f81814e27fcc8ce4129eb96e56a07bb9f7c7fec8ba083d3919f75f6
+  data.tar.gz: 0bbdb879ed861b5ca6f8be53c7448b2b464afc389c6ed4e7a708cd893af9763d87ae8afbc13aaf052ebc80387d1447ffe6c78bf9250406bbaeb89fe222ae6ad1

data/Gemfile

@@ -4,5 +4,6 @@ gem 'rake'
 gem 'minitest-reporters'
 gem 'excon'
 gem 'addressable'
+gem 'coderay'
 
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    waithook (0.4.2)
+    waithook (0.4.4)
       websocket (~> 1.2)
 
 GEM
@@ -11,8 +11,11 @@ GEM
       public_suffix (>= 2.0.2, < 7.0)
     ansi (1.5.0)
     builder (3.3.0)
-    excon (0.112.0)
-    minitest (5.25.1)
+    coderay (1.1.3)
+    excon (1.2.5)
+      logger
+    logger (1.7.0)
+    minitest (5.25.5)
     minitest-reporters (1.7.1)
       ansi
       builder
@@ -28,6 +31,7 @@ PLATFORMS
 
 DEPENDENCIES
   addressable
+  coderay
   excon
   minitest-reporters
   rake

data/lib/waithook/version.rb

@@ -1,3 +1,3 @@
 class Waithook
-  VERSION = "0.4.2"
+  VERSION = "0.4.4"
 end

data/lib/waithook.rb

@@ -150,7 +150,12 @@ class Waithook
     Timeout.timeout(timeout) do
       while true
         _, data = @client.wait_message
-        webhook = Webhook.new(data, logger)
+        webhook = Webhook.new(
+          data,
+          logger: logger,
+          forward_options: (options[:forward_options] || {}).merge(@options[:forward_options] || {}),
+          enable_colors: options.key?(:enable_colors) ? options.key?(:enable_colors) : true
+        )
         if @filter && @filter.call(webhook) || !@filter
           @messages << webhook
           return webhook
@@ -184,7 +189,7 @@ class Waithook
     # Raw message from waithook server
     attr_reader :message
 
-    def initialize(payload, logger = nil)
+    def initialize(payload, logger: nil, forward_options: {}, enable_colors: true)
       @message = payload
       data = JSON.parse(@message)
       @url = data['url']
@@ -192,9 +197,18 @@ class Waithook
       @body = data['body']
       @method = data['method']
       @logger = logger
+      @forward_options = forward_options
+      @enable_colors = enable_colors
     end
 
-    def pretty_print
+    def pretty_print(pp_arg = nil, *args)
+      return super if pp_arg && defined?(super) # method from 'pp' library has same name
+
+      if !@body
+        @logger&.debug("Error: Waithook::Webhook has no @body")
+        return @message
+      end
+
       if @body.start_with?('{') && @body.end_with?('}') || @body.start_with?('[') && @body.end_with?(']')
         begin
           body_data = JSON.parse(body)
@@ -202,19 +216,21 @@ class Waithook
           data_without_body = JSON.parse(@message)
           data_without_body.delete('body')
 
-          begin
-            require 'coderay'
-            pretty_body = CodeRay.scan(pretty_body, :json).term
-          rescue => error
-            logger&.debug("Error while trying to use CodeRay: #{error.message}")
+          if @enable_colors
+            begin
+              require 'coderay'
+              pretty_body = CodeRay.scan(pretty_body, :json).term
+            rescue => error
+              @logger&.debug("Error while trying to use CodeRay: #{error.message}")
+            end
           end
           return "#{JSON.pretty_generate(data_without_body)}\nBody:\n#{pretty_body}"
         rescue JSON::ParserError => error
-          logger&.debug("Error while parsing json body: #{error.message}")
+          @logger&.debug("Error while parsing json body: #{error.message}")
         end
       end
 
-      return message
+      return @message
     end
 
     # Returns Hash.
@@ -236,7 +252,8 @@ class Waithook
       uri = URI.parse(url)
       response = nil
 
-      Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
+      http_options = {use_ssl: uri.scheme == 'https'}.merge(@forward_options || {})
+      Net::HTTP.start(uri.host, uri.port, http_options) do |http|
         http_klass = case method
           when "GET"    then Net::HTTP::Get
           when "POST"   then Net::HTTP::Post
@@ -267,3 +284,4 @@ class Waithook
     end
   end
 end
+

data/tests/server_test.rb

@@ -71,9 +71,10 @@ describe "Server" do
 
     assert_includes(response.body, "<html lang='en'>")
     assert_equal({
-      "Connection"     => "close",
-      "Content-Length" => response.headers["Content-Length"],
-      "Content-Type"   => "text/html"
+      "Content-Encoding" => "", 
+      "Connection"       => "close",
+      "Content-Length"   => response.headers["Content-Length"],
+      "Content-Type"     => "text/html"
     }, response.headers)
   end
 
@@ -82,9 +83,10 @@ describe "Server" do
 
     assert_includes(response.body, "function")
     assert_equal({
-      "Connection"     => "close",
-      "Content-Length" => response.headers["Content-Length"],
-      "Content-Type"   => "application/javascript; charset=utf-8"
+      "Content-Encoding" => "", 
+      "Connection"       => "close",
+      "Content-Length"   => response.headers["Content-Length"],
+      "Content-Type"     => "application/javascript; charset=utf-8"
     }, response.headers)
   end
 

data/tests/waithook_test.rb

@@ -55,6 +55,20 @@ describe "Waithook" do
     assert_equal("POST", webhook.method)
   end
 
+  it "should use forward_options in request" do
+    waithook = default_client(forward_options: {write_timeout: :aaa, local_host: "--11"})
+
+    message = {'my_data' => true}
+
+    Excon.post("http://#{HOST}:#{PORT}/my-super-test", body: JSON.generate(message))
+
+    forward_error = begin
+      waithook.forward_to("http://#{HOST}:#{PORT}/my-super-test2")
+    rescue => e; e end
+    assert_equal(forward_error.class, Socket::ResolutionError)
+    assert_includes(forward_error.message, "getaddrinfo: nodename nor servname provided, or not known")
+  end
+
   it "should have trace log level" do
     out, err = capture_io do
       default_client(logger_level: :trace, logger: true)

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: waithook
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.4
 platform: ruby
 authors:
 - Pavel Evstigneev
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-29 00:00:00.000000000 Z
+date: 2025-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket
@@ -55,7 +54,6 @@ homepage: https://github.com/paxa/waithook-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -70,8 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.6.5
 specification_version: 4
 summary: HTTP to WebSocket transmitting client
 test_files: []