Merge pull request #115 from pusher/prep-v1.2.1

Prep v1.3.1

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
 ==================

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
 

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)

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)

lib/pusher/version.rb

@@ -1,3 +1,3 @@
 module Pusher
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

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"