pigeon-http 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b49e953d40948596cfea066d3002efb0e612ece45ce6b8bcdd1f25772d329ed
-  data.tar.gz: fc38bffab847cd7c37b13e0009bd11a61e039ceaf87fd8495833ec2228861317
+  metadata.gz: 20b7eedde8b0c9fb75e25872962fbda47a2425927c94995bcf99b5d6b2515c23
+  data.tar.gz: 81d2864272ffb24191949f132fd53964548391d561cf7b00057bc916b1a56d56
 SHA512:
-  metadata.gz: 2296d57aabe77db0a39cf9ef06abdbff05160b8a72fd16b910407e3c42075d8132c289ab9568942ccee5c44af51a96a43e020b01186f49225121e4d9a4f9e852
-  data.tar.gz: ff378ba4eb6137df6e43bf6355bc77882d0d4520c9ec9132ec8b64d5742ab5ecde89faeaf6bc0a72f7651130a8e8fd424aa941af4eb3a8450146821926fe224a
+  metadata.gz: a3b66e8bb1b3f1acad749742d6759af5aa0ad2eaac4ec144fcb5f956a93a44cba79745e3331c12587fdeb2041adc9f454448b2de7cb421c698ddb52ac078711c
+  data.tar.gz: 39939f3c8160246dea3c00e3c992474b175e79b266b62aafc3bb3925257063baf842edc1118c8107c0ea0533ec50760cfb8dc68d81361f29f65bd6237287bcdb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pigeon-http (0.1.3)
+    pigeon-http (0.1.5)
       circuitbox
       ddtrace
       dogstatsd-ruby

data/lib/pigeon/core.rb

@@ -77,49 +77,42 @@ module Pigeon
     end
 
     def get url, args = {}
-      start = Time.now
       response = http(:get, url, args)
-      Pigeon::Statsd.new(@options[:request_name] + '_latency', tags: [url]).capture(action: :histogram, count: (Time.now - start)) unless @options[:monitoring]
-
-      response
     rescue => e
       @callbacks[:HttpError]&.call(e)
     end
 
     def post url, args = {}
-      start = Time.now
       response = http(:post, url, args)
-      Pigeon::Statsd.new(@options[:request_name] + '_latency', tags: [url]).capture(action: :histogram, count: (Time.now - start)) unless @options[:monitoring]
-
-      response
     rescue => e
       @callbacks[:HttpError]&.call(e)
     end
 
     def put url, args = {}
-      start = Time.now
       response = http(:put, url, args)
-      Pigeon::Statsd.new(@options[:request_name] + '_latency', tags: [url]).capture(action: :histogram, count: (Time.now - start)) unless @options[:monitoring]
-
-      response
     rescue => e
       @callbacks[:HttpError]&.call(e)
     end
 
     def delete url, args = {}
-      http(:delete, url, args)
+      response = http(:delete, url, args)
     rescue => e
       @callbacks[:HttpError]&.call(e)
     end
 
     def http method, url, args = {}
+      start = Time.now
       args.merge({
         read_timeout: @options[:request_timeout],
         open_timeout: @options[:request_open_timeout],
         ssl_verify:   @options[:ssl_verify]
       })
       response = Pigeon::Http::Request.new(method, url, args).execute
-      Pigeon::Statsd.new(@options[:request_name] + '_througput', tags: [url]).capture
+
+      uri = URI.parse(url)
+      Pigeon::Statsd.new(@options[:request_name] + '_latency', tags: ["host:#{uri.host}"]).capture(action: :histogram, count: (Time.now - start))
+      Pigeon::Statsd.new(@options[:request_name] + '_througput', tags: ["host:#{uri.host}"]).capture
+      Pigeon::Statsd.new(@options[:request_name] + '_status', tags: ["host:#{uri.host}", "http:#{response.code}"]).capture
 
       response
     end

data/lib/pigeon/http.rb

@@ -17,7 +17,7 @@ module Pigeon
     end
 
     class Request
-      VALID_PARAMETERS        = %w[headers query body auth timeout open_timeout ssl_timeout read_timeout max_redirects ssl_verify]
+      VALID_PARAMETERS        = %w[headers query body form auth timeout open_timeout ssl_timeout read_timeout max_redirects ssl_verify]
       DEFAULT_HEADERS         = { 'User-Agent' => 'HTTP Client API/1.0' }
       VALID_VERBS             = [GET, HEAD, PUT, POST, DELETE, OPTIONS, TRACE]
       VALID_SSL_VERIFICATIONS = [SSL_VERIFY_NONE, SSL_VERIFY_PEER]
@@ -81,24 +81,28 @@ module Pigeon
         klass    = find_delegate_class(verb)
         headers  = DEFAULT_HEADERS.merge(args.fetch(:headers, {}))
         body     = args[:body]&.to_json
+        form     = args[:form]&.transform_keys(&:to_s)
         query    = args[:query]
         uri      = uri.dup
         delegate = klass.new(uri, headers)
 
+        delegate.content_type = 'application/json'
+
         if body
           raise Error::Argument, "#{verb} cannot have body" unless klass.const_get(:REQUEST_HAS_BODY)
-          delegate.content_type = 'application/json'
-          delegate.body         = body
+          delegate.body = body
+        elsif form
+          raise Error::Argument, "#{verb} cannot have form" unless klass.const_get(:REQUEST_HAS_BODY)
+          delegate.content_type = 'multipart/form-data'
+          delegate.set_form(form, 'multipart/form-data')
         elsif query
           if klass.const_get(:REQUEST_HAS_BODY)
-            delegate = klass.new(uri, headers)
+            delegate.content_type = 'application/x-www-form-urlencoded'
             delegate.set_form_data(query)
           else
             uri.query = URI.encode_www_form(query)
-            delegate  = klass.new(uri, headers)
+            delegate = klass.new(uri, headers)
           end
-        else
-          delegate = klass.new(uri, headers)
         end
 
         delegate

data/lib/pigeon/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pigeon
-  VERSION = '0.1.3'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pigeon-http
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Fitra Aditya
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-12 00:00:00.000000000 Z
+date: 2023-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: circuitbox