Merge pull request #84 from nsweeting/amqp-update

AMQP dep update

.travis.yml

@@ -3,9 +3,9 @@ language: elixir
 matrix:
   include:
     - elixir:  1.8
-      otp_release: 21.3
+      otp_release: 22.1
     - elixir:  1.7
-      otp_release: 21.3
+      otp_release: 22.1
 services:
   - rabbitmq
 script:

README.md

@@ -12,7 +12,7 @@ The package can be installed by adding `rabbit` to your list of dependencies in
 ```elixir
 def deps do
   [
-    {:rabbit, "~> 0.13"}
+    {:rabbit, "~> 0.14"}
   ]
 end
 ```

lib/rabbit/consumer.ex

@@ -96,7 +96,7 @@ defmodule Rabbit.Consumer do
           | {:no_local, boolean()}
           | {:no_ack, boolean()}
           | {:exclusive, boolean()}
-          | {:no_wait, boolean()}
+          | {:nowait, boolean()}
           | {:arguments, Keyword.t()}
           | {:custom_meta, map()}
           | {:setup_opts, setup_options()}
@@ -211,7 +211,7 @@ defmodule Rabbit.Consumer do
       messages - defaults to `false`.
     * `:exclusive` - A boolean representing whether only this consumer can access
       the queue - defaults to `false`.
-    * `:no_wait` - A boolean representing whether the server should not respond to
+    * `:nowait` - A boolean representing whether the server should not respond to
       methods - defaults to `false`.
     * `:arguments` - A set of arguments for the consumer.
     * `:custom_meta` - A map of custom data that will be included in each `Rabbit.Message`

lib/rabbit/consumer/server.ex

@@ -16,7 +16,7 @@ defmodule Rabbit.Consumer.Server do
     no_local: [type: :boolean, default: false],
     no_ack: [type: :boolean, default: false],
     exclusive: [type: :boolean, default: false],
-    no_wait: [type: :boolean, default: false],
+    nowait: [type: :boolean, default: false],
     arguments: [type: :list, default: []],
     timeout: [type: [:integer, :atom], required: false],
     custom_meta: [type: :map, default: %{}],
@@ -33,7 +33,7 @@ defmodule Rabbit.Consumer.Server do
     :no_local,
     :no_ack,
     :exclusive,
-    :no_wait,
+    :nowait,
     :arguments
   ]
   @worker_opts [

lib/rabbit/topology.ex

@@ -78,7 +78,7 @@ defmodule Rabbit.Topology do
             | {:auto_delete, boolean()}
             | {:internal, boolean()}
             | {:passive, boolean()}
-            | {:no_wait, boolean()}
+            | {:nowait, boolean()}
             | {:arguments, list()}
           ]
   @type queue ::
@@ -88,7 +88,7 @@ defmodule Rabbit.Topology do
             | {:auto_delete, boolean()}
             | {:exclusive, boolean()}
             | {:passive, boolean()}
-            | {:no_wait, boolean()}
+            | {:nowait, boolean()}
             | {:arguments, list()}
           ]
   @type binding ::
@@ -97,7 +97,7 @@ defmodule Rabbit.Topology do
             | {:source, binary()}
             | {:destination, binary()}
             | {:routing_key, binary()}
-            | {:no_wait, boolean()}
+            | {:nowait, boolean()}
             | {:arguments, list()}
           ]
   @type option ::

lib/rabbit/topology/server.ex

@@ -14,29 +14,29 @@ defmodule Rabbit.Topology.Server do
     passive: [type: :boolean, required: true, default: false],
     auto_delete: [type: :boolean, required: true, default: false],
     internal: [type: :boolean, required: true, default: false],
-    no_wait: [type: :boolean, required: true, default: false],
+    nowait: [type: :boolean, required: true, default: false],
     arguments: [type: :list, required: true, default: []]
   }
-  @exchange_opts [:durable, :passive, :auto_delete, :internal, :no_wait, :arguments]
+  @exchange_opts [:durable, :passive, :auto_delete, :internal, :nowait, :arguments]
   @queue_schema %{
     name: [type: :binary, required: true],
     durable: [type: :boolean, required: true, default: false],
     auto_delete: [type: :boolean, required: true, default: false],
     exclusive: [type: :boolean, required: true, default: false],
     passive: [type: :boolean, required: true, default: false],
-    no_wait: [type: :boolean, required: true, default: false],
+    nowait: [type: :boolean, required: true, default: false],
     arguments: [type: :list, required: true, default: []]
   }
-  @queue_opts [:durable, :passive, :auto_delete, :exclusive, :no_wait, :arguments]
+  @queue_opts [:durable, :passive, :auto_delete, :exclusive, :nowait, :arguments]
   @binding_schema %{
     type: [type: :atom, inclusion: [:queue, :exchange], required: true],
     source: [type: :binary, required: true],
     destination: [type: :binary, required: true],
     routing_key: [type: :binary, required: true, default: ""],
-    no_wait: [type: :boolean, required: true, default: false],
+    nowait: [type: :boolean, required: true, default: false],
     arguments: [type: :list, required: true, default: []]
   }
-  @binding_opts [:routing_key, :no_wait, :arguments]
+  @binding_opts [:routing_key, :nowait, :arguments]
   @opts_schema %{
     connection: [type: [:tuple, :pid, :atom], required: true],
     retry_delay: [type: :integer, required: true, default: 100],

mix.exs

@@ -1,7 +1,7 @@
 defmodule Rabbit.MixProject do
   use Mix.Project
 
-  @version "0.13.0"
+  @version "0.14.0"
 
   def project do
     [
@@ -51,7 +51,7 @@ defmodule Rabbit.MixProject do
   # Run "mix help deps" to learn about dependencies.
   defp deps do
     [
-      {:amqp, "~> 1.5"},
+      {:amqp, "~> 2.1"},
       {:poolboy, "~> 1.5"},
       {:keyword_validator, "~> 1.0"},
       {:jason, "~> 1.2", optional: true},

mix.lock

@@ -1,9 +1,9 @@
 %{
-  "amqp": {:hex, :amqp, "1.5.0", "91572d74e3569fa1bd9bab1ce8b161fe959574a1407a34f8046a0e64f3e83e95", [:mix], [{:amqp_client, "~> 3.8.0", [hex: :amqp_client, repo: "hexpm", optional: false]}], "hexpm", "b569cffcbc6e1c5d26bcb4e39168a9dd986e85b20c633e710d27d19d9a2e33de"},
-  "amqp_client": {:hex, :amqp_client, "3.8.5", "279a73dcbdc5f797d7874d600a51fad6a82a716eec40ab1f25e3497939fc7f2d", [:make, :rebar3], [{:rabbit_common, "3.8.5", [hex: :rabbit_common, repo: "hexpm", optional: false]}], "hexpm", "19bc8b22ddd00e5afa4bd7922090425e86f7ab26eb26a7230426e7637692d5cf"},
+  "amqp": {:hex, :amqp, "2.1.1", "ad8dec713ba885afffffcb81feb619fe7cfcbcabe9377ab65ab7a110bd4f43a0", [:mix], [{:amqp_client, "~> 3.8.0", [hex: :amqp_client, repo: "hexpm", optional: false]}], "hexpm", "b6d926770e4508e30e3e9e476c57b6c8aeda44f7715663bdc38935620ce5be6f"},
+  "amqp_client": {:hex, :amqp_client, "3.8.14", "7569517aefb47e0d1c41bca2f4768dc8a2d88487daf7819fecca0d78943f293c", [:make, :rebar3], [{:rabbit_common, "3.8.14", [hex: :rabbit_common, repo: "hexpm", optional: false]}], "hexpm", "e5ba3ac18abbe34a1d990a6bcac25633dc7061ab8f8d101c7dcff97f49f4c523"},
   "benchee": {:hex, :benchee, "1.0.1", "66b211f9bfd84bd97e6d1beaddf8fc2312aaabe192f776e8931cb0c16f53a521", [:mix], [{:deep_merge, "~> 1.0", [hex: :deep_merge, repo: "hexpm", optional: false]}], "hexpm", "3ad58ae787e9c7c94dd7ceda3b587ec2c64604563e049b2a0e8baafae832addb"},
   "bunt": {:hex, :bunt, "0.2.0", "951c6e801e8b1d2cbe58ebbd3e616a869061ddadcc4863d0a2182541acae9a38", [:mix], [], "hexpm", "7af5c7e09fe1d40f76c8e4f9dd2be7cebd83909f31fee7cd0e9eadc567da8353"},
-  "credentials_obfuscation": {:hex, :credentials_obfuscation, "2.0.0", "65425424414b91f85feb2c8f7e09af65e91b6e311842e4ca07f6aabe20f5e58c", [:rebar3], [], "hexpm", "0e49139d403b158a3c324a964a765799e0a01d0640040a0ee8229d7e50db094b"},
+  "credentials_obfuscation": {:hex, :credentials_obfuscation, "2.4.0", "9fb57683b84899ca3546b384e59ab5d3054a9f334eba50d74c82cd0ae82dd6ca", [:rebar3], [], "hexpm", "d28a89830e30698b075de9a4dbe683a20685c6bed1e3b7df744a0c06e6ff200a"},
   "credo": {:hex, :credo, "1.5.4", "9914180105b438e378e94a844ec3a5088ae5875626fc945b7c1462b41afc3198", [:mix], [{:bunt, "~> 0.2.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2.8", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "cf51af45eadc0a3f39ba13b56fdac415c91b34f7b7533a13dc13550277141bc4"},
   "deep_merge": {:hex, :deep_merge, "1.0.0", "b4aa1a0d1acac393bdf38b2291af38cb1d4a52806cf7a4906f718e1feb5ee961", [:mix], [], "hexpm", "ce708e5f094b9cd4e8f2be4f00d2f4250c4095be93f8cd6d018c753894885430"},
   "dialyxir": {:hex, :dialyxir, "1.0.0", "6a1fa629f7881a9f5aaf3a78f094b2a51a0357c843871b8bc98824e7342d00a5", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "aeb06588145fac14ca08d8061a142d52753dbc2cf7f0d00fc1013f53f8654654"},
@@ -14,14 +14,14 @@
   "goldrush": {:hex, :goldrush, "0.1.9", "f06e5d5f1277da5c413e84d5a2924174182fb108dabb39d5ec548b27424cd106", [:rebar3], [], "hexpm", "99cb4128cffcb3227581e5d4d803d5413fa643f4eb96523f77d9e6937d994ceb"},
   "inch_ex": {:git, "https://github.com/rrrene/inch_ex.git", "c8eeaa65312df3ce150e91d7dddb50e2983b3209", []},
   "jason": {:hex, :jason, "1.2.2", "ba43e3f2709fd1aa1dce90aaabfd039d000469c05c56f0b8e31978e03fa39052", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "18a228f5f0058ee183f29f9eae0805c6e59d61c3b006760668d8d18ff0d12179"},
-  "jsx": {:hex, :jsx, "2.9.0", "d2f6e5f069c00266cad52fb15d87c428579ea4d7d73a33669e12679e203329dd", [:mix, :rebar3], [], "hexpm", "8ee1db1cabafdd578a2776a6aaae87c2a8ce54b47b59e9ec7dab5d7eb71cd8dc"},
+  "jsx": {:hex, :jsx, "2.11.0", "08154624050333919b4ac1b789667d5f4db166dc50e190c4d778d1587f102ee0", [:rebar3], [], "hexpm", "eed26a0d04d217f9eecefffb89714452556cf90eb38f290a27a4d45b9988f8c0"},
   "keyword_validator": {:hex, :keyword_validator, "1.0.1", "1aef6705d306677d59c59fff9c3b7e1f70b161900af400a7b784cdfc042c0cb3", [:mix], [], "hexpm", "22e729ef861eb157f9a661d918abc2eee164dd7903110d9128948be59e33a40e"},
-  "lager": {:hex, :lager, "3.8.0", "3402b9a7e473680ca179fc2f1d827cab88dd37dd1e6113090c6f45ef05228a1c", [:rebar3], [{:goldrush, "0.1.9", [hex: :goldrush, repo: "hexpm", optional: false]}], "hexpm", "f6cb541b688eab60730d8d286eb77256a5a9ad06eac10d43beaf55d07e68bbb6"},
+  "lager": {:hex, :lager, "3.8.2", "b180b814fd8b7082b6ca8aaf287e55a908d304cfc7a240d32f4db2d07092b7d0", [:rebar3], [{:goldrush, "0.1.9", [hex: :goldrush, repo: "hexpm", optional: false]}], "hexpm", "73329ce700410b423f64aafc5f94583073904899098e4461f3558ed2980462ab"},
   "makeup": {:hex, :makeup, "1.0.5", "d5a830bc42c9800ce07dd97fa94669dfb93d3bf5fcf6ea7a0c67b2e0e4a7f26c", [:mix], [{:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "cfa158c02d3f5c0c665d0af11512fed3fba0144cf1aadee0f2ce17747fba2ca9"},
   "makeup_elixir": {:hex, :makeup_elixir, "0.15.0", "98312c9f0d3730fde4049985a1105da5155bfe5c11e47bdc7406d88e01e4219b", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.1", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "75ffa34ab1056b7e24844c90bfc62aaf6f3a37a15faa76b07bc5eba27e4a8b4a"},
   "nimble_parsec": {:hex, :nimble_parsec, "1.1.0", "3a6fca1550363552e54c216debb6a9e95bd8d32348938e13de5eda962c0d7f89", [:mix], [], "hexpm", "08eb32d66b706e913ff748f11694b17981c0b04a33ef470e33e11b3d3ac8f54b"},
   "poolboy": {:hex, :poolboy, "1.5.2", "392b007a1693a64540cead79830443abf5762f5d30cf50bc95cb2c1aaafa006b", [:rebar3], [], "hexpm", "dad79704ce5440f3d5a3681c8590b9dc25d1a561e8f5a9c995281012860901e3"},
-  "rabbit_common": {:hex, :rabbit_common, "3.8.5", "e69c2fdb205a4c709f4f003a91b2044fdab7e7196220388f57f13ab7187e0aa7", [:make, :rebar3], [{:credentials_obfuscation, "2.0.0", [hex: :credentials_obfuscation, repo: "hexpm", optional: false]}, {:jsx, "2.9.0", [hex: :jsx, repo: "hexpm", optional: false]}, {:lager, "3.8.0", [hex: :lager, repo: "hexpm", optional: false]}, {:ranch, "1.7.1", [hex: :ranch, repo: "hexpm", optional: false]}, {:recon, "2.5.1", [hex: :recon, repo: "hexpm", optional: false]}], "hexpm", "28fd016ae6bcc1a5d17953901966ee60dfa48356d98aa88739b6e9d88021a7fd"},
+  "rabbit_common": {:hex, :rabbit_common, "3.8.14", "cc1604891295cd82f34597f1526ac611ea7b6a0e57b3dd79b41cb4224bcc6ec5", [:make, :rebar3], [{:credentials_obfuscation, "2.4.0", [hex: :credentials_obfuscation, repo: "hexpm", optional: false]}, {:jsx, "2.11.0", [hex: :jsx, repo: "hexpm", optional: false]}, {:lager, "3.8.2", [hex: :lager, repo: "hexpm", optional: false]}, {:recon, "2.5.1", [hex: :recon, repo: "hexpm", optional: false]}], "hexpm", "27409e425413cdd3fc2c077cf08226c4a307d56b1467883f26ab3789b2e106d0"},
   "ranch": {:hex, :ranch, "1.7.1", "6b1fab51b49196860b733a49c07604465a47bdb78aa10c1c16a3d199f7f8c881", [:rebar3], [], "hexpm", "451d8527787df716d99dc36162fca05934915db0b6141bbdac2ea8d3c7afc7d7"},
   "recon": {:hex, :recon, "2.5.1", "430ffa60685ac1efdfb1fe4c97b8767c92d0d92e6e7c3e8621559ba77598678a", [:mix, :rebar3], [], "hexpm", "5721c6b6d50122d8f68cccac712caa1231f97894bab779eff5ff0f886cb44648"},
 }