pusher 0.9.2 → 0.9.3

data/lib/pusher/channel.rb

@@ -1,4 +1,4 @@
-require 'hmac-sha2'
+require 'openssl'
 require 'multi_json'
 
 module Pusher
@@ -91,7 +91,8 @@ module Pusher
       string_to_sign = [socket_id, name, custom_string].compact.map{|e|e.to_s}.join(':')
       Pusher.logger.debug "Signing #{string_to_sign}"
       token = @client.authentication_token
-      signature = HMAC::SHA256.hexdigest(token.secret, string_to_sign)
+      digest = OpenSSL::Digest::SHA256.new
+      signature = OpenSSL::HMAC.hexdigest(digest, token.secret, string_to_sign)
 
       return "#{token.key}:#{signature}"
     end

data/lib/pusher/webhook.rb

@@ -1,5 +1,5 @@
 require 'multi_json'
-require 'hmac-sha2'
+require 'openssl'
 
 module Pusher
   # Used to parse and authenticate WebHooks
@@ -96,7 +96,8 @@ module Pusher
     # Checks signature against secret and returns boolean
     #
     def check_signature(secret)
-      expected = HMAC::SHA256.hexdigest(secret, @body)
+      digest = OpenSSL::Digest::SHA256.new
+      expected = OpenSSL::HMAC.hexdigest(digest, secret, @body)
       if @signature == expected
         return true
       else

data/pusher.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "pusher"
-  s.version     = "0.9.2"
+  s.version     = "0.9.3"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Pusher"]
   s.email       = ["support@pusher.com"]
@@ -12,7 +12,6 @@ Gem::Specification.new do |s|
   s.description = %q{Wrapper for pusher.com REST api}
 
   s.add_dependency "multi_json", "~> 1.0"
-  s.add_dependency "ruby-hmac", "~> 0.4.0"
   s.add_dependency 'signature', "~> 0.1.2"
 
   s.add_development_dependency "rspec", "~> 2.0"

data/spec/channel_spec.rb

@@ -41,7 +41,7 @@ describe Pusher::Channel do
         :name => 'Pusher',
         :last_name => 'App'
       })
-      WebMock.should have_requested(:post, %r{/apps/20/channels/test_channel/events}).with do |req|
+      WebMock.should have_requested(:post, %r{/apps/20/channels/test_channel/events}).with { |req|
         query_hash = req.uri.query_values
         query_hash["name"].should == 'new_event'
         query_hash["auth_key"].should == @client.key
@@ -54,15 +54,13 @@ describe Pusher::Channel do
         }
 
         req.headers['Content-Type'].should == 'application/json'
-      end
+      }
     end
 
     it "should POST string data unmodified in request body" do
       string = "foo\nbar\""
       @channel.trigger!('new_event', string)
-      WebMock.should have_requested(:post, %r{/apps/20/channels/test_channel/events}).with do |req|
-        req.body.should == "foo\nbar\""
-      end
+      WebMock.should have_requested(:post, %r{/apps/20/channels/test_channel/events}).with { |req| req.body.should == "foo\nbar\"" }
     end
 
     it "should catch all Net::HTTP exceptions and raise a Pusher::HTTPError, exposing the original error if required" do
@@ -246,7 +244,7 @@ describe Pusher::Channel do
       it "should return an authentication string given a socket id and custom args" do
         auth = @channel.socket_auth('socketid', 'foobar')
 
-        auth.should == "12345678900000001:#{HMAC::SHA256.hexdigest(@client.secret, "socketid:test_channel:foobar")}"
+        auth.should == "12345678900000001:#{hmac(@client.secret, "socketid:test_channel:foobar")}"
       end
 
     end
@@ -265,7 +263,7 @@ describe Pusher::Channel do
       response = @channel.authenticate('socketid', @custom_data)
 
       response.should == {
-        :auth => "12345678900000001:#{HMAC::SHA256.hexdigest(@client.secret, "socketid:test_channel:a json string")}",
+        :auth => "12345678900000001:#{hmac(@client.secret, "socketid:test_channel:a json string")}",
         :channel_data => 'a json string'
       }
     end

data/spec/spec_helper.rb

@@ -11,3 +11,8 @@ require 'webmock/rspec'
 
 require 'pusher'
 require 'eventmachine'
+
+def hmac(key, data)
+  digest = OpenSSL::Digest::SHA256.new
+  expected = OpenSSL::HMAC.hexdigest(digest, key, data)
+end

data/spec/web_hook_spec.rb

@@ -46,7 +46,7 @@ describe Pusher::WebHook do
       body = MultiJson.encode(@hook_data)
       request = {
         :key => '1234',
-        :signature => HMAC::SHA256.hexdigest('asdf', body),
+        :signature => hmac('asdf', body),
         :content_type => 'application/json',
         :body => body
       }

metadata

@@ -1,152 +1,100 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pusher
-version: !ruby/object:Gem::Version 
-  hash: 63
+version: !ruby/object:Gem::Version
+  version: 0.9.3
   prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 2
-  version: 0.9.2
 platform: ruby
-authors: 
+authors:
 - Pusher
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-27 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: multi_json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2173495100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ruby-hmac
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 4
-        - 0
-        version: 0.4.0
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2173495100
+- !ruby/object:Gem::Dependency
   name: signature
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &2173493980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 1
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.1.2
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2173493980
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2173493120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2173493120
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &2173492340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: em-http-request
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2173492340
+- !ruby/object:Gem::Dependency
+  name: em-http-request
+  requirement: &2173491540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2173491540
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2173491080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *2173491080
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &2173490340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
+  prerelease: false
+  version_requirements: *2173490340
 description: Wrapper for pusher.com REST api
-email: 
+email:
 - support@pusher.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .document
 - .gemtest
 - .gitignore
@@ -168,39 +116,31 @@ files:
 - spec/web_hook_spec.rb
 homepage: http://github.com/pusher/pusher-gem
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Pusher API client
-test_files: 
+test_files:
 - spec/channel_spec.rb
 - spec/client_spec.rb
 - spec/spec_helper.rb
 - spec/web_hook_spec.rb
+has_rdoc: