rabbitmq_http_api_client 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b469accc29e88cb31b6a758bd41b8e5a4b23cdf
-  data.tar.gz: 0e937bf63faeb30172bee3008fe5ca3b7f05a776
+  metadata.gz: f70ef3ff3ec25ec720de49aeacc8b8f6761deaa5
+  data.tar.gz: 540c588e21de5cd1a791cd88c263488c12a145c2
 SHA512:
-  metadata.gz: 9049c26798c6aa7484216425676782e97f212ccb8ee2002867e0726aabe1b7f3c4ae0d14b737194b94b38263100376406f2107e68fa659a05f743b07205d1df0
-  data.tar.gz: d7aae20c64bbb343abe1beeb43e75840cac74318238fb3905ea9a624ee16b6bebdf46d7de772fcc2056d0dd509bdddc5c48fc86813955d5469942e961e657514
+  metadata.gz: 8e03485b55f0171a8e8af165f81d5ec6832d6b9e9f35875b649ba14965f21fea7b8e7e223c974923122b0566ae52c5817ac7d31ccfb1df1c389ac279cc78e625
+  data.tar.gz: df3022102e969d7e47460f63afa847ed2b57e4309dac55116b59731744c8c768d14ee4eed539b026d6a880c40feb08cff1fcb305482d2ab3ccc0a43efd3fc61a

data/.gitignore

@@ -15,4 +15,8 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-bin/*
+bin/autospec
+bin/bundler
+bin/rspec
+bin/ldiff
+bin/htmldiff

data/.rspec

@@ -1,2 +1 @@
---color
---format documentation
+-cfd

data/.travis.yml

@@ -1,13 +1,9 @@
 bundler_args: --without development
-script: "bundle exec rspec --color --format documentation spec"
+before_script: ./bin/before_build.sh
+script: "bundle exec rspec"
 rvm:
-  - "2.1"
-  - "2.0"
-  - "1.9.3"
-  - "jruby-19mode"
-  - "1.9.2"
-  - "rbx-19mode"
-  - "1.8.7"
+  - "2.3.3"
+  - "2.2"
 notifications:
   email: michael@rabbitmq.com
 services:
@@ -15,7 +11,3 @@ services:
 branches:
   only:
     - master
-matrix:
-  allow_failures:
-    - rvm: rbx-19mode
-    - rvm: 1.8.7

data/ChangeLog.md

@@ -1,3 +1,11 @@
+## Changes Between 1.6.0 and 1.7.0
+
+### Blank Tags by Default
+
+The `:tags` attribute is no longer required by `Client#update_user`. If not provided,
+a blank list of tags will be used.
+
+
 ## Changes Between 1.5.0 and 1.6.0
 
 ### Definition Upload Support

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 group :development, :test do
   gem "rspec", ">= 3.2.0"
   gem "json", :platform => :ruby_18
-  gem "bunny", ">= 1.7.0"
+  gem "bunny", ">= 2.5.1"
 
   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.5.0'
+    gem 'rabbitmq_http_api_client', '>= 1.6.0'
 
 And then execute:
 
@@ -219,6 +219,9 @@ puts q.backing_queue_status
 puts q.active_consumers
 
 
+# Get information about a queue
+client.queue_info("/", "collector1.megacorp.local")
+
 # Declare a queue
 client.declare_queue("/", "collector1.megacorp.local", :durable => false, :auto_delete => true)
 
@@ -342,21 +345,27 @@ ps = client.update_permissions_of("/", "guest", :write => ".*", :read => ".*", :
 ps = client.clear_permissions_of("/", "guest")
 ```
 
+## Running Tests
+
+    bundle install
+    bundle exec rspec -cfd spec
+
+The test suite assumes that RabbitMQ is running locally with stock settings
+and rabbitmq-management plugin enabled.
+
+
 ## Contributing
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+5. Create a new pull request
 
 
 ## License & Copyright
 
 Double-licensed under the MIT and Mozilla Public License (same as RabbitMQ).
 
-(c) Michael S. Klishin, 2012-2014.
-
-
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/ruby-amqp/rabbitmq_http_api_client/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+(c) Michael S. Klishin, 2012-2016.
 

data/bin/before_build.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+${RUBY_RABBITMQ_HTTP_API_CLIENT_RABBITMQCTL:="sudo rabbitmqctl"}
+
+# guest:guest has full access to /
+
+$RUBY_RABBITMQ_HTTP_API_CLIENT_RABBITMQCTL add_vhost /
+$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().'

data/lib/rabbitmq/http/client.rb

@@ -129,8 +129,11 @@ module RabbitMQ
         decode_resource(response)
       end
 
-      def delete_exchange(vhost, name)
-        decode_resource(@connection.delete("exchanges/#{uri_encode(vhost)}/#{uri_encode(name)}"))
+      def delete_exchange(vhost, name, if_unused = false)
+        response = @connection.delete("exchanges/#{uri_encode(vhost)}/#{uri_encode(name)}") do |req|
+          req.params["if-unused"] = true if if_unused
+        end
+        decode_resource(response)
       end
 
       def exchange_info(vhost, name)
@@ -219,6 +222,27 @@ 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)}"))
+      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)}"))
+      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|
+          req.headers['Content-Type'] = 'application/json'
+          req.body = MultiJson.dump({:routing_key => routing_key, :arguments => arguments})
+        end
+        resp.headers['location']
+      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.success?
+      end
 
 
       def list_vhosts
@@ -279,6 +303,8 @@ module RabbitMQ
       end
 
       def update_user(name, attributes)
+        attributes[:tags] ||= ""
+
         response = @connection.put("users/#{uri_encode(name)}") do |req|
           req.headers['Content-Type'] = "application/json"
           req.body = MultiJson.dump(attributes)

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

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

data/spec/integration/client_spec.rb

@@ -8,13 +8,25 @@ describe RabbitMQ::HTTP::Client do
     described_class.connect(endpoint, :username => "guest", :password => "guest")
   end
 
-  before :all do
-    @connection = Bunny.new
-    @connection.start
+  before :each do
+    @conn = Bunny.new
+    @conn.start
   end
 
-  after :all do
-    @connection.close
+  after :each do
+    @conn.close
+  end
+
+  #
+  # Helpers
+  #
+
+  # Statistics tables in the server are updated asynchronously,
+  # in particular starting with rabbitmq/rabbitmq-management#236,
+  # so in some cases we need to wait before GET'ing e.g. a newly opened connection.
+  def await_event_propagation
+    # same number as used in rabbit-hole test suite. Works OK.
+    sleep 1
   end
 
   #
@@ -139,12 +151,14 @@ describe RabbitMQ::HTTP::Client do
   end
 
   describe "POST /api/definitions" do
+    let(:queue_name) { 'my-definition-queue' }
+
     let(:definition) do
       {
         :queues => [{
-          :name => 'my-definition-queue',
+          :name => queue_name,
           :vhost => '/',
-          :durable => true,
+          durable: true,
           :auto_delete =>  false,
           :arguments => {
              "x-dead-letter-exchange" => 'dead'
@@ -156,13 +170,17 @@ describe RabbitMQ::HTTP::Client do
     it "returns true when successful" do
       r = subject.upload_definitions(definition)
       expect(r).to eq(true)
+
+      subject.delete_queue("/", queue_name)
     end
 
     it "stores the uploaded definitions" do
       subject.upload_definitions(definition)
       xs = subject.list_definitions
-      uploaded_queue = xs.queues.detect { |q| q.name = 'my-definition-queue' }
+      uploaded_queue = xs.queues.detect { |q| q.name == queue_name }
       expect(uploaded_queue).not_to eq(nil)
+
+      subject.delete_queue("/", queue_name)
     end
   end
 
@@ -171,12 +189,13 @@ describe RabbitMQ::HTTP::Client do
   #
 
   describe "GET /api/connections" do
-    before :all do
-      @connection = Bunny.new
-      @connection.start
+    before :each do
+      @conn = Bunny.new
+      @conn.start
     end
 
     it "returns a list of all active connections" do
+      await_event_propagation
       xs = subject.list_connections
       f  = xs.first
 
@@ -187,6 +206,7 @@ describe RabbitMQ::HTTP::Client do
 
   describe "GET /api/connections/:name" do
     it "returns information about the connection" do
+      await_event_propagation
       xs = subject.list_connections
       c  = subject.connection_info(xs.first.name)
 
@@ -195,51 +215,41 @@ describe RabbitMQ::HTTP::Client do
     end
   end
 
-  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)
-
-        expect(c.name).to match(/127.0.0.1/)
-        expect(c.client_properties.product).to eq("Bunny")
-
-        expect(@connection).to_not be_open
-      end
-    end
-  end
-
 
   #
   # Channels
   #
 
   describe "GET /api/channels" do
-    before :all do
-      @channel    = @connection.create_channel
-    end
-
     it "returns a list of all active channels" do
-      xs = subject.list_channels
-      f  = xs.first
+      conn = Bunny.new; conn.start
+      ch   = conn.create_channel
+      await_event_propagation
+      xs   = subject.list_channels
+      f    = xs.first
 
       expect(f.number).to be >= 1
       expect(f.prefetch_count).to be >= 0
+
+      ch.close
+      conn.close
     end
   end
 
   describe "GET /api/channels/:name" do
-    before :all do
-      @channel    = @connection.create_channel
-    end
-
     it "returns information about the channel" do
-      xs = subject.list_channels
-      c  = subject.channel_info(xs.first.name)
+      conn = Bunny.new; conn.start
+      ch   = conn.create_channel
+
+      await_event_propagation
+      xs   = subject.list_channels
+      c    = subject.channel_info(xs.first.name)
 
       expect(c.number).to be >= 1
       expect(c.prefetch_count).to be >= 0
+
+      ch.close
+      conn.close
     end
   end
 
@@ -281,54 +291,63 @@ describe RabbitMQ::HTTP::Client do
   end
 
   describe "PUT /api/exchanges/:vhost/:name" do
-    before :all do
-      @channel    = @connection.create_channel
+    before :each do
+      @channel    = @conn.create_channel
     end
 
-    after :all do
+    after :each do
       @channel.close
     end
 
     let(:exchange_name) { "httpdeclared" }
 
     it "declares an exchange" do
-      subject.declare_exchange("/", exchange_name, :durable => false, :type => "fanout")
+      subject.declare_exchange("/", exchange_name, durable: false, type: "fanout")
 
-      x = @channel.fanout(exchange_name, :durable => false, :auto_delete => false)
+      x = @channel.fanout(exchange_name, durable: false, auto_delete: false)
       x.delete
     end
   end
 
   describe "DELETE /api/exchanges/:vhost/:name" do
-    before :all do
-      @channel    = @connection.create_channel
+    before :each do
+      @channel    = @conn.create_channel
     end
 
-    after :all do
+    after :each do
       @channel.close
     end
 
     let(:exchange_name) { "httpdeclared" }
 
     it "deletes an exchange" do
-      x = @channel.fanout(exchange_name, :durable => false)
+      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
 
 
   describe "GET /api/exchanges/:vhost/:name/bindings/source" do
-    before :all do
-      @channel    = @connection.create_channel
+    before :each do
+      @channel    = @conn.create_channel
     end
-
-    after :all do
+    after :each do
       @channel.close
     end
 
     it "returns a list of all bindings in which the given exchange is the source" do
-      e  = @channel.fanout("http.api.tests.fanout", :durable => true)
-      q  = @channel.queue("http.api.tests.queue1",  :durable => true)
+      e  = @channel.fanout("http.api.tests.fanout", durable: true)
+      q  = @channel.queue("http.api.tests.queue1",  durable: true)
       q.bind(e)
 
       xs = subject.list_bindings_by_source("/", "http.api.tests.fanout")
@@ -347,13 +366,16 @@ describe RabbitMQ::HTTP::Client do
 
 
   describe "GET /api/exchanges/:vhost/:name/bindings/destination" do
-    before :all do
-      @channel    = @connection.create_channel
+    before :each do
+      @channel    = @conn.create_channel
+    end
+    after :each do
+      @channel.close
     end
 
-    it "returns a list of all bindings in which the given exchange is the source" do
-      e1  = @channel.fanout("http.api.tests.fanout1", :durable => true)
-      e2  = @channel.fanout("http.api.tests.fanout2", :durable => true)
+    it "returns a list of all bindings in which the given exchange is the destination" do
+      e1  = @channel.fanout("http.api.tests.fanout1", durable: true)
+      e2  = @channel.fanout("http.api.tests.fanout2", durable: true)
       e1.bind(e2)
 
       xs = subject.list_bindings_by_destination("/", "http.api.tests.fanout1")
@@ -382,39 +404,53 @@ describe RabbitMQ::HTTP::Client do
   #
 
   describe "GET /api/queues" do
-    before :all do
-      @channel    = @connection.create_channel
+    before :each do
+      @channel    = @conn.create_channel
+    end
+    after :each do
+      @channel.close
     end
 
     it "returns a list of all queues" do
-      q  = @channel.queue("", :exclusive => true)
+      q  = @channel.queue("", durable: false)
 
       xs = subject.list_queues
       expect(xs.detect { |x| x.name == q.name }).to_not be_empty
+
+      subject.delete_queue("/", q.name)
     end
   end
 
   describe "GET /api/queues/:vhost" do
-    before :all do
-      @channel    = @connection.create_channel
+    before :each do
+      @channel    = @conn.create_channel
+    end
+    after :each do
+      @channel.close
     end
 
     it "returns a list of all queues" do
-      q  = @channel.queue("", :exclusive => true)
+      q  = @channel.queue("", durable: false)
 
       xs = subject.list_queues("/")
       expect(xs.detect { |x| x.name == q.name }).to_not be_empty
+
+      subject.delete_queue("/", q.name)
     end
   end
 
   describe "GET /api/queues/:vhost/:name" do
     context "when queue exists" do
-      before :all do
-        @channel    = @connection.create_channel
+      before :each do
+        @channel    = @conn.create_channel
+      end
+      after :each do
+        @channel.close
       end
 
       it "returns information about a queue" do
-        q  = @channel.queue("", :exclusive => true, :durable => false)
+        q  = @channel.queue("", durable: false)
+        await_event_propagation
         i  = subject.queue_info("/", q.name)
 
         expect(i.durable).to eq(false)
@@ -424,6 +460,8 @@ describe RabbitMQ::HTTP::Client do
         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)
+
+        subject.delete_queue("/", q.name)
       end
     end
 
@@ -437,36 +475,36 @@ describe RabbitMQ::HTTP::Client do
   end
 
   describe "PUT /api/queues/:vhost/:name" do
-    before :all do
-      @channel    = @connection.create_channel
+    before :each do
+      @channel    = @conn.create_channel
     end
 
     let(:queue_name) { "httpdeclared" }
 
     it "declares a queue" do
-      subject.declare_queue("/", queue_name, :durable => false, :auto_delete => true)
+      subject.declare_queue("/", queue_name, durable: false, auto_delete: true)
 
-      q = @channel.queue(queue_name, :durable => false, :auto_delete => true)
+      q = @channel.queue(queue_name, durable: false, auto_delete: true)
       q.delete
     end
   end
 
   describe "DELETE /api/queues/:vhost/:name" do
-    before :all do
-      @channel    = @connection.create_channel
+    before :each do
+      @channel    = @conn.create_channel
     end
 
     let(:queue_name) { "httpdeclared" }
 
     it "deletes a queue" do
-      q = @channel.queue(queue_name, :durable => false)
+      q = @channel.queue(queue_name, durable: false)
       subject.delete_queue("/", queue_name)
     end
   end
 
   describe "GET /api/queues/:vhost/:name/bindings" do
-    before :all do
-      @channel    = @connection.create_channel
+    before :each do
+      @channel    = @conn.create_channel
     end
 
     it "returns a list of bindings for a queue" do
@@ -478,17 +516,22 @@ describe RabbitMQ::HTTP::Client do
 
       expect(x.destination).to eq(q.name)
       expect(x.destination_type).to eq("queue")
+
+      q.delete
     end
   end
 
   describe "DELETE /api/queues/:vhost/:name/contents" do
-    before :all do
-      @channel    = @connection.create_channel
+    before :each do
+      @channel    = @conn.create_channel
+    end
+    after :each do
+      @channel.close
     end
 
     it "purges a queue" do
       q   = @channel.queue("")
-      x   = @channel.fanout("amq.fanout", :durable => true, :auto_delete => false)
+      x   = @channel.fanout("amq.fanout", durable: true, auto_delete: false)
       q.bind(x)
 
       10.times do
@@ -506,13 +549,16 @@ describe RabbitMQ::HTTP::Client do
 
   # yes, POST, because it potentially modifies the state (ordering) of the queue
   describe "POST /api/queues/:vhost/:name/get" do
-    before :all do
-      @channel    = @connection.create_channel
+    before :each do
+      @channel    = @conn.create_channel
+    end
+    after :each do
+      @channel.close
     end
 
     it "fetches a message from a queue, a la basic.get" do
       q   = @channel.queue("")
-      x   = @channel.fanout("amq.fanout", :durable => true, :auto_delete => false)
+      x   = @channel.fanout("amq.fanout", durable: true, auto_delete: false)
       q.bind(x)
 
       10.times do |i|
@@ -521,7 +567,10 @@ describe RabbitMQ::HTTP::Client do
       sleep 0.7
 
       expect(q.message_count).to eq(10)
-      xs = subject.get_messages("/", q.name, :count => 10, :requeue => false, :encoding => "auto")
+      # the requeueing arguments differ between RabbitMQ 3.7.0 and earlier versions,
+      # so pass both
+      xs = subject.get_messages("/", q.name, count: 10,
+        requeue: false, ackmode: "ack_requeue_false", encoding: "auto")
       m  = xs.first
 
       expect(m.properties.content_type).to eq("application/xyz")
@@ -533,7 +582,18 @@ describe RabbitMQ::HTTP::Client do
   end
 
   describe "GET /api/bindings" do
+    before :each do
+      @channel    = @conn.create_channel
+    end
+    after :each do
+      @channel.close
+    end
+
     it "returns a list of all bindings" do
+      q   = @channel.queue("")
+      x   = @channel.fanout("amq.fanout", durable: true, auto_delete: false)
+      q.bind(x)
+      await_event_propagation
       xs = subject.list_bindings
       b  = xs.first
 
@@ -542,11 +602,24 @@ describe RabbitMQ::HTTP::Client do
       expect(b.source).to_not be_nil
       expect(b.routing_key).to_not be_nil
       expect(b.vhost).to_not be_nil
+
+      q.delete
     end
   end
 
   describe "GET /api/bindings/:vhost" do
+    before :each do
+      @channel    = @conn.create_channel
+    end
+    after :each do
+      @channel.close
+    end
+
     it "returns a list of all bindings in a vhost" do
+      q   = @channel.queue("")
+      x   = @channel.fanout("amq.fanout", durable: true, auto_delete: false)
+      q.bind(x)
+      await_event_propagation
       xs = subject.list_bindings("/")
       b  = xs.first
 
@@ -555,12 +628,17 @@ describe RabbitMQ::HTTP::Client do
       expect(b.source).to_not be_nil
       expect(b.routing_key).to_not be_nil
       expect(b.vhost).to_not be_nil
+
+      q.delete
     end
   end
 
   describe "GET /api/bindings/:vhost/e/:exchange/q/:queue" do
-    before :all do
-      @channel    = @connection.create_channel
+    before :each do
+      @channel    = @conn.create_channel
+    end
+    after :each do
+      @channel.close
     end
 
     it "returns a list of all bindings between an exchange and a queue" do
@@ -568,6 +646,8 @@ describe RabbitMQ::HTTP::Client do
       x = @channel.fanout("http.client.fanout")
       q.bind(x)
 
+      await_event_propagation
+
       xs = subject.list_bindings_between_queue_and_exchange("/", q.name, x.name)
       b  = xs.first
       expect(b.destination).to eq(q.name)
@@ -583,8 +663,11 @@ describe RabbitMQ::HTTP::Client do
   end
 
   describe "POST /api/bindings/:vhost/e/:exchange/q/:queue" do
-    before :all do
-      @channel    = @connection.create_channel
+    before :each do
+      @channel    = @conn.create_channel
+    end
+    after :each do
+      @channel.close
     end
 
     it "creates a binding between an exchange and a queue" do
@@ -603,8 +686,11 @@ describe RabbitMQ::HTTP::Client do
   end
 
   describe "GET /api/bindings/:vhost/e/:exchange/q/:queue/props" do
-    before :all do
-      @channel    = @connection.create_channel
+    before :each do
+      @channel    = @conn.create_channel
+    end
+    after :each do
+      @channel.close
     end
 
     it "returns an individual binding between an exchange and a queue" do
@@ -619,13 +705,16 @@ describe RabbitMQ::HTTP::Client do
       b2 = subject.queue_binding_info("/", q.name, x.name, b1.properties_key)
 
       expect(b1).to eq(b2)
-
+      q.delete
     end
   end
 
   describe "DELETE /api/bindings/:vhost/e/:exchange/q/:queue/props" do
-    before :all do
-      @channel    = @connection.create_channel
+    before :each do
+      @channel    = @conn.create_channel
+    end
+    after :each do
+      @channel.close
     end
 
     it "deletes an individual binding between an exchange and a queue" do
@@ -648,6 +737,85 @@ describe RabbitMQ::HTTP::Client do
     end
   end
 
+  describe "POST /api/bindings/:vhost/e/:source_exchange/e/:destination_exchange" do
+    before :each do
+      @channel    = @conn.create_channel
+    end
+    after :each do
+      @channel.close
+    end
+
+    it "creates a binding between two exchanges" do
+      routing_key = 'test.key'
+      sx = @channel.fanout("http.client.fanout_source")
+      dx = @channel.fanout("http.client.fanout_destination")
+
+      xs = subject.list_bindings_between_exchanges("/", dx.name, sx.name)
+      expect(xs).to be_empty
+
+      dx.bind(sx)
+
+      b = subject.bind_exchange("/", dx.name, sx.name, routing_key)
+      xs = subject.list_bindings_between_exchanges("/", dx.name, sx.name)
+      expect(xs).to_not be_empty
+
+      dx.delete
+      sx.delete
+    end
+  end
+
+  describe "GET /api/bindings/:vhost/e/:exchange/q/:queue/props" do
+    before :each do
+      @channel    = @conn.create_channel
+    end
+    after :each do
+      @channel.close
+    end
+
+    it "returns an individual binding between two exchanges" do
+      routing_key = 'test.key'
+      sx = @channel.fanout("http.client.fanout_source")
+      dx = @channel.fanout("http.client.fanout_destination")
+      dx.bind(sx)
+
+      xs = subject.list_bindings_between_exchanges("/", dx.name, sx.name)
+      b1 = xs.first
+
+      b2 = subject.exchange_binding_info("/", dx.name, sx.name, b1.properties_key)
+
+      expect(b1).to eq(b2)
+
+    end
+  end
+
+  describe "DELETE /api/bindings/:vhost/e/:exchange/q/:queue/props" do
+    before :each do
+      @channel    = @conn.create_channel
+    end
+    after :each do
+      @channel.close
+    end
+
+    it "deletes an individual binding between two exchanges" do
+      routing_key = 'test.key'
+      sx = @channel.fanout("http.client.fanout_source")
+      dx = @channel.fanout("http.client.fanout_destination")
+      dx.bind(sx)
+
+      xs = subject.list_bindings_between_exchanges("/", dx.name, sx.name)
+      b  = xs.first
+
+      expect(subject.delete_exchange_binding("/", dx.name, sx.name, b.properties_key)).to eq(true)
+
+      xs = subject.list_bindings_between_exchanges("/", dx.name, sx.name)
+
+      expect(xs.size).to eq(0)
+
+      dx.delete
+      sx.delete
+    end
+  end
+
   describe "GET /api/vhosts" do
     it "returns a list of vhosts" do
       xs = subject.list_vhosts
@@ -765,11 +933,22 @@ describe RabbitMQ::HTTP::Client do
   end
 
   describe "PUT /api/users/:name" do
-    it "updates information about a user" do
-      subject.update_user("alt", :tags => "http, policymaker, management", :password => "alt")
+    context "with tags provided explicitly" do
+      it "updates information about a user" do
+        subject.update_user("alt", :tags => "http, policymaker, management", :password => "alt")
 
-      u = subject.user_info("alt")
-      expect(u.tags).to eq("http,policymaker,management")
+        u = subject.user_info("alt")
+        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")
+
+        u = subject.user_info("alt")
+        expect(u.tags).to eq("")
+      end
     end
   end
 
@@ -815,7 +994,7 @@ describe RabbitMQ::HTTP::Client do
 
   describe "PUT /api/permissions/:vhost/:user" do
     it "updates permissions of a user in a vhost" do
-      subject.update_permissions_of("/", "guest", :write => ".*", :read => ".*", :configure => ".*")
+      subject.update_permissions_of("/", "guest", {write: ".*", read: ".*", configure: ".*"})
 
       p = subject.list_permissions_of("/", "guest")
 
@@ -827,14 +1006,13 @@ describe RabbitMQ::HTTP::Client do
 
   describe "DELETE /api/permissions/:vhost/:user" do
     it "clears permissions of a user in a vhost" do
-      pending
-      subject.create_user("/", "alt3")
-      subject.update_permissions_of("/", "alt3", :write => ".*", :read => ".*", :configure => ".*")
+      subject.create_user("alt3", {password: "s3cRE7"})
+      subject.update_permissions_of("/", "alt3", {write: ".*", read: ".*", configure: ".*"}).inspect
       subject.clear_permissions_of("/", "alt3")
 
-      p = subject.list_permissions_of("/", "alt3")
-
-      puts p.inspect
+      expect do
+        subject.list_permissions_of("/", "alt3")
+      end.to raise_error(Faraday::Error::ResourceNotFound)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabbitmq_http_api_client
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Michael Klishin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2016-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -83,7 +83,8 @@ dependencies:
 description: RabbitMQ HTTP API client for Ruby
 email:
 - michael@defprotocol.org
-executables: []
+executables:
+- before_build.sh
 extensions: []
 extra_rdoc_files: []
 files:
@@ -95,6 +96,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/before_build.sh
 - lib/rabbitmq/http/client.rb
 - lib/rabbitmq/http/client/version.rb
 - rabbitmq_http_api_client.gemspec
@@ -122,11 +124,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: RabbitMQ HTTP API client for Ruby
 test_files:
 - spec/integration/client_spec.rb
 - spec/spec_helper.rb
-has_rdoc: