pusher 0.4.0.beta.1 → 0.4.0.beta.2

data/VERSION

@@ -1 +1 @@
-0.4.0.beta.1
+0.4.0.beta.2

data/lib/pusher/authentication.rb

@@ -44,9 +44,7 @@ module Authentication
         :auth_timestamp => Time.now.to_i
       }
 
-      hmac_signature = HMAC::SHA256.digest(token.secret, string_to_sign)
-      # chomp because the Base64 output ends with \n
-      @auth_hash[:auth_signature] = Base64.encode64(hmac_signature).chomp
+      @auth_hash[:auth_signature] = signature(token)
 
       return @auth_hash
     end
@@ -92,6 +90,10 @@ module Authentication
 
     private
 
+      def signature(token)
+        HMAC::SHA256.hexdigest(token.secret, string_to_sign)
+      end
+
       def string_to_sign
         [@method, @path, parameter_string].join("\n")
       end
@@ -130,13 +132,9 @@ module Authentication
       end
 
       def validate_signature!(token)
-        string = string_to_sign
-        hmac_signature = HMAC::SHA256.digest(token.secret, string)
-        # chomp because the Base64 output ends with \n
-        base64_signature = Base64.encode64(hmac_signature).chomp
-        unless @auth_hash["auth_signature"] == base64_signature
+        unless @auth_hash["auth_signature"] == signature(token)
           raise AuthenticationError, "Invalid signature: you should have "\
-            "sent Base64Encode(HmacSHA256(#{string.inspect}, your_secret_key))"
+            "sent HmacSHA256Hex(#{string_to_sign.inspect}, your_secret_key)"
         end
         return true
       end

data/pusher.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pusher}
-  s.version = "0.4.0.beta.1"
+  s.version = "0.4.0.beta.2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["New Bamboo"]
-  s.date = %q{2010-04-22}
+  s.date = %q{2010-04-23}
   s.description = %q{Wrapper for pusherapp.com REST api}
   s.email = %q{support@pusherapp.com}
   s.extra_rdoc_files = [

data/spec/authentication_spec.rb

@@ -15,7 +15,7 @@ describe Authentication do
 
   it "should generate base64 encoded signature from correct key" do
     @request.send(:string_to_sign).should == "POST\n/some/path\nauth_key=key&auth_timestamp=1234&auth_version=1.0&go=here&query=params"
-    @signature.should == 'OyN5U6W6ZhmHXLsqLUPo2p71gk6KLGifYoSshbweoNs='
+    @signature.should == '3b237953a5ba6619875cbb2a2d43e8da9ef5824e8a2c689f6284ac85bc1ea0db'
   end
 
   it "should make auth_hash available after request is signed" do
@@ -28,7 +28,7 @@ describe Authentication do
 
     request.sign(@token)
     request.auth_hash.should == {
-      :auth_signature => "2gePzt1ylBtshzyqQNDWsgAOv8cAzugCsSjdIPcudOk=",
+      :auth_signature => "da078fcedd72941b6c873caa40d0d6b2000ebfc700cee802b128dd20f72e74e9",
       :auth_version => "1.0",
       :auth_key => "key",
       :auth_timestamp => 1234
@@ -88,7 +88,7 @@ describe Authentication do
       request = Authentication::Request.new('POST', '/some/path', @params)
       lambda {
         request.authenticate_by_token!(@token)
-      }.should raise_error('Invalid signature: you should have sent Base64Encode(HmacSHA256("POST\n/some/path\nauth_key=key&auth_timestamp=1234&auth_version=1.0&go=here&query=params", your_secret_key))')
+      }.should raise_error('Invalid signature: you should have sent HmacSHA256Hex("POST\n/some/path\nauth_key=key&auth_timestamp=1234&auth_version=1.0&go=here&query=params", your_secret_key)')
     end
 
     it "should raise error if timestamp not available" do

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 4
   - 0
   - beta
-  - 1
-  version: 0.4.0.beta.1
+  - 2
+  version: 0.4.0.beta.2
 platform: ruby
 authors: 
 - New Bamboo
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-22 00:00:00 +01:00
+date: 2010-04-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency