redgraph 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80c7cce1d1d19897882873e07e7a5a1fadabbb52d14717e16ff113f83511b32a
-  data.tar.gz: 72be15f7b95a7b45ec9ec21adb54f54676e0f960938c602fbb8381ae3ca1c682
+  metadata.gz: '0171849182c559f603bf4e09d1cb17eb5a3a4e3d95ddf8e6f1853434c0fc9380'
+  data.tar.gz: 7bdff0a775ebeffffe6b842b07a990292d351ee477c4aa2ef8ec492806a0b048
 SHA512:
-  metadata.gz: cce480b50ada0fb75bb1491d730668a8ac7f92be766dd161b1b3c3fa8082d579d7276383adb2966894388f6c95fb7e444abd9eb2935e50f6659d35be938df450
-  data.tar.gz: 806e2105e78b9c6a188dd271ed7b6315ec9afbe0bbd6d1008eb2c4f991e756512e7b4a83dbb7808b944ab2c8b66671f270cb1a4008a476945c9f20818209dad9
+  metadata.gz: 53de618a85999bd837e1fabb458c204ac7e0f783425cef8f1d0c07e810c33f580c41d9fd8bf124015970618d6c905c8945020c06a382ae2f692384d0df856482
+  data.tar.gz: 66866ac946e4b7456684e26587bfcec17eec93de0e4c84bc6827ee77f1f712adce2b895fc38138522c0635fe2ade930a5606e3f638eaec8ab10afc71879e612e

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-## [Unreleased]
+## [0.1.1] - 2021-04-11
+
+- Graph#nodes:
+    - filter by properties
+    - skip and limit options
 
 ## [0.1.0] - 2021-04-08
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    redgraph (0.1.0)
+    redgraph (0.1.1)
       redis (~> 4)
 
 GEM

data/README.md

@@ -47,6 +47,7 @@ To get all nodes:
 Optional filters:
 
     @graph.nodes(label: 'actor')
+    @graph.nodes(properties: {name: "Al Pacino"})
 
 ## Development
 

data/lib/redgraph/graph.rb

@@ -73,17 +73,27 @@ module Redgraph
       end
     end
 
-    def nodes(label: nil)
-      node_or_node_with_label = label ? "node:`#{label}`" : "node"
+    # Returns nodes. Options:
+    #
+    # - label: filter by label
+    # - properties: filter by properties
+    # - limit: number of items
+    # - skip: items offset (useful for pagination)
+    #
+    def nodes(label: nil, properties: nil, limit: nil, skip: nil)
+      _label = ":`#{label}`" if label
+      _props = quote_hash(properties) if properties
+      _limit = "LIMIT #{limit}" if limit
+      _skip = "SKIP #{skip}" if skip
 
-      cmd = "MATCH (#{node_or_node_with_label}) RETURN node"
+      cmd = "MATCH (node#{_label} #{_props}) RETURN node #{_skip} #{_limit}"
       result = query(cmd)
 
       result.resultset.map do |item|
-        (node_id, labels, properties) = item["node"]
+        (node_id, labels, props) = item["node"]
         attrs = {}
 
-        properties.each do |(index, type, value)|
+        props.each do |(index, type, value)|
           attrs[get_property(index)] = value
         end
         Node.new(label: get_label(labels.first), properties: attrs).tap do |node|
@@ -112,11 +122,9 @@ module Redgraph
     end
 
     def quote_hash(hash)
-      out = "{"
-      hash.each do |k,v|
-        out += "#{k}:#{escape_value(v)}"
-      end
-      out + "}"
+      "{" +
+      hash.map {|k,v| "#{k}:#{escape_value(v)}" }.join(", ") +
+      "}"
     end
 
     def escape_value(x)

data/lib/redgraph/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Redgraph
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/test/graph_queries_test.rb

@@ -5,11 +5,9 @@ require "test_helper"
 class GraphQueriesTest < Minitest::Test
   def setup
     @graph = Redgraph::Graph.new("movies", url: $REDIS_URL)
-    @actor = Redgraph::Node.new(label: 'actor', properties: {name: "Al Pacino"})
-    @graph.add_node(@actor)
 
-    @other_actor = Redgraph::Node.new(label: 'actor', properties: {name: "John Travolta"})
-    refute_nil(@actor.id)
+    @al = quick_add_node(label: 'actor', properties: {name: "Al Pacino"})
+    @john = quick_add_node(label: 'actor', properties: {name: "John Travolta"})
   end
 
   def teardown
@@ -17,42 +15,76 @@ class GraphQueriesTest < Minitest::Test
   end
 
   def test_find_node_by_id
-    node = @graph.find_node_by_id(@actor.id)
+    node = @graph.find_node_by_id(@al.id)
 
     refute_nil(node)
     assert_equal("actor", node.label)
     assert_equal("Al Pacino", node.properties["name"])
-    assert_equal(@actor.id, node.id)
+    assert_equal(@al.id, node.id)
   end
 
-  def test_get_all_nodes
-    @graph.add_node(@other_actor)
+  def test_find_node_by_wrong_id
+    node = @graph.find_node_by_id("-1")
+
+    assert_nil(node)
+  end
 
+  def test_find_all_nodes
     actors = @graph.nodes
 
     assert_equal(2, actors.size)
-    assert_includes(actors, @actor)
-    assert_includes(actors, @other_actor)
+    assert_includes(actors, @al)
+    assert_includes(actors, @john)
   end
 
-  def test_get_all_nodes_by_label
-    @graph.add_node(@other_actor)
-    film = Redgraph::Node.new(label: 'film', properties: {name: "Scarface"})
-    @graph.add_node(film)
+  def test_find_all_nodes_by_label
+    film = quick_add_node(label: 'film', properties: {name: "Scarface"})
 
     actors = @graph.nodes(label: 'actor')
     assert_equal(2, actors.size)
-    assert_includes(actors, @actor)
-    assert_includes(actors, @other_actor)
+    assert_includes(actors, @al)
+    assert_includes(actors, @john)
 
     films = @graph.nodes(label: 'film')
     assert_equal(1, films.size)
     assert_includes(films, film)
   end
 
-  def test_find_node_by_wrong_id
-    node = @graph.find_node_by_id("-1")
+  def test_find_all_nodes_by_property
+    scarface = quick_add_node(label: 'film', properties: {name: "Scarface", genre: "drama"})
+    casino = quick_add_node(label: 'film', properties: {name: "Casino", genre: "drama"})
+    mamma_mia = quick_add_node(label: 'film', properties: {name: "Mamma Mia", genre: "musical"})
 
-    assert_nil(node)
+    dramas = @graph.nodes(properties: {genre: "drama"})
+
+    assert_equal(2, dramas.size)
+    assert_includes(dramas, scarface)
+    assert_includes(dramas, casino)
+  end
+
+  def test_limit_nodes
+    10.times do |i|
+      quick_add_node(label: 'token', properties: {number: i})
+    end
+
+    items = @graph.nodes(label: 'token', limit: 5)
+    assert_equal(5, items.size)
+    assert_equal([0,1,2,3,4], items.map{|item| item.properties["number"]})
+  end
+
+  def test_skip_nodes
+    10.times do |i|
+      quick_add_node(label: 'token', properties: {number: i})
+    end
+
+    items = @graph.nodes(label: 'token', limit: 3, skip: 3)
+    assert_equal(3, items.size)
+    assert_equal([3,4,5], items.map{|item| item.properties["number"]})
+  end
+
+  private
+
+  def quick_add_node(label:, properties:)
+    @graph.add_node(Redgraph::Node.new(label: label, properties: properties))
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redgraph
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Paolo Zaccagnini
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-10 00:00:00.000000000 Z
+date: 2021-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis