redisgraph 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 732b9f9b3c2faa832739c1be5ef607e5f84621351244a604c9addd4b54957410
-  data.tar.gz: 37374c73ca02f5e59b29bba44b77405b460a743fca092fc6172cf67a46a3dc53
+  metadata.gz: e099fdc41f5cf1db6f09c0d660cf982132901831761389cfab03c862c97b2e3e
+  data.tar.gz: 2ea412cb08d913081314a330f27d87aed726593293955bd9341478e18b27e9f4
 SHA512:
-  metadata.gz: 1e79f75391e9c6160f60ec6dfa053804011e17441f64368badfb6974412c40b548f06e8c050d0364722681dc98bb093b41d1f664684c04548d9c5ca6f490e1e6
-  data.tar.gz: fb4e0d21066b7331f9f149e96b4bb02d1987ddce2d5ad4b02c710734f8b9bbae1a250dbd7aa2de07598fbfe79de3e004fff51b37ef42006f91eea71e5816f729
+  metadata.gz: 8339a9d8563a40dae5440d2ee289a5691abae82e78713c9333d42ef292c5e4c51dab43fe97013c861ac178e3501442c403e7393c8ac11e12bcadb003d48e7103
+  data.tar.gz: 0b0ef19e88ae176f3f173331964eb575f89a4c8ecd3548578ab4caf2dd3af661aee8b7616859991ac98ba434ca3d84a57d8fb8f06985d5855ca6698a400faffd

data/README.md

@@ -3,15 +3,14 @@
 [![GitHub issues](https://img.shields.io/github/release/RedisGraph/redisgraph-rb.svg)](https://github.com/RedisGraph/redisgraph-rb/releases/latest)
 [![Codecov](https://codecov.io/gh/RedisGraph/redisgraph-rb/branch/master/graph/badge.svg)](https://codecov.io/gh/RedisGraph/redisgraph-rb)
 
-
 # redisgraph-rb
+[![Forum](https://img.shields.io/badge/Forum-RedisGraph-blue)](https://forum.redislabs.com/c/modules/redisgraph)
+[![Gitter](https://badges.gitter.im/RedisLabs/RedisGraph.svg)](https://gitter.im/RedisLabs/RedisGraph?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 `redisgraph-rb` is a Ruby gem client for the [RedisGraph](https://github.com/RedisLabsModules/RedisGraph) module. It relies on `redis-rb` for Redis connection management and provides support for graph QUERY, EXPLAIN, and DELETE commands.
 
 ## RedisGraph compatibility
-`redisgraph-rb` is currently compatible with RedisGraph versions >= 1.99 (module version: 19900)
-
-The result set structure introduced by RedisGraph 2.0 requires some modifications to this client. If you are interested in using this client with the latest RedisGraph, please inform us by commenting on [the corresponding issue](https://github.com/RedisGraph/redisgraph-rb/issues/1)!
+The current version of `redisgraph-rb` is compatible with RedisGraph versions >= 1.99 (module version: 19900).
 
 ### Previous Version
 For RedisGraph versions >= 1.0 and < 2.0 (ie module version: 10202), instead use and refer to

data/lib/redisgraph.rb

@@ -23,7 +23,7 @@ class RedisGraph
     end
 
     def invalidate
-      @labels = @property_key = @relationship_types
+      @labels = @property_keys = @relationship_types = nil
     end
 
     def labels
@@ -57,7 +57,7 @@ class RedisGraph
 
   # Execute a command and return its parsed result
   def query(command)
-    resp = @connection.call("GRAPH.QUERY", @graphname, command, '--compact')
+    resp = @connection.call('GRAPH.QUERY', @graphname, command, '--compact')
     QueryResult.new(resp,
                     metadata:   @metadata)
   rescue Redis::CommandError => e
@@ -66,14 +66,14 @@ class RedisGraph
 
   # Return the execution plan for a given command
   def explain(command)
-    @connection.call("GRAPH.EXPLAIN", @graphname, command)
+    @connection.call('GRAPH.EXPLAIN', @graphname, command)
   rescue Redis::CommandError => e
     raise ExplainError, e
   end
 
   # Delete the graph and all associated keys
   def delete
-    @connection.call("GRAPH.DELETE", @graphname)
+    @connection.call('GRAPH.DELETE', @graphname)
   rescue Redis::CommandError => e
     raise DeleteError, e
   end

data/lib/redisgraph/query_result.rb

@@ -1,3 +1,19 @@
+# frozen_string_literal: true
+
+# Data types that can be returned in result sets
+module ValueType
+  UNKNOWN = 0
+  NULL = 1
+  STRING = 2
+  INTEGER = 3
+  BOOLEAN = 4
+  DOUBLE = 5
+  ARRAY = 6
+  EDGE = 7
+  NODE = 8
+  PATH = 9 # TODO: not yet implemented
+end
+
 class QueryResult
   attr_accessor :columns
   attr_accessor :resultset
@@ -21,6 +37,8 @@ class QueryResult
   end
 
   def print_resultset
+    return unless columns
+
     pretty = Terminal::Table.new headings: columns do |t|
       resultset.each { |record| t << record }
     end
@@ -33,7 +51,6 @@ class QueryResult
 
     # Any non-empty result set will have multiple rows (arrays)
 
-
     # First row is header describing the returned records, corresponding
     # precisely in order and naming to the RETURN clause of the query.
     header = response[0]
@@ -47,19 +64,7 @@ class QueryResult
       header.reduce([]) do |agg, (type, _it)|
         i += 1
         el = row[i]
-
-        case type
-        when 1 # scalar
-          agg << map_scalar(el[0], el[1])
-        when 2 # node
-          props = el[2]
-          agg << props.sort_by { |prop| prop[0] }.map { |prop| map_prop(prop) }
-        when 3 # relation
-          props = el[4]
-          agg << props.sort_by { |prop| prop[0] }.map { |prop| map_prop(prop) }
-        end
-
-        agg
+        agg << map_scalar(el[0], el[1])
       end
     end
 
@@ -68,21 +73,25 @@ class QueryResult
 
   def map_scalar(type, val)
     map_func = case type
-               when 1 # null
+               when ValueType::NULL
                  return nil
-               when 2 # string
+               when ValueType::STRING
                  :to_s
-               when 3 # integer
+               when ValueType::INTEGER
                  :to_i
-               when 4 # boolean
+               when ValueType::BOOLEAN
                  # no :to_b
-                 return val == "true"
-               when 5 # double
+                 return val == 'true'
+               when ValueType::DOUBLE
                  :to_f
-               # TODO: when in the distro packages and docker images,
-               #   the following _should_ work
-               # when 6 # array
-               #   val.map { |it| map_scalar(it[0], it[1]) }
+               when ValueType::ARRAY
+                 return val.map { |it| map_scalar(it[0], it[1]) }
+               when ValueType::EDGE
+                 props = val[4]
+                 return props.sort_by { |prop| prop[0] }.map { |prop| map_prop(prop) }
+               when ValueType::NODE
+                 props = val[2]
+                 return props.sort_by { |prop| prop[0] }.map { |prop| map_prop(prop) }
                end
     val.send(map_func)
   end
@@ -92,7 +101,7 @@ class QueryResult
 
     property_keys = @metadata.property_keys
     prop_index = prop[0]
-    if prop_index > property_keys.length
+    if prop_index >= property_keys.length
       @metadata.invalidate
       property_keys = @metadata.property_keys
     end

data/lib/redisgraph/version.rb

@@ -1,3 +1,3 @@
 class RedisGraph
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

data/spec/redisgraph_spec.rb

@@ -76,4 +76,20 @@ describe RedisGraph do
       expect(res.resultset).to eq([["src1", [{"name"=>"dest1"}, {"color"=>"magenta"}], [{"weight"=>7.8}]]])
     end
   end
+
+  context "update" do
+    it "should support adding new properties" do
+      q = """MATCH (a {name: 'src1'}) SET a.newval = true"""
+      plan = @r.explain(q)
+      expect(plan.detect { |row| row.include?("Update") }).to_not be_nil
+      res = @r.query(q)
+      expect(res.stats[:properties_set]).to eq(1)
+    end
+
+    it "should print property strings correctly after updates" do
+      q = """MATCH (a {name: 'src1'}) RETURN a"""
+      res = @r.query(q)
+      expect(res.resultset).to eq([[[{"name"=>"src1"}, {"color"=>"cyan"}, {"newval"=>TRUE}]]])
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redisgraph
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Redis Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-12 00:00:00.000000000 Z
+date: 2020-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis