mementus 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5be27f3627a1c98758d9c342f3caf1e66f5fe70
-  data.tar.gz: aeb311c257b6107697ebc02aaad5dddb88f64030
+  metadata.gz: 419399d50dad3b0243a7756f259e99f64bec6da5
+  data.tar.gz: 12a25815a2bb6fd8beebdfd1d9aaf696f1ee5e03
 SHA512:
-  metadata.gz: 23ea3552c0307467dd23b1066466c663087573219b4d2261f440dc85d5dd671c5f19c341000b690c3b1e8d55250307bf1532acb511e6de9a9319a90eafad0281
-  data.tar.gz: e035bb59dd2c6298cc2301e97e5f738cf50f06cb4df4680673cee7514b674217dc8b45a312260a23253fb5eca95021d98cc14d6c3b1f42f6a24db9839ebf465a
+  metadata.gz: 4a8c602c0b356d31062eac51d63fc4e93b1740abc417baed0824018d04f75308ac12fdfb47953689bce86bfa8600a62675036d7e15a7107a4e3d3ae287125b85
+  data.tar.gz: b68d9dd85cf13935e41006c8814242243d1b3701672037a79e831433b011ac2b6a3861b1b13dc959c8a1a560349e01967d58ac8c727b0ded0cf3c2d1d5694e96

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in mementus.gemspec
 gemspec

data/lib/mementus/breadth_first_search.rb

@@ -16,12 +16,12 @@ module Mementus
     def visit(id, &block)
       @queue.concat(@graph.adjacent(id))
 
-      while next_id = @queue.shift
-        next if @visited[next_id]
+      while next_node = @queue.shift
+        next if @visited[next_node]
 
-        @visited[next_id] = true
-        block.call(NodeProxy.new(next_id, @graph))
-        @queue.concat(@graph.adjacent(next_id))
+        @visited[next_node] = true
+        block.call(next_node)
+        @queue.concat(@graph.adjacent(next_node.id))
       end
     end
   end

data/lib/mementus/depth_first_search.rb

@@ -13,12 +13,12 @@ module Mementus
     private
 
     def visit(id, &block)
-      @graph.each_adjacent(id) do |adjacent_id|
-        next if @visited[adjacent_id]
+      @graph.each_adjacent(id) do |adj_node|
+        next if @visited[adj_node.id]
 
-        @visited[adjacent_id] = true
-        block.call(NodeProxy.new(adjacent_id, @graph))
-        visit(adjacent_id, &block)
+        @visited[adj_node.id] = true
+        block.call(adj_node)
+        visit(adj_node.id, &block)
       end
     end
   end

data/lib/mementus/edge.rb

@@ -2,20 +2,21 @@ module Mementus
   class Edge
     attr_reader :from, :to, :label, :id
 
-    def initialize(from, to, label=:edge)
-       @from = if from.is_a?(Integer)
-         Node.new(from)
-       else
-         from
-       end
+    def initialize(id: nil, from:, to:, label: :edge)
+      @id = id
+      @label = label
 
-       @to = if to.is_a?(Integer)
-         Node.new(to)
-       else
-         to
-       end
+      @from = if from.is_a?(Integer)
+        Node.new(id: from)
+      else
+        from
+      end
 
-      @label = label
+      @to = if to.is_a?(Integer)
+        Node.new(id: to)
+      else
+        to
+      end
     end
 
     def nodes

data/lib/mementus/edge_builder.rb

@@ -1,23 +1,14 @@
 module Mementus
   class EdgeBuilder
-    attr_reader :from, :to, :label, :id
+    include ElementBuilder
 
-    def initialize(from=nil, to=nil, label=:edge, id=nil)
-      @from = from
-      @to = to
-      @label = label
-      @id = id
-    end
-
-    def id=(id)
-      @id = id
-    end
+    attr_reader :from, :to
 
     def from=(node, label=:node)
       if node.is_a?(Node)
         @from = node
       else
-        @from = Node.new(node, label)
+        @from = Node.new(id: node, label: label)
       end
     end
 
@@ -25,20 +16,12 @@ module Mementus
       if node.is_a?(Node)
         @to = node
       else
-        @to = Node.new(node, label)
+        @to = Node.new(id: node, label: label)
       end
     end
 
-    def label=(label)
-      @label = label
-    end
-
-    def nodes
-      [@from, @to]
-    end
-
-    def other(node)
-      @from == node ? @to : @from
+    def to_edge
+      Edge.new(id: id, from: from, to: to, label: label)
     end
   end
 end

data/lib/mementus/element_builder.rb

@@ -0,0 +1,5 @@
+module Mementus
+  module ElementBuilder
+    attr_accessor :id, :label, :props
+  end
+end

data/lib/mementus/graph.rb

@@ -42,6 +42,10 @@ module Mementus
       @structure.node(id)
     end
 
+    def edge(id)
+      @structure.edge(id)
+    end
+
     def nodes
       @structure.nodes
     end

data/lib/mementus/graph_builder.rb

@@ -6,26 +6,34 @@ module Mementus
       @edge_ids = IntegerId.new
     end
 
-    def add_node(node)
-      @structure.add_node(node)
+    def set_node(node)
+      @structure.set_node(node)
     end
 
-    def create_edge(&block)
-      edge = EdgeBuilder.new
-      yield edge
-      edge.id = @edge_ids.next_id unless edge.id
-      @structure.add_edge(edge)
+    def set_edge(edge)
+      @structure.set_edge(edge)
+    end
+
+    def add_node(id: nil, label: nil)
+      @structure.set_node(Node.new(id: id, label: label))
+    end
+
+    def add_edge(id: nil, from: nil, to: nil, label: nil)
+      @structure.set_edge(Edge.new(id: id, from: from, to: to, label: label))
     end
 
     def create_node(&block)
-      node = NodeBuilder.new
-      yield node
-      node.id = @node_ids.next_id unless node.id
-      @structure.add_node(node)
+      builder = NodeBuilder.new
+      yield builder
+      builder.id = @node_ids.next_id unless builder.id
+      set_node(builder.to_node)
     end
 
-    def add_edge(edge)
-      @structure.add_edge(edge)
+    def create_edge(&block)
+      builder = EdgeBuilder.new
+      yield builder
+      builder.id = @edge_ids.next_id unless builder.id
+      set_edge(builder.to_edge)
     end
 
     def graph

data/lib/mementus/node.rb

@@ -2,7 +2,7 @@ module Mementus
   class Node
     attr_reader :id, :label
 
-    def initialize(id=nil, label=:node)
+    def initialize(id: nil, label: nil)
       @id = id
       @label = label
     end

data/lib/mementus/node_builder.rb

@@ -1,18 +1,9 @@
 module Mementus
   class NodeBuilder
-    attr_reader :id, :label
+    include ElementBuilder
 
-    def initialize(id=nil, label=:node)
-      @id = id
-      @label = label
-    end
-
-    def id=(id)
-      @id = id
-    end
-
-    def label=(label)
-      @label = label
+    def to_node
+      Node.new(id: id, label: label)
     end
   end
 end

data/lib/mementus/node_proxy.rb

@@ -1,22 +1,28 @@
 module Mementus
   class NodeProxy
-    def initialize(id, graph)
-      @id = id
+    def initialize(node, graph)
+      @node = node
       @graph = graph
     end
 
     def id
-      @id
+      @node.id
+    end
+
+    def label
+      @node.label
+    end
+
+    def outgoing
+
     end
 
     def each_adjacent(&block)
-      @graph.each_adjacent(@id, &block)
+      @graph.each_adjacent(@node.id, &block)
     end
 
     def adjacent
-      each_adjacent.to_a.map do |node|
-        self.class.new(node, @graph)
-      end
+      @graph.adjacent(@node.id)
     end
   end
 end

data/lib/mementus/pipeline.rb

@@ -69,10 +69,8 @@ module Mementus
 
     class Outgoing
       def process(graph, source)
-        if source.respond_to?(:id)
-          graph.each_adjacent(source.id).map do |id|
-            Mementus::NodeProxy.new(id, graph)
-          end
+        if source.respond_to?(:adjacent)
+          source.adjacent
         else
           source.inject([]) do |result, node|
             result.concat(node.adjacent)
@@ -84,7 +82,7 @@ module Mementus
     class OutgoingEdges
       def process(graph, node)
         graph.each_adjacent(node.id).map do |id|
-          Mementus::Edge.new(node, id)
+          Mementus::Edge.new(from: node, to: id)
         end
       end
     end
@@ -93,9 +91,9 @@ module Mementus
       def process(graph, node)
         incoming = []
 
-        graph.each_node do |n|
-          graph.each_adjacent(n.id) do |id|
-            incoming << Mementus::NodeProxy.new(n.id, graph) if id == node.id
+        graph.each_node do |graph_node|
+          graph.each_adjacent(graph_node.id) do |adj_node|
+            incoming << graph_node if adj_node.id == node.id
           end
         end
 
@@ -108,9 +106,9 @@ module Mementus
         ids = source.respond_to?(:id) ? [source.id] : source.map(&:id)
         incoming = []
 
-        graph.each_node do |n|
-          graph.each_adjacent(n.id) do |id|
-            incoming << Mementus::Edge.new(n.id, id) if ids.include?(id)
+        graph.each_node do |graph_node|
+          graph.each_adjacent(graph_node.id) do |adj_node|
+            incoming << Mementus::Edge.new(from: graph_node, to: adj_node) if ids.include?(adj_node.id)
           end
         end
 

data/lib/mementus/query/step.rb

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

data/lib/mementus/structure/adjacency_list.rb

@@ -20,13 +20,13 @@ module Mementus
         @is_directed
       end
 
-      def add_node(node)
+      def set_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)
+      def set_edge(edge)
+        set_node(edge.from) unless has_node?(edge.from)
+        set_node(edge.to) unless has_node?(edge.to)
 
         @index[edge.from.id].add(edge.to.id)
         @index[edge.to.id].add(edge.from.id) unless directed?
@@ -41,11 +41,11 @@ module Mementus
       end
 
       def node(id)
-        NodeProxy.new(id, self)
+        NodeProxy.new(Node.new(id: id), self)
       end
 
       def nodes
-        @index.keys.map { |id| NodeProxy.new(id, self) }
+        @index.keys.map { |id| NodeProxy.new(Node.new(id: id), self) }
       end
 
       def adjacent(id)
@@ -64,7 +64,7 @@ module Mementus
         if directed?
           each_node do |from|
             each_adjacent(from.id) do |to|
-              yield Edge.new(from, to)
+              yield Edge.new(from: from, to: to)
             end
           end
         else

data/lib/mementus/structure/incidence_list.rb

@@ -26,26 +26,30 @@ module Mementus
       end
 
       def has_edge?(edge)
-        @edges.key?("#{edge.from.id},#{edge.to.id}")
+        @edges.key?(edge.id)
       end
 
-      def add_node(node)
-        @nodes[node.id] = node
+      def set_node(node)
+        @nodes[node.id] = NodeProxy.new(node, self)
         @outgoing[node.id] ||= []
         @incoming[node.id] ||= []
       end
 
-      def add_edge(edge)
-        add_node(edge.from) unless has_node?(edge.from)
-        add_node(edge.to) unless has_node?(edge.to)
+      def set_edge(edge)
+        set_node(edge.from) unless has_node?(edge.from)
+        set_node(edge.to) unless has_node?(edge.to)
 
-        @edges["#{edge.from.id},#{edge.to.id}"] = edge
+        @edges[edge.id] = edge
         @outgoing[edge.from.id] << edge.to.id
         @incoming[edge.to.id] << edge.from.id
       end
 
+      def edge(id)
+        @edges[id]
+      end
+
       def node(id)
-        NodeProxy.new(id, self)
+        @nodes[id]
       end
 
       def each_node(&block)
@@ -53,15 +57,15 @@ module Mementus
       end
 
       def nodes
-        @nodes.keys.map { |id| NodeProxy.new(id, self) }
+        @nodes.values
       end
 
       def adjacent(id)
-        @outgoing[id]
+        @nodes.values_at(*@outgoing[id])
       end
 
       def each_adjacent(id, &blk)
-        @outgoing[id].each(&blk)
+        adjacent(id).each(&blk)
       end
     end
   end

data/lib/mementus/version.rb

@@ -1,3 +1,3 @@
 module Mementus
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.5.0'.freeze
 end

data/lib/mementus.rb

@@ -1,18 +1,19 @@
-require_relative 'mementus/graph'
-require_relative 'mementus/structure/adjacency_list'
-require_relative 'mementus/structure/incidence_list'
-require_relative 'mementus/node'
-require_relative 'mementus/edge'
-require_relative 'mementus/node_proxy'
-require_relative 'mementus/pipeline'
-require_relative 'mementus/depth_first_search'
-require_relative 'mementus/breadth_first_search'
-require_relative 'mementus/query/traversal'
-require_relative 'mementus/query/source'
-require_relative 'mementus/query/step'
-require_relative 'mementus/query/traversal'
-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 'mementus/graph'
+require 'mementus/structure/adjacency_list'
+require 'mementus/structure/incidence_list'
+require 'mementus/node'
+require 'mementus/edge'
+require 'mementus/node_proxy'
+require 'mementus/pipeline'
+require 'mementus/depth_first_search'
+require 'mementus/breadth_first_search'
+require 'mementus/query/traversal'
+require 'mementus/query/source'
+require 'mementus/query/step'
+require 'mementus/query/traversal'
+require 'mementus/integer_id'
+require 'mementus/element_builder'
+require 'mementus/graph_builder'
+require 'mementus/node_builder'
+require 'mementus/edge_builder'
+require 'mementus/direction'

data/spec/edge_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Mementus::Edge do
   it 'should initialize with integer ids' do
-    edge = Mementus::Edge.new(1, 2)
+    edge = Mementus::Edge.new(from: 1, to: 2)
 
     expect(edge.from).to be_a(Mementus::Node)
     expect(edge.from.id).to eq(1)
@@ -11,7 +11,7 @@ describe Mementus::Edge do
   end
 
   it 'should initialize with node instances' do
-    edge = Mementus::Edge.new(Mementus::Node.new(1), Mementus::Node.new(2))
+    edge = Mementus::Edge.new(from: Mementus::Node.new(id: 1), to: Mementus::Node.new(id: 2))
 
     expect(edge.from).to be_a(Mementus::Node)
     expect(edge.from.id).to eq(1)
@@ -20,14 +20,14 @@ describe Mementus::Edge do
   end
 
   it 'should initialize with label given' do
-    edge = Mementus::Edge.new(1, 2, :relationship)
+    edge = Mementus::Edge.new(from: 1, to: 2, label: :relationship)
 
     expect(edge.label).to eq(:relationship)
   end
 
   it 'should test equality based on value' do
-    edge1 = Mementus::Edge.new(1, 2, :relationship)
-    edge2 = Mementus::Edge.new(1, 2, :relationship)
+    edge1 = Mementus::Edge.new(from: 1, to: 2, label: :relationship)
+    edge2 = Mementus::Edge.new(from: 1, to: 2, label: :relationship)
 
     expect(edge1).to eq(edge2)
     expect(edge1.hash).to eq(edge2.hash)

data/spec/graph_spec.rb

@@ -8,13 +8,23 @@ describe Mementus::Graph do
     expect(graph.edges_count).to eq(0)
   end
 
+  specify '#set_node' do
+    graph = Mementus::Graph.new do
+      set_node(node_1)
+    end
+
+    expect(graph.nodes_count).to eq(1)
+    expect(graph.edges_count).to eq(0)
+  end
+
   specify '#add_node' do
     graph = Mementus::Graph.new do
-      add_node(Mementus::Node.new(1, :node))
+      add_node(id: 1)
     end
 
     expect(graph.nodes_count).to eq(1)
     expect(graph.edges_count).to eq(0)
+    expect(graph.node(1).id).to eq(1)
   end
 
   specify '#create_node' do
@@ -27,12 +37,23 @@ describe Mementus::Graph do
 
     expect(graph.nodes_count).to eq(1)
     expect(graph.edges_count).to eq(0)
+    expect(graph.node(20).id).to eq(20)
+  end
+
+  specify '#set_edge' do
+    graph = Mementus::Graph.new do
+      set_edge(edge_1_2)
+    end
+
+    expect(graph.nodes_count).to eq(2)
+    expect(graph.edges_count).to eq(1)
     expect(graph.node(1).id).to eq(1)
+    expect(graph.node(2).id).to eq(2)
   end
 
   specify '#add_edge' do
     graph = Mementus::Graph.new do
-      add_edge(Mementus::Edge.new(Mementus::Node.new(1, :node), Mementus::Node.new(2, :node)))
+      add_edge(id: 3, from: 1, to: 2)
     end
 
     expect(graph.nodes_count).to eq(2)
@@ -44,6 +65,7 @@ describe Mementus::Graph do
   specify '#create_edge' do
     graph = Mementus::Graph.new do
       create_edge do |edge|
+        edge.id = 123
         edge.label = :relationship
         edge.from = "A"
         edge.to = "B"
@@ -52,42 +74,39 @@ describe Mementus::Graph do
 
     expect(graph.nodes_count).to eq(2)
     expect(graph.edges_count).to eq(1)
+    expect(graph.edge(123).id).to eq(123)
   end
 
   specify '#has_node?' do
-    node = Mementus::Node.new(1, :node)
     graph = Mementus::Graph.new do
-      add_node(node)
+      set_node(node_1)
     end
 
-    expect(graph.has_node?(node)).to be true
+    expect(graph.has_node?(node_1)).to be true
   end
 
   specify '#has_edge?' do
-    edge = Mementus::Edge.new(Mementus::Node.new(1, :node), Mementus::Node.new(2, :node))
     graph = Mementus::Graph.new do
-      add_edge(edge)
+      set_edge(edge_1_2)
     end
 
-    expect(graph.has_edge?(edge)).to be true
+    expect(graph.has_edge?(edge_1_2)).to be true
   end
 
   specify '#node(id)' do
-    edge = Mementus::Edge.new(Mementus::Node.new(1, :node), Mementus::Node.new(2, :node))
     graph = Mementus::Graph.new do
-      add_edge(edge)
+      set_edge(edge_1_2)
     end
 
-    expect(graph.node(1).id).to eq(edge.from.id)
+    expect(graph.node(1).id).to eq(edge_1_2.from.id)
   end
 
   specify '#nodes(filter)' do
-    edge = Mementus::Edge.new(Mementus::Node.new(1, :node), Mementus::Node.new(2, :node))
     graph = Mementus::Graph.new do
-      add_edge(edge)
+      set_edge(edge_1_2)
     end
 
-    expect(graph.nodes.first.id).to eq(edge.from.id)
-    expect(graph.nodes.last.id).to eq(edge.to.id)
+    expect(graph.nodes.first.id).to eq(edge_1_2.from.id)
+    expect(graph.nodes.last.id).to eq(edge_1_2.to.id)
   end
 end

data/spec/node_proxy_spec.rb

@@ -1,16 +1,13 @@
 require 'spec_helper'
 
 describe Mementus::NodeProxy do
-  specify '#new' do
-    node1 = Mementus::Node.new(1, :node)
-    node2 = Mementus::Node.new(2, :node)
-    node3 = Mementus::Node.new(3, :node)
+  specify '#adjacent' do
     graph = Mementus::Graph.new do
-      add_edge(Mementus::Edge.new(node1, node2))
-      add_edge(Mementus::Edge.new(node1, node3))
+      set_edge(edge_1_2)
+      set_edge(edge_1_3)
     end
 
-    node_proxy = Mementus::NodeProxy.new(1, graph)
-    expect(node_proxy.adjacent.map { |node| node.id}).to eq([node2.id, node3.id])
+    node_proxy = Mementus::NodeProxy.new(node_1, graph)
+    expect(node_proxy.adjacent.map { |node| node.id }).to eq([node_2.id, node_3.id])
   end
 end

data/spec/node_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe Mementus::Node do
+  it 'should initialize with id' do
+    node = Mementus::Node.new(id: 22)
+
+    expect(node.id).to eq(22)
+  end
+
+  it 'should initialize with id and label' do
+    node = Mementus::Node.new(id: 22, label: :vertex)
+
+    expect(node.id).to eq(22)
+    expect(node.label).to eq(:vertex)
+  end
+end

data/spec/query_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Mementus::Query do
   let(:graph) do
     Mementus::Graph.new do
-      add_edge(Mementus::Edge.new(Mementus::Node.new(1, :node), Mementus::Node.new(2, :node)))
+      set_edge(Mementus::Edge.new(from: Mementus::Node.new(id: 1),to: Mementus::Node.new(id: 2)))
     end
   end
 

data/spec/spec_helper.rb

@@ -1,3 +1,23 @@
 require 'rspec'
 require 'mementus'
 require 'mementus/library'
+
+def node_1
+  Mementus::Node.new(id: 1)
+end
+
+def node_2
+  Mementus::Node.new(id: 2)
+end
+
+def node_3
+  Mementus::Node.new(id: 2)
+end
+
+def edge_1_2
+  Mementus::Edge.new(from: node_1, to: node_2)
+end
+
+def edge_1_3
+  Mementus::Edge.new(from: node_1, to: node_3)
+end

data/spec/structure_spec.rb

@@ -11,18 +11,18 @@ shared_examples_for "a mutable graph data structure" do
     end
   end
 
-  describe '#add_node' do
-    it 'adds a node object to the graph' do
-      structure.add_node(Mementus::Node.new(1, :node))
+  describe '#set_node' do
+    it 'assigns a node object to the graph' do
+      structure.set_node(Mementus::Node.new(id: 1))
 
       expect(structure.nodes_count).to eq(1)
       expect(structure.edges_count).to eq(0)
     end
   end
 
-  describe '#add_edge' do
+  describe '#set_edge' do
     it 'adds an edge object to the graph' do
-      structure.add_edge(Mementus::Edge.new(Mementus::Node.new(1, :node), Mementus::Node.new(2, :node)))
+      structure.set_edge(Mementus::Edge.new(from: Mementus::Node.new(id: 1), to: Mementus::Node.new(id: 2)))
 
       expect(structure.nodes_count).to eq(2)
       expect(structure.edges_count).to eq(1)
@@ -31,8 +31,8 @@ shared_examples_for "a mutable graph data structure" do
 
   describe '#has_node?' do
     it 'tests for the presence of a given node' do
-      node = Mementus::Node.new(1, :node)
-      structure.add_node(node)
+      node = Mementus::Node.new(id: 1)
+      structure.set_node(node)
 
       expect(structure.has_node?(node)).to be true
     end
@@ -40,8 +40,8 @@ shared_examples_for "a mutable graph data structure" do
 
   describe '#has_edge?' do
     it 'tests for the presence of a given edge' do
-      edge = Mementus::Edge.new(Mementus::Node.new(1, :node), Mementus::Node.new(2, :node))
-      structure.add_edge(edge)
+      edge = Mementus::Edge.new(from: Mementus::Node.new(id: 1), to: Mementus::Node.new(id: 2))
+      structure.set_edge(edge)
 
       expect(structure.has_edge?(edge)).to be true
     end
@@ -49,8 +49,8 @@ shared_examples_for "a mutable graph data structure" do
 
   describe '#node(id)' do
     it 'finds a node by id' do
-      edge = Mementus::Edge.new(Mementus::Node.new(1, :node), Mementus::Node.new(2, :node))
-      structure.add_edge(edge)
+      edge = Mementus::Edge.new(from: Mementus::Node.new(id: 1), to: Mementus::Node.new(id: 2))
+      structure.set_edge(edge)
 
       expect(structure.node(1).id).to eq(edge.from.id)
     end
@@ -58,8 +58,8 @@ shared_examples_for "a mutable graph data structure" do
 
   describe '#nodes' do
     it 'lists all nodes in the graph' do
-      edge = Mementus::Edge.new(Mementus::Node.new(1, :node), Mementus::Node.new(2, :node))
-      structure.add_edge(edge)
+      edge = Mementus::Edge.new(from: Mementus::Node.new(id: 1), to: Mementus::Node.new(id: 2))
+      structure.set_edge(edge)
 
       expect(structure.nodes.first.id).to eq(edge.from.id)
       expect(structure.nodes.last.id).to eq(edge.to.id)

data/spec/traversal_spec.rb

@@ -3,13 +3,13 @@ require 'spec_helper'
 describe 'Basic graph traversals' do
   let(:graph) do
     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)))
-      add_edge(Mementus::Edge.new(Mementus::Node.new(2, :node), Mementus::Node.new(7, :node)))
-      add_edge(Mementus::Edge.new(Mementus::Node.new(7, :node), Mementus::Node.new(8, :node)))
-      add_edge(Mementus::Edge.new(Mementus::Node.new(5, :node), Mementus::Node.new(9, :node)))
+      set_edge(Mementus::Edge.new(from: Mementus::Node.new(id: 1), to: Mementus::Node.new(id: 2)))
+      set_edge(Mementus::Edge.new(from: Mementus::Node.new(id: 2), to: Mementus::Node.new(id: 3)))
+      set_edge(Mementus::Edge.new(from: Mementus::Node.new(id: 2), to: Mementus::Node.new(id: 5)))
+      set_edge(Mementus::Edge.new(from: Mementus::Node.new(id: 1), to: Mementus::Node.new(id: 6)))
+      set_edge(Mementus::Edge.new(from: Mementus::Node.new(id: 2), to: Mementus::Node.new(id: 7)))
+      set_edge(Mementus::Edge.new(from: Mementus::Node.new(id: 7), to: Mementus::Node.new(id: 8)))
+      set_edge(Mementus::Edge.new(from: Mementus::Node.new(id: 5), to: Mementus::Node.new(id: 9)))
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mementus
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - maetl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2016-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,13 +64,13 @@ files:
 - Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
 - 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/element_builder.rb
 - lib/mementus/graph.rb
 - lib/mementus/graph_builder.rb
 - lib/mementus/integer_id.rb
@@ -93,6 +93,7 @@ files:
 - spec/herschel_spec.rb
 - spec/integer_id_spec.rb
 - spec/node_proxy_spec.rb
+- spec/node_spec.rb
 - spec/pipeline_spec.rb
 - spec/query_spec.rb
 - spec/spec_helper.rb
@@ -129,6 +130,7 @@ test_files:
 - spec/herschel_spec.rb
 - spec/integer_id_spec.rb
 - spec/node_proxy_spec.rb
+- spec/node_spec.rb
 - spec/pipeline_spec.rb
 - spec/query_spec.rb
 - spec/spec_helper.rb

data/Rakefile

@@ -1 +0,0 @@
-require "bundler/gem_tasks"