Merge pull request #64 from AuthorizeNet/future

Q3 updates - future to master

Author: Sunny Raj Rathod

.coveragerc

@@ -0,0 +1,5 @@
+[report]
+omit =
+    */python?.?/*
+    */site-packages/nose/*
+    */tests/*

.travis.yml

@@ -3,19 +3,23 @@ sudo: false
 
 python:
   - "2.7"
+  - "3.4"
+  - "3.5"
   # - "pypy" Disabling pypy until travis moves to newer version, known issue with lxml crashing pypy
 
 install:
  - pip install unittest2
  - pip install nose
  - pip install pyxb
  - pip install lxml
+ - pip install coveralls
 
 before_script:
   - git submodule update --remote --recursive
 
 script:
- - nosetests
+ - nosetests --with-coverage -cover-package=authorizenet
+ - coveralls
  - python setup.py install
  - cd sample-code-python
  - python ./test-runner.py

README.md

@@ -2,8 +2,7 @@
 
 [![Travis](https://img.shields.io/travis/AuthorizeNet/sdk-python/master.svg)]
 (https://travis-ci.org/AuthorizeNet/sdk-python)
-[![Coverage Status](https://coveralls.io/repos/github/AuthorizeNet/sdk-python/badge.svg?branch=master)]
-(https://coveralls.io/github/AuthorizeNet/sdk-python?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/AuthorizeNet/sdk-python/badge.svg?branch=master)](https://coveralls.io/github/AuthorizeNet/sdk-python?branch=master)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/AuthorizeNet/sdk-python/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/AuthorizeNet/sdk-python/?branch=master)
 [![PyPI](https://img.shields.io/pypi/v/authorizenet.svg)](https://badge.fury.io/py/authorizenet)
 
@@ -93,8 +92,9 @@ Requirements
 
 Run the following to get pyxb and nosetests:
 - pip install pyxb
-- pip install nosetests
-- pip install Magicmock
+- pip install unittest2
+- pip install nose
+- pip install lxml
 
 Testing
 --------------------------------------

authorizenet/apicontractsv1.py

@@ -9,7 +9,6 @@
 import sys
 import xml.dom.minidom
 from pip._vendor import requests
-from _pyio import __metaclass__
 from lxml import objectify
 
 from authorizenet.constants import constants
@@ -87,8 +86,11 @@ def validate(self):
         self.validateandsetmerchantauthentication()       
         self.validaterequest()
 
-        return     
-    
+        return
+
+    def setClientId(self): #protected method
+        self._request.clientId = constants.clientId
+
     def _getrequest(self): #protected method
         return self._request 
 
@@ -97,9 +99,9 @@ def buildrequest(self):
 
         xmlRequest = self._request.toxml(encoding=constants.xml_encoding, element_name=self.getrequesttype())
         #remove namespaces that toxml() generates
-        xmlRequest = xmlRequest.replace(constants.nsNamespace1, '')
-        xmlRequest = xmlRequest.replace(constants.nsNamespace2, '')
-        
+        xmlRequest = xmlRequest.replace(constants.nsNamespace1, b'')
+        xmlRequest = xmlRequest.replace(constants.nsNamespace2, b'')
+
         return xmlRequest
 
     def getprettyxmlrequest(self):
@@ -123,6 +125,7 @@ def execute(self):
 
         #requests is http request  
         try:
+            self.setClientId()
             xmlRequest = self.buildrequest()
             self._httpResponse = requests.post(self.endpoint, data=xmlRequest, headers=constants.headers, proxies=proxyDictionary)
         except Exception as httpException:
@@ -138,8 +141,8 @@ def execute(self):
                 self._response = apicontractsv1.CreateFromDocument(self._httpResponse) 
                 #objectify code  
                 xmlResponse= self._response.toxml(encoding=constants.xml_encoding, element_name=self.getrequesttype()) 
-                xmlResponse = xmlResponse.replace(constants.nsNamespace1, '')
-                xmlResponse = xmlResponse.replace(constants.nsNamespace2, '') 
+                xmlResponse = xmlResponse.replace(constants.nsNamespace1, b'')
+                xmlResponse = xmlResponse.replace(constants.nsNamespace2, b'') 
                 self._mainObject = objectify.fromstring(xmlResponse)   
 
             except Exception as objectifyexception:
@@ -148,21 +151,21 @@ def execute(self):
                 self._response = apicontractsv1.CreateFromDocument(self._httpResponse)    
                 #objectify code 
                 xmlResponse= self._response.toxml(encoding=constants.xml_encoding, element_name=self.getrequesttype()) 
-                xmlResponse = xmlResponse.replace(constants.nsNamespace1, '')
-                xmlResponse = xmlResponse.replace(constants.nsNamespace2, '') 
+                xmlResponse = xmlResponse.replace(constants.nsNamespace1, b'')
+                xmlResponse = xmlResponse.replace(constants.nsNamespace2, b'') 
                 self._mainObject = objectify.fromstring(xmlResponse) 
             else:    
                 #if type(self.getresponseclass()) == type(self._response):
                 if type(self.getresponseclass()) != type(self._mainObject):
                     if self._response.messages.resultCode == "Error":
-                        print "Response error"
+                        logging.debug("Response error")
                     domResponse = xml.dom.minidom.parseString(self._httpResponse)
                     logging.debug('Received response: %s' % domResponse.toprettyxml())
                 else:
                     #Need to handle ErrorResponse  
                     logging.debug('Error retrieving response for request: %s' % self._request)
         else:
-            print "Did not receive http response"
+            logging.debug("Did not receive http response")
         return
 
     def getresponse(self):

authorizenet/apicontrollersbase.py

@@ -15,6 +15,10 @@ class constants(object):
     SANDBOX = 'https://apitest.authorize.net/xml/v1/request.api'
     PRODUCTION = 'https://api2.authorize.net/xml/v1/request.api'
 
+    '''clientId'''
+    version = '1.0.12'
+    clientId = 'sdk-python-' + version
+
     '''xml encoding'''
     xml_encoding = 'utf-8'
 
@@ -38,10 +42,10 @@ class constants(object):
     note = ' note="Status with a capital \'S\' is obsolete."'
 
     '''ns namespace 1'''
-    nsNamespace1 = 'ns1:'
+    nsNamespace1 = b'ns1:'
 
     '''ns namespace 2'''
-    nsNamespace2 = ':ns1'
+    nsNamespace2 = b':ns1'
 
     '''default log file name'''
     defaultLogFileName = "anetsdk.log"

authorizenet/constants.py

@@ -4,12 +4,20 @@
 @author: krgupta
 '''
 
-from ConfigParser import SafeConfigParser
-from ConfigParser import NoSectionError
+try:
+    from ConfigParser import SafeConfigParser
+    from ConfigParser import NoSectionError
+except ImportError:
+    from configparser import SafeConfigParser
+    from configparser import NoSectionError
+
 import os
 import sys
+import logging
 #from __future__ import print_function
 
+logger = logging.getLogger(__name__)
+
 class helper(): 
     __parser = "null"
     __propertyfilename = "null"
@@ -45,20 +53,20 @@ def getproperty(propertyname):
                     try:
                         helper.__parser = SafeConfigParser({"http":"","https":"","ftp":""})
                     except:
-                        print ("Parser could not be initialized")
+                        logger.debug("Parser could not be initialized")
 
                 if ('null' != helper.getparser()):
                     try:
                         helper.getparser().read(helper.__propertyfilename)
                         helper.__initialized = True
                     except:
-                        print ("Unable to load the property file")
+                        logger.debug("Unable to load the property file")
 
         if (True == helper.__classinitialized()):
             try:
                 stringvalue = helper.getparser().get("properties", propertyname)
             except:
-                sys.stderr.write("'%s' not found\n" %propertyname )
+                logger.debug("'%s' not found\n" %propertyname )
 
         if ( "null" == stringvalue):
             stringvalue = os.getenv(propertyname)               

authorizenet/utility.py

@@ -5,9 +5,9 @@
 #Modifying XSD to add wildcard character 
 #Adding paymentScheduleTypeInterval type to overcome pyxb's anonymous complex type issue
 
-$input_file = "AnetApiSchema.xsd";
-$intermediate_file = "IntermediateAnetOut.xsd";
-$output_file = "AnetApiSchemaOut.xsd";
+$input_file = $ARGV[0];
+$intermediate_file = $ARGV[1];
+$output_file = $ARGV[2];
 $inp_cmd = "dos2unix $input_file\n";
 
 open(INP,"<$input_file") or die "Cannot open $input_file for reading:$!\n";
@@ -25,7 +25,7 @@
 }		
 close(OUP);
 close(INP);
-print "$intermediate_file created from AnetApiSchema.xsd\n";
+#print "$intermediate_file created from AnetApiSchema.xsd\n"; #uncomment for debugging
 
 # Using intermediate file as input
 open(INPUT,"<$intermediate_file") or die "Cannot open $intermediate_file for reading:$!\n";

script/addany.pl

@@ -4,6 +4,16 @@
 # Requires pyxb module to be installed and available in path
 
 dt=`date '+%m/%d/%Y %H:%M:%S'`
+
+AnetURL=https://apitest.authorize.net/xml/v1/schema/AnetApiSchema.xsd
+AnetURLPERL='https:\/\/apitest.authorize.net\/xml\/v1\/schema\/AnetApiSchema.xsd'
+LOCALXSDWITHANY=./script/AnetOut.xsd
+CONTRACTSDIR=authorizenet
+CONTRACTSFILE=apicontractsv1
+PYXBGENPATH=`which pyxbgen`
+TEMPFILE=binding
+TEMPDIRECTORY=./script/temp
+
 echo Starting pyxbgen on ${dt}
 which python > /dev/null
 if [ $? -eq 0 ]
@@ -32,32 +42,60 @@ else
     exit 1
 fi
 
-LOCALXSDWITHANY=./script/AnetApiSchemaOut.xsd
-CONTRACTSDIR=authorizenet
-CONTRACTSFILE=apicontractsv1
-PYXBGENPATH=`which pyxbgen`
-TEMPFILE=binding
-
-echo Downloading AnetAPISchema file under Script directory
-wget -O AnetApiSchema.xsd https://apitest.authorize.net/xml/v1/schema/AnetApiSchema.xsd
+which wget > /dev/null
 if [ $? -eq 0 ]
 then
-	echo AnetAPISchema.xsd downloaded
+    echo Found wget. Downloading AnetAPISchema file under Script directory.
+	wget -O ./script/AnetApiSchema.xsd ${AnetURL}
+	if [ $? -eq 0 ]
+	then
+		echo AnetAPISchema.xsd downloaded.
+	else
+		echo Unable to download AnetAPISchema.
+		exit 1
+	fi
 else
-    echo Unable to download AnetAPISchema.
-    exit 1
+	echo Wget not found. Looking for Curl
+	which curl > /dev/null
+	if [ $? -eq 0 ]
+	then
+		echo Found curl. Downloading AnetAPISchema file under Script directory.
+		curl --noproxy '*' ${AnetURL} > ./script/AnetApiSchema.xsd
+		if [ $? -eq 0 ]
+		then
+			echo AnetAPISchema.xsd downloaded.
+		else		
+			curl ${AnetURL} > ./script/AnetApiSchema.xsd
+			if [ $? -eq 0 ]
+			then
+				echo AnetAPISchema.xsd downloaded.
+			else
+				echo Unable to download AnetAPISchema.
+				exit 1
+			fi
+		fi
+	else
+		echo Unable to find wget and curl. Make sure either one is installed
+		exit 1
+	fi
 fi
 
-echo modifying XSD using perl to support backward compatibility
-perl addany.pl
+echo Modifying XSD using perl to support backward compatibility
+echo Creating temporary directory 
+mkdir -p "$TEMPDIRECTORY"
+
+perl script/addany.pl script/AnetApiSchema.xsd ${TEMPDIRECTORY}/IntermediateAnetOut.xsd ${LOCALXSDWITHANY}
 if [ $? -eq 0 ]
 then
-	echo AnetOut.xsd generated 
+	: #echo AnetOut.xsd generated #Uncomment for debugging
 else
     echo Unable to generate AnetOut.xsd
     exit 1
 fi
 
+echo Deleting temporary directory 
+rm -rf "$TEMPDIRECTORY"
+
 echo Using pyxb from "${PYXBGENPATH}"
 if [ -e "${TEMPFILE}.py" ]; then
     rm ${TEMPFILE}.py
@@ -75,12 +113,13 @@ then
         rm "${CONTRACTSDIR}/${CONTRACTSFILE}.py"
     fi
     mv "${TEMPFILE}.py" "${CONTRACTSDIR}/${CONTRACTSFILE}.py"
-    echo Bindings have been successfully generated from XSD in the file "${CONTRACTSDIR}/${CONTRACTSFILE}.py"
+   echo Bindings have been successfully generated from XSD in the file "${CONTRACTSDIR}/${CONTRACTSFILE}.py"
     echo Old contracts have been moved to .old
 else
     echo Error generating bindings from XSD. Review the errors and rerun the script.
     exit 1
 fi
 
-exit 0
+perl -i -pe "s/.Location\(\'.*xsd\'/.Location\(\'$AnetURLPERL\'/g" ${CONTRACTSDIR}/${CONTRACTSFILE}.py
 
+exit 0

script/generateobjectsfromxsd.sh

@@ -17,7 +17,7 @@
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version='1.0.11',
+    version='1.0.12',
 
     description='Authorize.Net Python SDK',
 
@@ -48,7 +48,7 @@
 
         # Specify the Python versions you support here. In particular, ensure
         # that you indicate whether you support Python 2, Python 3 or both.
-        'Programming Language :: Python :: 2.7'
+        'Programming Language :: Python :: 3.5'
     ],
 
     # What does your project relate to?