radio5 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dbd8b7a0f0f52fbd61723bdadc3ce5391e06569ac5dd14af9179a5686b7144c
-  data.tar.gz: ace0a638624953a08f543ddb34646c2a13b2f661db12e79ca3527184d9723410
+  metadata.gz: 9cae0f327ab80b79f9d50626a2e59161ce8b0a2b7eb62400a2d36c0ef800b47d
+  data.tar.gz: ae74f46091926142fd98de0be436e50a21d6a7a9755ac6d1a533d7e4cee02ad3
 SHA512:
-  metadata.gz: 1a6ba08b636344e53094fd718f7c63f60047ebb5ea8e12d0e274f4bb828792cc0eeb9748d3ecbe718d409c573c76c0e3632bcd2214ed7bd9702078a0572db4dd
-  data.tar.gz: b42658c994bb9dd6b0c1b06bd97f9eb19032031a6f82752dbcc1bd0d8d8bdbfad1da647a0f20bf8f51b83481546ab1c1b2f397d7359c5b62f9786e951b53a31e
+  metadata.gz: 551122e49cbabbdc97e8655f10157fd373a29022bab4242267eb6e1bd347045445a3438de9a20c0ff3837dcc9b970c027992c8d15feb3602a4338abe5f748269
+  data.tar.gz: 46e0212e7fc3fb608aff1b163ff600b97939a768518c6fabc688ea77b3571d974303a9285ad2f89094b83646b99f8633e69c1891fa3e65e6a6b65bd1d61379e4

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+0.1.2
+----------
+
+- Fixed bug when custom HTTP config was ignored
+- Fixed bug with broken HTTP retries
+
 0.1.1
 ----------
 

data/README.md

@@ -242,11 +242,11 @@ Currently auth is in a WIP state.
 ## Development
 
 ```sh
-bin/setup     // install deps
-bin/console   // interactive prompt to play around
-rake spec     // test!
-rake rubocop  // lint!
-sudo rm -rf / // relax, just kidding ^^
+bin/setup      // install deps
+bin/console    // interactive prompt to play around
+rake spec      // test!
+rake rubocop   // lint!
+sudo rm -rf /  // just kidding ^^
 ```
 
 ## Contributing

data/lib/radio5/http.rb

@@ -9,12 +9,15 @@ module Radio5
     DEFAULT_OPEN_TIMEOUT = 10 # seconds
     DEFAULT_READ_TIMEOUT = 10 # seconds
     DEFAULT_WRITE_TIMEOUT = 10 # seconds
-    DEFAULT_DEBUG_OUTPUT = nil
+    DEFAULT_PROXY_URL = nil
     DEFAULT_MAX_RETRIES = 3
+    DEFAULT_DEBUG_OUTPUT = nil
+
     DEFAULT_HEADERS = {
       "Content-Type" => "application/json; charset=utf-8",
       "User-Agent" => "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
     }.freeze
+
     RETRIABLE_ERRORS = [
       Errno::ECONNREFUSED,
       Errno::ECONNRESET,
@@ -25,41 +28,45 @@ module Radio5
       OpenSSL::SSL::SSLError
     ].freeze
 
+    attr_reader :host, :port, :open_timeout, :read_timeout, :write_timeout, :proxy_url, :max_retries, :debug_output, :http_client
+
     # rubocop:disable Layout/ExtraSpacing
     def initialize(
       host:,
       port:,
-      open_timeout: DEFAULT_OPEN_TIMEOUT,
-      read_timeout: DEFAULT_READ_TIMEOUT,
-      write_timeout: DEFAULT_WRITE_TIMEOUT,
+      open_timeout: nil,
+      read_timeout: nil,
+      write_timeout: nil,
       proxy_url: nil,
-      max_retries: DEFAULT_MAX_RETRIES,
-      debug_output: DEFAULT_DEBUG_OUTPUT
+      max_retries: nil,
+      debug_output: nil
     )
-      # @host          = host
-      # @port          = port
-      # @open_timeout  = open_timeout
-      # @read_timeout  = read_timeout
-      # @write_timeout = write_timeout
-      # @proxy_url     = proxy_url
-      # @debug_output  = debug_output
-
-      proxy_uri = parse_proxy_uri(proxy_url)
-      @max_retries = max_retries
-
-      @http = Net::HTTP.new(host, port, proxy_uri&.host, proxy_uri&.port, proxy_uri&.user, proxy_uri&.pass)
-
-      @http.tap do |c|
-        c.use_ssl       = port == 443
-        c.open_timeout  = open_timeout
-        c.read_timeout  = read_timeout
-        c.write_timeout = write_timeout
-
-        c.set_debug_output(debug_output)
+      @host          = host
+      @port          = port
+      @open_timeout  = open_timeout  || DEFAULT_OPEN_TIMEOUT
+      @read_timeout  = read_timeout  || DEFAULT_READ_TIMEOUT
+      @write_timeout = write_timeout || DEFAULT_WRITE_TIMEOUT
+      @proxy_url     = proxy_url     || DEFAULT_PROXY_URL
+      @max_retries   = max_retries   || DEFAULT_MAX_RETRIES
+      @debug_output  = debug_output  || DEFAULT_DEBUG_OUTPUT
+
+      @http_client = Net::HTTP.new(@host, @port, proxy_uri&.host, proxy_uri&.port, proxy_uri&.user, proxy_uri&.password)
+
+      @http_client.tap do |c|
+        c.use_ssl       = @port == 443
+        c.open_timeout  = @open_timeout
+        c.read_timeout  = @read_timeout
+        c.write_timeout = @write_timeout
+
+        c.set_debug_output(@debug_output)
       end
     end
     # rubocop:enable Layout/ExtraSpacing
 
+    def proxy_uri
+      @proxy_uri ||= parse_proxy_uri
+    end
+
     def request(http_method_class, path, query_params, body, headers)
       request = build_request(http_method_class, path, query_params, body, headers)
       make_request(request)
@@ -67,16 +74,15 @@ module Radio5
 
     private
 
-    def parse_proxy_uri(proxy_url)
+    def parse_proxy_uri
       return if proxy_url.nil?
 
-      proxy_uri = URI(proxy_url)
-
-      unless @proxy_uri.is_a?(URI::HTTP)
-        raise ArgumentError, "Invalid proxy URL: #{@proxy_uri}"
+      case uri = URI(proxy_url)
+      when URI::HTTP
+        uri
+      else
+        raise ArgumentError, "Invalid proxy URL: #{proxy_url.inspect}, parsed URI: #{uri.inspect}"
       end
-
-      proxy_uri
     end
 
     def build_request(http_method_class, path, query_params, body, headers)
@@ -109,9 +115,9 @@ module Radio5
     end
 
     def make_request(request, retries: 0)
-      @http.request(request)
+      http_client.request(request)
     rescue *RETRIABLE_ERRORS => error
-      if retries < @max_retries
+      if retries < max_retries
         make_request(request, retries: retries + 1)
       else
         raise error

data/lib/radio5/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Radio5
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: radio5
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Dmytro Horoshko