neo4j 8.1.2 → 8.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ec365e6c2d839f910c1cf4de9e3ff505eccee46
-  data.tar.gz: 2b762b29dc08b63e97ea33568282646a531c45aa
+  metadata.gz: b73745139ccf41ae025891a9c0ff69c57cd94aeb
+  data.tar.gz: 6826e2a3b7abeef95527550178e854ebbdf4ecf8
 SHA512:
-  metadata.gz: 778d06ad2a50499917623b6ddfe8bbde523799e413cb55c4b2f2497f802e3f5d9c3d81de718444cfc97913ccd159800b29022ee710980d97e1c788c29e0b7bbc
-  data.tar.gz: 602d550908544156306de24498526feab2fa31da6d084a3f4d15aaf8c520f68a4923eee7580a35049cc9dd93cc451750faa1bd32336d566f799c724fd6ef47c3
+  metadata.gz: 13e0a756de72ad02f82b1526f84599d7cf47eaf20fbf842da11e008e09f1f231e01045bd1a2cba64c1a9cbbe7cf44a9fe8253f435730bef73545aed71af71c70
+  data.tar.gz: 0d2e7ffd847bb2c16389226f3ee9f8338f9eded404053fa8414f610901562bc916fc11b12f9260e6b14884cf5ab120e34331d3c9b98291dc6340342f098b1efb

data/CHANGELOG.md

@@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file.
 This file should follow the standards specified on [http://keepachangelog.com/]
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [8.1.3] 2017-06-29
+
+### Fixed
+
+- `ActiveRel` `.first` / `.last` aren't dependable for ordering in Neo4j enterprise, so fixed test (be aware that using `.first` / `.last` are not recommended in `ActiveRel`) (see #1396 / thanks @klobuczek)
+- Labels for models are now returned alphabetically (see #1396 / thanks @klobuczek)
+- JSON serialization is fixed for `String` and objects in general which respond to `to_json` (see #1397 / thanks @leviwilson)
+
 ## [8.1.2] 2017-06-20
 
 ### Fixed

data/lib/neo4j/active_node/labels.rb

@@ -72,6 +72,7 @@ module Neo4j
       # Finds an appropriate matching model given a set of labels
       # which are assigned to a node
       def self.model_for_labels(labels)
+        labels.sort!
         return MODELS_FOR_LABELS_CACHE[labels] if MODELS_FOR_LABELS_CACHE[labels]
 
         models = WRAPPED_CLASSES.select do |model|

data/lib/neo4j/active_node/query/query_proxy_enumerable.rb

@@ -19,19 +19,8 @@ module Neo4j
           @result_cache ||= {}
           return result_cache_for(node, rel) if result_cache?(node, rel)
 
-          pluck_vars = []
-          pluck_vars << ensure_distinct(identity) if node
-          pluck_vars << @rel_var if rel
-
-          result = pluck(*pluck_vars)
-
-          result.each do |object|
-            object.instance_variable_set('@source_query_proxy', self)
-            object.instance_variable_set('@source_proxy_result_cache', result)
-            if node && rel && object.last.is_a?(Neo4j::ActiveRel)
-              object.last.instance_variable_set(association.direction == :in ? '@from_node' : '@to_node', object.first)
-            end
-          end
+          result = pluck_vars(node, rel)
+          set_instance_caches(result, node, rel)
 
           @result_cache[[node, rel]] ||= result
         end
@@ -96,6 +85,25 @@ module Neo4j
         def ensure_distinct(node, force = false)
           @distinct || force ? "DISTINCT(#{node})" : node
         end
+
+        private
+
+        def pluck_vars(node, rel)
+          vars = []
+          vars << ensure_distinct(identity) if node
+          vars << @rel_var if rel
+          pluck(*vars)
+        end
+
+        def set_instance_caches(instance, node, rel)
+          instance.each do |object|
+            object.instance_variable_set('@source_query_proxy', self)
+            object.instance_variable_set('@source_proxy_result_cache', instance)
+            if node && rel && object.last.is_a?(Neo4j::ActiveRel)
+              object.last.instance_variable_set(association.direction == :in ? '@from_node' : '@to_node', object.first)
+            end
+          end
+        end
       end
     end
   end

data/lib/neo4j/shared/type_converters.rb

@@ -245,6 +245,10 @@ module Neo4j::Shared
     # Converts hash to/from JSON
     class JSONConverter < BaseConverter
       class << self
+        def converted?(_value)
+          false
+        end
+
         def convert_type
           JSON
         end
@@ -407,7 +411,7 @@ module Neo4j::Shared
       # @param value The value for conversion.
       def formatted_for_db?(found_converter, value)
         return false unless found_converter.respond_to?(:db_type)
-        found_converter.respond_to?(:converted) ? found_converter.converted?(value) : value.is_a?(found_converter.db_type)
+        found_converter.respond_to?(:converted?) ? found_converter.converted?(value) : value.is_a?(found_converter.db_type)
       end
 
       def register_converter(converter)

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '8.1.2'
+  VERSION = '8.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 8.1.2
+  version: 8.1.3
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-21 00:00:00.000000000 Z
+date: 2017-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter