neo4j 7.0.0.rc.2 → 7.0.0.rc.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a8afc709bd3d4e369395546f660ec08451e9d28
-  data.tar.gz: 181c2899fbab41d65b573631dea7db7a9333ef79
+  metadata.gz: 8d5bc4e8f2bcb42f5e7747829c71fcb95428bf34
+  data.tar.gz: a0bfde6039373ffdcec00dafb52aad95011575f8
 SHA512:
-  metadata.gz: f35c3f75e3a7fd737738892811844381d8b2fb83d4533635ddf0b790ff04a9e10634a0fee4199324365c89ae144e00d9520655adc459a0d41308cbc170e21696
-  data.tar.gz: 080b24bf7d0bb3c9990cbbfd72de0f7a60ba172ecc0089364b2c7d5bd9c3ff0deef3a0fd7a8cf4b64e11504aa53efd9e45f10718f3b97b9d91e16efa4ec44c7f
+  metadata.gz: d43b84a06a654cd8c35aaed5fb300690f9bfc3e626657f6aa459e0a124349ede4c3933449c2c0e16ec8fe98c30b1a55ac1c5abfb49e05dbe32367124358f0258
+  data.tar.gz: 5b4d1156d174b8c26c8d55f2fb16634b25698435af6532fbbf2b7fe19b55f48f8e6ae616be2b89e2fc9d5f0cfd139333b174c7a18727794d220574d67d441703

data/CHANGELOG.md

@@ -3,6 +3,18 @@ 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/).
 
+## [7.0.0.rc.2] - 03-08-2016
+
+### Fixed
+
+- Allow for array values when querying for enums (i.e. `where(enum_field: [:value1, :value2])`) (see #1150)
+
+## [7.0.0.rc.2] - 03-08-2016
+
+### Fixed
+
+- Issue where creating relationships via `has_one` association created two relationships (forward ported from 6.0.7 / 6.1.9)
+
 ## [7.0.0.rc.1] - 03-08-2016
 
 ### Changed
@@ -32,6 +44,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - All `call` class methods from Type Converters. Use `to_ruby` instead.
 - `Neo4j::ActiveNode::Labels::InvalidQueryError`, since it's unused.
 
+## [6.1.9] - 2016-03-08
+
+### Fixed
+
+- Issue where creating relationships via `has_one` association created two relationships (forward ported from 6.0.7)
+
 ## [6.1.8] - 2016-03-02
 
 ### Fixed
@@ -99,6 +117,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - `config/neo4j.yml` now renders with an ERB step (thanks to mrstif via #1060)
 - `#increment`, `#increment!` and `#concurrent_increment!` methods added to instances of ActiveNode and ActiveRel (thanks to ProGM in #1074)
 
+## [6.0.7] - 03-08-2016
+
+### Fixed
+
+- Issue where creating relationships via `has_one` association created two relationships
+
 ## [6.0.6] - 01-20-2016
 
 ### Fixed

data/lib/neo4j/shared/declared_properties.rb

@@ -136,7 +136,12 @@ module Neo4j::Shared
     def value_for_where(key, value)
       return value unless prop = registered_properties[key]
       return value_for_db(key, value) if prop.typecaster && prop.typecaster.convert_type == value.class
-      EXCLUDED_TYPES.include?(value.class) ? value : value_for_db(key, value)
+
+      if should_convert_for_where?(key, value)
+        value_for_db(key, value)
+      else
+        value
+      end
     end
 
     def value_for_db(key, value)
@@ -165,6 +170,10 @@ module Neo4j::Shared
 
     private
 
+    def should_convert_for_where?(key, value)
+      (value.is_a?(Array) && supports_array?(key)) || !EXCLUDED_TYPES.include?(value.class)
+    end
+
     # @param [Symbol] key An undeclared property value found in the _persisted_obj.props hash.
     # Typically, this is a node's id property, which will not be registered as other properties are.
     # In the future, this should probably be reworked a bit. This class should either not know or care

data/lib/neo4j/shared/type_converters.rb

@@ -17,6 +17,10 @@ module Neo4j::Shared
           value.is_a?(db_type)
         end
       end
+
+      def supports_array?
+        false
+      end
     end
 
     class IntegerConverter < BaseConverter
@@ -274,6 +278,10 @@ module Neo4j::Shared
         value.is_a?(db_type)
       end
 
+      def supports_array?
+        true
+      end
+
       def db_type
         Integer
       end
@@ -289,7 +297,11 @@ module Neo4j::Shared
       alias_method :call, :to_ruby
 
       def to_db(value)
-        @enum_keys[value.to_s.to_sym] || 0
+        if value.is_a?(Array)
+          value.map(&method(:to_db))
+        else
+          @enum_keys[value.to_s.to_sym] || 0
+        end
       end
     end
 
@@ -326,6 +338,11 @@ module Neo4j::Shared
       converted_property(primitive_type(key.to_sym), value, direction)
     end
 
+    def supports_array?(key)
+      type = primitive_type(key.to_sym)
+      type.respond_to?(:supports_array?) && type.supports_array?
+    end
+
     def typecaster_for(value)
       Neo4j::Shared::TypeConverters.typecaster_for(value)
     end

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '7.0.0.rc.2'
+  VERSION = '7.0.0.rc.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 7.0.0.rc.2
+  version: 7.0.0.rc.3
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter