mastercard_api_core 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4b966df966d30e4f49eae6cf492856a4e90dd81
-  data.tar.gz: ca58164761fc78ebe20ab58cf22fba834461e619
+  metadata.gz: f5f763aebe0c1c4a9a63b42140714f3855315cb2
+  data.tar.gz: 5052018374598d3ce2f0e696db496582fb4d7371
 SHA512:
-  metadata.gz: 66b6ae06797faaefe099d07a4e7784e51adc81267c43a4123489c9a38abda57ee2112fcd157c77f9845db7248d7eb9cc7219a1fad28006557a254391b5feedb3
-  data.tar.gz: 5bc5ebb68ae3752c945f05821eda32a7257bf0b68a1c0aea86b46ff0ca8a83bad5a785399df594251f38e7d3af49a6c6933761191e089e99cf2c48168c6765da
+  metadata.gz: d69f38d00443e4458f114226a422bce782f65949b68babafe2b0488a4bc2b73a3e27ba360d646bbedaacb5e730c35ecc87b3ab6313190902e881f157977b5b56
+  data.tar.gz: da1d578e23a34fb2083890bc37ef250711f400eec3083fbeb00b33224314957fd6474e58fe86ecff6fa8a228d9924b8f4ef663db60f13461d0b11931912bf9eb

data/lib/mastercard/core/config.rb

@@ -70,14 +70,11 @@ module MasterCard
       end
 
       def self.getAPIBaseURL
-
-        if @@localhost
-          return Constants::API_BASE_LOCALHOST_URL
-        elsif @@sandbox
+        if @@sandbox
           return Constants::API_BASE_SANDBOX_URL
+        else
+          return Constants::API_BASE_LIVE_URL
         end
-
-        return Constants::API_BASE_LIVE_URL
       end
     end
   end

data/lib/mastercard/core/constants.rb

@@ -27,8 +27,6 @@
 module MasterCard
   module Core
     module Constants
-      VERSION                 = "1.0.0"
-      API_BASE_LOCALHOST_URL  = "http://localhost:8080"
       API_BASE_LIVE_URL       = "https://api.mastercard.com"
       API_BASE_SANDBOX_URL    = "https://sandbox.api.mastercard.com"
     end

data/lib/mastercard/core/controller.rb

@@ -56,10 +56,10 @@ module MasterCard
         JSON_STR       = "JSON"
 
 
-        def initialize(version=nil)
+        def initialize()
           #Set the parameters
           @baseURL = Config.getAPIBaseURL()
-
+          
           @baseURL = removeForwardSlashFromTail(@baseURL)
 
           #Verify if the URL is correct
@@ -67,47 +67,17 @@ module MasterCard
             raise APIException.new "URL: '" + @baseURL + "' is not a valid url"
           end
 
-          #Set the version
-          unless version.nil?
-            @version = version
-          else
-            @version = Constants::VERSION
-          end
-
         end
 
-        def execute(action,resourcePath,headerKey,queryKey,input)
-
+        def execute(config,metadata,input)
+          
           #Check preconditions for execute
           preCheck()
-
-          #Separate the headers from the inputMap
-          headers = Util.subMap(input,headerKey)
-
-          #Separate the query from the inputMap
-          queryParams = Util.subMap(input,queryKey)
-
-          #Get the resourcePath containing values from input
-          resourcePath = getFullResourcePath(action,resourcePath,input)
-
-          #Get the path parameters
-          pathParams = getPathParams(action,queryParams,input)
-          #Get the body
-          body = getBody(action,input)
-
+          
           #Get the request Object
-          request = getRequestObject(resourcePath,action,pathParams,body)
-
-          #Add headers to request
-          headers.each do |key,value|
-            request.add_field(key,value)
-          end
-
-          fullUrl = @baseURL+resourcePath
-          #Sign and get back the request
-          request = Config.getAuthentication().signRequest(fullUrl,request,request.method,body,pathParams)
-
-          uri = URI.parse(@baseURL)
+          request = getRequestObject(config,metadata,input)
+          
+          uri = URI.parse(request.path)
           #Get the http object
           http = getHTTPObject(uri)
 
@@ -115,7 +85,7 @@ module MasterCard
             puts "---- Request ----"
             puts ""
             puts "URL"
-            puts @baseURL+request.path
+            puts request.path
             puts ""
             puts "Headers"
             request.each_header do |header_name, header_value|
@@ -217,10 +187,11 @@ module MasterCard
         end
 
         def getHTTPObject(uri)
+          
           #Returns the HTTP Object
           http = Net::HTTP.new(uri.host,uri.port)
-
-          unless Config.isLocal()
+          
+          if uri.scheme ==  "https"
             http.use_ssl = true
           end
 
@@ -234,9 +205,35 @@ module MasterCard
           [path, encoded].join("?")
         end
 
-        def getRequestObject(path,action,pathParams,body)
+        def getRequestObject(config,metadata,input)
+          
+          #action,resourcePath,headerKey,queryKey,input
+          
+          #Separate the headers from the inputMap
+          headers = Util.subMap(input,config.getHeaderParams())
+
+          #Separate the query from the inputMap
+          queryParams = Util.subMap(input,config.getQueryParams())
+          
+          #We need to resolve the host
+          resolvedHost = @baseURL
+          unless metadata.getHost().nil?
+            resolvedHost = metadata.getHost()
+          end
+          
+          fullUrl = resolvedHost + config.getResoucePath()
+
+          #Get the resourcePath containing values from input
+          fullUrl = getFullResourcePath(config.getAction(),fullUrl,input)
+
+          #Get the path parameters
+          pathParams = getPathParams(config.getAction(),queryParams,input)
+          #Get the body
+          body = getBody(config.getAction(),input)
+
+          
           #Retuns the request object based on action
-          case action.upcase
+          case config.getAction().upcase
           when ACTION_LIST, ACTION_READ, ACTION_QUERY
             verb = Net::HTTP::Get
 
@@ -249,26 +246,34 @@ module MasterCard
           when ACTION_UPDATE
             verb = Net::HTTP::Put
           else
-            raise APIException.new "Invalid action #{action}"
+            raise APIException.new "Invalid action #{config.getAction()}"
           end
 
           #add url parameters  to path
-          path = encode_path_params(path,pathParams)
+          fullUrl = encode_path_params(fullUrl,pathParams)
 
-          req = verb.new(path)
+          request = verb.new(fullUrl)
 
           #Add default headers
-          req.add_field(KEY_ACCEPT,APPLICATION_JSON)
-          req.add_field(KEY_CONTENT_TYPE,APPLICATION_JSON)
-          req.add_field(KEY_USER_AGENT,RUBY_SDK+"/"+@version)
+          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())
 
           #Add body
 
           unless body.nil?
-            req.body = body.to_json
+            request.body = body.to_json
+          end
+          
+          #Add headers to request
+          headers.each do |key,value|
+            request.add_field(key,value)
           end
 
-          return req
+          #Sign and get back the request
+          request = Config.getAuthentication().signRequest(fullUrl,request,request.method,body,pathParams)
+
+          return request
 
 
         end

data/lib/mastercard/core/model.rb

@@ -340,7 +340,59 @@ module MasterCard
 
 
       end
+      
+      ################################################################################
+      # OperationMetadata
+      ################################################################################
 
+      class OperationMetadata
+       
+        def initialize(version, host)
+          @version = version
+          @host = host
+        end
+        
+        def getVersion()
+          return @version
+        end
+        
+        def getHost()
+          return @host
+        end
+       
+      end
+      
+      
+      ################################################################################
+      # OperationConfig
+      ################################################################################
+
+      class OperationConfig
+       
+        def initialize(resourcePath, action, headerParams, queryParams)
+          @resourcePath = resourcePath
+          @action = action
+          @headerParams = headerParams
+          @queryParams = queryParams
+        end
+        
+        def getResoucePath()
+           return @resourcePath
+        end
+        
+        def getAction()
+          return @action
+        end
+        
+        def getHeaderParams()
+          return @headerParams
+        end
+        
+        def getQueryParams()
+          return @queryParams
+        end
+        
+      end
 
       ################################################################################
       # BaseObject
@@ -361,67 +413,26 @@ module MasterCard
         end
 
 
-        def getResourcePath(action)
-          raise NotImplementedError.new("Child class must define getResourcePath method to use this class")
-        end
-
-        def getHeaderParams(action)
-          raise NotImplementedError.new("Child class must define getHeaderParams method to use this class")
+        protected
+        
+        def self.getOperationConfig(uuid)
+          raise NotImplementedError.new("Child class must define getOperationConfig method to use this class")
         end
 
-        def getQueryParams(action)
-          raise NotImplementedError.new("Child class must define getQueryParams method to use this class")
+        def self.getOperationMetadata()
+          raise NotImplementedError.new("Child class must define getOperationMetadata method to use this class")
         end
-
-        def self.getApiVersion()
-          raise NotImplementedError.new("Child class must define getApiVersion method to use this class")
-        end
-
-        def self.readObject(inputObject,criteria=nil)
-
-          unless criteria.nil?
-
-            if criteria.is_a?(RequestMap)
-              inputObject.setAll(criteria.getObject())
-            else
-              inputObject.setAll(criteria)
-            end
-
-          end
-
-          return self.execute(APIController::ACTION_READ,inputObject)
-
-        end
-
-        def self.listObjects(inputObject)
-          return self.execute(APIController::ACTION_LIST,inputObject)
-        end
-
-        def self.createObject(inputObject)
-          return self.execute(APIController::ACTION_CREATE,inputObject)
-        end
-
-        def self.queryObject(inputObject)
-          return self.execute(APIController::ACTION_QUERY,inputObject)
-        end
-
-        def self.deleteObject(inputObject)
-          return self.execute(APIController::ACTION_DELETE,inputObject)
-        end
-
-        def self.updateObject(inputObject)
-          return self.execute(APIController::ACTION_UPDATE,inputObject)
-        end
-
-        private
-
-        def self.execute(action,inputObject)
-
-          controller = APIController.new(self.getApiVersion)
-          response = controller.execute(action,inputObject.getResourcePath(action),inputObject.getHeaderParams(action),inputObject.getQueryParams(action),inputObject.getObject())
+        
+        def self.execute(operationUUID,inputObject)
+          
+          
+          config = inputObject.class.getOperationConfig(operationUUID)
+          metadata = inputObject.class.getOperationMetadata()
+
+          response = APIController.new.execute(config,metadata,inputObject.getObject())
           returnObjClass = inputObject.class
 
-          if action == APIController::ACTION_LIST
+          if config.getAction().upcase == APIController::ACTION_LIST
             returnObj = []
 
             if response.is_a?(Hash) && response.key?(RequestMap::KEY_LIST)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mastercard_api_core
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - MasterCard Worldwide
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2016-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov