rabbitmq_http_api_client 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1804b5a58f15be23377604aa4ded51161a53f5d5
-  data.tar.gz: bc32d5b90c2a6706a407a61dcfedb3d3e927cf7c
+  metadata.gz: 544cb8a706ba1359e42ab9bff221cad9b67eb97d
+  data.tar.gz: 0eb83fe2a328807ddb76a46ea054bbdcee3ff557
 SHA512:
-  metadata.gz: 3af37ad9375df0de92c1728e36cc1c57f47eafc06b684175b57612c095aca0121e924a269b2a39aa8a7cdd5361494541ac0d2a8c2b937ed24328818fd532b777
-  data.tar.gz: 96ef7bd174555bac699ff7e094a0a0a13d55a14af8fb3c72e820823656448eec82e1935ca7164e4ea4d707e4a7c881cebf0be0ae9cae66641b9453af1210f082
+  metadata.gz: 8b6aaab7c0f8e9b4d456368d0490054657793da60baae1b6c32bedb794a986f34670c7e15a1a3903c1b7fccd77ee07665cde0f6eadfbe553688842d58f1a062f
+  data.tar.gz: 9e73ea391051df2d4e3ab029bb6c788036c6ab1769a67da098ee04ec0269dacd35e57ccb93545e818b3e04fee5770ced227057f76da5e777144821568e972064

data/ChangeLog.md

@@ -1,3 +1,11 @@
+## Changes Between 1.4.0 and 1.5.0
+
+### Support for URIs containing a path
+
+If provided endpoint contains a path, it will be used instead of `/api`.
+
+Contributed by Pol Miro.
+
 ## Changes Between 1.3.0 and 1.4.0
 
 ### Protocol Ports for Non-Administrators
@@ -5,7 +13,7 @@
 `Client#protocol_ports` no longer fails with a nil pointer exception
 for non-administrators.
 
-### Hashi Upgrade
+### Hashie Upgrade
 
 The library now depends on `hashie ~> 3.2`.
 

data/Gemfile

@@ -1,9 +1,9 @@
 source 'https://rubygems.org'
 
 group :development, :test do
-  gem "rspec"
+  gem "rspec", ">= 3.2.0"
   gem "json", :platform => :ruby_18
-  gem "bunny", ">= 1.6.3"
+  gem "bunny", ">= 1.7.0"
 
   gem "rantly"
 end

data/README.md

@@ -33,7 +33,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.3.0'
+    gem 'rabbitmq_http_api_client', '>= 1.4.0'
 
 And then execute:
 

data/lib/rabbitmq/http/client.rb

@@ -29,7 +29,7 @@ module RabbitMQ
       end
 
       def overview
-        decode_resource(@connection.get("/api/overview"))
+        decode_resource(@connection.get("overview"))
       end
 
       # Returns a list of messaging protocols supported by
@@ -61,19 +61,19 @@ module RabbitMQ
       end
 
       def list_nodes
-        decode_resource_collection(@connection.get("/api/nodes"))
+        decode_resource_collection(@connection.get("nodes"))
       end
 
       def node_info(name)
-        decode_resource(@connection.get("/api/nodes/#{uri_encode(name)}"))
+        decode_resource(@connection.get("nodes/#{uri_encode(name)}"))
       end
 
       def list_extensions
-        decode_resource_collection(@connection.get("/api/extensions"))
+        decode_resource_collection(@connection.get("extensions"))
       end
 
       def list_definitions
-        decode_resource(@connection.get("/api/definitions"))
+        decode_resource(@connection.get("definitions"))
       end
 
       def upload_definitions(defs)
@@ -81,30 +81,30 @@ module RabbitMQ
       end
 
       def list_connections
-        decode_resource_collection(@connection.get("/api/connections"))
+        decode_resource_collection(@connection.get("connections"))
       end
 
       def connection_info(name)
-        decode_resource(@connection.get("/api/connections/#{uri_encode(name)}"))
+        decode_resource(@connection.get("connections/#{uri_encode(name)}"))
       end
 
       def close_connection(name)
-        decode_resource(@connection.delete("/api/connections/#{uri_encode(name)}"))
+        decode_resource(@connection.delete("connections/#{uri_encode(name)}"))
       end
 
       def list_channels
-        decode_resource_collection(@connection.get("/api/channels"))
+        decode_resource_collection(@connection.get("channels"))
       end
 
       def channel_info(name)
-        decode_resource(@connection.get("/api/channels/#{uri_encode(name)}"))
+        decode_resource(@connection.get("channels/#{uri_encode(name)}"))
       end
 
       def list_exchanges(vhost = nil)
         path = if vhost.nil?
-                 "/api/exchanges"
+                 "exchanges"
                else
-                 "/api/exchanges/#{uri_encode(vhost)}"
+                 "exchanges/#{uri_encode(vhost)}"
                end
 
         decode_resource_collection(@connection.get(path))
@@ -118,7 +118,7 @@ module RabbitMQ
           :arguments => {}
         }.merge(attributes)
 
-        response = @connection.put("/api/exchanges/#{uri_encode(vhost)}/#{uri_encode(name)}") do |req|
+        response = @connection.put("exchanges/#{uri_encode(vhost)}/#{uri_encode(name)}") do |req|
           req.headers['Content-Type'] = 'application/json'
           req.body = MultiJson.dump(opts)
         end
@@ -126,37 +126,37 @@ module RabbitMQ
       end
 
       def delete_exchange(vhost, name)
-        decode_resource(@connection.delete("/api/exchanges/#{uri_encode(vhost)}/#{uri_encode(name)}"))
+        decode_resource(@connection.delete("exchanges/#{uri_encode(vhost)}/#{uri_encode(name)}"))
       end
 
       def exchange_info(vhost, name)
-        decode_resource(@connection.get("/api/exchanges/#{uri_encode(vhost)}/#{uri_encode(name)}"))
+        decode_resource(@connection.get("exchanges/#{uri_encode(vhost)}/#{uri_encode(name)}"))
       end
 
       def list_bindings_by_source(vhost, exchange)
-        decode_resource_collection(@connection.get("/api/exchanges/#{uri_encode(vhost)}/#{uri_encode(exchange)}/bindings/source"))
+        decode_resource_collection(@connection.get("exchanges/#{uri_encode(vhost)}/#{uri_encode(exchange)}/bindings/source"))
       end
 
       def list_bindings_by_destination(vhost, exchange)
-        decode_resource_collection(@connection.get("/api/exchanges/#{uri_encode(vhost)}/#{uri_encode(exchange)}/bindings/destination"))
+        decode_resource_collection(@connection.get("exchanges/#{uri_encode(vhost)}/#{uri_encode(exchange)}/bindings/destination"))
       end
 
       def list_queues(vhost = nil)
         path = if vhost.nil?
-                 "/api/queues"
+                 "queues"
                else
-                 "/api/queues/#{uri_encode(vhost)}"
+                 "queues/#{uri_encode(vhost)}"
                end
 
         decode_resource_collection(@connection.get(path))
       end
 
       def queue_info(vhost, name)
-        decode_resource(@connection.get("/api/queues/#{uri_encode(vhost)}/#{uri_encode(name)}"))
+        decode_resource(@connection.get("queues/#{uri_encode(vhost)}/#{uri_encode(name)}"))
       end
 
       def declare_queue(vhost, name, attributes)
-        response = @connection.put("/api/queues/#{uri_encode(vhost)}/#{uri_encode(name)}") do |req|
+        response = @connection.put("queues/#{uri_encode(vhost)}/#{uri_encode(name)}") do |req|
           req.headers['Content-Type'] = "application/json"
           req.body = MultiJson.dump(attributes)
         end
@@ -164,20 +164,20 @@ module RabbitMQ
       end
 
       def delete_queue(vhost, name)
-        decode_resource(@connection.delete("/api/queues/#{uri_encode(vhost)}/#{uri_encode(name)}"))
+        decode_resource(@connection.delete("queues/#{uri_encode(vhost)}/#{uri_encode(name)}"))
       end
 
       def list_queue_bindings(vhost, queue)
-        decode_resource_collection(@connection.get("/api/queues/#{uri_encode(vhost)}/#{uri_encode(queue)}/bindings"))
+        decode_resource_collection(@connection.get("queues/#{uri_encode(vhost)}/#{uri_encode(queue)}/bindings"))
       end
 
       def purge_queue(vhost, name)
-        @connection.delete("/api/queues/#{uri_encode(vhost)}/#{uri_encode(name)}/contents")
+        @connection.delete("queues/#{uri_encode(vhost)}/#{uri_encode(name)}/contents")
         Hashie::Mash.new
       end
 
       def get_messages(vhost, name, options)
-        response = @connection.post("/api/queues/#{uri_encode(vhost)}/#{uri_encode(name)}/get") do |req|
+        response = @connection.post("queues/#{uri_encode(vhost)}/#{uri_encode(name)}/get") do |req|
           req.headers['Content-Type'] = "application/json"
           req.body = MultiJson.dump(options)
         end
@@ -186,24 +186,24 @@ module RabbitMQ
 
       def list_bindings(vhost = nil)
         path = if vhost.nil?
-                 "/api/bindings"
+                 "bindings"
                else
-                 "/api/bindings/#{uri_encode(vhost)}"
+                 "bindings/#{uri_encode(vhost)}"
                end
 
         decode_resource_collection(@connection.get(path))
       end
 
       def list_bindings_between_queue_and_exchange(vhost, queue, exchange)
-        decode_resource_collection(@connection.get("/api/bindings/#{uri_encode(vhost)}/e/#{uri_encode(exchange)}/q/#{uri_encode(queue)}"))
+        decode_resource_collection(@connection.get("bindings/#{uri_encode(vhost)}/e/#{uri_encode(exchange)}/q/#{uri_encode(queue)}"))
       end
 
       def queue_binding_info(vhost, queue, exchange, properties_key)
-        decode_resource(@connection.get("/api/bindings/#{uri_encode(vhost)}/e/#{uri_encode(exchange)}/q/#{uri_encode(queue)}/#{uri_encode(properties_key)}"))
+        decode_resource(@connection.get("bindings/#{uri_encode(vhost)}/e/#{uri_encode(exchange)}/q/#{uri_encode(queue)}/#{uri_encode(properties_key)}"))
       end
 
       def bind_queue(vhost, queue, exchange, routing_key, arguments = [])
-        resp = @connection.post("/api/bindings/#{uri_encode(vhost)}/e/#{uri_encode(exchange)}/q/#{uri_encode(queue)}") do |req|
+        resp = @connection.post("bindings/#{uri_encode(vhost)}/e/#{uri_encode(exchange)}/q/#{uri_encode(queue)}") do |req|
           req.headers['Content-Type'] = 'application/json'
           req.body = MultiJson.dump({:routing_key => routing_key, :arguments => arguments})
         end
@@ -211,49 +211,49 @@ module RabbitMQ
       end
 
       def delete_queue_binding(vhost, queue, exchange, properties_key)
-        resp = @connection.delete("/api/bindings/#{uri_encode(vhost)}/e/#{uri_encode(exchange)}/q/#{uri_encode(queue)}/#{uri_encode(properties_key)}")
+        resp = @connection.delete("bindings/#{uri_encode(vhost)}/e/#{uri_encode(exchange)}/q/#{uri_encode(queue)}/#{uri_encode(properties_key)}")
         resp.success?
       end
 
 
 
       def list_vhosts
-        decode_resource_collection(@connection.get("/api/vhosts"))
+        decode_resource_collection(@connection.get("vhosts"))
       end
 
       def vhost_info(name)
-        decode_resource(@connection.get("/api/vhosts/#{uri_encode(name)}"))
+        decode_resource(@connection.get("vhosts/#{uri_encode(name)}"))
       end
 
       def create_vhost(name)
-        response = @connection.put("/api/vhosts/#{uri_encode(name)}") do |req|
+        response = @connection.put("vhosts/#{uri_encode(name)}") do |req|
           req.headers['Content-Type'] = "application/json"
         end
         decode_resource(response)
       end
 
       def delete_vhost(name)
-        decode_resource(@connection.delete("/api/vhosts/#{uri_encode(name)}"))
+        decode_resource(@connection.delete("vhosts/#{uri_encode(name)}"))
       end
 
 
 
       def list_permissions(vhost = nil)
         path = if vhost
-                 "/api/vhosts/#{uri_encode(vhost)}/permissions"
+                 "vhosts/#{uri_encode(vhost)}/permissions"
                else
-                 "/api/permissions"
+                 "permissions"
                end
 
         decode_resource_collection(@connection.get(path))
       end
 
       def list_permissions_of(vhost, user)
-        decode_resource(@connection.get("/api/permissions/#{uri_encode(vhost)}/#{uri_encode(user)}"))
+        decode_resource(@connection.get("permissions/#{uri_encode(vhost)}/#{uri_encode(user)}"))
       end
 
       def update_permissions_of(vhost, user, attributes)
-        response = @connection.put("/api/permissions/#{uri_encode(vhost)}/#{uri_encode(user)}") do |req|
+        response = @connection.put("permissions/#{uri_encode(vhost)}/#{uri_encode(user)}") do |req|
           req.headers['Content-Type'] = "application/json"
           req.body = MultiJson.dump(attributes)
         end
@@ -261,21 +261,21 @@ module RabbitMQ
       end
 
       def clear_permissions_of(vhost, user)
-        decode_resource(@connection.delete("/api/permissions/#{uri_encode(vhost)}/#{uri_encode(user)}"))
+        decode_resource(@connection.delete("permissions/#{uri_encode(vhost)}/#{uri_encode(user)}"))
       end
 
 
 
       def list_users
-        decode_resource_collection(@connection.get("/api/users"))
+        decode_resource_collection(@connection.get("users"))
       end
 
       def user_info(name)
-        decode_resource(@connection.get("/api/users/#{uri_encode(name)}"))
+        decode_resource(@connection.get("users/#{uri_encode(name)}"))
       end
 
       def update_user(name, attributes)
-        response = @connection.put("/api/users/#{uri_encode(name)}") do |req|
+        response = @connection.put("users/#{uri_encode(name)}") do |req|
           req.headers['Content-Type'] = "application/json"
           req.body = MultiJson.dump(attributes)
         end
@@ -284,24 +284,24 @@ module RabbitMQ
       alias create_user update_user
 
       def delete_user(name)
-        decode_resource(@connection.delete("/api/users/#{uri_encode(name)}"))
+        decode_resource(@connection.delete("users/#{uri_encode(name)}"))
       end
 
       def user_permissions(name)
-        decode_resource_collection(@connection.get("/api/users/#{uri_encode(name)}/permissions"))
+        decode_resource_collection(@connection.get("users/#{uri_encode(name)}/permissions"))
       end
 
       def whoami
-        decode_resource(@connection.get("/api/whoami"))
+        decode_resource(@connection.get("whoami"))
       end
 
 
 
       def list_policies(vhost = nil)
         path = if vhost
-                 "/api/policies/#{uri_encode(vhost)}"
+                 "policies/#{uri_encode(vhost)}"
                else
-                 "/api/policies"
+                 "policies"
                end
 
         decode_resource_collection(@connection.get(path))
@@ -309,15 +309,15 @@ module RabbitMQ
 
       def list_policies_of(vhost, name = nil)
         path = if name
-                 "/api/policies/#{uri_encode(vhost)}/#{uri_encode(name)}"
+                 "policies/#{uri_encode(vhost)}/#{uri_encode(name)}"
                else
-                 "/api/policies/#{uri_encode(vhost)}"
+                 "policies/#{uri_encode(vhost)}"
                end
         decode_resource_collection(@connection.get(path))
       end
 
       def update_policies_of(vhost, name, attributes)
-        response = @connection.put("/api/policies/#{uri_encode(vhost)}/#{uri_encode(name)}") do |req|
+        response = @connection.put("policies/#{uri_encode(vhost)}/#{uri_encode(name)}") do |req|
           req.headers['Content-Type'] = "application/json"
           req.body = MultiJson.dump(attributes)
         end
@@ -325,7 +325,7 @@ module RabbitMQ
       end
 
       def clear_policies_of(vhost, name)
-        decode_resource(@connection.delete("/api/policies/#{uri_encode(vhost)}/#{uri_encode(name)}"))
+        decode_resource(@connection.delete("policies/#{uri_encode(vhost)}/#{uri_encode(name)}"))
       end
 
 
@@ -333,24 +333,24 @@ module RabbitMQ
 
       def list_parameters(component = nil)
         path = if component
-                 "/api/parameters/#{uri_encode(component)}"
+                 "parameters/#{uri_encode(component)}"
                else
-                 "/api/parameters"
+                 "parameters"
                end
         decode_resource_collection(@connection.get(path))
       end
 
       def list_parameters_of(component, vhost, name = nil)
         path = if name
-                 "/api/parameters/#{uri_encode(component)}/#{uri_encode(vhost)}/#{uri_encode(name)}"
+                 "parameters/#{uri_encode(component)}/#{uri_encode(vhost)}/#{uri_encode(name)}"
                else
-                 "/api/parameters/#{uri_encode(component)}/#{uri_encode(vhost)}"
+                 "parameters/#{uri_encode(component)}/#{uri_encode(vhost)}"
                end
         decode_resource_collection(@connection.get(path))
       end
 
       def update_parameters_of(component, vhost, name, attributes)
-        response = @connection.put("/api/parameters/#{uri_encode(component)}/#{uri_encode(vhost)}/#{uri_encode(name)}") do |req|
+        response = @connection.put("parameters/#{uri_encode(component)}/#{uri_encode(vhost)}/#{uri_encode(name)}") do |req|
           req.headers['Content-Type'] = "application/json"
           req.body = MultiJson.dump(attributes)
         end
@@ -358,13 +358,13 @@ module RabbitMQ
       end
 
       def clear_parameters_of(component, vhost, name)
-        decode_resource(@connection.delete("/api/parameters/#{uri_encode(component)}/#{uri_encode(vhost)}/#{uri_encode(name)}"))
+        decode_resource(@connection.delete("parameters/#{uri_encode(component)}/#{uri_encode(vhost)}/#{uri_encode(name)}"))
       end
 
 
 
       def aliveness_test(vhost)
-        r = @connection.get("/api/aliveness-test/#{uri_encode(vhost)}")
+        r = @connection.get("aliveness-test/#{uri_encode(vhost)}")
         r.body["status"] == "ok"
       end
 
@@ -373,11 +373,12 @@ module RabbitMQ
 
       def initialize_connection(endpoint, options = {})
         uri     = URI.parse(endpoint)
-
+        uri.path = "/api" if ["","/"].include?(uri.path)
         user     = uri.user     || options.delete(:username) || "guest"
         password = uri.password || options.delete(:password) || "guest"
+        options = options.merge(:url => uri.to_s)
 
-        @connection = Faraday.new(endpoint, options) do |conn|
+        @connection = Faraday.new(options) do |conn|
           conn.basic_auth user, password
           conn.use        FaradayMiddleware::FollowRedirects, :limit => 3
           conn.use        Faraday::Response::RaiseError

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

@@ -1,7 +1,7 @@
 module RabbitMQ
   module HTTP
     class Client
-      VERSION = "1.4.0"
+      VERSION = "1.5.0"
     end
   end
 end

data/spec/integration/client_spec.rb

@@ -17,6 +17,19 @@ describe RabbitMQ::HTTP::Client do
     @connection.close
   end
 
+  #
+  # Default endpoint path
+  #
+  describe "default endpoint path" do
+    it "does NOT append '/api' if the endpoint provides a path" do
+      c = described_class.connect("http://guest:guest@127.0.0.1:15672/api")
+
+      r = c.overview
+      expect(r.rabbitmq_version).to_not be_nil
+      expect(r.erlang_version).to_not be_nil
+    end
+  end
+
 
   #
   # URI-only access
@@ -27,8 +40,8 @@ describe RabbitMQ::HTTP::Client do
       c = described_class.connect("http://guest:guest@127.0.0.1:15672")
 
       r = c.overview
-      r.rabbitmq_version.should_not be_nil
-      r.erlang_version.should_not be_nil
+      expect(r.rabbitmq_version).to_not be_nil
+      expect(r.erlang_version).to_not be_nil
     end
   end
 
@@ -44,11 +57,11 @@ describe RabbitMQ::HTTP::Client do
       ts = r.exchange_types.map { |h| h.name }.
         sort
       ["direct", "fanout", "headers", "topic"].each do |t|
-        ts.should include(t)
+        expect(ts).to include(t)
       end
 
-      r.rabbitmq_version.should_not be_nil
-      r.erlang_version.should_not be_nil
+      expect(r.rabbitmq_version).to_not be_nil
+      expect(r.erlang_version).to_not be_nil
     end
   end
 
@@ -56,7 +69,7 @@ describe RabbitMQ::HTTP::Client do
     it "returns a list of enabled protocols" do
       xs = subject.enabled_protocols
 
-      xs.should include("amqp")
+      expect(xs).to include("amqp")
     end
   end
 
@@ -65,7 +78,7 @@ describe RabbitMQ::HTTP::Client do
       xs = subject.protocol_ports
 
       # hash of protocol => port
-      xs["amqp"].should == 5672
+      expect(xs["amqp"]).to eq(5672)
     end
   end
 
@@ -79,21 +92,9 @@ describe RabbitMQ::HTTP::Client do
       n      = nodes.first
 
       rabbit = n.applications.detect { |app| app.name == "rabbit" }
-      rabbit.description.should == "RabbitMQ"
+      expect(rabbit.description).to eq("RabbitMQ")
 
-      n.name.should =~ /^rabbit/
-      n.partitions.should == []
-      n.fd_used.should_not be_nil
-      n.fd_total.should_not be_nil
-      n.sockets_used.should_not be_nil
-      n.sockets_total.should_not be_nil
-      n.mem_used.should_not be_nil
-      n.mem_limit.should_not be_nil
-      n.disk_free_limit.should_not be_nil
-      n.disk_free.should_not be_nil
-      n.proc_used.should_not be_nil
-      n.proc_total.should_not be_nil
-      n.run_queue.should_not be_nil
+      expect(n.name).to match(/^rabbit/)
     end
   end
 
@@ -103,22 +104,9 @@ describe RabbitMQ::HTTP::Client do
       n  = subject.node_info(ns.first.name)
 
       rabbit = n.applications.detect { |app| app.name == "rabbit" }
-      rabbit.description.should == "RabbitMQ"
+      expect(rabbit.description).to eq("RabbitMQ")
 
-      n.name.should =~ /^rabbit/
-      n.partitions.should == []
-      n.fd_used.should_not be_nil
-      n.fd_total.should_not be_nil
-      n.sockets_used.should_not be_nil
-      n.sockets_total.should_not be_nil
-      n.mem_used.should_not be_nil
-      n.mem_limit.should_not be_nil
-      n.disk_free_limit.should_not be_nil
-      n.disk_free.should_not be_nil
-      n.proc_used.should_not be_nil
-      n.proc_total.should_not be_nil
-      n.run_queue.should_not be_nil
-      n.running.should be_true
+      expect(n.name).to match(/^rabbit/)
     end
   end
 
@@ -129,9 +117,8 @@ describe RabbitMQ::HTTP::Client do
   describe "GET /api/extensions" do
     it "returns a list of enabled management plugin extensions" do
       xs = subject.list_extensions
-      f  = xs.first
 
-      ["dispatcher.js", "shovel.js"].should include(f.javascript)
+      expect(xs).to be_kind_of(Array)
     end
   end
 
@@ -143,11 +130,11 @@ describe RabbitMQ::HTTP::Client do
     it "returns a list of all resources/definitions (vhosts, users, permissions, queues, exchanges, bindings, etc)" do
       xs = subject.list_definitions
 
-      xs.bindings.should be_instance_of(Array)
-      xs.queues.should be_instance_of(Array)
-      xs.exchanges.should be_instance_of(Array)
-      xs.users.should be_instance_of(Array)
-      xs.vhosts.should be_instance_of(Array)
+      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)
     end
   end
 
@@ -169,8 +156,8 @@ describe RabbitMQ::HTTP::Client do
       xs = subject.list_connections
       f  = xs.first
 
-      f.name.should =~ /127.0.0.1/
-      f.client_properties.product.should == "Bunny"
+      expect(f.name).to match(/127.0.0.1/)
+      expect(f.client_properties.product).to eq("Bunny")
     end
   end
 
@@ -179,21 +166,23 @@ describe RabbitMQ::HTTP::Client do
       xs = subject.list_connections
       c  = subject.connection_info(xs.first.name)
 
-      c.name.should =~ /127.0.0.1/
-      c.client_properties.product.should == "Bunny"
+      expect(c.name).to match(/127.0.0.1/)
+      expect(c.client_properties.product).to eq("Bunny")
     end
   end
 
-  describe "DELETE /api/connections/:name" do
-    it "closes the connection" do
-      pending "Needs investigation, DELETE does not seem to close the connection"
-      xs = subject.list_connections
-      c  = subject.close_connection(xs.first.name)
+  unless ENV["CI"]
+    describe "DELETE /api/connections/:name" do
+      it "closes the connection" do
+        pending "Needs investigation, DELETE does not seem to close the connection"
+        xs = subject.list_connections
+        c  = subject.close_connection(xs.first.name)
 
-      c.name.should =~ /127.0.0.1/
-      c.client_properties.product.should == "Bunny"
+        expect(c.name).to match(/127.0.0.1/)
+        expect(c.client_properties.product).to eq("Bunny")
 
-      @connection.should_not be_open
+        expect(@connection).to_not be_open
+      end
     end
   end
 
@@ -211,8 +200,8 @@ describe RabbitMQ::HTTP::Client do
       xs = subject.list_channels
       f  = xs.first
 
-      f.number.should be >= 1
-      f.prefetch_count.should be >= 0
+      expect(f.number).to be >= 1
+      expect(f.prefetch_count).to be >= 0
     end
   end
 
@@ -225,8 +214,8 @@ describe RabbitMQ::HTTP::Client do
       xs = subject.list_channels
       c  = subject.channel_info(xs.first.name)
 
-      c.number.should be >= 1
-      c.prefetch_count.should be >= 0
+      expect(c.number).to be >= 1
+      expect(c.prefetch_count).to be >= 0
     end
   end
 
@@ -239,11 +228,11 @@ describe RabbitMQ::HTTP::Client do
       xs = subject.list_exchanges
       f  = xs.first
 
-      f.type.should_not be_nil
-      f.name.should_not be_nil
-      f.vhost.should_not be_nil
-      f.durable.should_not be_nil
-      f.auto_delete.should_not be_nil
+      expect(f.type).to_not be_nil
+      expect(f.name).to_not be_nil
+      expect(f.vhost).to_not be_nil
+      expect(f.durable).to_not be_nil
+      expect(f.auto_delete).to_not be_nil
     end
   end
 
@@ -252,7 +241,7 @@ describe RabbitMQ::HTTP::Client do
       xs = subject.list_exchanges("/")
       f  = xs.first
 
-      f.vhost.should == "/"
+      expect(f.vhost).to eq("/")
     end
   end
 
@@ -260,12 +249,10 @@ describe RabbitMQ::HTTP::Client do
     it "returns information about the exchange" do
       e = subject.exchange_info("/", "amq.fanout")
 
-      e.type.should == "fanout"
-      e.name.should == "amq.fanout"
-      e.durable.should be_true
-      e.vhost.should == "/"
-      e.internal.should be_false
-      e.auto_delete.should be_false
+      expect(e.type).to eq("fanout")
+      expect(e.name).to eq("amq.fanout")
+      expect(e.durable).to eq(true)
+      expect(e.vhost).to eq("/")
     end
   end
 
@@ -323,11 +310,11 @@ describe RabbitMQ::HTTP::Client do
       xs = subject.list_bindings_by_source("/", "http.api.tests.fanout")
       f  = xs.first
 
-      f.destination.should == q.name
-      f.destination_type.should == "queue"
-      f.routing_key.should == ""
-      f.source.should == e.name
-      f.vhost.should == "/"
+      expect(f.destination).to eq(q.name)
+      expect(f.destination_type).to eq("queue")
+      expect(f.routing_key).to eq("")
+      expect(f.source).to eq(e.name)
+      expect(f.vhost).to eq("/")
 
       e.delete
       q.delete
@@ -348,11 +335,11 @@ describe RabbitMQ::HTTP::Client do
       xs = subject.list_bindings_by_destination("/", "http.api.tests.fanout1")
       f  = xs.first
 
-      f.destination.should == e1.name
-      f.destination_type.should == "exchange"
-      f.routing_key.should == ""
-      f.source.should == e2.name
-      f.vhost.should == "/"
+      expect(f.destination).to eq(e1.name)
+      expect(f.destination_type).to eq("exchange")
+      expect(f.routing_key).to eq("")
+      expect(f.source).to eq(e2.name)
+      expect(f.vhost).to eq("/")
 
       e1.delete
       e2.delete
@@ -379,7 +366,7 @@ describe RabbitMQ::HTTP::Client do
       q  = @channel.queue("", :exclusive => true)
 
       xs = subject.list_queues
-      xs.detect { |x| x.name == q.name }.should_not be_empty
+      expect(xs.detect { |x| x.name == q.name }).to_not be_empty
     end
   end
 
@@ -392,7 +379,7 @@ describe RabbitMQ::HTTP::Client do
       q  = @channel.queue("", :exclusive => true)
 
       xs = subject.list_queues("/")
-      xs.detect { |x| x.name == q.name }.should_not be_empty
+      expect(xs.detect { |x| x.name == q.name }).to_not be_empty
     end
   end
 
@@ -406,21 +393,21 @@ describe RabbitMQ::HTTP::Client do
         q  = @channel.queue("", :exclusive => true, :durable => false)
         i  = subject.queue_info("/", q.name)
 
-        i.durable.should be_false
-        i.durable.should == q.durable?
+        expect(i.durable).to eq(false)
+        expect(i.durable).to eq(q.durable?)
 
-        i.name.should == q.name
-        i.auto_delete.should == q.auto_delete?
-        i.active_consumers.should be_nil
-        i.backing_queue_status.avg_ack_egress_rate.should == 0.0
+        expect(i.name).to eq(q.name)
+        expect(i.auto_delete).to eq(q.auto_delete?)
+        expect(i.active_consumers).to be_nil
+        expect(i.backing_queue_status.avg_ack_egress_rate).to eq(0.0)
       end
     end
 
     context "when queue DOES NOT exist" do
       it "raises NotFound" do
-        lambda do
+        expect do
           subject.queue_info("/", Time.now.to_i.to_s)
-        end.should raise_error(Faraday::Error::ResourceNotFound)
+        end.to raise_error(Faraday::Error::ResourceNotFound)
       end
     end
   end
@@ -465,8 +452,8 @@ describe RabbitMQ::HTTP::Client do
       xs = subject.list_queue_bindings("/", q.name)
       x  = xs.first
 
-      x.destination.should == q.name
-      x.destination_type.should == "queue"
+      expect(x.destination).to eq(q.name)
+      expect(x.destination_type).to eq("queue")
     end
   end
 
@@ -485,10 +472,10 @@ describe RabbitMQ::HTTP::Client do
       end
       sleep 0.7
 
-      q.message_count.should == 10
+      expect(q.message_count).to eq(10)
       subject.purge_queue("/", q.name)
       sleep 0.5
-      q.message_count.should == 0
+      expect(q.message_count).to eq(0)
       q.delete
     end
   end
@@ -509,13 +496,13 @@ describe RabbitMQ::HTTP::Client do
       end
       sleep 0.7
 
-      q.message_count.should == 10
+      expect(q.message_count).to eq(10)
       xs = subject.get_messages("/", q.name, :count => 10, :requeue => false, :encoding => "auto")
       m  = xs.first
 
-      m.properties.content_type.should == "application/xyz"
-      m.payload.should == "msg 0"
-      m.payload_encoding.should == "string"
+      expect(m.properties.content_type).to eq("application/xyz")
+      expect(m.payload).to eq("msg 0")
+      expect(m.payload_encoding).to eq("string")
 
       q.delete
     end
@@ -526,11 +513,11 @@ describe RabbitMQ::HTTP::Client do
       xs = subject.list_bindings
       b  = xs.first
 
-      b.destination.should_not be_nil
-      b.destination_type.should_not be_nil
-      b.source.should_not be_nil
-      b.routing_key.should_not be_nil
-      b.vhost.should_not be_nil
+      expect(b.destination).to_not be_nil
+      expect(b.destination_type).to_not be_nil
+      expect(b.source).to_not be_nil
+      expect(b.routing_key).to_not be_nil
+      expect(b.vhost).to_not be_nil
     end
   end
 
@@ -539,11 +526,11 @@ describe RabbitMQ::HTTP::Client do
       xs = subject.list_bindings("/")
       b  = xs.first
 
-      b.destination.should_not be_nil
-      b.destination_type.should_not be_nil
-      b.source.should_not be_nil
-      b.routing_key.should_not be_nil
-      b.vhost.should_not be_nil
+      expect(b.destination).to_not be_nil
+      expect(b.destination_type).to_not be_nil
+      expect(b.source).to_not be_nil
+      expect(b.routing_key).to_not be_nil
+      expect(b.vhost).to_not be_nil
     end
   end
 
@@ -559,12 +546,12 @@ describe RabbitMQ::HTTP::Client do
 
       xs = subject.list_bindings_between_queue_and_exchange("/", q.name, x.name)
       b  = xs.first
-      b.destination.should == q.name
-      b.destination_type.should == "queue"
-      b.source.should == x.name
-      b.routing_key.should_not be_nil
-      b.properties_key.should_not be_nil
-      b.vhost.should == "/"
+      expect(b.destination).to eq(q.name)
+      expect(b.destination_type).to eq("queue")
+      expect(b.source).to eq(x.name)
+      expect(b.routing_key).to_not be_nil
+      expect(b.properties_key).to_not be_nil
+      expect(b.vhost).to eq("/")
 
       q.delete
       x.delete
@@ -575,7 +562,7 @@ describe RabbitMQ::HTTP::Client do
     before :all do
       @channel    = @connection.create_channel
     end
-  
+
     it "creates a binding between an exchange and a queue" do
       routing_key = 'test.key'
       q = @channel.queue("")
@@ -584,7 +571,7 @@ describe RabbitMQ::HTTP::Client do
 
       b = subject.bind_queue("/", q.name, x.name, routing_key)
 
-      b.should == q.name + "/" + routing_key
+      expect(b).to eq(q.name + "/" + routing_key)
 
       q.delete
       x.delete
@@ -604,11 +591,11 @@ describe RabbitMQ::HTTP::Client do
 
       xs = subject.list_bindings_between_queue_and_exchange("/", q.name, x.name)
       b1 = xs.first
-      
+
       b2 = subject.queue_binding_info("/", q.name, x.name, b1.properties_key)
-      
-      b1.should == b2
-    
+
+      expect(b1).to eq(b2)
+
     end
   end
 
@@ -616,7 +603,7 @@ describe RabbitMQ::HTTP::Client do
     before :all do
       @channel    = @connection.create_channel
     end
-  
+
     it "deletes an individual binding between an exchange and a queue" do
       routing_key = 'test.key'
       q = @channel.queue("")
@@ -625,12 +612,12 @@ describe RabbitMQ::HTTP::Client do
 
       xs = subject.list_bindings_between_queue_and_exchange("/", q.name, x.name)
       b  = xs.first
-      
-      subject.delete_queue_binding("/", q.name, x.name, b.properties_key).should be_true
+
+      expect(subject.delete_queue_binding("/", q.name, x.name, b.properties_key)).to eq(true)
 
       xs = subject.list_bindings_between_queue_and_exchange("/", q.name, x.name)
-      
-      xs.size.should == 0
+
+      expect(xs.size).to eq(0)
 
       q.delete
       x.delete
@@ -642,8 +629,8 @@ describe RabbitMQ::HTTP::Client do
       xs = subject.list_vhosts
       v  = xs.first
 
-      v.name.should_not be_nil
-      v.tracing.should be_false
+      expect(v.name).to_not be_nil
+      expect(v.tracing).to eq(false)
     end
   end
 
@@ -652,16 +639,16 @@ describe RabbitMQ::HTTP::Client do
       it "returns infomation about a vhost" do
         v = subject.vhost_info("/")
 
-        v.name.should_not be_nil
-        v.tracing.should be_false
+        expect(v.name).to_not be_nil
+        expect(v.tracing).to eq(false)
       end
     end
 
     context "when vhost DOES NOT exist" do
       it "raises NotFound" do
-        lambda do
+        expect do
           subject.vhost_info(Time.now.to_i.to_s)
-        end.should raise_error(Faraday::Error::ResourceNotFound)
+        end.to raise_error(Faraday::Error::ResourceNotFound)
       end
     end
 
@@ -692,7 +679,7 @@ describe RabbitMQ::HTTP::Client do
           subject.create_vhost(vhost)
 
           v = subject.vhost_info(vhost)
-          v.name.should == vhost
+          expect(v.name).to eq(vhost)
 
           subject.delete_vhost(v.name)
         end
@@ -708,7 +695,7 @@ describe RabbitMQ::HTTP::Client do
           subject.create_vhost(vhost)
 
           v = subject.vhost_info(vhost)
-          v.name.should == vhost
+          expect(v.name).to eq(vhost)
 
           subject.delete_vhost(v.name)
         end
@@ -730,7 +717,7 @@ describe RabbitMQ::HTTP::Client do
       xs = subject.list_permissions("/")
       p  = xs.detect { |x| x.user == "guest" }
 
-      p.read.should == ".*"
+      expect(p.read).to eq(".*")
     end
   end
 
@@ -739,17 +726,17 @@ describe RabbitMQ::HTTP::Client do
       xs = subject.list_users
       u  = xs.first
 
-      u.name.should_not be_nil
-      u.password_hash.should_not be_nil
-      u.tags.should_not be_nil
+      expect(u.name).to_not be_nil
+      expect(u.password_hash).to_not be_nil
+      expect(u.tags).to_not be_nil
     end
   end
 
   describe "GET /api/users/:name" do
     it "returns information about a user" do
       u = subject.user_info("guest")
-      u.name.should == "guest"
-      u.tags.should == "administrator"
+      expect(u.name).to eq("guest")
+      expect(u.tags).to eq("administrator")
     end
   end
 
@@ -758,7 +745,7 @@ describe RabbitMQ::HTTP::Client do
       subject.update_user("alt", :tags => "http, policymaker, management", :password => "alt")
 
       u = subject.user_info("alt")
-      u.tags.should == "http,policymaker,management"
+      expect(u.tags).to eq("http,policymaker,management")
     end
   end
 
@@ -774,21 +761,21 @@ describe RabbitMQ::HTTP::Client do
       xs = subject.user_permissions("guest")
       p  = xs.first
 
-      p.read.should == ".*"
+      expect(p.read).to eq(".*")
     end
   end
 
   describe "GET /api/whoami" do
     it "returns information about the current user" do
       u = subject.whoami
-      u.name.should == "guest"
+      expect(u.name).to eq("guest")
     end
   end
 
   describe "GET /api/permissions" do
     it "lists all permissions" do
       xs = subject.list_permissions
-      xs.first.read.should_not be_nil
+      expect(xs.first.read).to_not be_nil
     end
   end
 
@@ -796,9 +783,9 @@ describe RabbitMQ::HTTP::Client do
     it "returns a list of permissions of a user in a vhost" do
       p = subject.list_permissions_of("/", "guest")
 
-      p.read.should == ".*"
-      p.write.should == ".*"
-      p.configure.should == ".*"
+      expect(p.read).to eq(".*")
+      expect(p.write).to eq(".*")
+      expect(p.configure).to eq(".*")
     end
   end
 
@@ -808,9 +795,9 @@ describe RabbitMQ::HTTP::Client do
 
       p = subject.list_permissions_of("/", "guest")
 
-      p.read.should == ".*"
-      p.write.should == ".*"
-      p.configure.should == ".*"
+      expect(p.read).to eq(".*")
+      expect(p.write).to eq(".*")
+      expect(p.configure).to eq(".*")
     end
   end
 
@@ -834,7 +821,7 @@ describe RabbitMQ::HTTP::Client do
   describe "GET /api/parameters" do
     it "returns a list of all parameters" do
       xs = subject.list_parameters
-      xs.should be_kind_of(Array)
+      expect(xs).to be_kind_of(Array)
     end
   end
 
@@ -846,14 +833,14 @@ describe RabbitMQ::HTTP::Client do
   describe "GET /api/policies" do
     it "returns a list of all policies" do
       xs = subject.list_policies
-      xs.should be_kind_of(Array)
+      expect(xs).to be_kind_of(Array)
     end
   end
 
   describe "GET /api/policies/:vhost" do
     it "returns a list of all policies in a vhost" do
       xs = subject.list_policies("/")
-      xs.should be_kind_of(Array)
+      expect(xs).to be_kind_of(Array)
     end
   end
 
@@ -866,7 +853,7 @@ describe RabbitMQ::HTTP::Client do
     it "performs aliveness check" do
       r = subject.aliveness_test("/")
 
-      r.should be_true
+      expect(r).to eq(true)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabbitmq_http_api_client
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Michael Klishin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie