mementus 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ae7a8b89d3a35849ea26912ff75d5b2491e7c87
-  data.tar.gz: 0d4bdcb9bede0c28548e2f1565126864e98683ff
+  metadata.gz: 5a5329b3dc6e0429a47324ea39971d0cd87320ea
+  data.tar.gz: e4e2469c67e5368f014d7ef870bb9846c6b57521
 SHA512:
-  metadata.gz: 8eff9fc722af1259cd66415632281d52f5e237da5f9914b05416d5ae6f84e662290a2072674f5d2a659de6f297d45c1539c4000eea2327ae6dd4dfb4d2616384
-  data.tar.gz: cffc400f5e932176b9dcd8a0bc06d0506964ed8a2268acc818205b6c82bf9fb761997c85711e28600e85d954b6521d1eeac6c552a03882be0dee26607882369b
+  metadata.gz: 9c551118086f9c08fe6d60127c7f7bf8eb41a4ee2a0c9a0834dde157e05087316ae2189dffc5d2f16ab8f35273dab928a4fc65e4269dab5d25945c465aa725a2
+  data.tar.gz: cac72cbf24feba518297dcf86e9a331a058920ec9d1bf15213f3fa294d4fb36ecffb4b4cabc2e66b0e5f22613b71907946be6f0f9103aa95c5c808e074b97f31

data/lib/mementus/breadth_first_search.rb

@@ -1,27 +1,27 @@
 module Mementus
   class BreadthFirstSearch
-    def initialize(graph, start)
+    def initialize(graph, start_id)
       @graph = graph
-      @start = start
-      @visited = { @start => true }
+      @start_id = start_id
+      @visited = { @start_id => true }
       @queue = []
     end
 
     def each(&block)
-      visit(NodeProxy.new(@start, graph), &block)
+      visit(@start_id, &block)
     end
 
     private
 
-    def visit(node, &block)
-      @queue << node.adjacent
+    def visit(id, &block)
+      @queue.concat(@graph.adjacent(id))
 
-      while next_node = @queue.shift
-        next if @visited[next_node]
+      while next_id = @queue.shift
+        next if @visited[next_id]
 
-        @visited[next_node] = true
-        block.call(next_node)
-        @queue << next_node.adjacent
+        @visited[next_id] = true
+        block.call(NodeProxy.new(next_id, @graph))
+        @queue.concat(@graph.adjacent(next_id))
       end
     end
   end

data/lib/mementus/depth_first_search.rb

@@ -1,24 +1,24 @@
 module Mementus
   class DepthFirstSearch
-    def initialize(graph, start)
+    def initialize(graph, start_id)
       @graph = graph
-      @start = start
-      @visited = { @start => true }
+      @start_id = start_id
+      @visited = { @start_id => true }
     end
 
     def each(&block)
-      visit(NodeProxy.new(@start, @graph), &block)
+      visit(@start_id, &block)
     end
 
     private
 
-    def visit(node, &block)
-      node.each_adjacent do |adjacent|
-        next if @visited[adjacent]
+    def visit(id, &block)
+      @graph.each_adjacent(id) do |adjacent_id|
+        next if @visited[adjacent_id]
 
-        @visited[adjacent] = true
-        block.call(adjacent)
-        visit(NodeProxy.new(adjacent, @graph), &block)
+        @visited[adjacent_id] = true
+        block.call(NodeProxy.new(adjacent_id, @graph))
+        visit(adjacent_id, &block)
       end
     end
   end

data/lib/mementus/direction.rb

@@ -0,0 +1,16 @@
+module Mementus
+  class Direction
+    IN = :in
+    OUT = :out
+    BOTH = :both
+
+    def self.flip(direction)
+      case direction
+      when IN then OUT
+      when OUT then IN
+      else
+        BOTH
+      end
+    end
+  end
+end

data/lib/mementus/edge_builder.rb

@@ -6,6 +6,11 @@ module Mementus
       @from = from
       @to = to
       @label = label
+      @id = nil
+    end
+
+    def id=(id)
+      @id = id
     end
 
     def from=(node, label=:node)

data/lib/mementus/graph.rb

@@ -26,6 +26,10 @@ module Mementus
       @structure.directed?
     end
 
+    def n(id)
+      Processor.new(self, Pipes::Node.new(id))
+    end
+
     def has_node?(node)
       @structure.has_node?(node)
     end
@@ -42,6 +46,10 @@ module Mementus
       @structure.nodes
     end
 
+    def adjacent(id)
+      @structure.adjacent(id)
+    end
+
     def each_node(&blk)
       @structure.each_node(&blk)
     end

data/lib/mementus/graph_builder.rb

@@ -9,11 +9,15 @@ module Mementus
     end
 
     def create_edge(&block)
-      @structure.create_edge(&block)
+      edge = EdgeBuilder.new
+      yield edge
+      @structure.add_edge(edge)
     end
 
     def create_node(&block)
-      @structure.create_node(&block)
+      node = NodeBuilder.new
+      yield node
+      @structure.add_node(node)
     end
 
     def add_edge(edge)

data/lib/mementus/node_proxy.rb

@@ -1,12 +1,12 @@
 module Mementus
   class NodeProxy
-    def initialize(node, graph)
-      @node = node
+    def initialize(id, graph)
+      @id = id
       @graph = graph
     end
 
     def id
-      @node.id
+      @id
     end
 
     def label
@@ -14,7 +14,7 @@ module Mementus
     end
 
     def each_adjacent(&block)
-      @graph.each_adjacent(@node, &block)
+      @graph.each_adjacent(@id, &block)
     end
 
     def adjacent

data/lib/mementus/query/step.rb

@@ -2,7 +2,7 @@ module Mementus
   module Query
     class Step
       def initialize(traversal, id)
-        @node = NodeProxy.new(traversal.graph.node(id), traversal.graph)
+        @node = NodeProxy.new(id, traversal.graph)
       end
 
       def to_node

data/lib/mementus/structure.rb

@@ -19,58 +19,50 @@ module Mementus
       @is_directed
     end
 
-    def create_edge(&block)
-      edge = Edge.new
-      yield edge
-      add_edge(edge)
-    end
-
     def add_node(node)
-      @index[node] ||= Set.new
-    end
-
-    def create_node(&block)
-      node = Node.new
-      yield node
-      add_node(node)
+      @index[node.id] ||= Set.new
     end
 
     def add_edge(edge)
       add_node(edge.from) unless has_node?(edge.from)
       add_node(edge.to) unless has_node?(edge.to)
 
-      @index[edge.from].add(edge.to)
-      @index[edge.to].add(edge.from) unless directed?
+      @index[edge.from.id].add(edge.to.id)
+      @index[edge.to.id].add(edge.from.id) unless directed?
     end
 
     def has_node?(node)
-      @index.key?(node)
+      @index.key?(node.id)
     end
 
     def has_edge?(edge)
-      has_node?(edge.from) && @index[edge.from].include?(edge.to)
+      has_node?(edge.from) && @index[edge.from.id].include?(edge.to.id)
     end
 
     def node(id)
-      @index.keys.find { |node| node.id == id }
+      NodeProxy.new(id, self)
     end
 
     def nodes
-      @index.keys
+      @index.keys.map { |id| NodeProxy.new(id, self) }
+    end
+
+    def adjacent(id)
+      @index[id].to_a
     end
 
     def each_node(&blk)
-      @index.each_key(&blk)
+      nodes.each(&blk)
     end
 
-    def each_adjacent(node, &blk)
-      @index[node].each(&blk)
+    def each_adjacent(id, &blk)
+      @index[id].each(&blk)
     end
 
     def each_edge(&blk)
       if directed?
         each_node do |from|
-          each_adjacent(from) do |to|
+          each_adjacent(from.id) do |to|
             yield Edge.new(from, to)
           end
         end

data/lib/mementus/version.rb

@@ -1,3 +1,3 @@
 module Mementus
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.3.1'.freeze
 end

data/lib/mementus.rb

@@ -13,3 +13,5 @@ require_relative 'mementus/integer_id'
 require_relative 'mementus/graph_builder'
 require_relative 'mementus/node_builder'
 require_relative 'mementus/edge_builder'
+require_relative 'mementus/direction'
+require_relative 'mementus/pipeline'

data/spec/direction_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe Mementus::Direction do
+  specify 'incoming const' do
+    expect(Mementus::Direction::IN).to eq(:in)
+  end
+
+  specify 'outgoing const' do
+    expect(Mementus::Direction::OUT).to eq(:out)
+  end
+
+  specify 'bidirectional const' do
+    expect(Mementus::Direction::BOTH).to eq(:both)
+  end
+
+  specify 'incoming flips to outgoing' do
+    expect(Mementus::Direction.flip(:in)).to eq(:out)
+  end
+
+  specify 'outgoing flips to incoming' do
+    expect(Mementus::Direction.flip(:out)).to eq(:in)
+  end
+
+  specify 'bidirectional does not flip' do
+    expect(Mementus::Direction.flip(:both)).to eq(:both)
+  end
+end

data/spec/graph_spec.rb

@@ -1,10 +1,6 @@
 require 'spec_helper'
 
 describe Mementus::Graph do
-  let(:graph) do
-
-  end
-
   specify '#new' do
     graph = Mementus::Graph.new
 
@@ -62,19 +58,15 @@ describe Mementus::Graph do
     end
 
     expect(graph.has_node?(node)).to be true
-    expect(graph.has_node?(node.dup)).to be false
   end
 
   specify '#has_edge?' do
     edge = Mementus::Edge.new(Mementus::Node.new(1, :node), Mementus::Node.new(2, :node))
-    edge2 = Mementus::Edge.new(Mementus::Node.new(1, :node), Mementus::Node.new(2, :node))
-
     graph = Mementus::Graph.new do
       add_edge(edge)
     end
 
     expect(graph.has_edge?(edge)).to be true
-    expect(graph.has_edge?(edge2)).to be false
   end
 
   specify '#node(id)' do
@@ -83,7 +75,7 @@ describe Mementus::Graph do
       add_edge(edge)
     end
 
-    expect(graph.node(1)).to eq(edge.from)
+    expect(graph.node(1).id).to eq(edge.from.id)
   end
 
   specify '#nodes(filter)' do
@@ -92,6 +84,7 @@ describe Mementus::Graph do
       add_edge(edge)
     end
 
-    expect(graph.nodes).to eq([edge.from, edge.to])
+    expect(graph.nodes.first.id).to eq(edge.from.id)
+    expect(graph.nodes.last.id).to eq(edge.to.id)
   end
 end

data/spec/node_proxy_spec.rb

@@ -10,7 +10,7 @@ describe Mementus::NodeProxy do
       add_edge(Mementus::Edge.new(node1, node3))
     end
 
-    node_proxy = Mementus::NodeProxy.new(node1, graph)
+    node_proxy = Mementus::NodeProxy.new(1, graph)
     expect(node_proxy.adjacent.map { |node| node.id}).to eq([node2.id, node3.id])
   end
 end

data/spec/structure_spec.rb

@@ -17,16 +17,6 @@ describe Mementus::Structure do
     expect(structure.edges_count).to eq(0)
   end
 
-  specify '#create_node' do
-    structure.create_node do |node|
-      node.id = 1
-      node.label = :vertex
-    end
-
-    expect(structure.nodes_count).to eq(1)
-    expect(structure.edges_count).to eq(0)
-  end
-
   specify '#add_edge' do
     structure.add_edge(Mementus::Edge.new(Mementus::Node.new(1, :node), Mementus::Node.new(2, :node)))
 
@@ -34,45 +24,32 @@ describe Mementus::Structure do
     expect(structure.edges_count).to eq(1)
   end
 
-  specify '#create_edge' do
-    structure.create_edge do |edge|
-      edge.label = :relationship
-      edge.from = "A"
-      edge.to = "B"
-    end
-
-    expect(structure.nodes_count).to eq(2)
-    expect(structure.edges_count).to eq(1)
-  end
-
   specify '#has_node?' do
     node = Mementus::Node.new(1, :node)
     structure.add_node(node)
 
     expect(structure.has_node?(node)).to be true
-    expect(structure.has_node?(node.dup)).to be false
   end
 
   specify '#has_edge?' do
     edge = Mementus::Edge.new(Mementus::Node.new(1, :node), Mementus::Node.new(2, :node))
-    edge2 = Mementus::Edge.new(Mementus::Node.new(1, :node), Mementus::Node.new(2, :node))
     structure.add_edge(edge)
 
     expect(structure.has_edge?(edge)).to be true
-    expect(structure.has_edge?(edge2)).to be false
   end
 
   specify '#node(id)' do
     edge = Mementus::Edge.new(Mementus::Node.new(1, :node), Mementus::Node.new(2, :node))
     structure.add_edge(edge)
 
-    expect(structure.node(1)).to eq(edge.from)
+    expect(structure.node(1).id).to eq(edge.from.id)
   end
 
-  specify '#nodes(filter)' do
+  specify '#nodes' do
     edge = Mementus::Edge.new(Mementus::Node.new(1, :node), Mementus::Node.new(2, :node))
     structure.add_edge(edge)
 
-    expect(structure.nodes).to eq([edge.from, edge.to])
+    expect(structure.nodes.first.id).to eq(edge.from.id)
+    expect(structure.nodes.last.id).to eq(edge.to.id)
   end
 end

data/spec/traversal_spec.rb

@@ -1,14 +1,9 @@
 require 'spec_helper'
 
 describe 'Basic graph traversals' do
-  let(:start) do
-    Mementus::Node.new(1, :node)
-  end
-
   let(:graph) do
-    start_node = start
-    graph = Mementus::Graph.new do
-      add_edge(Mementus::Edge.new(start_node, Mementus::Node.new(2, :node)))
+    Mementus::Graph.new do
+      add_edge(Mementus::Edge.new(Mementus::Node.new(1, :node), Mementus::Node.new(2, :node)))
       add_edge(Mementus::Edge.new(Mementus::Node.new(2, :node), Mementus::Node.new(3, :node)))
       add_edge(Mementus::Edge.new(Mementus::Node.new(2, :node), Mementus::Node.new(5, :node)))
       add_edge(Mementus::Edge.new(Mementus::Node.new(1, :node), Mementus::Node.new(6, :node)))
@@ -19,22 +14,23 @@ describe 'Basic graph traversals' do
   end
 
   specify 'DepthFirstSearch#each' do
-    traversal = Mementus::DepthFirstSearch.new(graph, start)
+    traversal = Mementus::DepthFirstSearch.new(graph, 1)
 
-    expected = [1,2,3,5,9,7,8,6]
-    index = 0
-    traversal.each do |node|
-      expect(node.id).to eq(expected[index + 1])
-    end
+    expected = [2,3,5,9,7,8,6]
+    actual = []
+    traversal.each { |n| actual << n.id }
+
+    expect(actual).to eq(expected)
   end
 
   specify 'BreadthFirstSearch#each' do
-    traversal = Mementus::DepthFirstSearch.new(graph, start)
+    traversal = Mementus::BreadthFirstSearch.new(graph, 1)
 
-    expected = [1,2,6,3,5,7,9,8]
-    index = 0
-    traversal.each do |node|
-      expect(node.id).to eq(expected[index + 1])
-    end
+    expected = [2,6,3,5,7,9,8]
+
+    actual = []
+    traversal.each { |n| actual << n.id }
+
+    expect(actual).to eq(expected)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mementus
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - maetl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-22 00:00:00.000000000 Z
+date: 2016-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -68,6 +68,7 @@ files:
 - lib/mementus.rb
 - lib/mementus/breadth_first_search.rb
 - lib/mementus/depth_first_search.rb
+- lib/mementus/direction.rb
 - lib/mementus/edge.rb
 - lib/mementus/edge_builder.rb
 - lib/mementus/graph.rb
@@ -82,6 +83,7 @@ files:
 - lib/mementus/structure.rb
 - lib/mementus/version.rb
 - mementus.gemspec
+- spec/direction_spec.rb
 - spec/graph_spec.rb
 - spec/integer_id_spec.rb
 - spec/node_proxy_spec.rb
@@ -114,6 +116,7 @@ signing_key:
 specification_version: 4
 summary: In-memory data model
 test_files:
+- spec/direction_spec.rb
 - spec/graph_spec.rb
 - spec/integer_id_spec.rb
 - spec/node_proxy_spec.rb