rabbitmq_http_api_client 1.13.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0b9cc95320a9b5267b3ca4e0c0afc635bc07d4b1a06d4a684568dc887f8538e
-  data.tar.gz: 6a99738452b35246c258b11e76b92b9d58be9ea184611600d677681677becc73
+  metadata.gz: b27e07a1d996952430cd53fa4c8eb1fc942a0c9126274bbd4436db5274a69764
+  data.tar.gz: a4d4b7429098509a8d971c8ed994555d24e99eb827e87179113cb50bf009a4bf
 SHA512:
-  metadata.gz: 288d82241e7bcbf7ba6ec4fff269b0ad2f9bbdb4c6c51317675a3a29504926d793e8211489ab521f79237977770c96a49b1e1061f38c9af42b039c7185249edb
-  data.tar.gz: 2b2ecfc8fb8fe35522571bc836d77324ba20991afaacc4f151cece7efb856d537e0a7c3d0474a3b79fe695760e44073e4692ef0a9d3a73eb54f63ecf028869bd
+  metadata.gz: 85efb6fca0ae57d98876a8db4124852f1c4c7911f428c92aac4d5607c3c93e5466dd04d81f2df27d77a59929581d477469c5605e15e287e8cd73f51ae78a5fb0
+  data.tar.gz: a185c9007cc1f45e1f0d0f9d25d3ad4adf91f1ebfb72469a1eeec70448ef25a5502c383e319ccf218a72b005738782f1bfdc909ca6bc4ecb3ecc90c0a51ac143

data/ChangeLog.md

@@ -1,7 +1,91 @@
-## Changes Between 1.12.0 and 1.13.0 (March 5th, 2020)
+## Changes Between 2.1.0 and 2.2.0 (in development)
 
 No changes yet.
 
+
+## Changes Between 2.0.0 and 2.1.0 (February 12, 2022)
+
+### Handle Responses that Do Not Contain a Body
+
+GitHub issue: [#52](https://github.com/ruby-amqp/rabbitmq_http_api_client/issues/52)
+
+### Support for Management of Topic Permissions
+
+Contributed by @bagedevimo.
+
+GitHub issue: [#57](https://github.com/ruby-amqp/rabbitmq_http_api_client/issues/57)
+
+### Upgraded Faraday Middleware
+
+Faraday (a dependency) has been upgraded to `1.2.x` to eliminate some deprecation warnings.
+
+
+## Changes Between 1.15.0 and 2.0.0 (May 21, 2021)
+
+### Health Check Endpoint Changes
+
+`RabbitMQ::HTTP::Client#aliveness_test` has been removed. The endpoint has been deprecated
+in favor of [more focussed health check endpoints](https://www.rabbitmq.com/monitoring.html#health-checks):
+
+``` ruby
+c = RabbitMQ::HTTP::Client.new("http://username:s3kRe7@localhost:15672")
+
+# Returns a pair of [success, details]. Details will be nil
+# if the check succeeds.
+#
+# Checks for any alarms across the cluster
+passed, details = c.health.check_alarms
+
+# alarms on the given node
+passed, details = c.health.check_local_alarms
+
+# is this node essential for an online quorum of any quorum queues?
+passed, details = c.health.check_if_node_is_quorum_critical
+
+# do any certificates used by this node's TLS listeners expire within
+# three months?
+passed, details = c.health.check_certificate_expiration(3, "months")
+```
+
+See the list of methods in `RabbitMQ::HTTP::HealthChecks` to find out what other
+health checks are available.
+
+### User Tags Type Change
+
+User tags returned by the `RabbitMQ::HTTP::Client#list_users` and `RabbitMQ::HTTP::Client#user_info`
+methods are now arrays of strings instead of comma-separated strings.
+
+Internally the method encodes both command-separated strings and JSON arrays in API responses
+to support response types from RabbitMQ 3.9 and earlier versions.
+
+See [rabbitmq/rabbitmq-server#2676](https://github.com/rabbitmq/rabbitmq-server/pull/2676) for details.
+
+## Changes Between 1.14.0 and 1.15.0 (February 16th, 2021)
+### Content Length Detection Changes
+
+When deserialising response bodies, the client now uses actual body length instead of
+the value of the `content-length` header.
+
+Contributed by Ryan @rquant Quant.
+
+GitHub issue: [#49](https://github.com/ruby-amqp/rabbitmq_http_api_client/pull/49)
+
+
+## Changes Between 1.13.0 and 1.14.0 (July 8th, 2020)
+
+### URI.escape is No Longer Used
+
+Deprecated `URI.escape` has been replaced with `Addressable::URI.escape_component`.
+This introduces `addressable` as a new dependency.
+
+### Dependency Bump
+
+Note: Faraday will now raise a `Faraday::ResourceNotFound` instead of `Faraday::Error::ResourceNotFound`.
+
+GitHub issue: [#45](https://github.com/ruby-amqp/rabbitmq_http_api_client/pull/45)
+
+Contributed by Niels Jansen.
+
 ## Changes Between 1.12.0 and 1.13.0 (March 5th, 2020)
 
 ### Pagination Support

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2019 Michael Klishin
+Copyright (c) 2012-2020 Michael Klishin
 
 MIT License
 

data/README.md

@@ -18,12 +18,12 @@ and will support more HTTP API features in the future
 
 ## Supported Ruby Versions
 
- * CRuby 2.0 through 2.4.x
+ * CRuby 2.2 through 2.7.x
  * JRuby 9K
 
 ## Supported RabbitMQ Versions
 
- * RabbitMQ 3.x
+All [supported RabbitMQ release series](https://www.rabbitmq.com/versions.html).
 
 All versions require [RabbitMQ Management UI plugin](http://www.rabbitmq.com/management.html) to be installed and enabled.
 
@@ -32,7 +32,7 @@ All versions require [RabbitMQ Management UI plugin](http://www.rabbitmq.com/man
 Add this line to your application's Gemfile:
 
 ``` ruby
-gem 'rabbitmq_http_api_client', '>= 1.12.0'
+gem 'rabbitmq_http_api_client', '>= 2.0.0'
 ```
 
 And then execute:
@@ -371,4 +371,4 @@ and rabbitmq-management plugin enabled.
 
 Double-licensed under the MIT and Mozilla Public License (same as RabbitMQ).
 
-(c) Michael S. Klishin, 2012-2019.
+(c) Michael S. Klishin, 2012-2020.

data/lib/rabbitmq/http/client/health_checks.rb

@@ -0,0 +1,70 @@
+require "hashie"
+require "faraday"
+require "faraday_middleware"
+require "multi_json"
+require "uri"
+
+module RabbitMQ
+  module HTTP
+    class HealthChecks
+
+      def initialize(client)
+        @client = client
+        @request_helper  = @client.request_helper
+        @response_helper = @client.response_helper
+      end
+
+      def check_alarms
+        health_check_for("health/checks/alarms")
+      end
+
+      def check_local_alarms
+        health_check_for("health/checks/local-alarms")
+      end
+
+      def check_virtual_hosts
+        health_check_for("health/checks/virtual-hosts")
+      end
+
+      def check_if_node_is_quorum_critical
+        health_check_for("health/checks/node-is-quorum-critical")
+      end
+
+      def check_if_node_is_mirror_sync_critical
+        health_check_for("health/checks/node-is-mirror-sync-critical")
+      end
+
+      def check_port_listener(port)
+        health_check_for("health/checks/port-listener/#{encode_uri_path_segment(port)}")
+      end
+
+      def check_protocol_listener(proto)
+        health_check_for("health/checks/protocol-listener/#{encode_uri_path_segment(proto)}")
+      end
+
+      TIME_UNITS = %w(days weeks months years)
+
+      def check_certificate_expiration(within, unit)
+        raise ArgumentError.new("supported time units are #{TIME_UNITS.join(', ')}, given: #{unit}") if !TIME_UNITS.include?(unit)
+        raise ArgumentError.new("the number of time units must be a positive integer") if within <= 0
+
+        health_check_for("health/checks/certificate-expiration/#{@request_helper.encode_uri_path_segment(within)}/#{@request_helper.encode_uri_path_segment(unit)}")
+      end
+
+
+      def health_check_for(path)
+        begin
+            _ = @response_helper.decode_resource(@client.connection.get(path))
+            [true, nil]
+          rescue Faraday::ServerError => se
+            # health check endpoints respond with a 503 if the server fails
+            if se.response_status == 503
+              [false, @response_helper.decode_response_body(se.response[:body])]
+            else
+              raise se
+            end
+        end
+      end
+    end
+  end
+end

data/lib/rabbitmq/http/client/request_helper.rb

@@ -0,0 +1,19 @@
+require "hashie"
+require "faraday"
+require "faraday_middleware"
+require "multi_json"
+require "uri"
+
+module RabbitMQ
+  module HTTP
+    class RequestHelper
+      def encode_uri_path_segment(segment)
+        # Correctly escapes spaces, see ruby-amqp/rabbitmq_http_api_client#28.
+        #
+        # Note that slashes also must be escaped since this is a single URI path segment,
+        # not an entire path.
+        Addressable::URI.encode_component(segment, Addressable::URI::CharacterClasses::UNRESERVED)
+      end
+    end
+  end
+end

data/lib/rabbitmq/http/client/response_helper.rb

@@ -0,0 +1,38 @@
+require "hashie"
+require "faraday"
+require "faraday_middleware"
+require "multi_json"
+require "uri"
+
+module RabbitMQ
+  module HTTP
+    class ResponseHelper
+
+      def initialize(client)
+        @client = client
+      end
+
+      def decode_resource(response)
+        if response.nil? || response.body.empty?
+          Hashie::Mash.new
+        else
+          decode_response_body(response.body)
+        end
+      end
+
+      def decode_response_body(body)
+        if body.empty?
+          Hashie::Mash.new
+        else
+          Hashie::Mash.new(body)
+        end
+      end
+
+      def decode_resource_collection(response)
+        collection = response.body.is_a?(Array) ? response.body : response.body.fetch('items')
+
+        collection.map { |i| Hashie::Mash.new(i) }
+      end
+    end
+  end
+end

data/lib/rabbitmq/http/client/version.rb

@@ -1,7 +1,7 @@
 module RabbitMQ
   module HTTP
     class Client
-      VERSION = "1.13.0"
+      VERSION = "2.1.0"
     end
   end
 end

data/lib/rabbitmq/http/client.rb

@@ -1,9 +1,14 @@
+require "addressable/uri"
 require "hashie"
 require "faraday"
 require "faraday_middleware"
 require "multi_json"
 require "uri"
 
+require_relative "client/request_helper"
+require_relative "client/response_helper"
+require_relative "client/health_checks"
+
 module RabbitMQ
   module HTTP
     class Client
@@ -12,7 +17,8 @@ module RabbitMQ
       # API
       #
 
-      attr_reader :endpoint
+      attr_reader :endpoint, :health
+      attr_reader :connection, :request_helper, :response_helper
 
       def self.connect(endpoint, options = {})
         new(endpoint, options)
@@ -22,6 +28,10 @@ module RabbitMQ
         @endpoint = endpoint
         @options  = options
 
+        @request_helper = RequestHelper.new()
+        @response_helper = ResponseHelper.new(self)
+        @health = HealthChecks.new(self)
+
         initialize_connection(endpoint, options)
       end
 
@@ -62,7 +72,7 @@ module RabbitMQ
       end
 
       def node_info(name)
-        decode_resource(@connection.get("nodes/#{uri_encode(name)}"))
+        decode_resource(@connection.get("nodes/#{encode_uri_path_segment(name)}"))
       end
 
       def list_extensions(query = {})
@@ -86,11 +96,11 @@ module RabbitMQ
       end
 
       def connection_info(name)
-        decode_resource(@connection.get("connections/#{uri_encode(name)}"))
+        decode_resource(@connection.get("connections/#{encode_uri_path_segment(name)}"))
       end
 
       def close_connection(name)
-        decode_resource(@connection.delete("connections/#{uri_encode(name)}"))
+        decode_resource(@connection.delete("connections/#{encode_uri_path_segment(name)}"))
       end
 
       def list_channels(query = {})
@@ -98,14 +108,14 @@ module RabbitMQ
       end
 
       def channel_info(name)
-        decode_resource(@connection.get("channels/#{uri_encode(name)}"))
+        decode_resource(@connection.get("channels/#{encode_uri_path_segment(name)}"))
       end
 
       def list_exchanges(vhost = nil, query = {})
         path = if vhost.nil?
                  "exchanges"
                else
-                 "exchanges/#{uri_encode(vhost)}"
+                 "exchanges/#{encode_uri_path_segment(vhost)}"
                end
 
         decode_resource_collection(@connection.get(path, query))
@@ -113,13 +123,13 @@ module RabbitMQ
 
       def declare_exchange(vhost, name, attributes = {})
         opts = {
-          :type => "direct",
-          :auto_delete => false,
-          :durable => true,
-          :arguments => {}
+          type: "direct",
+          auto_delete: false,
+          durable: true,
+          arguments: {}
         }.merge(attributes)
 
-        response = @connection.put("exchanges/#{uri_encode(vhost)}/#{uri_encode(name)}") do |req|
+        response = @connection.put("exchanges/#{encode_uri_path_segment(vhost)}/#{encode_uri_path_segment(name)}") do |req|
           req.headers['Content-Type'] = 'application/json'
           req.body = MultiJson.dump(opts)
         end
@@ -127,40 +137,40 @@ module RabbitMQ
       end
 
       def delete_exchange(vhost, name, if_unused = false)
-        response = @connection.delete("exchanges/#{uri_encode(vhost)}/#{uri_encode(name)}") do |req|
+        response = @connection.delete("exchanges/#{encode_uri_path_segment(vhost)}/#{encode_uri_path_segment(name)}") do |req|
           req.params["if-unused"] = true if if_unused
         end
         decode_resource(response)
       end
 
       def exchange_info(vhost, name)
-        decode_resource(@connection.get("exchanges/#{uri_encode(vhost)}/#{uri_encode(name)}"))
+        decode_resource(@connection.get("exchanges/#{encode_uri_path_segment(vhost)}/#{encode_uri_path_segment(name)}"))
       end
 
       def list_bindings_by_source(vhost, exchange, query = {})
-        decode_resource_collection(@connection.get("exchanges/#{uri_encode(vhost)}/#{uri_encode(exchange)}/bindings/source", query))
+        decode_resource_collection(@connection.get("exchanges/#{encode_uri_path_segment(vhost)}/#{encode_uri_path_segment(exchange)}/bindings/source", query))
       end
 
       def list_bindings_by_destination(vhost, exchange, query = {})
-        decode_resource_collection(@connection.get("exchanges/#{uri_encode(vhost)}/#{uri_encode(exchange)}/bindings/destination", query))
+        decode_resource_collection(@connection.get("exchanges/#{encode_uri_path_segment(vhost)}/#{encode_uri_path_segment(exchange)}/bindings/destination", query))
       end
 
       def list_queues(vhost = nil, query = {})
         path = if vhost.nil?
                  "queues"
                else
-                 "queues/#{uri_encode(vhost)}"
+                 "queues/#{encode_uri_path_segment(vhost)}"
                end
 
         decode_resource_collection(@connection.get(path, query))
       end
 
       def queue_info(vhost, name)
-        decode_resource(@connection.get("queues/#{uri_encode(vhost)}/#{uri_encode(name)}"))
+        decode_resource(@connection.get("queues/#{encode_uri_path_segment(vhost)}/#{encode_uri_path_segment(name)}"))
       end
 
       def declare_queue(vhost, name, attributes)
-        response = @connection.put("queues/#{uri_encode(vhost)}/#{uri_encode(name)}") do |req|
+        response = @connection.put("queues/#{encode_uri_path_segment(vhost)}/#{encode_uri_path_segment(name)}") do |req|
           req.headers['Content-Type'] = "application/json"
           req.body = MultiJson.dump(attributes)
         end
@@ -168,20 +178,20 @@ module RabbitMQ
       end
 
       def delete_queue(vhost, name)
-        decode_resource(@connection.delete("queues/#{uri_encode(vhost)}/#{uri_encode(name)}"))
+        decode_resource(@connection.delete("queues/#{encode_uri_path_segment(vhost)}/#{encode_uri_path_segment(name)}"))
       end
 
       def list_queue_bindings(vhost, queue, query = {})
-        decode_resource_collection(@connection.get("queues/#{uri_encode(vhost)}/#{uri_encode(queue)}/bindings", query))
+        decode_resource_collection(@connection.get("queues/#{encode_uri_path_segment(vhost)}/#{encode_uri_path_segment(queue)}/bindings", query))
       end
 
       def purge_queue(vhost, name)
-        @connection.delete("queues/#{uri_encode(vhost)}/#{uri_encode(name)}/contents")
+        @connection.delete("queues/#{encode_uri_path_segment(vhost)}/#{encode_uri_path_segment(name)}/contents")
         Hashie::Mash.new
       end
 
       def get_messages(vhost, name, options)
-        response = @connection.post("queues/#{uri_encode(vhost)}/#{uri_encode(name)}/get") do |req|
+        response = @connection.post("queues/#{encode_uri_path_segment(vhost)}/#{encode_uri_path_segment(name)}/get") do |req|
           req.headers['Content-Type'] = "application/json"
           req.body = MultiJson.dump(options)
         end
@@ -192,22 +202,22 @@ module RabbitMQ
         path = if vhost.nil?
                  "bindings"
                else
-                 "bindings/#{uri_encode(vhost)}"
+                 "bindings/#{encode_uri_path_segment(vhost)}"
                end
 
         decode_resource_collection(@connection.get(path, query))
       end
 
       def list_bindings_between_queue_and_exchange(vhost, queue, exchange, query = {})
-        decode_resource_collection(@connection.get("bindings/#{uri_encode(vhost)}/e/#{uri_encode(exchange)}/q/#{uri_encode(queue)}", query))
+        decode_resource_collection(@connection.get("bindings/#{encode_uri_path_segment(vhost)}/e/#{encode_uri_path_segment(exchange)}/q/#{encode_uri_path_segment(queue)}", query))
       end
 
       def queue_binding_info(vhost, queue, exchange, properties_key)
-        decode_resource(@connection.get("bindings/#{uri_encode(vhost)}/e/#{uri_encode(exchange)}/q/#{uri_encode(queue)}/#{uri_encode(properties_key)}"))
+        decode_resource(@connection.get("bindings/#{encode_uri_path_segment(vhost)}/e/#{encode_uri_path_segment(exchange)}/q/#{encode_uri_path_segment(queue)}/#{encode_uri_path_segment(properties_key)}"))
       end
 
       def bind_queue(vhost, queue, exchange, routing_key, arguments = [])
-        resp = @connection.post("bindings/#{uri_encode(vhost)}/e/#{uri_encode(exchange)}/q/#{uri_encode(queue)}") do |req|
+        resp = @connection.post("bindings/#{encode_uri_path_segment(vhost)}/e/#{encode_uri_path_segment(exchange)}/q/#{encode_uri_path_segment(queue)}") do |req|
           req.headers['Content-Type'] = 'application/json'
           req.body = MultiJson.dump({:routing_key => routing_key, :arguments => arguments})
         end
@@ -215,21 +225,21 @@ module RabbitMQ
       end
 
       def delete_queue_binding(vhost, queue, exchange, properties_key)
-        resp = @connection.delete("bindings/#{uri_encode(vhost)}/e/#{uri_encode(exchange)}/q/#{uri_encode(queue)}/#{uri_encode(properties_key)}")
+        resp = @connection.delete("bindings/#{encode_uri_path_segment(vhost)}/e/#{encode_uri_path_segment(exchange)}/q/#{encode_uri_path_segment(queue)}/#{encode_uri_path_segment(properties_key)}")
         resp.success?
       end
 
       def list_bindings_between_exchanges(vhost, destination_exchange, source_exchange, query = {})
-        decode_resource_collection(@connection.get("bindings/#{uri_encode(vhost)}/e/#{uri_encode(source_exchange)}/e/#{uri_encode(destination_exchange)}", query))
+        decode_resource_collection(@connection.get("bindings/#{encode_uri_path_segment(vhost)}/e/#{encode_uri_path_segment(source_exchange)}/e/#{encode_uri_path_segment(destination_exchange)}", query))
       end
 
       def exchange_binding_info(vhost, destination_exchange, source_exchange, properties_key)
-        decode_resource(@connection.get("bindings/#{uri_encode(vhost)}/e/#{uri_encode(source_exchange)}/e/#{uri_encode(destination_exchange)}/#{uri_encode(properties_key)}"))
+        decode_resource(@connection.get("bindings/#{encode_uri_path_segment(vhost)}/e/#{encode_uri_path_segment(source_exchange)}/e/#{encode_uri_path_segment(destination_exchange)}/#{encode_uri_path_segment(properties_key)}"))
       end
 
 
       def bind_exchange(vhost, destination_exchange, source_exchange, routing_key, arguments = [])
-        resp = @connection.post("bindings/#{uri_encode(vhost)}/e/#{uri_encode(source_exchange)}/e/#{uri_encode(destination_exchange)}") do |req|
+        resp = @connection.post("bindings/#{encode_uri_path_segment(vhost)}/e/#{encode_uri_path_segment(source_exchange)}/e/#{encode_uri_path_segment(destination_exchange)}") do |req|
           req.headers['Content-Type'] = 'application/json'
           req.body = MultiJson.dump({:routing_key => routing_key, :arguments => arguments})
         end
@@ -237,7 +247,7 @@ module RabbitMQ
       end
 
       def delete_exchange_binding(vhost, destination_exchange, source_exchange, properties_key)
-        resp = @connection.delete("bindings/#{uri_encode(vhost)}/e/#{uri_encode(source_exchange)}/e/#{uri_encode(destination_exchange)}/#{uri_encode(properties_key)}")
+        resp = @connection.delete("bindings/#{encode_uri_path_segment(vhost)}/e/#{encode_uri_path_segment(source_exchange)}/e/#{encode_uri_path_segment(destination_exchange)}/#{encode_uri_path_segment(properties_key)}")
         resp.success?
       end
 
@@ -247,25 +257,25 @@ module RabbitMQ
       end
 
       def vhost_info(name)
-        decode_resource(@connection.get("vhosts/#{uri_encode(name)}"))
+        decode_resource(@connection.get("vhosts/#{encode_uri_path_segment(name)}"))
       end
 
       def create_vhost(name)
-        response = @connection.put("vhosts/#{uri_encode(name)}") do |req|
+        response = @connection.put("vhosts/#{encode_uri_path_segment(name)}") do |req|
           req.headers['Content-Type'] = "application/json"
         end
         decode_resource(response)
       end
 
       def delete_vhost(name)
-        decode_resource(@connection.delete("vhosts/#{uri_encode(name)}"))
+        decode_resource(@connection.delete("vhosts/#{encode_uri_path_segment(name)}"))
       end
 
 
 
       def list_permissions(vhost = nil, query = {})
         path = if vhost
-                 "vhosts/#{uri_encode(vhost)}/permissions"
+                 "vhosts/#{encode_uri_path_segment(vhost)}/permissions"
                else
                  "permissions"
                end
@@ -274,11 +284,11 @@ module RabbitMQ
       end
 
       def list_permissions_of(vhost, user)
-        decode_resource(@connection.get("permissions/#{uri_encode(vhost)}/#{uri_encode(user)}"))
+        decode_resource(@connection.get("permissions/#{encode_uri_path_segment(vhost)}/#{encode_uri_path_segment(user)}"))
       end
 
       def update_permissions_of(vhost, user, attributes)
-        response = @connection.put("permissions/#{uri_encode(vhost)}/#{uri_encode(user)}") do |req|
+        response = @connection.put("permissions/#{encode_uri_path_segment(vhost)}/#{encode_uri_path_segment(user)}") do |req|
           req.headers['Content-Type'] = "application/json"
           req.body = MultiJson.dump(attributes)
         end
@@ -286,23 +296,56 @@ module RabbitMQ
       end
 
       def clear_permissions_of(vhost, user)
-        decode_resource(@connection.delete("permissions/#{uri_encode(vhost)}/#{uri_encode(user)}"))
+        decode_resource(@connection.delete("permissions/#{encode_uri_path_segment(vhost)}/#{encode_uri_path_segment(user)}"))
+      end
+
+      def list_topic_permissions(vhost = nil, query = {})
+        path = if vhost
+                 "vhosts/#{encode_uri_path_segment(vhost)}/topic-permissions"
+                else
+                  "topic-permissions"
+                end
+
+        decode_resource_collection(@connection.get(path, query))
       end
 
+      def list_topic_permissions_of(vhost, user)
+        path = "topic-permissions/#{encode_uri_path_segment(vhost)}/#{encode_uri_path_segment(user)}"
+        decode_resource_collection(@connection.get(path))
+      end
 
+      def update_topic_permissions_of(vhost, user, attributes)
+        response = @connection.put("topic-permissions/#{encode_uri_path_segment(vhost)}/#{encode_uri_path_segment(user)}") do |req|
+          req.headers['Content-Type'] = "application/json"
+          req.body = MultiJson.dump(attributes)
+        end
+
+        nil
+      end
 
       def list_users(query = {})
-        decode_resource_collection(@connection.get("users", query))
+        results = decode_resource_collection(@connection.get("users", query))
+
+        # HTTP API will return tags as an array starting with RabbitMQ 3.9
+        results.map do |u|
+          u.tags = u.tags.split(",") if u.tags.is_a?(String)
+          u
+        end
       end
 
       def user_info(name)
-        decode_resource(@connection.get("users/#{uri_encode(name)}"))
+        result = decode_resource(@connection.get("users/#{encode_uri_path_segment(name)}"))
+
+        # HTTP API will return tags as an array starting with RabbitMQ 3.9
+        result.tags = result.tags.split(",") if result.tags.is_a?(String)
+
+        result
       end
 
       def update_user(name, attributes)
         attributes[:tags] ||= ""
 
-        response = @connection.put("users/#{uri_encode(name)}") do |req|
+        response = @connection.put("users/#{encode_uri_path_segment(name)}") do |req|
           req.headers['Content-Type'] = "application/json"
           req.body = MultiJson.dump(attributes)
         end
@@ -311,11 +354,11 @@ module RabbitMQ
       alias create_user update_user
 
       def delete_user(name)
-        decode_resource(@connection.delete("users/#{uri_encode(name)}"))
+        decode_resource(@connection.delete("users/#{encode_uri_path_segment(name)}"))
       end
 
       def user_permissions(name, query = {})
-        decode_resource_collection(@connection.get("users/#{uri_encode(name)}/permissions", query))
+        decode_resource_collection(@connection.get("users/#{encode_uri_path_segment(name)}/permissions", query))
       end
 
       def whoami
@@ -326,7 +369,7 @@ module RabbitMQ
 
       def list_policies(vhost = nil, query = {})
         path = if vhost
-                 "policies/#{uri_encode(vhost)}"
+                 "policies/#{encode_uri_path_segment(vhost)}"
                else
                  "policies"
                end
@@ -336,15 +379,15 @@ module RabbitMQ
 
       def list_policies_of(vhost, name = nil, query = {})
         path = if name
-                 "policies/#{uri_encode(vhost)}/#{uri_encode(name)}"
+                 "policies/#{encode_uri_path_segment(vhost)}/#{encode_uri_path_segment(name)}"
                else
-                 "policies/#{uri_encode(vhost)}"
+                 "policies/#{encode_uri_path_segment(vhost)}"
                end
         decode_resource_collection(@connection.get(path, query))
       end
 
       def update_policies_of(vhost, name, attributes)
-        response = @connection.put("policies/#{uri_encode(vhost)}/#{uri_encode(name)}") do |req|
+        response = @connection.put("policies/#{encode_uri_path_segment(vhost)}/#{encode_uri_path_segment(name)}") do |req|
           req.headers['Content-Type'] = "application/json"
           req.body = MultiJson.dump(attributes)
         end
@@ -352,7 +395,7 @@ module RabbitMQ
       end
 
       def clear_policies_of(vhost, name)
-        decode_resource(@connection.delete("policies/#{uri_encode(vhost)}/#{uri_encode(name)}"))
+        decode_resource(@connection.delete("policies/#{encode_uri_path_segment(vhost)}/#{encode_uri_path_segment(name)}"))
       end
 
 
@@ -360,7 +403,7 @@ module RabbitMQ
 
       def list_parameters(component = nil, query = {})
         path = if component
-                 "parameters/#{uri_encode(component)}"
+                 "parameters/#{encode_uri_path_segment(component)}"
                else
                  "parameters"
                end
@@ -369,15 +412,15 @@ module RabbitMQ
 
       def list_parameters_of(component, vhost, name = nil, query = {})
         path = if name
-                 "parameters/#{uri_encode(component)}/#{uri_encode(vhost)}/#{uri_encode(name)}"
+                 "parameters/#{encode_uri_path_segment(component)}/#{encode_uri_path_segment(vhost)}/#{encode_uri_path_segment(name)}"
                else
-                 "parameters/#{uri_encode(component)}/#{uri_encode(vhost)}"
+                 "parameters/#{encode_uri_path_segment(component)}/#{encode_uri_path_segment(vhost)}"
                end
         decode_resource_collection(@connection.get(path, query))
       end
 
       def update_parameters_of(component, vhost, name, attributes)
-        response = @connection.put("parameters/#{uri_encode(component)}/#{uri_encode(vhost)}/#{uri_encode(name)}") do |req|
+        response = @connection.put("parameters/#{encode_uri_path_segment(component)}/#{encode_uri_path_segment(vhost)}/#{encode_uri_path_segment(name)}") do |req|
           req.headers['Content-Type'] = "application/json"
           req.body = MultiJson.dump(attributes)
         end
@@ -385,17 +428,9 @@ module RabbitMQ
       end
 
       def clear_parameters_of(component, vhost, name)
-        decode_resource(@connection.delete("parameters/#{uri_encode(component)}/#{uri_encode(vhost)}/#{uri_encode(name)}"))
-      end
-
-
-
-      def aliveness_test(vhost)
-        r = @connection.get("aliveness-test/#{uri_encode(vhost)}")
-        r.body["status"] == "ok"
+        decode_resource(@connection.delete("parameters/#{encode_uri_path_segment(component)}/#{encode_uri_path_segment(vhost)}/#{encode_uri_path_segment(name)}"))
       end
 
-
       protected
 
       def initialize_connection(endpoint, options = {})
@@ -407,7 +442,8 @@ module RabbitMQ
         adapter = options.delete(:adapter) || Faraday.default_adapter
 
         @connection = Faraday.new(options) do |conn|
-          conn.basic_auth user, password
+          conn.request    :basic_auth, user, password
+
           conn.use        FaradayMiddleware::FollowRedirects, :limit => 3
           conn.use        Faraday::Response::RaiseError
           conn.response   :json, :content_type => /\bjson$/
@@ -416,29 +452,20 @@ module RabbitMQ
         end
       end
 
-      def uri_encode(s)
-        # correctly escapes spaces, unlike CGI.escape, see ruby-amqp/rabbitmq_http_api_client#28
-        URI.escape(s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
+      def encode_uri_path_segment(segment)
+        @request_helper.encode_uri_path_segment(segment)
       end
 
       def decode_resource(response)
-        case response.headers["content-length"]
-        when nil then Hashie::Mash.new
-        when 0   then Hashie::Mash.new
-        when "0" then Hashie::Mash.new
-        else
-          if response.body.empty?
-            Hashie::Mash.new
-          else
-            Hashie::Mash.new(response.body)
-          end
-        end
+        @response_helper.decode_resource(response)
       end
 
-      def decode_resource_collection(response)
-        collection = response.body.is_a?(Array) ? response.body : response.body.fetch('items')
+      def decode_response_body(body)
+        @response_helper.decode_response_body(body)
+      end
 
-        collection.map { |i| Hashie::Mash.new(i) }
+      def decode_resource_collection(response)
+        @response_helper.decode_resource_collection(response)
       end
     end # Client
   end # HTTP

metadata

@@ -1,83 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: rabbitmq_http_api_client
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Michael Klishin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-05 00:00:00.000000000 Z
+date: 2022-02-11 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.1
+        version: '1.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.1
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.15'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.15'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.13.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.13.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.2'
 description: RabbitMQ HTTP API client for Ruby
 email:
 - michael@clojurewerkz.org
@@ -89,13 +91,16 @@ files:
 - LICENSE.txt
 - README.md
 - lib/rabbitmq/http/client.rb
+- lib/rabbitmq/http/client/health_checks.rb
+- lib/rabbitmq/http/client/request_helper.rb
+- lib/rabbitmq/http/client/response_helper.rb
 - lib/rabbitmq/http/client/version.rb
 homepage: http://github.com/ruby-amqp/rabbitmq_http_api_client
 licenses:
 - MIT
-- Mozilla Public License
+- MPL-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -110,8 +115,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: RabbitMQ HTTP API client for Ruby
 test_files: []