rabbitmq_http_api_client 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bb6d6b0972f2f811e0a010aa2c41b8fbf64d7d056b380e513848970290f9593
-  data.tar.gz: 2ed34cedaf2289ec3c1d63ec10abedd91ce748e68996495867373db1f5e2a133
+  metadata.gz: d0b9cc95320a9b5267b3ca4e0c0afc635bc07d4b1a06d4a684568dc887f8538e
+  data.tar.gz: 6a99738452b35246c258b11e76b92b9d58be9ea184611600d677681677becc73
 SHA512:
-  metadata.gz: 0d8e6de34019754d1b032b9cee0709504a6104bf9210031314b9535229ec2c85f129cce436c520947290ea58e6ba620bfd1c0fff6b805275833cad20d6f892e6
-  data.tar.gz: 6e12a66d286621b511a2d20ea148cb90812c196222be39eed12d9d8c2ce42160fd2f893e3dbc2c521182c569cfb77caca9fca88e2492aec1da56da02b206d040
+  metadata.gz: 288d82241e7bcbf7ba6ec4fff269b0ad2f9bbdb4c6c51317675a3a29504926d793e8211489ab521f79237977770c96a49b1e1061f38c9af42b039c7185249edb
+  data.tar.gz: 2b2ecfc8fb8fe35522571bc836d77324ba20991afaacc4f151cece7efb856d537e0a7c3d0474a3b79fe695760e44073e4692ef0a9d3a73eb54f63ecf028869bd

data/ChangeLog.md

@@ -1,7 +1,21 @@
-## Changes Between 1.12.0 and 1.13.0 (unreleased)
+## Changes Between 1.12.0 and 1.13.0 (March 5th, 2020)
 
 No changes yet.
 
+## Changes Between 1.12.0 and 1.13.0 (March 5th, 2020)
+
+### Pagination Support
+
+GitHub issue: [#43](https://github.com/ruby-amqp/rabbitmq_http_api_client/pull/43)
+
+Contributed by Rustam Sharshenov.
+
+### Dependency Updates
+
+GitHub issue: [#42](https://github.com/ruby-amqp/rabbitmq_http_api_client/pull/42)
+
+Contributed by @hatch-carl.
+
 
 ## Changes Between 1.11.0 and 1.12.0 (March 12th, 2019)
 

data/LICENSE.txt

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

data/README.md

@@ -20,7 +20,7 @@ and will support more HTTP API features in the future
 
  * CRuby 2.0 through 2.4.x
  * JRuby 9K
- 
+
 ## Supported RabbitMQ Versions
 
  * RabbitMQ 3.x
@@ -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.11.0'
+gem 'rabbitmq_http_api_client', '>= 1.12.0'
 ```
 
 And then execute:
@@ -127,7 +127,7 @@ puts n.proc_used
 puts n.fd_total
 
 # Get Management Plugin extension list
-xs    = client.list_extensions 
+xs    = client.list_extensions
 
 # List all the entities (vhosts, queues, exchanges, bindings, users, etc)
 defs  = client.list_definitions
@@ -259,7 +259,7 @@ puts b.vhost
 # List all bindings in a vhost
 bs = client.list_bindings("/")
 
-# List all binsings between an exchange and a queue
+# List all bindings between an exchange and a queue
 bs = client.list_bindings_between_queue_and_exchange("/", "collector1.megacorp.local", "log.events")
 ```
 
@@ -371,5 +371,4 @@ and rabbitmq-management plugin enabled.
 
 Double-licensed under the MIT and Mozilla Public License (same as RabbitMQ).
 
-(c) Michael S. Klishin, 2012-2017.
-
+(c) Michael S. Klishin, 2012-2019.

data/lib/rabbitmq/http/client.rb

@@ -57,16 +57,16 @@ module RabbitMQ
           reduce(Hash.new) { |acc, lnr| acc[lnr.protocol] = lnr.port; acc }
       end
 
-      def list_nodes
-        decode_resource_collection(@connection.get("nodes"))
+      def list_nodes(query = {})
+        decode_resource_collection(@connection.get("nodes", query))
       end
 
       def node_info(name)
         decode_resource(@connection.get("nodes/#{uri_encode(name)}"))
       end
 
-      def list_extensions
-        decode_resource_collection(@connection.get("extensions"))
+      def list_extensions(query = {})
+        decode_resource_collection(@connection.get("extensions", query))
       end
 
       def list_definitions
@@ -81,8 +81,8 @@ module RabbitMQ
         response.success?
       end
 
-      def list_connections
-        decode_resource_collection(@connection.get("connections"))
+      def list_connections(query = {})
+        decode_resource_collection(@connection.get("connections", query))
       end
 
       def connection_info(name)
@@ -93,22 +93,22 @@ module RabbitMQ
         decode_resource(@connection.delete("connections/#{uri_encode(name)}"))
       end
 
-      def list_channels
-        decode_resource_collection(@connection.get("channels"))
+      def list_channels(query = {})
+        decode_resource_collection(@connection.get("channels", query))
       end
 
       def channel_info(name)
         decode_resource(@connection.get("channels/#{uri_encode(name)}"))
       end
 
-      def list_exchanges(vhost = nil)
+      def list_exchanges(vhost = nil, query = {})
         path = if vhost.nil?
                  "exchanges"
                else
                  "exchanges/#{uri_encode(vhost)}"
                end
 
-        decode_resource_collection(@connection.get(path))
+        decode_resource_collection(@connection.get(path, query))
       end
 
       def declare_exchange(vhost, name, attributes = {})
@@ -137,22 +137,22 @@ module RabbitMQ
         decode_resource(@connection.get("exchanges/#{uri_encode(vhost)}/#{uri_encode(name)}"))
       end
 
-      def list_bindings_by_source(vhost, exchange)
-        decode_resource_collection(@connection.get("exchanges/#{uri_encode(vhost)}/#{uri_encode(exchange)}/bindings/source"))
+      def list_bindings_by_source(vhost, exchange, query = {})
+        decode_resource_collection(@connection.get("exchanges/#{uri_encode(vhost)}/#{uri_encode(exchange)}/bindings/source", query))
       end
 
-      def list_bindings_by_destination(vhost, exchange)
-        decode_resource_collection(@connection.get("exchanges/#{uri_encode(vhost)}/#{uri_encode(exchange)}/bindings/destination"))
+      def list_bindings_by_destination(vhost, exchange, query = {})
+        decode_resource_collection(@connection.get("exchanges/#{uri_encode(vhost)}/#{uri_encode(exchange)}/bindings/destination", query))
       end
 
-      def list_queues(vhost = nil)
+      def list_queues(vhost = nil, query = {})
         path = if vhost.nil?
                  "queues"
                else
                  "queues/#{uri_encode(vhost)}"
                end
 
-        decode_resource_collection(@connection.get(path))
+        decode_resource_collection(@connection.get(path, query))
       end
 
       def queue_info(vhost, name)
@@ -171,8 +171,8 @@ module RabbitMQ
         decode_resource(@connection.delete("queues/#{uri_encode(vhost)}/#{uri_encode(name)}"))
       end
 
-      def list_queue_bindings(vhost, queue)
-        decode_resource_collection(@connection.get("queues/#{uri_encode(vhost)}/#{uri_encode(queue)}/bindings"))
+      def list_queue_bindings(vhost, queue, query = {})
+        decode_resource_collection(@connection.get("queues/#{uri_encode(vhost)}/#{uri_encode(queue)}/bindings", query))
       end
 
       def purge_queue(vhost, name)
@@ -188,18 +188,18 @@ module RabbitMQ
         decode_resource_collection(response)
       end
 
-      def list_bindings(vhost = nil)
+      def list_bindings(vhost = nil, query = {})
         path = if vhost.nil?
                  "bindings"
                else
                  "bindings/#{uri_encode(vhost)}"
                end
 
-        decode_resource_collection(@connection.get(path))
+        decode_resource_collection(@connection.get(path, query))
       end
 
-      def list_bindings_between_queue_and_exchange(vhost, queue, exchange)
-        decode_resource_collection(@connection.get("bindings/#{uri_encode(vhost)}/e/#{uri_encode(exchange)}/q/#{uri_encode(queue)}"))
+      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))
       end
 
       def queue_binding_info(vhost, queue, exchange, properties_key)
@@ -219,8 +219,8 @@ module RabbitMQ
         resp.success?
       end
 
-      def list_bindings_between_exchanges(vhost, destination_exchange, source_exchange)
-        decode_resource_collection(@connection.get("bindings/#{uri_encode(vhost)}/e/#{uri_encode(source_exchange)}/e/#{uri_encode(destination_exchange)}"))
+      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))
       end
 
       def exchange_binding_info(vhost, destination_exchange, source_exchange, properties_key)
@@ -242,8 +242,8 @@ module RabbitMQ
       end
 
 
-      def list_vhosts
-        decode_resource_collection(@connection.get("vhosts"))
+      def list_vhosts(query = {})
+        decode_resource_collection(@connection.get("vhosts", query))
       end
 
       def vhost_info(name)
@@ -263,14 +263,14 @@ module RabbitMQ
 
 
 
-      def list_permissions(vhost = nil)
+      def list_permissions(vhost = nil, query = {})
         path = if vhost
                  "vhosts/#{uri_encode(vhost)}/permissions"
                else
                  "permissions"
                end
 
-        decode_resource_collection(@connection.get(path))
+        decode_resource_collection(@connection.get(path, query))
       end
 
       def list_permissions_of(vhost, user)
@@ -291,8 +291,8 @@ module RabbitMQ
 
 
 
-      def list_users
-        decode_resource_collection(@connection.get("users"))
+      def list_users(query = {})
+        decode_resource_collection(@connection.get("users", query))
       end
 
       def user_info(name)
@@ -314,8 +314,8 @@ module RabbitMQ
         decode_resource(@connection.delete("users/#{uri_encode(name)}"))
       end
 
-      def user_permissions(name)
-        decode_resource_collection(@connection.get("users/#{uri_encode(name)}/permissions"))
+      def user_permissions(name, query = {})
+        decode_resource_collection(@connection.get("users/#{uri_encode(name)}/permissions", query))
       end
 
       def whoami
@@ -324,23 +324,23 @@ module RabbitMQ
 
 
 
-      def list_policies(vhost = nil)
+      def list_policies(vhost = nil, query = {})
         path = if vhost
                  "policies/#{uri_encode(vhost)}"
                else
                  "policies"
                end
 
-        decode_resource_collection(@connection.get(path))
+        decode_resource_collection(@connection.get(path, query))
       end
 
-      def list_policies_of(vhost, name = nil)
+      def list_policies_of(vhost, name = nil, query = {})
         path = if name
                  "policies/#{uri_encode(vhost)}/#{uri_encode(name)}"
                else
                  "policies/#{uri_encode(vhost)}"
                end
-        decode_resource_collection(@connection.get(path))
+        decode_resource_collection(@connection.get(path, query))
       end
 
       def update_policies_of(vhost, name, attributes)
@@ -358,22 +358,22 @@ module RabbitMQ
 
 
 
-      def list_parameters(component = nil)
+      def list_parameters(component = nil, query = {})
         path = if component
                  "parameters/#{uri_encode(component)}"
                else
                  "parameters"
                end
-        decode_resource_collection(@connection.get(path))
+        decode_resource_collection(@connection.get(path, query))
       end
 
-      def list_parameters_of(component, vhost, name = nil)
+      def list_parameters_of(component, vhost, name = nil, query = {})
         path = if name
                  "parameters/#{uri_encode(component)}/#{uri_encode(vhost)}/#{uri_encode(name)}"
                else
                  "parameters/#{uri_encode(component)}/#{uri_encode(vhost)}"
                end
-        decode_resource_collection(@connection.get(path))
+        decode_resource_collection(@connection.get(path, query))
       end
 
       def update_parameters_of(component, vhost, name, attributes)
@@ -436,7 +436,9 @@ module RabbitMQ
       end
 
       def decode_resource_collection(response)
-        response.body.map { |i| Hashie::Mash.new(i) }
+        collection = response.body.is_a?(Array) ? response.body : response.body.fetch('items')
+
+        collection.map { |i| Hashie::Mash.new(i) }
       end
     end # Client
   end # HTTP

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabbitmq_http_api_client
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Michael Klishin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-12 00:00:00.000000000 Z
+date: 2020-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -42,30 +42,42 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.15'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.15.4
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.15'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.15.4
+        version: '1'
 - !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'
   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'
 description: RabbitMQ HTTP API client for Ruby
 email:
 - michael@clojurewerkz.org
@@ -98,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: RabbitMQ HTTP API client for Ruby