Merge remote-tracking branch 'fflib-origin/master' into merger

# Conflicts:
#	fflib/src/classes/fflib_QueryFactory.cls

Author: tstone

.gitignore

@@ -0,0 +1,4 @@
+
+*.prefs
+
+fflib/salesforce.schema

.travis.yml

@@ -0,0 +1,14 @@
+language: java
+jdk:
+  - oraclejdk8
+sudo: false
+branches:
+  only:
+    - master
+env:
+  global:
+    - secure: "EG37gA3LxAJR9FzUSzDc4iXLmOZ0o5Qbel7mzVfxnkrbiBH59wconB6mq+/gpc5AihFLoehjjskQKEcRYl7xc256iChwzZE9bf7PTYnGtscLIQwNenPEpxPBJTw9oLJK3wgShcjMF/1ZfqHoGmzkwxnmzJKzuaZ9OW1l8uqn+Lw="
+    - secure: "ctp6SfgSVW3HqfpdRykfIq5lPOZk900wag0RC33NfYjxoXUTu797F6KhOGojqfh1E0/Ivng1IngvFScAFyDscpIJzTu+2/FMP9qsC2bn/e4iXg8sjhmgKhjqg/rFHiAJQz/XuW0b1xom2dxQ12ipiouniooveHe1f7541LrQq6c="
+script: 
+  - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && ant -lib lib/ant-salesforce.jar -Dsf.username=${SFUSER} -Dsf.password=${SFPWD} deploy || [ "${TRAVIS_PULL_REQUEST}" != "false" ]'
+  - '[ "${TRAVIS_PULL_REQUEST}" != "false" ] && ant -lib lib/ant-salesforce.jar -Dsf.username=${SFUSER} -Dsf.password=${SFPWD} deploy || [ "${TRAVIS_PULL_REQUEST}" = "false" ]'

README.md

@@ -1,6 +1,8 @@
 FinancialForce Apex Common
 ==========================
 
+[![Build Status](https://travis-ci.org/financialforcedev/fflib-apex-common.svg)](https://travis-ci.org/financialforcedev/fflib-apex-common) 
+
 **Dependencies:** Must deploy [ApexMocks](https://github.com/financialforcedev/fflib-apex-mocks) before deploying this library
 
 <a href="https://githubsfdeploy.herokuapp.com?owner=financialforcedev&repo=fflib-apex-common">

build.xml

@@ -0,0 +1,50 @@
+<project xmlns:sf="antlib:com.salesforce" basedir="." xmlns:git="antlib:com.rimerosolutions.ant.git" default="deploy">
+	
+	<property name="sf.server" value="https://login.salesforce.com"/>
+	<import file="${basedir}/lib/exec_anon.xml"/> 
+	<import file="${basedir}/lib/undeploy.xml"/>
+
+	<!--  Downloaded from Salesforce Tools page under Setup -->
+	<typedef 
+		uri="antlib:com.salesforce" 
+		resource="com/salesforce/antlib.xml" 
+		classpath="${basedir}/lib/ant-salesforce.jar"/>
+	
+	<!-- See https://github.com/rimerosolutions/ant-git-tasks -->
+	<taskdef uri="antlib:com.rimerosolutions.ant.git"
+         resource="com/rimerosolutions/ant/git/jgit-ant-lib.xml">
+		 <classpath>
+			  <pathelement location="${basedir}/lib/org.eclipse.jgit.ant-3.0.0.201306101825-r.jar"/>
+			  <pathelement location="${basedir}/lib/org.eclipse.jgit-3.0.0.201306101825-r.jar"/>
+			  <pathelement location="${basedir}/lib/jsch-0.1.50.jar"/>
+			  <pathelement location="${basedir}/lib/ant-git-tasks-0.0.1.jar"/>
+		 </classpath>
+	</taskdef>	
+	
+	<!-- Deploy -->
+	<target name="deploy" depends="undeploy">
+		
+		<!-- Download and deploy ApexMocks -->
+		<delete dir="${basedir}/lib/apexmocks"/>
+		<echo message="Cloning fflib-apex-mocks..."/>
+		<git:git directory="${basedir}/lib/apexmocks" verbose="false">
+			<git:clone uri="https://github.com/financialforcedev/fflib-apex-mocks.git"/>
+		</git:git>
+		<sf:deploy 
+	        username="${sf.username}" 
+	        password="${sf.password}" 
+	        serverurl="${sf.server}"
+	        testLevel="RunLocalTests" 
+	        deployRoot="${basedir}/lib/apexmocks/src"/>
+	
+		<!-- Deploy Apex Commons -->		
+		<sf:deploy 
+	        username="${sf.username}" 
+	        password="${sf.password}" 
+	        serverurl="${sf.server}"
+	        testLevel="RunLocalTests" 
+	        deployRoot="${basedir}/fflib/src"/>
+	        
+	</target>
+		
+</project>

fflib/src/classes/fflib_ISObjectUnitOfWork.cls

@@ -50,6 +50,15 @@ public interface fflib_ISObjectUnitOfWork
 	 * @param record An existing record
 	 **/
 	void registerDirty(SObject record);
+    /**
+     * Register an existing record to be updated when commitWork is called,
+     *   you may also provide a reference to the parent record instance (should also be registered as new separatly)
+     *
+     * @param record A newly created SObject instance to be inserted during commitWork
+     * @param relatedToParentField A SObjectField reference to the child field that associates the child record with its parent
+     * @param relatedToParentRecord A SObject instance of the parent record (should also be registered as new separatly)
+     **/
+    void registerDirty(SObject record, Schema.sObjectField relatedToParentField, SObject relatedToParentRecord);
 	/**
 	 * Register a list of existing records to be updated during the commitWork method
 	 *