From 2d35ba2aa78162803124b41d7962c87e1afe6179 Mon Sep 17 00:00:00 2001
From: Tyler Hogan <tybot204@gmail.com>
Date: Tue, 1 Nov 2016 15:21:06 -0700
Subject: [PATCH 1/4] Added client batch methods to default client delegations

---
 lib/pusher.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/pusher.rb b/lib/pusher.rb
index 54d4bee..c60454d 100644
--- a/lib/pusher.rb
+++ b/lib/pusher.rb
@@ -37,7 +37,8 @@ class << self
     def_delegators :default_client, :timeout=, :connect_timeout=, :send_timeout=, :receive_timeout=, :keep_alive_timeout=
 
     def_delegators :default_client, :get, :get_async, :post, :post_async
-    def_delegators :default_client, :channels, :channel_info, :channel_users, :trigger, :trigger_async
+    def_delegators :default_client, :channels, :channel_info, :channel_users
+    def_delegators :default_client, :trigger, :trigger_batch, :trigger_async, :trigger_batch_async
     def_delegators :default_client, :authenticate, :webhook, :channel, :[]
     def_delegators :default_client, :notify
 

From 07732b7658fb44e3264996c8b48e8694fe0a1892 Mon Sep 17 00:00:00 2001
From: rogeriopvl <rogeriopvl@gmail.com>
Date: Tue, 21 Feb 2017 22:30:07 +0000
Subject: [PATCH 2/4] Add raised exceptions to authenticate method doc

Closes #111
---
 lib/pusher/channel.rb | 4 ++++
 lib/pusher/client.rb  | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/lib/pusher/channel.rb b/lib/pusher/channel.rb
index f56f32c..7214b30 100644
--- a/lib/pusher/channel.rb
+++ b/lib/pusher/channel.rb
@@ -120,6 +120,8 @@ def users(params = {})
     # @param custom_string [String] Allows signing additional data
     # @return [String]
     #
+    # @raise [Pusher::Error] if socket_id or custom_string invalid
+    #
     def authentication_string(socket_id, custom_string = nil)
       validate_socket_id(socket_id)
 
@@ -157,6 +159,8 @@ def authentication_string(socket_id, custom_string = nil)
     #
     # @return [Hash]
     #
+    # @raise [Pusher::Error] if socket_id or custom_data is invalid
+    #
     # @private Custom data is sent to server as JSON-encoded string
     #
     def authenticate(socket_id, custom_data = nil)
diff --git a/lib/pusher/client.rb b/lib/pusher/client.rb
index 76f36b6..9e42173 100644
--- a/lib/pusher/client.rb
+++ b/lib/pusher/client.rb
@@ -345,6 +345,8 @@ def notify(interests, data = {})
     #
     # @return [Hash]
     #
+    # @raise [Pusher::Error] if channel_name or socket_id are invalid
+    #
     # @private Custom data is sent to server as JSON-encoded string
     #
     def authenticate(channel_name, socket_id, custom_data = nil)

From cae68e5ba458e77df78b3af9da25b5a052cd6871 Mon Sep 17 00:00:00 2001
From: Vivan Kumar <vivangkumar@gmail.com>
Date: Wed, 15 Mar 2017 15:57:56 +0000
Subject: [PATCH 3/4] Lock addressable version to 2.4

2.5.0 uses publix_suffix which requires ruby > 2.0
---
 pusher.gemspec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pusher.gemspec b/pusher.gemspec
index 2182c8b..e46fb09 100644
--- a/pusher.gemspec
+++ b/pusher.gemspec
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec", "~> 3.0"
   s.add_development_dependency "webmock"
   s.add_development_dependency "em-http-request", "~> 1.1.0"
+  s.add_development_dependency "addressable", "=2.4.0"
   s.add_development_dependency "rake", "~> 10.4.2"
   s.add_development_dependency "rack", "~> 1.6.4"
   s.add_development_dependency "json", "~> 1.8.3"

From 4b95faad039923ed5a200e7f5fd8a10ed53484f4 Mon Sep 17 00:00:00 2001
From: Vivan Kumar <vivangkumar@gmail.com>
Date: Wed, 15 Mar 2017 16:10:14 +0000
Subject: [PATCH 4/4] Change gem version and add changelog entry

---
 CHANGELOG.md          | 6 ++++++
 lib/pusher/version.rb | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5596c40..a6bf59a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+1.3.1 / 2017-03-15
+==================
+
+  * Added missing client batch methods to default client delegations
+  * Document raised exception in the `authenticate` method
+  * Fixes em-http-request from using v2.5.0 of `addressable` breaking builds.
 
 1.3.0 / 2016-08-23
 ==================
diff --git a/lib/pusher/version.rb b/lib/pusher/version.rb
index c2357f6..c916830 100644
--- a/lib/pusher/version.rb
+++ b/lib/pusher/version.rb
@@ -1,3 +1,3 @@
 module Pusher
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end