pusher-client 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cc802ffe2416f85cd407687b0e23f82569c9f15
-  data.tar.gz: 6af614c433c815e762fc308f0de05bd78e6f8e3c
+  metadata.gz: bf04dc511a185b1a37118fb7aa892d5f7582ae51
+  data.tar.gz: 39c0e1be1d0b4452804727e9f33237ea398bbd67
 SHA512:
-  metadata.gz: 46fd409658e26cc23b41f77f94d789a61f7b2c9efb19535c3c9cf22c70da8146dacaafb803ae07eb5a0a7a8446b2739157509c3fc170fa7df337ab31111d5913
-  data.tar.gz: a77689a96349a40d574b012f0d2f19df81c79b29d081b835ea0b67bd6ae3bc06758896eea0d91c897a19256e61607b366cd2f9ec5ac661f89467b2259f4a5e14
+  metadata.gz: d28001be9d6969ed7a86bcfbed7507e3f292cd518a5230acf3203cc8573e140af69315b53ba20adcf686c008bf48e133e73e8350bbabb75044d1787edc5dfaaf
+  data.tar.gz: f96d506e8b24e69b922233ed3a85f660bbbfcf2b5e962ca5e633f088339dc712e528a5ba6ba05512d687fc743520a7674b8c68962061d74c7b33a5941b2a329e

data/CHANGELOG.md

@@ -1,4 +1,10 @@
 
+0.6.0 / 2014-04-23
+==================
+
+ * options[:auth_method] for both private and presence channels
+ * Relax websocket dependency to any 1.x version
+
 0.5.0 / 2014-04-15
 ==================
 

data/lib/pusher-client/socket.rb

@@ -23,7 +23,8 @@ module PusherClient
       @connected = false
       @encrypted = options[:encrypted] || false
       @logger = options[:logger] || PusherClient.logger
-      @private_auth_method = options[:private_auth_method]
+      # :private_auth_method is deprecated
+      @auth_method = options[:auth_method] || options[:private_auth_method]
       @cert_file = options[:cert_file]
       @ws_host = options[:ws_host] || HOST
       @ws_port = options[:ws_port] || WS_PORT
@@ -157,19 +158,19 @@ module PusherClient
     end
 
     def get_private_auth(channel)
-      if @private_auth_method.nil?
-        string_to_sign = @socket_id + ':' + channel.name
-        signature = hmac(@secret, string_to_sign)
-        return "#{@key}:#{signature}"
-      else
-        return @private_auth_method.call(@socket_id, channel)
-      end
+      return @auth_method.call(@socket_id, channel) if @auth_method
+
+      string_to_sign = @socket_id + ':' + channel.name
+      signature = hmac(@secret, string_to_sign)
+      "#{@key}:#{signature}"
     end
 
     def get_presence_auth(channel)
+      return @auth_method.call(@socket_id, channel) if @auth_method
+
       string_to_sign = @socket_id + ':' + channel.name + ':' + channel.user_data
       signature = hmac(@secret, string_to_sign)
-      return "#{@key}:#{signature}"
+      "#{@key}:#{signature}"
     end
 
 

data/lib/pusher-client/version.rb

@@ -1,3 +1,3 @@
 module PusherClient
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/pusher-client.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.require_paths    = ['lib']
   s.licenses         = ['MIT']
 
-  s.add_runtime_dependency 'websocket', '~> 1.1.2'
+  s.add_runtime_dependency 'websocket', '~> 1.0'
   s.add_runtime_dependency 'json'
 
   s.add_development_dependency "rspec"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pusher-client
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Pusher
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement