neo4j-core 5.0.2 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b74f69f9b3d8758405b41493b43eb58c9d7113fb
-  data.tar.gz: bca8ba4bdf95e2caef2d07d396da5e47c5f7d41f
+  metadata.gz: d2160daa8962ca2c3473801e1a9bd5aa69d49f3f
+  data.tar.gz: b2dd9812b8e775c8e827376dd753d6d3fe20aaf8
 SHA512:
-  metadata.gz: be6fa6687915b5ab2974d3f8089d21732cf58b5d75981e0b7a979fa3beff6e3d5f2ca23e84ce5527e6409df4cc5e2f21f3e5b295d7fcc2a81446f18afd50f419
-  data.tar.gz: d60a1cf05c0e317d61d468bc5e7641d1c48e57ba8a3f94214126430ba747458ef22f0962d645d03dc1b3b06ea1165f7f6be34ba5254ae60182ae872d881a83b0
+  metadata.gz: d6b5547d132c434f796e912cb14978bb33df054d3d8d203ac99a50b765984cb5a4003ebea17a0308e498a7fe38af9fa3d5a8200ace05cbd7e75fb68d36edd4ab
+  data.tar.gz: df6d567989bef93a58e05133de6e73fa6c419e8b46ca581aede542ac0b46889b45c765f59be171ff58787418289546ccf310133288c9ff584debe6422916daaa

data/lib/neo4j-core/query_clauses.rb

@@ -148,13 +148,31 @@ module Neo4j
           param.tr_s!('^a-zA-Z0-9', UNDERSCORE)
           param.gsub!(/^_+|_+$/, '')
 
-          value = value.first if !is_set && value.is_a?(Array) && value.size == 1
-          @params[param.to_sym] = value
+          if value.is_a?(Range)
+            add_params("#{param}_range_min" => value.min, "#{param}_range_max" => value.max)
 
-          if !value.is_a?(Array) || is_set
-            "#{key} = {#{param}}"
+            "#{key} IN RANGE({#{param}_range_min}, {#{param}_range_max})"
           else
-            "#{key} IN {#{param}}"
+            value = value.first if array_value?(value, is_set) && value.size == 1
+            operator = array_value?(value, is_set) ? 'IN' : '='
+
+            add_param(param, value)
+
+            "#{key} #{operator} {#{param}}"
+          end
+        end
+
+        def array_value?(value, is_set)
+          value.is_a?(Array) && !is_set
+        end
+
+        def add_param(key, value)
+          @params[key.freeze.to_sym] = value
+        end
+
+        def add_params(params)
+          params.each do |key, value|
+            add_param(key, value)
           end
         end
 
@@ -180,7 +198,7 @@ module Neo4j
               "#{key}: #{value}"
             else
               param_key = "#{prefix}#{key}".gsub('::', '_')
-              @params[param_key.to_sym] = value
+              add_param(param_key, value)
               "#{key}: {#{param_key}}"
             end
           end.join(Clause::COMMA_SPACE)
@@ -220,7 +238,7 @@ 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)
-          when Array then 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
@@ -418,13 +436,13 @@ module Neo4j
 
         def from_string(value)
           clause_id = "#{self.class.keyword_downcase}_#{value}"
-          @params[clause_id.to_sym] = value.to_i
+          add_param(clause_id, value.to_i)
           "{#{clause_id}}"
         end
 
         def from_integer(value)
           clause_id = "#{self.class.keyword_downcase}_#{value}"
-          @params[clause_id.to_sym] = value
+          add_param(clause_id, value)
           "{#{clause_id}}"
         end
 
@@ -440,13 +458,13 @@ module Neo4j
 
         def from_string(value)
           clause_id = "#{self.class.keyword_downcase}_#{value}"
-          @params[clause_id.to_sym] = value.to_i
+          add_param(clause_id, value.to_i)
           "{#{clause_id}}"
         end
 
         def from_integer(value)
           clause_id = "#{self.class.keyword_downcase}_#{value}"
-          @params[clause_id.to_sym] = value
+          add_param(clause_id, value)
           "{#{clause_id}}"
         end
 
@@ -465,7 +483,7 @@ module Neo4j
           when String, Symbol then "#{key}:`#{value}`"
           when Hash
             if @options[:set_props]
-              @params["#{key}_set_props".freeze.to_sym] = value
+              add_param("#{key}_set_props", value)
               "#{key} = {#{key}_set_props}"
             else
               value.map { |k, v| key_value_string("#{key}.`#{k}`", v, ['setter'], true) }

data/lib/neo4j-core/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module Core
-    VERSION = '5.0.2'
+    VERSION = '5.0.3'
   end
 end

data/lib/neo4j-server/cypher_session.rb

@@ -237,7 +237,7 @@ module Neo4j
         clear, yellow, cyan = %W(\e[0m \e[33m \e[36m)
         ActiveSupport::Notifications.subscribe('neo4j.cypher_query') do |_, start, finish, _id, payload|
           ms = (finish - start) * 1000
-          params_string = (payload[:params].size > 0 ? "| #{payload[:params].inspect}" : EMPTY)
+          params_string = (payload[:params] && payload[:params].size > 0 ? "| #{payload[:params].inspect}" : EMPTY)
           yield(" #{cyan}#{payload[:context]}#{clear} #{yellow}#{ms.round}ms#{clear} #{payload[:cypher]} #{params_string}")
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-core
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.0.3
 platform: ruby
 authors:
 - Andreas Ronge, Chris Grigg, Brian Underwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -262,7 +262,6 @@ files:
 - lib/neo4j-core.rb
 - lib/neo4j-core/active_entity.rb
 - lib/neo4j-core/cypher_translator.rb
-- lib/neo4j-core/graph_json.rb
 - lib/neo4j-core/hash_with_indifferent_access.rb
 - lib/neo4j-core/helpers.rb
 - lib/neo4j-core/label.rb

data/lib/neo4j-core/graph_json.rb

@@ -1,35 +0,0 @@
-module Neo4j
-  module Core
-    module GraphJSON
-      def self.to_graph_json(objects)
-        nodes = {}
-        edges = {}
-
-        objects.each do |object|
-          case object
-          when Neo4j::ActiveNode, Neo4j::Server::CypherNode
-            nodes[object.neo_id] = {
-              id: object.neo_id,
-              labels: (object.is_a?(Neo4j::ActiveNode) ? [object.class.name] : object.labels),
-              properties: object.attributes
-            }
-          when Neo4j::ActiveRel, Neo4j::Server::CypherRelationship
-            edges[[object.start_node.neo_id, object.end_node.neo_id]] = {
-              source: object.start_node.neo_id,
-              target: object.end_node.neo_id,
-              type: object.rel_type,
-              properties: object.props
-            }
-          else
-            fail "Invalid value found: #{object.inspect}"
-          end
-        end
-
-        {
-          nodes: nodes.values,
-          edges: edges.values
-        }.to_json
-      end
-    end
-  end
-end