Merge branch 'master' into more_radical_rake_tasks_refactor

Conflicts:
	docs/Configuration.rst

.overcommit.yml

@@ -1,9 +1,11 @@
 
 PreCommit:
   Rubocop:
+    enabled: true
     on_warn: fail # Treat all warnings as failures
 
   TrailingWhitespace:
+    enabled: true
     exclude:
       - '**/db/structure.sql' # Ignore trailing whitespace in generated files
 

CHANGELOG.md

@@ -15,6 +15,17 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - QueryProxy `where` will now look for declared properties matching hash keys. When found, it will send the value through that property's type converter if the type matches the property's unconverted state.
 - Improved handling of unpersisted nodes with associations. You can now use `<<` to create associations between unpersisted nodes. A `save` will cascade through unpersisted objects, creating nodes and rels along the way. See https://github.com/neo4jrb/neo4j/pull/871
 - Support formatted cypher queries for easy reading by humans via the `pretty_logged_cypher_queries` configuration variable
+- On `QueryProxy` objects you can now use an `:id` key in `where` and `find_by` methods to refer to the property from `id_property` (`uuid` by default)
+
+## [5.0.10] - 2015-07-31
+- Fix what should have been a very obvious bug in `_active_record_destroyed_behavior` behavior
+- Add eager loading to QueryProxy so that it works in all expected places
+
+## [5.0.9] - 2015-07-29
+- Fix "NameError: uninitialized constant Class::Date" (https://github.com/neo4jrb/neo4j/issues/852)
+
+## [5.0.8] - 2015-07-26
+- Copied QueryClauseMethods doc from master
 
 ## [5.0.7] - 2015-07-26
 - Copied `docs` folder from master because a lot of work had gone into the docs since 5.0.0 was released

docs/Configuration.rst

@@ -58,4 +58,4 @@ Configuration
   **pretty_logged_cypher_queries**
     **Default:** ``nil``
 
-    When logging cypher queries format with newlines and colors to be more easily readable by humans
+    If true, format outputted queries with newlines and colors to be more easily readable by humans