rabbitmq_http_api_client 2.2.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a39be0a10b8f98fecdccfa407bf150811498cf8739ed6edef8cbf1b88b11bb2
-  data.tar.gz: d5898d4b21ceed5c53abffcd251277cfdfd72c90665e4a0ed5f3f72c57578ffd
+  metadata.gz: b9fe9cd3da39f8ad9d88cab48895b67278e5df0e5df8f5a397660bc6c73af671
+  data.tar.gz: cd233d873f713a5ec50a751a8a58992920f3f03761c8f18b313207febf57acb3
 SHA512:
-  metadata.gz: 2684a342bd54fc6fe432772e707f10562696b33b344eff100a2c3c1c0c017088e24eb59b31133e9020dd27698c22bb3f2c15619af411a95d5943eebc6946d9b1
-  data.tar.gz: afd8403234f005f8b6f133dcaf8cf203b8bf94fe9c94f6d66f020965a088eae05067f89cbb7c04f02ccaa607d95dc692e9bad82788b378366019e22a9240a389
+  metadata.gz: a72745520c25dfbc6f5133dc6978b2ff4739ec3f8f56c4e344497a75f9716f7930d1c17fbf93f07a4e544818567d987f5d795ec2ede94e191a030627b2cb835a
+  data.tar.gz: 53c18efe60eec7b84f3e0738e6d7e04b76a796cdf6a15746fb9574cbf7becb5a379891fff9a9a8d88475df3e2bf619aa7d227ec6de872e37a5acaa66ba00152a

data/ChangeLog.md

@@ -1,6 +1,26 @@
-## Changes Between 2.2.0 and 2.3.0 (unreleased)
+## Changes Between 2.2.0 and 3.0.0 (July 20, 2024)
 
-No changes yet.
+### Why the Major Version Bump?
+
+This release adopts a new major version of Faraday and targets
+only [community supported RabbitMQ versions](https://www.rabbitmq.com/release-information),
+which at this time means `3.13.x`.
+
+While there are no major breaking changes in the library itself,
+these two changes and more than two years that have passed since 2.0.0
+warrant a major version bump.
+
+### Support for Faraday 2.x
+
+Contributed by @shashankmehra.
+
+GitHub issue: [#63](https://github.com/ruby-amqp/rabbitmq_http_api_client/pull/63)
+
+### Queue Deletion: Support for if-unused and if-empty
+
+Contributed by @shashankmehra.
+
+GitHub issue: [#62](https://github.com/ruby-amqp/rabbitmq_http_api_client/pull/62)
 
 
 ## Changes Between 2.1.0 and 2.2.0 (May 19, 2022)

data/README.md

@@ -18,7 +18,7 @@ and will support more HTTP API features in the future
 
 ## Supported Ruby Versions
 
- * CRuby 2.2 through 2.7.x
+ * CRuby 2.5 through 3.x
  * JRuby 9K
 
 ## Supported RabbitMQ Versions
@@ -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', '>= 2.0.0'
+gem 'rabbitmq_http_api_client', '>= 2.2.0'
 ```
 
 And then execute:
@@ -116,7 +116,6 @@ h     = client.overview
 # List cluster nodes with detailed status info for each one of them
 nodes = client.list_nodes
 n     = nodes.first
-puts n.sockets_used
 puts n.mem_used
 puts n.run_queue
 
@@ -347,8 +346,21 @@ ps = client.clear_permissions_of("/", "guest")
 
 ## Running Tests
 
-    bundle install
-    bundle exec rspec -cfd spec
+Before running the test suites, run a script that will set up the local node:
+
+``` shell
+export RUBY_RABBITMQ_HTTP_API_CLIENT_RABBITMQCTL="rabbitmqctl"
+export RUBY_RABBITMQ_HTTP_API_CLIENT_RABBITMQ_PLUGINS="rabbitmq-plugins"
+
+./bin/ci/before_build.sh
+```
+
+To run all specs:
+
+``` shell
+bundle install
+bundle exec rspec -cfd spec
+```
 
 The test suite assumes that RabbitMQ is running locally with stock settings
 and rabbitmq-management plugin enabled.

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

@@ -1,6 +1,6 @@
 require "hashie"
 require "faraday"
-require "faraday_middleware"
+require "faraday/follow_redirects"
 require "multi_json"
 require "uri"
 

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

@@ -1,6 +1,6 @@
 require "hashie"
 require "faraday"
-require "faraday_middleware"
+require "faraday/follow_redirects"
 require "multi_json"
 require "uri"
 

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

@@ -1,6 +1,6 @@
 require "hashie"
 require "faraday"
-require "faraday_middleware"
+require "faraday/follow_redirects"
 require "multi_json"
 require "uri"
 
@@ -13,7 +13,7 @@ module RabbitMQ
       end
 
       def decode_resource(response)
-        if response.nil? || response.body.empty?
+        if response.nil? || response.body.nil? || response.body.empty?
           Hashie::Mash.new
         else
           decode_response_body(response.body)
@@ -31,7 +31,13 @@ module RabbitMQ
       def decode_resource_collection(response)
         collection = response.body.is_a?(Array) ? response.body : response.body.fetch('items')
 
-        collection.map { |i| Hashie::Mash.new(i) }
+        collection.map do |i|
+          if i == []
+            Hashie::Mash.new()
+          else
+            Hashie::Mash.new(i)
+          end
+        end
       end
     end
   end

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

@@ -1,7 +1,7 @@
 module RabbitMQ
   module HTTP
     class Client
-      VERSION = "2.2.0"
+      VERSION = "3.0.0"
     end
   end
 end

data/lib/rabbitmq/http/client.rb

@@ -1,7 +1,7 @@
 require "addressable/uri"
 require "hashie"
 require "faraday"
-require "faraday_middleware"
+require "faraday/follow_redirects"
 require "multi_json"
 require "uri"
 
@@ -177,8 +177,12 @@ module RabbitMQ
         decode_resource(response)
       end
 
-      def delete_queue(vhost, name)
-        decode_resource(@connection.delete("queues/#{encode_uri_path_segment(vhost)}/#{encode_uri_path_segment(name)}"))
+      def delete_queue(vhost, name, if_unused = false, if_empty = false)
+        response = @connection.delete("queues/#{encode_uri_path_segment(vhost)}/#{encode_uri_path_segment(name)}") do |req|
+          req.params["if-unused"] = true if if_unused
+          req.params["if-empty"] = true if if_empty
+        end
+        decode_resource(response)
       end
 
       def list_queue_bindings(vhost, queue, query = {})
@@ -443,12 +447,12 @@ module RabbitMQ
         user     = uri.user     || options.delete(:username) || "guest"
         password = uri.password || options.delete(:password) || "guest"
         options = options.merge(:url => uri.to_s)
-        adapter = options.delete(:adapter) || Faraday.default_adapter
+        adapter = options.delete(:adapter) || Faraday.default_adapter || :httpclient
 
         @connection = Faraday.new(options) do |conn|
-          conn.request    :basic_auth, user, password
+          conn.request    :authorization, :basic, user, password
 
-          conn.use        FaradayMiddleware::FollowRedirects, :limit => 3
+          conn.use        Faraday::FollowRedirects::Middleware, :limit => 3
           conn.use        Faraday::Response::RaiseError
           conn.response   :json, :content_type => /\bjson$/
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabbitmq_http_api_client
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Michael Klishin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-19 00:00:00.000000000 Z
+date: 2024-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.9'
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: faraday-follow_redirects
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0.3'
 description: RabbitMQ HTTP API client for Ruby
 email:
 - michael@clojurewerkz.org
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: RabbitMQ HTTP API client for Ruby