neo4j-core 7.1.2 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83b5add6c72001413e08b822272caf74810cb12a
-  data.tar.gz: fd65a1c54329a3a032ed944d8b63c34489eab243
+  metadata.gz: e7a349a32447c684e13fa3712b4b6c886229e956
+  data.tar.gz: a0a5c7964efbee681b46b5c4f7d44f6b93f78e42
 SHA512:
-  metadata.gz: fbd5749ef7c577360fb585e85065d5e075b7e016325f16e19e8e93ec44b01edbebfa950139477016564ff45df6eb7382a045e36be5b53dfa1d3efc38158104b6
-  data.tar.gz: d99510d9b64a5c987e09241713b48e1eec3b0c8096fd6ee4c8e997f6b25cf0ac1b55214e1dc41b4906a9781e3db48b82d168b06a1830fd4c322b8ec786293517
+  metadata.gz: ba6151f2678bb163439b21846d0377fd1126397f9f7e01f6052cced6e7a900d55d25e46fbe834e93b9502d27f723ed650a5b6fdf73390febf2628bd3ed523ca3
+  data.tar.gz: c3b4a9c49985e8793c356a170c94b6d18ac6902533ee54f40587d2c04b0176654e6f8370efb66c9f6bb079c206ab840041bfd26cb3c20fc9b4b80f8f6938c823

data/lib/neo4j-core/query_clauses.rb

@@ -111,11 +111,7 @@ module Neo4j
         def attributes_from_key_and_value(_key, value)
           return nil unless value.is_a?(Hash)
 
-          if value.values.map(&:class) == [Hash]
-            value.first[1]
-          else
-            value
-          end
+          value.values.map(&:class) == [Hash] ? value.first[1] : value
         end
 
         class << self
@@ -166,11 +162,7 @@ module Neo4j
           end
 
           def from_key_and_single_value(key, value)
-            if value.to_sym == :neo_id
-              "ID(#{key})"
-            else
-              "#{key}.#{value}"
-            end
+            value.to_sym == :neo_id ? "ID(#{key})" : "#{key}.#{value}"
           end
         end
 
@@ -196,19 +188,21 @@ module Neo4j
           self.class.paramaterize_key!(param)
 
           if value.is_a?(Range)
-            min_param, max_param = add_params("#{param}_range_min" => value.min, "#{param}_range_max" => value.max)
-
-            "#{key} IN RANGE({#{min_param}}, {#{max_param}})"
+            range_key_value_string(key, value, previous_keys, param)
           else
             value = value.first if array_value?(value, is_set) && value.size == 1
-            operator = array_value?(value, is_set) ? 'IN' : '='
 
             param = add_param(param, value)
 
-            "#{key} #{operator} {#{param}}"
+            "#{key} #{array_value?(value, is_set) ? 'IN' : '='} {#{param}}"
           end
         end
 
+        def range_key_value_string(key, value, previous_keys, param)
+          begin_param, end_param = add_params("#{param}_range_min" => value.begin, "#{param}_range_max" => value.end)
+          "#{key} >= {#{begin_param}} AND #{previous_keys[-2]}.#{key} <#{'=' unless value.exclude_end?} {#{end_param}}"
+        end
+
         def array_value?(value, is_set)
           value.is_a?(Array) && !is_set
         end
@@ -281,7 +275,6 @@ module Neo4j
           when Hash then hash_key_value_string(key, value, previous_keys)
           when NilClass then "#{key} IS NULL"
           when Regexp then regexp_key_value_string(key, value, previous_keys)
-          when Array, Range then key_value_string(key, value, previous_keys)
           else
             key_value_string(key, value, previous_keys)
           end

data/lib/neo4j-core/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module Core
-    VERSION = '7.1.2'
+    VERSION = '7.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-core
 version: !ruby/object:Gem::Version
-  version: 7.1.2
+  version: 7.2.0
 platform: ruby
 authors:
 - Andreas Ronge, Chris Grigg, Brian Underwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-05 00:00:00.000000000 Z
+date: 2017-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday