redisgraph 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdd856161112d91a2415f7e305acdd33942a07f7b904d29f5b944feaffa274d8
-  data.tar.gz: 1e4b223e139602df62b95b3e9c05d6d7de4cf11ceb75c756032995e365133594
+  metadata.gz: 6d49963c89e143060931e2fc7a20c73a0fe41a06f0002ec84494e6182ad28728
+  data.tar.gz: 90b9a339ae932fcea45bbf355518e54db7ddcad137739d5d2ad95bcb72b5bd99
 SHA512:
-  metadata.gz: da84d8a649e3b00a5c34a894787368d730327eeb8209c0cc15c229700e078bfbf6c32b4d6d29052baa7867b9439beb8186160e3f550501526f1879ee92aceb41
-  data.tar.gz: 75f764f6989c5d2bcb379daae2646347d140447f89260935127ce7df80076418bb232c8ee035fa6ed0271d80e55eaa0bfafc71a9efa10d1a24a37aa529786b10
+  metadata.gz: d4b3bc2e45a843c4328786fc1ce99e07873f9f0d09de3773ca572491867ccdc9b0f06653830167160fcf4e036349150166262890cc783e180569faecfd43bc6b
+  data.tar.gz: 8a0f6138c785a35ede21619c98960e3bdf96a557b98cdb3a183f1ee41ad3f99890c1e011ac6588e49efab2bcaa4f998b44cd0a44aff222155b3d0ece2b10f803

data/.github/release-drafter-config.yml

@@ -0,0 +1,21 @@
+name-template: 'Version $NEXT_PATCH_VERSION'
+tag-template: 'v$NEXT_PATCH_VERSION'
+categories:
+  - title: 'Features'
+    labels:
+      - 'feature'
+      - 'enhancement'
+  - title: 'Bug Fixes'
+    labels:
+      - 'fix'
+      - 'bugfix'
+      - 'bug'
+  - title: 'Maintenance'
+    label: 'chore'
+change-template: '- $TITLE (#$NUMBER)'
+exclude-labels:
+  - 'skip-changelog'
+template: |
+  ## Changes
+
+  $CHANGES

data/.github/workflows/release-drafter.yml

@@ -0,0 +1,20 @@
+name: Release Drafter
+
+on:
+  push:
+    # branches to consider in the event; optional, defaults to all
+    branches:
+      - master
+
+jobs:
+  update_release_draft:
+    runs-on: ubuntu-latest
+    steps:
+      # Drafts your next Release notes as Pull Requests are merged into "master"
+      - uses: release-drafter/release-drafter@v5
+        with:
+          # (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
+           config-name: release-drafter-config.yml
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+

data/Gemfile

@@ -3,7 +3,6 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'redis', '~> 4'
-gem 'terminal-table', '~> 1', '>= 1.8'
 gem 'rspec'
 gem 'codecov', :require => false, :group => :test
 

data/README.md

@@ -2,10 +2,11 @@
 [![CircleCI](https://circleci.com/gh/RedisGraph/redisgraph-rb/tree/master.svg?style=svg)](https://circleci.com/gh/RedisGraph/redisgraph-rb/tree/master)
 [![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)
+[![Gem Version](https://badge.fury.io/rb/redisgraph.svg)](https://badge.fury.io/rb/redisgraph)
 
 # 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)
+[![Discord](https://img.shields.io/discord/697882427875393627?style=flat-square)](https://discord.gg/gWBRT6P)
 
 `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.
 
@@ -44,11 +45,11 @@ cmd = """MATCH ()-[:works]->(e:employer) RETURN e"""
 response = r.query(cmd)
 
 response.print_resultset
-+----------------+
-| e.name         |
-+----------------+
-| Dunder Mifflin |
-+----------------+
+--------------------------------
+| e                            |
+--------------------------------
+| [{"name"=>"Dunder Mifflin"}] |
+--------------------------------
 
 r.delete
  => "Graph removed, internal execution time: 0.416024 milliseconds"

data/lib/redisgraph/connection.rb

@@ -1,19 +1,26 @@
 class RedisGraph
   def connect_to_server(options)
     @connection = Redis.new(options)
-    @module_version = module_version()
-    raise ServerError, "RedisGraph module not loaded." if @module_version.nil?
-    raise ServerError, "RedisGraph module incompatible, expecting >= 1.99." if @module_version < 19900
+    check_module_version
   end
 
   # Ensure that the connected Redis server supports modules
   # and has loaded the RedisGraph module
-  def module_version()
+  def check_module_version()
     redis_version = @connection.info["redis_version"]
     major_version = redis_version.split('.').first.to_i
     raise ServerError, "Redis 4.0 or greater required for RedisGraph support." unless major_version >= 4
-    modules = @connection.call("MODULE", "LIST")
+
+    begin
+      modules = @connection.call("MODULE", "LIST")
+    rescue Redis::CommandError
+      # Ignore check if the connected server does not support the "MODULE LIST" command
+      return
+    end
+
     module_graph = modules.detect { |_name_key, name, _ver_key, _ver| name == 'graph' }
-    module_graph[3] if module_graph
+    module_version = module_graph[3] if module_graph
+    raise ServerError, "RedisGraph module not loaded." if module_version.nil?
+    raise ServerError, "RedisGraph module incompatible, expecting >= 1.99." if module_version < 19900
   end
 end

data/lib/redisgraph/query_result.rb

@@ -39,10 +39,25 @@ class QueryResult
   def print_resultset
     return unless columns
 
-    pretty = Terminal::Table.new headings: columns do |t|
-      resultset.each { |record| t << record }
+    # Compute max length of each column
+    column_sizes = resultset.reduce([]) do |lengths, row|
+      row.each_with_index.map{|iterand, index| [lengths[index] || 0, iterand.to_s.length].max}
     end
-    puts pretty
+
+    # Print column headers
+    puts head = '-' * (column_sizes.inject(&:+) + (3 * column_sizes.count) + 1)
+    row = columns.fill(nil, columns.size..(column_sizes.size - 1))
+    row = row.each_with_index.map{|v, i| v = v.to_s + ' ' * (column_sizes[i] - v.to_s.length)}
+    puts '| ' + row.join(' | ') + ' |'
+    puts head
+
+    # Print result set rows
+    resultset.each do |row|
+      row = row.fill(nil, row.size..(column_sizes.size - 1))
+      row = row.each_with_index.map{|v, i| v = v.to_s + ' ' * (column_sizes[i] - v.to_s.length)}
+      puts '| ' + row.join(' | ') + ' |'
+    end
+    puts head
   end
 
   def parse_resultset(response)

data/lib/redisgraph/version.rb

@@ -1,3 +1,3 @@
 class RedisGraph
-  VERSION = '2.0.2'
+  VERSION = '2.0.3'
 end

data/lib/redisgraph.rb

@@ -1,5 +1,4 @@
 require 'redis'
-require 'terminal-table'
 
 require_relative 'redisgraph/errors.rb'
 require_relative 'redisgraph/query_result.rb'

data/redisgraph.gemspec

@@ -20,5 +20,4 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   s.add_runtime_dependency('redis', '~> 4')
-  s.add_runtime_dependency('terminal-table', '~> 1', '>= 1.8')
 end

data/spec/redisgraph_spec.rb

@@ -89,7 +89,7 @@ describe RedisGraph do
     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}]]])
+      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.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Redis Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-09 00:00:00.000000000 Z
+date: 2021-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -24,26 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
-- !ruby/object:Gem::Dependency
-  name: terminal-table
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.8'
 description: A client that extends redis-rb to provide explicit support for the RedisGraph
   module.
 email: jeffrey@redislabs.com
@@ -52,6 +32,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".github/release-drafter-config.yml"
+- ".github/workflows/release-drafter.yml"
 - ".gitignore"
 - Gemfile
 - LICENSE
@@ -84,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: A client for RedisGraph