caren-api 0.9.3 → 0.9.4

data/VERSION

@@ -1 +1 @@
-0.9.3
+0.9.4

data/caren-api.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "caren-api"
-  s.version = "0.9.3"
+  s.version = "0.9.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andre Foeken"]

data/lib/caren/caren.rb

@@ -178,9 +178,7 @@ module Caren
     # Timestamp is UNIX timestamp seconds since 1970
     def sign timestamp, path=nil, string=nil, private_key=self.private_key
       path = URI.parse(path).path if path
-      encrypted_digest = private_key.sign( DIGEST_ALGORITHMS.first, "#{path}#{string}#{timestamp}".strip )
-      signature = CGI.escape(Base64.encode64(encrypted_digest))
-      return signature
+      return sign_string("#{path}#{string}#{timestamp}",private_key)
     end
 
     # Check the signature of the response from rest-client
@@ -195,14 +193,8 @@ module Caren
       verify_string(signature, "#{path}#{string}#{timestamp}", public_key)
     end
 
-    def verify_string provided_string, expected_string, public_key=self.caren_public_key
-      provided_string = Base64.decode64(CGI.unescape(provided_string.to_s))
-      DIGEST_ALGORITHMS.map{ |algorithm| public_key.verify( algorithm, provided_string, expected_string.strip ) }.any?
-    end
-
     def create_photo_signature url_shortcut, external_or_caren_id, private_key=self.private_key
-      digest = OpenSSL::PKey::RSA.new(private_key).sign( DIGEST_ALGORITHMS.first, url_shortcut.to_s + external_or_caren_id.to_s )
-      return CGI.escape(Base64.encode64(digest))
+      return sign_string(url_shortcut.to_s + external_or_caren_id.to_s, private_key)
     end
 
     # Verify photo url signature using the caren public key
@@ -211,6 +203,16 @@ module Caren
       verify_string(signature, url_shortcut.to_s + external_id.to_s, public_key)
     end
 
+    def sign_string provided_string, key=self.private_key
+      digest = OpenSSL::PKey::RSA.new(key).sign( DIGEST_ALGORITHMS.first, provided_string.strip )
+      return CGI.escape(Base64.encode64(digest))
+    end
+
+    def verify_string provided_string, expected_string, key=self.caren_public_key
+      provided_string = Base64.decode64(CGI.unescape(provided_string.to_s))
+      DIGEST_ALGORITHMS.map{ |algorithm| key.verify( algorithm, provided_string, expected_string.strip ) }.any?
+    end
+
     private
 
     # Raise a Caren exception on errors

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caren-api
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
   prerelease: 
 platform: ruby
 authors:
@@ -269,7 +269,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2880785186653608564
+      hash: -4558201187329960637
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: