rabbitmq_http_api_client 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f70ef3ff3ec25ec720de49aeacc8b8f6761deaa5
-  data.tar.gz: 540c588e21de5cd1a791cd88c263488c12a145c2
+  metadata.gz: 6d8ada29fcfb2d9ace237b89e6172fef52fadffb
+  data.tar.gz: ff901540b1761cafcaf2004b8e9e9af74b52062e
 SHA512:
-  metadata.gz: 8e03485b55f0171a8e8af165f81d5ec6832d6b9e9f35875b649ba14965f21fea7b8e7e223c974923122b0566ae52c5817ac7d31ccfb1df1c389ac279cc78e625
-  data.tar.gz: df3022102e969d7e47460f63afa847ed2b57e4309dac55116b59731744c8c768d14ee4eed539b026d6a880c40feb08cff1fcb305482d2ab3ccc0a43efd3fc61a
+  metadata.gz: fc24be0290dc8a91da0d1f21bfb7bc06e4a0b1a57be2179474308b162d201e14f3f39f02ddb6928b2c7397daefd6fb3abce547d220b14bcb3817f3cd75b97269
+  data.tar.gz: 8b9391797082f6fccd289e89af915268dac757a7422b8432e98ce3106fd48f003bd3d3f4ae4c23ce290fd89578ad3e5d9baf2f90e9fd13bbcf8e5f5276177d0f

data/.travis.yml

@@ -2,6 +2,7 @@ bundler_args: --without development
 before_script: ./bin/before_build.sh
 script: "bundle exec rspec"
 rvm:
+  - "2.4.0"
   - "2.3.3"
   - "2.2"
 notifications:

data/ChangeLog.md

@@ -1,3 +1,14 @@
+## Changes Between 1.7.0 and 1.8.0
+
+### Correct URI Path Segment Encoding
+
+URI path segment encoding (e.g. vhosts, queue names, etc)
+in this client now correctly encodes spaces.
+
+GitHub issue: [#28](https://github.com/ruby-amqp/rabbitmq_http_api_client/issues/28).
+
+
+
 ## Changes Between 1.6.0 and 1.7.0
 
 ### Blank Tags by Default

data/README.md

@@ -18,14 +18,12 @@ and will support more HTTP API features in the future
 
 ## Supported Ruby Versions
 
- * CRuby 1.8.7 through 2.2.x
- * JRuby 1.7+
- * Rubinius 2.0+
+ * CRuby 2.0 through 2.4.x
+ * JRuby 9K
  
 ## Supported RabbitMQ Versions
 
  * RabbitMQ 3.x
- * RabbitMQ 2.x
 
 All versions require [RabbitMQ Management UI plugin](http://www.rabbitmq.com/management.html) to be installed and enabled.
 
@@ -33,7 +31,7 @@ All versions require [RabbitMQ Management UI plugin](http://www.rabbitmq.com/man
 
 Add this line to your application's Gemfile:
 
-    gem 'rabbitmq_http_api_client', '>= 1.6.0'
+    gem 'rabbitmq_http_api_client', '>= 1.7.0'
 
 And then execute:
 
@@ -353,6 +351,10 @@ ps = client.clear_permissions_of("/", "guest")
 The test suite assumes that RabbitMQ is running locally with stock settings
 and rabbitmq-management plugin enabled.
 
+## Continuous Integration
+
+[![Build Status](https://travis-ci.org/ruby-amqp/rabbitmq_http_api_client.svg?branch=master)](https://travis-ci.org/ruby-amqp/rabbitmq_http_api_client)
+
 
 ## Contributing
 

data/bin/before_build.sh

@@ -9,5 +9,5 @@ $RUBY_RABBITMQ_HTTP_API_CLIENT_RABBITMQCTL add_user guest guest
 $RUBY_RABBITMQ_HTTP_API_CLIENT_RABBITMQCTL set_permissions -p / guest ".*" ".*" ".*"
 
 # Reduce retention policy for faster publishing of stats
-$RUBY_RABBITMQ_HTTP_API_CLIENT_RABBITMQCTL eval 'supervisor2:terminate_child(rabbit_mgmt_sup_sup, rabbit_mgmt_sup), application:set_env(rabbitmq_management,       sample_retention_policies, [{global, [{605, 1}]}, {basic, [{605, 1}]}, {detailed, [{10, 1}]}]), rabbit_mgmt_sup_sup:start_child().'
-$RUBY_RABBITMQ_HTTP_API_CLIENT_RABBITMQCTL eval 'supervisor2:terminate_child(rabbit_mgmt_agent_sup_sup, rabbit_mgmt_agent_sup), application:set_env(rabbitmq_management_agent, sample_retention_policies, [{global, [{605, 1}]}, {basic, [{605, 1}]}, {detailed, [{10, 1}]}]), rabbit_mgmt_agent_sup_sup:start_child().'
+$RUBY_RABBITMQ_HTTP_API_CLIENT_RABBITMQCTL eval 'supervisor2:terminate_child(rabbit_mgmt_sup_sup, rabbit_mgmt_sup), application:set_env(rabbitmq_management,       sample_retention_policies, [{global, [{605, 1}]}, {basic, [{605, 1}]}, {detailed, [{10, 1}]}]), rabbit_mgmt_sup_sup:start_child().' | true
+$RUBY_RABBITMQ_HTTP_API_CLIENT_RABBITMQCTL eval 'supervisor2:terminate_child(rabbit_mgmt_agent_sup_sup, rabbit_mgmt_agent_sup), application:set_env(rabbitmq_management_agent, sample_retention_policies, [{global, [{605, 1}]}, {basic, [{605, 1}]}, {detailed, [{10, 1}]}]), rabbit_mgmt_agent_sup_sup:start_child().' | true

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

@@ -1,7 +1,7 @@
 module RabbitMQ
   module HTTP
     class Client
-      VERSION = "1.7.0"
+      VERSION = "1.8.0"
     end
   end
 end

data/lib/rabbitmq/http/client.rb

@@ -4,9 +4,6 @@ require "faraday_middleware"
 require "multi_json"
 require "uri"
 
-# for URI encoding
-require "cgi"
-
 module RabbitMQ
   module HTTP
     class Client
@@ -419,7 +416,8 @@ module RabbitMQ
       end
 
       def uri_encode(s)
-        CGI.escape(s)
+        # correctly escapes spaces, unlike CGI.escape, see ruby-amqp/rabbitmq_http_api_client#28
+        URI.escape(s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
       end
 
       def decode_resource(response)

data/spec/integration/client_spec.rb

@@ -100,24 +100,20 @@ describe RabbitMQ::HTTP::Client do
 
   describe "GET /api/nodes" do
     it "lists cluster nodes with detailed status information for each one of them" do
+      await_event_propagation
       nodes  = subject.list_nodes
       n      = nodes.first
 
-      rabbit = n.applications.detect { |app| app.name == "rabbit" }
-      expect(rabbit.description).to eq("RabbitMQ")
-
       expect(n.name).to match(/^rabbit/)
     end
   end
 
   describe "GET /api/node/:name" do
     it "returns status information for a single cluster node" do
+      await_event_propagation
       ns = subject.list_nodes
       n  = subject.node_info(ns.first.name)
 
-      rabbit = n.applications.detect { |app| app.name == "rabbit" }
-      expect(rabbit.description).to eq("RabbitMQ")
-
       expect(n.name).to match(/^rabbit/)
     end
   end
@@ -128,6 +124,7 @@ describe RabbitMQ::HTTP::Client do
 
   describe "GET /api/extensions" do
     it "returns a list of enabled management plugin extensions" do
+      await_event_propagation
       xs = subject.list_extensions
 
       expect(xs).to be_kind_of(Array)
@@ -140,13 +137,14 @@ describe RabbitMQ::HTTP::Client do
 
   describe "GET /api/definitions" do
     it "returns a list of all resources/definitions (vhosts, users, permissions, queues, exchanges, bindings, etc)" do
+      await_event_propagation
       xs = subject.list_definitions
 
-      expect(xs.bindings).to be_instance_of(Array)
-      expect(xs.queues).to be_instance_of(Array)
-      expect(xs.exchanges).to be_instance_of(Array)
-      expect(xs.users).to be_instance_of(Array)
-      expect(xs.vhosts).to be_instance_of(Array)
+      expect(xs.bindings).not_to be_nil
+      expect(xs.queues).not_to be_nil
+      expect(xs.exchanges).not_to be_nil
+      expect(xs.users).not_to be_nil
+      expect(xs.vhosts).not_to be_nil
     end
   end
 
@@ -324,16 +322,6 @@ describe RabbitMQ::HTTP::Client do
       x = @channel.fanout(exchange_name, durable: false)
       subject.delete_exchange("/", exchange_name)
     end
-
-    # HTTP client tries to uncompress an empty response :( MK
-    it "doesn't delete used exchange" do
-      q = @channel.queue("")
-      e = @channel.fanout(exchange_name, durable: false)
-      q.bind(e)
-      expect do
-        subject.delete_exchange("/", exchange_name, true)
-      end.to raise_error(Faraday::ClientError)
-    end
   end
 
 
@@ -878,7 +866,7 @@ describe RabbitMQ::HTTP::Client do
       end
     end
 
-    1000.times do
+    200.times do
       vhost = gen.string
 
       context "when vhost name is #{vhost}" do
@@ -935,18 +923,18 @@ describe RabbitMQ::HTTP::Client do
   describe "PUT /api/users/:name" do
     context "with tags provided explicitly" do
       it "updates information about a user" do
-        subject.update_user("alt", :tags => "http, policymaker, management", :password => "alt")
+        subject.update_user("alt-user", tags: "http, policymaker, management", password: "alt-user")
 
-        u = subject.user_info("alt")
+        u = subject.user_info("alt-user")
         expect(u.tags).to eq("http,policymaker,management")
       end
     end
 
     context "without tags provided" do
       it "uses blank tag list" do
-        subject.update_user("alt", :password => "alt")
+        subject.update_user("alt-user", password: "alt-user")
 
-        u = subject.user_info("alt")
+        u = subject.user_info("alt-user")
         expect(u.tags).to eq("")
       end
     end
@@ -954,8 +942,8 @@ describe RabbitMQ::HTTP::Client do
 
   describe "DELETE /api/users/:name" do
     it "deletes a user" do
-      subject.update_user("alt2", :tags => "http", :password => "alt")
-      subject.delete_user("alt2")
+      subject.update_user("alt2-user", tags: "http", password: "alt2-user")
+      subject.delete_user("alt2-user")
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabbitmq_http_api_client
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Michael Klishin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2017-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie