Merge branch 'CumulusCI'

.gitignore

@@ -0,0 +1,13 @@
+.externalToolBuilders
+.project
+.settings
+build.properties
+salesforce.schema
+Referenced Packages
+/uninstall
+/uninstallsrc
+/installdeploy
+/installedPackages
+src/quickActions/LogACall.quickAction
+src/quickActions/NewNote.quickAction
+src/quickActions/NewTask.quickAction

build.xml

@@ -0,0 +1,36 @@
+<project default="deploy" basedir="." xmlns:sf="antlib:com.salesforce">
+    <!-- Load the package requirements from version.properties -->
+    <loadproperties srcFile="${basedir}/version.properties"/>
+
+    <!-- Load environment variables -->
+    <property environment="env" />
+
+    <!-- Check if the CUMULUSCI_PATH environment variable is set -->
+    <fail>
+        <condition>
+            <not><isset property="env.CUMULUSCI_PATH" /></not>
+        </condition>
+        CUMULUSCI_PATH is Required!
+
+        This project uses the CumulusCI build scripts which must be checked out and 
+        referenced in an environment variable before you can run the build scripts.
+
+        To configure the build scripts, do the following:
+
+        1. Clone the CumulusCI GitHub repository to a local folder: 
+            https://github.com/SalesforceFoundation/CumulusCI
+
+        2. Set the CUMULUSCI_PATH environment variable to the path to CumulusCI
+
+        If you are on a unix based system, the following commands should work:
+
+            git clone https://github.com/SalesforceFoundation/CumulusCI ~/CumulusCI
+            export CUMULUSCI_PATH=~/CumulusCI
+    </fail>
+
+    <!-- Load CumulusCI build targets -->
+    <import file="${env.CUMULUSCI_PATH}/build/build.xml" />
+
+    <!-- Add project specific build targets and CumulusCI overrides here -->
+
+</project>

cumulusci.properties

@@ -0,0 +1,6 @@
+cumulusci.package.name=Recurring Donations
+cumulusci.package.namespace=npe03
+cumulusci.package.apiVersion=29.0
+cumulusci.package.installClass=
+cumulusci.package.uninstallClass=
+cumulusci.github.url.raw=https://raw.github.com/SalesforceFoundation/Recurring_Donations

src/classes/RecurringDonations.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>27.0</apiVersion>
+    <apiVersion>29.0</apiVersion>
     <status>Active</status>
 </ApexClass>

src/classes/RecurringDonationsPkgVersionCheck.cls

@@ -32,202 +32,7 @@
 * @date 2012 (2.0) 
 * @description Handles XML exchange for webservice callout to compare package versions 
 */
+@deprecated
 global without sharing class RecurringDonationsPkgVersionCheck {
 
-    private Recurring_Donations_Settings__c pageSettings;
-    private final string ENDPOINT;
-    private final string NAMESPACE_TO_CHECK;
-
-    public RecurringDonationsPkgVersionCheck(string namespace){
-        if (pageSettings == null){
-            pageSettings = RecurringDonations.getRecurringDonationsSettings();
-            if (pageSettings.Update_Check_Interval__c == null)
-                pagesettings.Update_Check_Interval__c = 90;   
-        }        
-
-        if (!System.Test.isRunningTest()){
-            NAMESPACE_TO_CHECK = namespace;
-            ENDPOINT = 'http://foundation.force.com/packages/NPSPVersionCheck?orgid=' + UserInfo.getOrganizationId().substring(0, 15) + '&pkgname=' + namespace;   
-        }
-
-        else{    
-            pageSettings.Enable_Update_Check__c = true;
-            pageSettings.Last_Update_Check__c = null;
-            NAMESPACE_TO_CHECK = 'test';
-            ENDPOINT = 'http://foundation.kbromer.cs0.force.com/packages/NPSPVersionCheck?orgid=' + UserInfo.getOrganizationId().substring(0, 15) + '&pkgname=test';    
-        }
-    } 
-
-    public void RecurringDonationsCheckVersion(boolean useSyncCallOut){        
-
-        //if manually initiated callout immediately
-        if(useSyncCallOut){
-            initiateCallout();
-        }    
-
-        //if we're due for a checkup, call out async 
-        else if (pageSettings.Enable_Update_Check__c && (pageSettings.Last_Update_Check__c == null || pageSettings.Last_Update_Check__c.addDays(integer.valueof(pageSettings.Update_Check_Interval__c.round())) > system.today())){
-            RecurringDonationsPkgVersionCheck.FutureCallout(NAMESPACE_TO_CHECK);            
-        }     
-    }
-
-    //async wrapper for a callout, we have to create a duplicate object
-    //to get at the private class, but this gives us a single 
-    //interaction point for the class    
-    @future (callout = true)    
-    private static void FutureCallout(string namespace){
-        RecurringDonationsPkgVersionCheck npvc = new RecurringDonationsPkgVersionCheck(namespace);
-        npvc.initiateCallout();
-    }
-
-    private void initiateCallout(){
-        string pkgname = NAMESPACE_TO_CHECK;
-        string endpoint = ENDPOINT;
-
-        HttpRequest req = new HttpRequest();
-        req.setEndPoint(constructendpoint(endpoint, pkgname));
-        req.setMethod('GET'); 
-        Http http = new Http();
-        HttpResponse res = new HttpResponse();
-        if (!System.Test.isRunningTest())
-            res = http.send(req);
-        else{
-            string testresponsebody = '';
-            testresponsebody += '<?xml version="1.0" encoding="UTF-8"?><pkg><namespace>test</namespace><mypkgver>1.5.5</mypkgver><maxpkgver>2.2</maxpkgver><needsupdate>true</needsupdate><updatelink>http://foundation.force.com/packages/affiliations</updatelink></pkg>';
-            res.setBody(testresponsebody);
-        }
-        system.debug('MY RESPONSE BODY======================' + res.getBody());        
-        //<pkg>namespace;yourver;maxver;isupdateable;updateurl</pkg>
-
-        //if the callout was successful - send for parsing and updating
-        if (res.getBody().length() > 0)
-            updatePKGInfo(new NPSPEndPointResponse(res.getBody()));         
-    }
-
-    //method for adding pkgver param to the defined endpoint
-    private string constructendpoint(string endpoint, string namespace){
-
-        string newendpoint = endpoint;
-
-        if (!system.Test.isRunningTest())
-            newendpoint = newendpoint + '&pkgver=' + string.valueOf(Package.Version.Request);
-
-        else
-            newendpoint = newendpoint + '&pkgver=' + '1.5.0';
-
-        return newendpoint;
-    }
-
-    class NPSPEndPointResponse{
-
-        public string namespace {get; private set;}
-        public string yourversion {get; private set;}
-        public string maxversion {get; private set;}
-        public string haspackageupdate {get; private set;}
-        public string updateURL {get; private set;}
-
-
-        NPSPEndPointResponse(string responsebody){
-            updateproperties(parseResponseBody(responsebody));
-        }
-
-        private map<string, string> parseResponseBody(string bodytext){
-
-            map<string, string> endpointText = new map<string, string>();
-            system.debug('BODYTEXT: ' + bodytext);
-
-            if (bodytext.length() > 0 && bodytext.contains('<pkg>')){
-
-                //the body occasionall contains erroneous html characters that need to be stripped
-                bodytext = bodytext.replace('</html>', '');
-                bodytext = bodytext.replace('<html>', '');
-
-                try{
-                    XmlStreamReader xsr = new XmlStreamReader(bodytext);
-                    string value = '';
-                    while (xsr.hasNext()){
-                        if(xsr.getEventType() == xmlTag.START_ELEMENT){
-                            if (xsr.getLocalName() != 'pkg'){
-                                value = getChars(xsr);                              
-                                endpointText.put(xsr.getLocalName(), value);
-                                system.debug('PUTTING: ' + xsr.getLocalName() + ', ' + value);
-                            }
-                        }                        
-                        xsr.next(); 
-                    }                    
-                    system.debug(xsr.toString());
-                }                
-                catch (Exception e){
-                    endpointText.put('namespace', 'ERROR');
-                    endpointText.put('mypkgver', '0.0.0');
-                    endpointText.put('maxpkgver', '0.0.0');
-                    endpointText.put('needsupdate', 'UNKNOWN');
-                    endpointText.put('updatelink', 'http://nonprofitstarterpack.org');  
-                }    
-            }
-
-            //malformed return body
-            else {
-                endpointText.put('namespace', 'ERROR');
-                endpointText.put('mypkgver', '0.0.0');
-                endpointText.put('maxpkgver', '0.0.0');
-                endpointText.put('needsupdate', 'UNKNOWN');
-                endpointText.put('updatelink', 'http://nonprofitstarterpack.org');  
-            }
-
-            return endpointText;
-        }
-
-        private string getChars(XmlStreamReader xmlreader){
-            string returnChars = '';
-            while (xmlreader.hasNext()){
-                if (xmlreader.getEventType() == xmltag.END_ELEMENT)
-                   break;
-                else if (xmlreader.getEventType() == xmltag.CHARACTERS){
-                    returnChars = xmlreader.getText();
-                }                
-                xmlreader.next();            
-            }
-            return returnChars;
-        }
-
-        private void updateproperties(map<string, string> parsedBody){
-            this.namespace = parsedbody.get('namespace');
-            this.yourversion = parsedbody.get('mypkgver');
-            this.maxversion = parsedbody.get('maxpkgver');
-            this.haspackageupdate = parsedbody.get('needsupdate');
-            this.updateURL = parsedbody.get('updatelink');
-        }
-    }
-
-    private void updatePKGInfo(NPSPEndPointResponse epr){
-
-        pagesettings.Has_Package_Update__c = epr.haspackageupdate;
-        pagesettings.Last_Update_Check__c = system.now();
-        pagesettings.Max_Package_Version__c = epr.maxversion;
-        pagesettings.Package_Update_URL__c = epr.updateURL;
-
-        Database.Update(pagesettings);
-
-    }
-
-    /*******************TEST METHODS****************************/
-    public static testMethod void VersionCheckTest(){
-
-        RecurringDonationsPkgVersionCheck npvc = new RecurringDonationsPkgVersionCheck('test');
-        npvc.RecurringDonationsCheckVersion(true);
-        npvc.RecurringDonationsCheckVersion(false);
-
-        map<string, string> newmap = new map<string, string>();
-
-        string invalidbody = '<badbody>junk</badbody>';
-        string invalidxml =  '<pkg>invalidxmlstructure<pkg><random>';
-
-        NPSPEndPointResponse nerp = new NPSPEndPointResponse(invalidbody);
-        system.assert(nerp.haspackageupdate == 'UNKNOWN');
-
-        NPSPEndPointResponse nerp2 = new NPSPEndPointResponse(invalidxml);
-        system.assert(nerp2.haspackageupdate == 'UNKNOWN');
-
-    }
 }

src/classes/RecurringDonationsPkgVersionCheck.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>23.0</apiVersion>
+    <apiVersion>29.0</apiVersion>
     <status>Active</status>
 </ApexClass>