paytrail 0.0.0 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 998d4096f959c262c564f34055dbbc104985bce8
-  data.tar.gz: 3879f7fc13dad3fb54626cfb715b8f0d8237cae4
+  metadata.gz: e52de41101a3fcea1ccd68d46a9fb08b308d6ff8
+  data.tar.gz: 12d147acb31fa42031046812cedc10492edf2722
 SHA512:
-  metadata.gz: c2aef54fd2d3d3e65cc6c25ea3e3faedfd68f7215857e24c88bd8104ac93ac2a16438034de6a35d359bfed18ea2223b80670f496f2db0b0043b39a6a68ce9137
-  data.tar.gz: 77cc32ab2f250c2211744c5dcb3276f9e380f4a3b140c7bafafa7b40fba279ec62201c1267dd1f340754274731d61574740a6dcc6f7a28be5071c870ce93de81
+  metadata.gz: a9df305a15c3431738636052e65aade7670238312055aff2262d1b67c03bb74adf882c52df88c6b71f30884f52d0be76d3998b86a8a759b1d6e0eeb27309ef44
+  data.tar.gz: a22ca2ac9fdc3d9253d745cf7205fa533e197f4aa6fb22e7bd0288e15f0a52c9b5951a6a317e7ea4363a54e27ad57a573b4f11349fd5facf75759ab467b7692e

data/lib/paytrail.rb

@@ -7,27 +7,33 @@ require 'net/http'
 require 'uri'
 
 class Paytrail
+    def initialize(apiName, apiKey, secret)
+        @apiName = apiName
+        @apiKey = apiKey
+        @secret = secret
+    end
+
     def makeTimestamp()
         Time.now.iso8601
     end
 
-    def makeAuthorization(apiName, apiKey, secret, method, url, timestamp, contentMD5)
-        signatureData = "%s\n%s\n%s %s\n%s\n%s" % [method, url, apiName, apiKey, timestamp, contentMD5]
+    def makeAuthorization(method, location, timestamp, contentMD5)
+        signatureData = "%s\n%s\n%s %s\n%s\n%s" % [method, location, @apiName, @apiKey, timestamp, contentMD5]
         digest = OpenSSL::Digest::SHA256.new
-        hmac = OpenSSL::HMAC.digest(digest, secret, signatureData)
+        hmac = OpenSSL::HMAC.digest(digest, @secret, signatureData)
 
-        Base64.encode64(hmac)
+        Base64.strict_encode64(hmac)
     end
 
     def makeContentMD5(content)
         Digest::MD5.base64digest content
     end
 
-    def makeHeaders(apiName, apiKey, secret, method, uri, timestamp, body)
+    def makeHeaders(method, location, timestamp, body)
         {
             'Timestamp' => timestamp,
             'Content-MD5' => makeContentMD5(body),
-            'Authorization' => "%s %s:%s" % [apiName, apiKey, makeAuthorization(apiName, apiKey, secret, method, uri, timestamp, makeContentMD5(body))]
+            'Authorization' => "%s %s:%s" % [@apiName, @apiKey, makeAuthorization(method, location, timestamp, makeContentMD5(body))]
         }
     end
 
@@ -47,7 +53,7 @@ class Paytrail
     end
 
     def makeRequest(uri, request)
-        http = Net::HTTP.start(uri.hostname, uri.port, :use_ssl => true)
+        http = Net::HTTP.start(uri.hostname, uri.port)
 
         http.request(request)
     end

data/lib/paytrail/merchantapi.rb

@@ -3,6 +3,8 @@ require 'paytrail'
 class Paytrail::MerchantApi
     # Example usage
     #
+    # require 'paytrail/merchantapi'
+    #
     # merchantApi = Paytrail::MerchantApi.new(13466, '6pKF4jkv97zmqBJ3ZL8gUw5DfT2NMQ', 'https://api.paytrail.com')
     # response = merchantApi.createRefund(
     #     'ORD-59867',
@@ -44,10 +46,8 @@ class Paytrail::MerchantApi
     @@apiName = 'PaytrailMerchantAPI'
 
     def initialize(apiKey, secret, uri)
-        @apiKey = apiKey
-        @secret = secret
+        @paytrail = Paytrail.new(@@apiName, apiKey, secret)
         @uri = uri
-        @paytrail = Paytrail.new
     end
 
     def createRefund(orderNumber, email, refundRows, notifyUrl)
@@ -62,14 +62,14 @@ class Paytrail::MerchantApi
 
         data = data.to_json
         location = '/merchant/v1/payments/%s/refunds' % [orderNumber]
-        headers = @paytrail.makeHeaders(@@apiName, @apiKey, @secret, 'POST', location, @paytrail.makeTimestamp, data)
+        headers = @paytrail.makeHeaders('POST', location, @paytrail.makeTimestamp, data)
 
         @paytrail.post(@uri + location, headers, data)
     end
 
     def deleteRefund(refundToken)
         location = '/merchant/v1/refunds/%s' % [refundToken]
-        headers = @paytrail.makeHeaders(@@apiName, @apiKey, @secret, 'DELETE', location, @paytrail.makeTimestamp, '')
+        headers = @paytrail.makeHeaders('DELETE', location, @paytrail.makeTimestamp, '')
 
         @paytrail.delete(@uri + location, headers)
     end

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: paytrail
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.2
 platform: ruby
 authors:
-- Johanna Turkia
+- Johanna Pelkonen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies: []
 description: Paytrail Merchant API allows merchant to create and delete refunds for
   payments made via Paytrail
-email: johanna.turkia@paytrail.com
+email: johanna.pelkonen@paytrail.com
 executables: []
 extensions: []
 extra_rdoc_files: []