neo4j 6.0.2 → 6.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: ba8e9dd2a99d71ec77769df55c3bba43ab068f24
4
- data.tar.gz: f7daa016f99de0900a5401185a7cce81adf3f1c6
3
+ metadata.gz: a52df19251c38a7049d0b9278957d4082d5e383c
4
+ data.tar.gz: 85fa3a60b9010119344fb6f1483552c6d3c9b975
5
5
  SHA512:
6
- metadata.gz: 3d3a1d21c13e16765efe7f0f16deb7a0c2f9832e6c7b5a01523de660f025142300c427cadca7bc2dacb5688f09ee8df41d6902f1fdde36aa7b4006f150d8b369
7
- data.tar.gz: 4b391f5cae01b5beeb4e271b4f076e159fa99d1e2177a9d7ee4249983254dac8f7b935e80d059b4828d8b0e8f1240cf33f6baec6b63c5489807c6a1c93a61d0d
6
+ metadata.gz: c4382d6c1b6c775bd9ef932550e43b5c442ef1e75c5013a9fc310741440af660972a9efb72394b3acbd2fd0608a7fd810838a299061d9d65de8230d7688c6794
7
+ data.tar.gz: 7d1531abe853894486407d1cd17d5e6367fbd2a7cc035dac29c1056bc6e9bd374195a98b2cff77f986c0cffe537c925ebea62049ba48e900fb44a8564361cf4c
data/CHANGELOG.md CHANGED
@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
3
3
  This file should follow the standards specified on [http://keepachangelog.com/]
4
4
  This project adheres to [Semantic Versioning](http://semver.org/).
5
5
 
6
+ ## [6.0.3] - 12-18-2015
7
+
8
+ ### Fixed
9
+
10
+ - Fixed issue where find_or_create was prioritizing property`s default value rather than what was being passed in (Thanks to brucek via #1071)
11
+
6
12
  ## [6.0.2] - 12-16-2015
7
13
 
8
14
  ### Fixed
@@ -128,7 +128,7 @@ module Neo4j::ActiveNode
128
128
  end
129
129
 
130
130
  def find_or_create(find_attributes, set_attributes = {})
131
- on_create_attributes = set_attributes.merge(on_create_props(find_attributes))
131
+ on_create_attributes = set_attributes.reverse_merge(on_create_props(find_attributes))
132
132
  neo4j_session.query.merge(n: {self.mapped_label_names => find_attributes})
133
133
  .on_create_set(n: on_create_attributes)
134
134
  .pluck(:n).first
data/lib/neo4j/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Neo4j
2
- VERSION = '6.0.2'
2
+ VERSION = '6.0.3'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: neo4j
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.0.2
4
+ version: 6.0.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Andreas Ronge, Brian Underwood, Chris Grigg
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-12-17 00:00:00.000000000 Z
11
+ date: 2015-12-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: orm_adapter