mastercard_api_core 1.4.6 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c81e9e0b949bc4849f068a97925747473497cc7
-  data.tar.gz: 92b0018476825ea191e14cec91396c3e113f640a
+  metadata.gz: 296da60bdee286979c6ca87713a51d0948f8f076
+  data.tar.gz: c2c7df86096d2ea0e8b7caf525f745864b1924c5
 SHA512:
-  metadata.gz: 8ff1f3ed215d237fc2a21088f98bb56bf4b7915089b05bcabb93a8cae85eabf31ad71d46347f6c72a113707a40332a7d2352ebb796d1bcc5579981f370e47ac9
-  data.tar.gz: 63436f4dba15ffa787b997d9e102c57d39c97f8f3f66c6e1222765f6585c4deac0b0f132655013a93f4f5e527e91c1c08760f50a590e5e0ab7b74c027430b4d8
+  metadata.gz: 3818063fe52ea1acd907190a5b5661984de49fa75d1e7839463ba6e5710ab71e825617dcc61a666abf9792296a00dafa8e02eb2d2e688ab2296b3c3973c79160
+  data.tar.gz: b0f2e048f0fcb5676f559f1784d866651762e57da000d3a900eeb61081e8c3f65a03ae0dce3b5606bf033b33a4832763d1dccc7184b107c320908aa66aac4641

data/lib/mastercard/core/config.rb

@@ -36,6 +36,12 @@ module MasterCard
       @@authentication = nil;
       @@registeredInstances = {}
 
+      @@proxy = nil
+      @@connection_timeout = 5
+      @@read_timeout = 30
+      
+      
+
       public
       def self.setDebug(debug)
         @@debug = debug
@@ -58,6 +64,43 @@ module MasterCard
         return @@environment == Environment::SANDBOX
       end
 
+      def self.setProxy(proxy)
+        if (proxy.nil? == false) 
+          @@proxy = proxy
+        else
+          @@proxy = nil
+        end
+      end
+
+      def self.getProxy()
+        return @@proxy
+      end
+
+
+      def self.setConnectionTimeout(timeout)
+        if (timeout.nil? == false && timeout.is_a?(Numeric))  
+          @@connection_timeout = timeout
+        else
+          @@connection_timeout = 5
+        end
+      end
+
+
+      def self.setReadTimeout(timeout)
+        if (timeout.nil? == false && timeout.is_a?(Numeric)) 
+          @@read_timeout = timeout
+        else
+          @@read_timeout = 30
+        end
+      end
+
+      def self.getConnectionTimeout()
+        return @@connection_timeout
+      end
+
+      def self.getReadTimeout()
+        return @@read_timeout
+      end
 
       def self.getEnvironment
         return @@environment

data/lib/mastercard/core/constants.rb

@@ -24,11 +24,19 @@
 # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
+
+
+
 module MasterCard
   module Core
-    module Constants
-      API_BASE_LIVE_URL       = "https://api.mastercard.com"
-      API_BASE_SANDBOX_URL    = "https://sandbox.api.mastercard.com"
+    module Constants    
+      spec = Gem::Specification::load(File.join( File.dirname(__FILE__), '../../../mastercard_api_core.gemspec' ))
+      SDK       = "mastercard_api_core(ruby)"
+      VERSION    = spec.version.to_s()
+
+      def self.getCoreVersion
+        return SDK+":"+VERSION
+      end
     end
 
     module Environment

data/lib/mastercard/core/controller.rb

@@ -36,6 +36,7 @@ module MasterCard
     module Controller
       class APIController
         include MasterCard::Core
+        include MasterCard::Core::Constants
         include MasterCard::Core::Exceptions
         include MasterCard::Security
 
@@ -51,8 +52,7 @@ module MasterCard
         KEY_ACCEPT = "Accept"
         KEY_USER_AGENT = "User-Agent"
         KEY_CONTENT_TYPE = "Content-Type"
-        APPLICATION_JSON = "application/json"
-        RUBY_SDK       = "Ruby_SDK"
+        APPLICATION_JSON = "application/json; charset=UTF-8"
         JSON_STR       = "JSON"
 
 
@@ -155,26 +155,36 @@ module MasterCard
           return body
         end
 
-        def getPathParams(action,queryParams,input)
+        def getQueryParams(action,queryParams,isJsonNative,input)
           #Returns the path params based on action
-          pathParams = {KEY_FORMAT => JSON_STR}
+          params = {}
+          if isJsonNative == false
+            params = {KEY_FORMAT => JSON_STR}
+          end
+
           case action.upcase
           when ACTION_LIST, ACTION_READ, ACTION_QUERY, ACTION_DELETE
             unless input.nil?
-              pathParams = pathParams.merge(input)
+              params = params.merge(input)
             end
           end
 
           #merge the queryParams
-          pathParams = pathParams.merge(queryParams)
+          params = params.merge(queryParams)
 
-          return pathParams
+          return params
         end
 
         def getHTTPObject(uri)
+
+          proxy = Config.getProxy()
+          proxyHost = proxy.nil? == false ? proxy.key?(:host) ? proxy[:host] : nil : nil
+          proxyPort = proxy.nil? == false ? proxy.key?(:port) ? proxy[:port] : nil : nil
           
           #Returns the HTTP Object
-          http = Net::HTTP.new(uri.host,uri.port)
+          http = Net::HTTP.new(uri.host,uri.port, proxyHost, proxyPort)
+          http.read_timeout = Config.getReadTimeout()
+          http.open_timeout = Config.getConnectionTimeout()
           
           if uri.scheme ==  "https"
             http.use_ssl = true
@@ -184,7 +194,7 @@ module MasterCard
 
         end
 
-        def encode_path_params(path, params)
+        def encode_query_params(path, params)
           #Encode and join the params
           encoded = URI.encode_www_form(params)
           [path, encoded].join("?")
@@ -217,16 +227,18 @@ module MasterCard
           
           fullUrl = resolvedHost + resourcePath
 
-          #Get the resourcePath containing values from input
+          #Get the resourcePath containing path parameters
           fullUrl = getFullResourcePath(config.getAction(),fullUrl,input)
 
           #Get the path parameters
-          pathParams = getPathParams(config.getAction(),queryParams,input)
+          params = getQueryParams(config.getAction(),queryParams,metadata.isJsonNative(),input)
           #Get the body
           body = getBody(config.getAction(),input)
 
           #add url parameters  to path
-          fullUrl = encode_path_params(fullUrl,pathParams)
+          if params.any?
+            fullUrl = encode_query_params(fullUrl,params)
+          end
           
           uri = URI(fullUrl)
           
@@ -250,13 +262,12 @@ module MasterCard
           
 
           #Add default headers
-          request.add_field(KEY_ACCEPT,APPLICATION_JSON)
-          request.add_field(KEY_CONTENT_TYPE,APPLICATION_JSON)
-          request.add_field(KEY_USER_AGENT,RUBY_SDK+"/"+metadata.getVersion())
+          request[KEY_ACCEPT] = APPLICATION_JSON
+          request[KEY_USER_AGENT] =Constants::getCoreVersion()+"/"+metadata.getVersion()
 
           #Add body
-
           unless body.nil?
+            request[KEY_CONTENT_TYPE] = APPLICATION_JSON
             request.body = body.to_json
           end
           
@@ -266,7 +277,7 @@ module MasterCard
           end
 
           #Sign and get back the request
-          request = Config.getAuthentication().signRequest(fullUrl,request,request.method,body,pathParams)
+          request = Config.getAuthentication().signRequest(request,params)
 
           return request
 

data/lib/mastercard/core/model.rb

@@ -337,6 +337,75 @@ module MasterCard
 
 
 
+      end
+
+      ################################################################################
+      # CaseInsensitiveMap
+      ################################################################################
+
+      class CaseInsensitiveMap < SmartMap
+        def initialize
+          #call the base class constructor
+          super()
+        end
+
+        def containsKeys(key)
+          return super(key.to_s.downcase)
+        end
+
+        def get(key)
+          return super(key.to_s.downcase)
+        end
+
+        def set(key,value)
+          super(key.to_s.downcase, value)
+        end 
+        
+        def setAll(map)
+          properties = parseMap(map)
+          super(map)
+        end
+
+        private
+        def parseMap(map)
+          parsedMap = {}
+          map.each do |k, v|
+            if v.is_a?(Array)
+              parsedMap[k.to_s.downcase] = parseList(v)
+            elsif v.is_a?(Hash)
+              parsedMap[k.to_s.downcase] = parseMap(v)
+            else
+              parsedMap[k.to_s.downcase] = v
+            end
+          end
+          return parsedMap
+        end
+
+        def parseList(list)
+          parsedList = []
+          list.each do |v|
+            if v.is_a?(Array)
+              parsedList << parseList(v) 
+            elsif v.is_a?(Hash)
+              parsedList << parseMap(v)
+            else
+              parsedList << v
+            end
+          end
+          return parsedList
+        end
+
+      end
+
+      ################################################################################
+      # RequestMap
+      ################################################################################
+
+      class RequestMap < SmartMap
+        def initialize
+          #call the base class constructor
+          super()
+        end
       end
       
       ################################################################################
@@ -345,10 +414,11 @@ module MasterCard
 
       class OperationMetadata
        
-        def initialize(version, host, context = nil)
+        def initialize(version, host, context = nil, jsonNative = false)
           @version = version
           @host = host
           @context = context
+          @jsonNative = jsonNative
         end
         
         def getVersion()
@@ -362,6 +432,10 @@ module MasterCard
         def getContext()
           return @context
         end
+
+        def isJsonNative()
+          return @jsonNative
+        end
        
       end
       
@@ -397,16 +471,7 @@ module MasterCard
         
       end
 
-      ################################################################################
-      # RequestMap
-      ################################################################################
 
-      class RequestMap < SmartMap
-        def initialize
-          #call the base class constructor
-          super()
-        end
-      end
 
       
 

data/lib/mastercard/security/authentication.rb

@@ -28,7 +28,7 @@ module MasterCard
   module Security
     class Authentication
 
-      def signRequest(uri,request)
+      def signRequest(request,params)
         raise NotImplementedError.new("This method should be overridden by the class")
       end
     end

data/lib/mastercard/security/oauth.rb

@@ -62,20 +62,13 @@ module MasterCard
           oAuthParameters.setOAuthSignatureMethod("RSA-SHA256")
           oAuthParameters.setOAuthVersion("1.0")
 
-          if body.nil?
-            body = ""
+          unless body.nil?
+            encodedHash = sha256Base64Encode(body)
+            oAuthParameters.setOAuthBodyHash(encodedHash)
           end
 
-          begin
-            body = body.to_json
-          rescue
-            #Do nothing and hope for the best
-          end
-
-          encodedHash = sha256Base64Encode(body)
-          oAuthParameters.setOAuthBodyHash(encodedHash)
-
           return oAuthParameters
+          
         end
 
         def getBaseString(url,method,params,oAuthParams)
@@ -94,9 +87,9 @@ module MasterCard
         end
 
 
-        def signRequest(url,request,method,data,params)
+        def signRequest(request,params)
 
-          oauth_key = getOAuthKey(url,method,data,params)
+          oauth_key = getOAuthKey(request.uri.to_s,request.method,request.body,params)
           request.add_field(OAuthParameters::AUTHORIZATION,oauth_key)
           return request
 

data/mastercard_api_core.gemspec

@@ -0,0 +1,43 @@
+# -*- encoding: utf-8 -*-#
+# Copyright (c) 2016 MasterCard International Incorporated
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are
+# permitted provided that the following conditions are met:
+#
+# Redistributions of source code must retain the above copyright notice, this list of
+# conditions and the following disclaimer.
+# Redistributions in binary form must reproduce the above copyright notice, this list of
+# conditions and the following disclaimer in the documentation and/or other materials
+# provided with the distribution.
+# Neither the name of the MasterCard International Incorporated nor the names of its
+# contributors may be used to endorse or promote products derived from this software
+# without specific prior written permission.
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+# SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+Gem::Specification.new do |gem|
+  gem.name          = "mastercard_api_core"
+  gem.authors       = ["MasterCard Worldwide"]
+  gem.email         = ["APISupport@mastercard.com"]
+  gem.summary       = %q{MasterCard core SDK}
+  gem.description   = %q{This is the MasterCard OpenAPI core SDK. This provides the base functionality for all MasterCard APIs}
+  gem.homepage      = "https://developer.mastercard.com"
+  gem.version       = "1.4.7"
+  gem.license       = "BSD-2-Clause"
+
+  gem.files         = Dir["{bin,spec,lib}/**/*"]+ Dir["data/*"] + ["mastercard_api_core.gemspec"]
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ["lib"]
+  gem.add_development_dependency 'simplecov', '~> 0'
+  gem.add_development_dependency 'ci_reporter_minitest', '~> 0'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mastercard_api_core
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.4.7
 platform: ruby
 authors:
 - MasterCard Worldwide
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-09 00:00:00.000000000 Z
+date: 2017-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
@@ -57,6 +57,7 @@ files:
 - lib/mastercard/security/oauth.rb
 - lib/mastercard/security/util.rb
 - lib/mastercard_api_core.rb
+- mastercard_api_core.gemspec
 homepage: https://developer.mastercard.com
 licenses:
 - BSD-2-Clause