mobilepay 1.1.5 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ed8cd01478cd62cb2fff164d2462df436e134be
-  data.tar.gz: 169b04892f82143102c62808e200024252243434
+  metadata.gz: 911b78597309b66a9038aeffb8eb9f51120d02b6
+  data.tar.gz: 210a253262c808ee88a804bda67eb27df0696594
 SHA512:
-  metadata.gz: dabc279c9015995637acd75aea52edb3323935bb371323c4f4be839e0dc4da8c32f95a7afd000785fffd599833b164d8c04d58496e50af5e2ee506f5fa07fe73
-  data.tar.gz: d698ae7044f46ec67efef4f26e5c57864aca4389ab32eb36bdf55ac671683e96ade54926f9fc667085e7068a945095da0081f4a2d14e396a2c2fdb87851b908f
+  metadata.gz: 654cf5c7761405cd849eca10ceeeb035d3a7ac644cd73b3408ed20967411a50915834fab738dade4f95d905234913d7ef669619a7655d934d53ddb1d090d4c93
+  data.tar.gz: 6cdc421f794cee4370551affcef507600ce29ac68963efd7676f03974d615d5f862ea33751996f94710811f58e2f5b0762b3ce7af3d44f64a0ca35f463b0e573

data/.rubocop.yml

@@ -0,0 +1,46 @@
+AllCops:
+  Exclude:
+    - bin/*
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/BlockLength:
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/LineLength:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/ModuleLength:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Max: 20
+
+Layout/IndentationWidth:
+  Width: 4
+
+Layout/CaseIndentation:
+  EnforcedStyle: case
+  SupportedStyles:
+    - case
+    - end
+  IndentOneStep: true
+
+Layout/AlignHash:
+  Enabled: false
+
+Style/GuardClause:
+  Enabled: false
+
+Style/FileName:
+  Enabled: false
+
+Style/FormatStringToken:
+  EnforcedStyle: template

data/Gemfile

@@ -1,5 +1,7 @@
 source 'https://rubygems.org'
 
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
+
 group :test do
     gem 'rspec'
     gem 'webmock'

data/README.md

@@ -7,7 +7,6 @@ Actions with payments in MobilePay system.
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'jose'
 gem 'mobilepay'
 ```
 
@@ -25,7 +24,7 @@ Or install it yourself as:
 
 ```ruby
   require 'mobilepay'
-  security = Mobilepay::Security.new subscription_key: 'subscription_key'
+  security = Mobilepay::Security.new subscription_key: 'subscription_key', privatekey: 'key.pvk'
 ```
     merchant_id - Merchant ID, required
 
@@ -33,7 +32,6 @@ Or install it yourself as:
 
 ```ruby
   require 'mobilepay'
-  require 'jose'
   client = Mobilepay::Client.new merchant_id: 'merchant_id', subscription_key: 'subscription_key', privatekey: 'key.pvk', test_mode: true
 ```
     subscription_key - Subscription Key for MobilePay, required

data/Rakefile

@@ -3,4 +3,4 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/lib/mobilepay.rb

@@ -2,6 +2,7 @@ require_relative 'mobilepay/version'
 require_relative 'mobilepay/client'
 require_relative 'mobilepay/security'
 
+# Top-level comment
 module Mobilepay
     class Failure < StandardError; end
 end

data/lib/mobilepay/client.rb

@@ -1,4 +1,4 @@
-require 'json'
+require 'httparty'
 require_relative 'client/payment_status'
 require_relative 'client/payment_transactions'
 require_relative 'client/reservations'
@@ -9,7 +9,9 @@ require_relative 'requests'
 require_relative 'requests/generate_signature'
 
 module Mobilepay
+    # Clients requests
     class Client
+        include HTTParty
         include Mobilepay::Client::PaymentStatus
         include Mobilepay::Client::PaymentTransactions
         include Mobilepay::Client::Reservations
@@ -19,35 +21,20 @@ module Mobilepay
         include Mobilepay::Requests
         include Mobilepay::Requests::GenerateSignature
 
-        attr_reader :merchant_id, :subscription_key, :privatekey, :test_mode, :base_uri
+        base_uri 'https://api.mobeco.dk/appswitch/api/v1'
+        format :json
+
+        attr_reader :privatekey, :headers, :merchant_id, :body
 
         def initialize(args = {})
-            @merchant_id = args[:merchant_id] || ''
-            @subscription_key = args[:subscription_key] || ''
             @privatekey = args[:privatekey]
-            @test_mode = args[:test_mode] || false
-            @base_uri = 'https://api.mobeco.dk/appswitch/api/v1'
-        end
-
-        private
-
-        def call(req, address, args = {})
-            response = case req
-                when :get, :put, :delete then http_request(req, address, args)
-                else raise Failure, 'Undefined  type for call'
-            end
-            check_response(response)
-            response
-        end
-
-        def check_response(response)
-            if response.code != '200'
-                error_message = response.body.empty? ? response.code : response.body
-                raise Failure, error_message
-            end
+            @headers = { 'Ocp-Apim-Subscription-Key' => args[:subscription_key], 'Content-Type' => 'application/json' }
+            @merchant_id = args[:merchant_id]
+            headers['Test-mode'] = 'true' if args[:test_mode] == true
+            @body = ''
         end
 
-        def check_args(args)
+        private def check_args(args)
             args.each do |arg_name, value|
                 if value.nil?
                     raise Failure, "Invalid argument '#{arg_name}', must be string"
@@ -55,4 +42,4 @@ module Mobilepay
             end
         end
     end
-end
+end

data/lib/mobilepay/client/cancel_reservation.rb

@@ -1,17 +1,15 @@
 module Mobilepay
     class Client
+        # Reservations_CancelReservation
         module CancelReservation
-
-            # Reservations_CancelReservation
             # Cancels a specific reservation
             def cancel_reservation(args = {})
                 check_args(order_id: args[:order_id])
-                response = call(:delete, "/reservations/merchants/#{merchant_id}/orders/#{args[:order_id]}", { body: '' })
-                JSON.parse(response.body)
+                response = request(:delete, "/reservations/merchants/#{merchant_id}/orders/#{args[:order_id]}")
+                response.parsed_response
             rescue Failure => ex
                 return { error: ex.message }
             end
-
         end
     end
-end
+end

data/lib/mobilepay/client/capture_amount.rb

@@ -1,17 +1,16 @@
 module Mobilepay
     class Client
+        # Reservations_CaptureAmount
         module CaptureAmount
-
-            # Reservations_CaptureAmount
             # Captures a previously reserved amount, either in full or partially
             def capture_amount(args = {})
                 check_args(order_id: args[:order_id])
-                response = call(:put, "/reservations/merchants/#{merchant_id}/orders/#{args[:order_id]}", { body: args[:body] || '' })
-                JSON.parse(response.body)
+                @body = args[:body]
+                response = request(:put, "/reservations/merchants/#{merchant_id}/orders/#{args[:order_id]}")
+                response.parsed_response
             rescue Failure => ex
                 return { error: ex.message }
             end
-
         end
     end
-end
+end

data/lib/mobilepay/client/payment_status.rb

@@ -1,17 +1,15 @@
 module Mobilepay
     class Client
+        # Merchants_GetPaymentStatus
         module PaymentStatus
-
-            # Merchants_GetPaymentStatus
             # Gets the status of a given order
             def payment_status(args = {})
                 check_args(order_id: args[:order_id])
-                response = call(:get, "/merchants/#{merchant_id}/orders/#{args[:order_id]}", { body: '' })
-                JSON.parse(response.body)
+                response = request(:get, "/merchants/#{merchant_id}/orders/#{args[:order_id]}")
+                response.parsed_response
             rescue Failure => ex
                 return { error: ex.message }
             end
-
         end
     end
-end
+end

data/lib/mobilepay/client/payment_transactions.rb

@@ -1,17 +1,15 @@
 module Mobilepay
     class Client
+        # Merchants_GetPaymentTransactions
         module PaymentTransactions
-
-            # Merchants_GetPaymentTransactions
             # Gets the transactions for a given order
             def payment_transactions(args = {})
                 check_args(order_id: args[:order_id])
-                response = call(:get, "/merchants/#{merchant_id}/orders/#{args[:order_id]}/transactions", { body: '' })
-                JSON.parse(response.body)
+                response = request(:get, "/merchants/#{merchant_id}/orders/#{args[:order_id]}/transactions")
+                response.parsed_response
             rescue Failure => ex
                 return { error: ex.message }
             end
-
         end
     end
-end
+end

data/lib/mobilepay/client/refund_amount.rb

@@ -1,17 +1,16 @@
 module Mobilepay
     class Client
+        # Merchants_RefundAmount
         module RefundAmount
-
-            # Merchants_RefundAmount
             # Refunds an amount to the customer based on an order id
             def refund_amount(args = {})
                 check_args(order_id: args[:order_id])
-                response = call(:put, "/merchants/#{merchant_id}/orders/#{args[:order_id]}", { body: args[:body] || '{}' })
-                JSON.parse(response.body)
+                @body = args[:body]
+                response = request(:put, "/merchants/#{merchant_id}/orders/#{args[:order_id]}")
+                response.parsed_response
             rescue Failure => ex
                 return { error: ex.message }
             end
-
         end
     end
-end
+end

data/lib/mobilepay/client/reservations.rb

@@ -1,19 +1,17 @@
 module Mobilepay
     class Client
+        # Reservations_GetReservations
         module Reservations
-
-            # Reservations_GetReservations
             # Get the reservations for a particular date/time interval, and alternatively also for a specific customer
             def reservations(args = {})
                 check_args(datetime_from: args[:datetime_from], datetime_to: args[:datetime_to])
-                address = "/reservations/merchants/#{merchant_id}/#{args[:datetime_from]}/#{args[:datetime_to]}"
-                address += "?customerId=#{args[:customer_id]}" if args[:customer_id]
-                response = call(:get, address, { body: '{}' })
-                JSON.parse(response.body)
+                uri = "/reservations/merchants/#{merchant_id}/#{args[:datetime_from]}/#{args[:datetime_to]}"
+                uri += "?customerId=#{args[:customer_id]}" if args[:customer_id]
+                response = request(:get, uri)
+                response.parsed_response
             rescue Failure => ex
                 return { error: ex.message }
             end
-
         end
     end
-end
+end

data/lib/mobilepay/requests.rb

@@ -1,37 +1,30 @@
-require 'net/http'
-
 module Mobilepay
+    # Common requests for classes
     module Requests
-
-        private
-
-        def http_request(req, address, args = {})
-            uri = generate_uri(address)
-            req = generate_request(req, uri)
-            req = generate_headers(req, args[:body])
-            Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) { |http| http.request(req) }
+        private def request(type, uri)
+            add_signature(uri)
+            response = send_request(type, uri)
+            check_response(response)
+            response
         end
 
-        def generate_uri(address = '')
-            URI("#{base_uri}#{address}")
+        private def add_signature(uri)
+            headers['AuthenticationSignature'] = generate_signature(uri)
         end
 
-        def generate_request(req, uri)
-            case req
-                when :get then Net::HTTP::Get.new(uri)
-                when :put then Net::HTTP::Put.new(uri)
-                when :delete then Net::HTTP::Delete.new(uri)
+        private def send_request(type, uri)
+            case type
+                when :get then self.class.get(uri, query: {}, headers: headers)
+                when :put then self.class.put(uri, query: {}, headers: headers)
+                when :delete then self.class.delete(uri, query: {}, headers: headers)
             end
         end
 
-        def generate_headers(req, body)
-            req['Content-Type'] = 'application/json'
-            req['Ocp-Apim-Subscription-Key'] = subscription_key
-            req['AuthenticationSignature'] = generate_signature(req) unless privatekey.nil?
-            req['Test-mode'] = test_mode if test_mode == true
-            req.body = body
-            req
+        private def check_response(response)
+            if response.code != 200
+                error_message = response.message.empty? ? response.code : response.message
+                raise Failure, error_message
+            end
         end
-
     end
-end
+end

data/lib/mobilepay/requests/generate_signature.rb

@@ -4,18 +4,16 @@ require 'jose'
 
 module Mobilepay
     module Requests
+        # Generate signature module
         module GenerateSignature
-
             # Generate Authentication Signature
-            def generate_signature(request)
-                payload = (request.uri.to_s + request.body.to_s).encode('UTF-8')
+            def generate_signature(uri)
+                payload = (Mobilepay::Client.base_uri + uri + body.to_s).encode('UTF-8')
                 payload_sha1 = Digest::SHA1.digest(payload)
                 payload_base64 = Base64.strict_encode64(payload_sha1)
-
                 jwk = JOSE::JWK.from_pem_file(privatekey)
-                JOSE::JWS.sign(jwk, payload_base64, { 'alg' => 'RS256', 'typ' => 'JWT' }).compact
+                JOSE::JWS.sign(jwk, payload_base64, 'alg' => 'RS256', 'typ' => 'JWT').compact
             end
-
         end
     end
-end
+end

data/lib/mobilepay/security.rb

@@ -1,36 +1,25 @@
-require 'json'
+require 'httparty'
 require_relative 'security/public_key'
 require_relative 'requests'
 require_relative 'requests/generate_signature'
 
 module Mobilepay
+    # Security requests
     class Security
+        include HTTParty
         include Mobilepay::Security::PublicKey
         include Mobilepay::Requests
         include Mobilepay::Requests::GenerateSignature
 
-        attr_reader :subscription_key, :privatekey, :test_mode, :base_uri
+        base_uri 'https://api.mobeco.dk/merchantsecurity/api'
+        format :json
 
-        def initialize(args = {})
-            @subscription_key = args[:subscription_key] || ''
-            @privatekey = nil
-            @test_mode = false
-            @base_uri = 'https://api.mobeco.dk/merchantsecurity/api'
-        end
-
-        private
+        attr_reader :privatekey, :headers, :body
 
-        def call
-            response = http_request(:get, '/publickey')
-            check_response(response)
-            response
-        end
-
-        def check_response(response)
-            if response.code != '200'
-                error_message = response.body.empty? ? response.code : JSON.parse(response.body)['message']
-                raise Failure, error_message
-            end
+        def initialize(args = {})
+            @privatekey = args[:privatekey]
+            @headers = { 'Ocp-Apim-Subscription-Key' => args[:subscription_key], 'Content-Type' => 'application/json' }
+            @body = ''
         end
     end
-end
+end

data/lib/mobilepay/security/public_key.rb

@@ -1,16 +1,14 @@
 module Mobilepay
     class Security
+        # Security_PublicKey
         module PublicKey
-
-            # Secutiry_PublicKey
-            # Get MobilePay's public key to use when signing up new merchants
+            # Gets the public key
             def public_key
-                response = call
-                JSON.parse(response.body)
+                response = request(:get, '/publickey')
+                response.parsed_response
             rescue Failure => ex
                 return { error: ex.message }
             end
-
         end
     end
-end
+end

data/lib/mobilepay/version.rb

@@ -1,3 +1,3 @@
 module Mobilepay
-    VERSION = '1.1.5'
+    VERSION = '1.3.0'.freeze
 end

data/mobilepay.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'mobilepay/version'
@@ -23,5 +24,7 @@ Gem::Specification.new do |spec|
 
     spec.add_development_dependency 'bundler', '~> 1.14'
     spec.add_development_dependency 'rake', '~> 10.0'
-    spec.add_development_dependency 'jose', '~> 1.1'
+    spec.add_development_dependency 'rubocop', '~> 0.49.1'
+    spec.add_dependency 'jose', '~> 1.1'
+    spec.add_dependency 'httparty', '~> 0.15'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobilepay
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.3.0
 platform: ruby
 authors:
 - JungleCoders
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-22 00:00:00.000000000 Z
+date: 2017-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,6 +39,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.49.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.49.1
 - !ruby/object:Gem::Dependency
   name: jose
   requirement: !ruby/object:Gem::Requirement
@@ -46,13 +60,27 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
 description: Actions with payments in MobilePay system
 email:
 - kortirso@gmail.com
@@ -62,6 +90,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt