mementus 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68a2c93ad9bdaedbd2d5ca511da4ac9f7d37e032
-  data.tar.gz: 4c91f58f3e77c009595759c4fc895f496bf2e8d1
+  metadata.gz: a24b4b584fd6dd3213786d5014b6f9c72f65be3c
+  data.tar.gz: a1660f7d12409486ffb8dbfdcde3de9cb44e1b08
 SHA512:
-  metadata.gz: a3f45b1dd11463fb0259b7c48d4024b0e4de41652acec66d0ea9e531474c26eedf221e4ea2985b8e6fbb6e45c654e3f3fe7bbb392402b25349ef4df204d38ec7
-  data.tar.gz: 822ede8244fb90e52fb8d489ab01b6822b9dadb2120911c1e26c184206405c574b75c1f53c6f84b62aac5d29e617e3024e68a9b86e81aa2bea290bbd0c16e7bf
+  metadata.gz: 84c9b24db29c6ce2f2f58f855727304880c3d72d02a4546a2962652732b07a4a3462f059637b0ad45cf8b279a8c456484216548f14c3b97802d653fc3a328820
+  data.tar.gz: 2185a04b77943a108dc6f66b02cb2f09965aaa424ff7b26b93ce52d448ff2fa8a0096904cecfceed17142426dcafe2dec6f10e9960f0eafaae7193a6b0783a25

data/lib/mementus/edge_builder.rb

@@ -1,12 +1,12 @@
 module Mementus
   class EdgeBuilder
-    attr_reader :from, :to, :label
+    attr_reader :from, :to, :label, :id
 
-    def initialize(from=nil, to=nil, label=:edge)
+    def initialize(from=nil, to=nil, label=:edge, id=nil)
       @from = from
       @to = to
       @label = label
-      @id = nil
+      @id = id
     end
 
     def id=(id)

data/lib/mementus/graph_builder.rb

@@ -1,7 +1,9 @@
 module Mementus
   class GraphBuilder
     def initialize(is_directed)
-      @structure = Structure::AdjacencyList.new(is_directed)
+      @structure = Structure::IncidenceList.new(is_directed)
+      @node_ids = IntegerId.new
+      @edge_ids = IntegerId.new
     end
 
     def add_node(node)
@@ -11,12 +13,14 @@ module Mementus
     def create_edge(&block)
       edge = EdgeBuilder.new
       yield edge
+      edge.id = @edge_ids.next_id unless edge.id
       @structure.add_edge(edge)
     end
 
     def create_node(&block)
       node = NodeBuilder.new
       yield node
+      node.id = @node_ids.next_id unless node.id
       @structure.add_node(node)
     end
 

data/lib/mementus/node.rb

@@ -6,13 +6,5 @@ module Mementus
       @id = id
       @label = label
     end
-
-    def id=(id)
-      @id = id
-    end
-
-    def label=(label)
-      @label = label
-    end
   end
 end

data/lib/mementus/structure/incidence_list.rb

@@ -0,0 +1,68 @@
+module Mementus
+  module Structure
+    class IncidenceList
+      def initialize(is_directed=true)
+        @outgoing = {}
+        @incoming = {}
+        @nodes = {}
+        @edges = {}
+        @is_directed = is_directed
+      end
+
+      def is_directed?
+        @is_directed
+      end
+
+      def nodes_count
+        @nodes.count
+      end
+
+      def edges_count
+        @edges.count
+      end
+
+      def has_node?(node)
+        @nodes.key?(node.id)
+      end
+
+      def has_edge?(edge)
+        @edges.key?("#{edge.from.id},#{edge.to.id}")
+      end
+
+      def add_node(node)
+        @nodes[node.id] = node
+        @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)
+
+        @edges["#{edge.from.id},#{edge.to.id}"] = edge
+        @outgoing[edge.from.id] << edge.to.id
+        @incoming[edge.to.id] << edge.from.id
+      end
+
+      def node(id)
+        NodeProxy.new(id, self)
+      end
+
+      def each_node(&block)
+        @nodes.values.each(&block)
+      end
+
+      def nodes
+        @nodes.keys.map { |id| NodeProxy.new(id, self) }
+      end
+
+      def adjacent(id)
+        @outgoing[id]
+      end
+
+      def each_adjacent(id, &blk)
+        @outgoing[id].each(&blk)
+      end
+    end
+  end
+end

data/lib/mementus/version.rb

@@ -1,3 +1,3 @@
 module Mementus
-  VERSION = '0.3.4'.freeze
+  VERSION = '0.3.5'.freeze
 end

data/spec/graph_spec.rb

@@ -20,13 +20,14 @@ describe Mementus::Graph do
   specify '#create_node' do
     graph = Mementus::Graph.new do
       create_node do |node|
-        node.id = 1
+        node.id = 20
         node.label = :vertex
       end
     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 '#add_edge' do
@@ -36,6 +37,8 @@ describe Mementus::Graph do
 
     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 '#create_edge' do

data/spec/pipeline_spec.rb

@@ -13,12 +13,24 @@ describe 'pipeline api' do
         node.label = :passage
       end
 
+      create_node do |node|
+        node.id = 4
+        node.label = :passage
+      end
+
       create_edge do |edge|
         edge.id = 3
         edge.from = 1
         edge.to = 2
         edge.label = :choice
       end
+
+      create_edge do |edge|
+        edge.id = 5
+        edge.from = 2
+        edge.to = 4
+        edge.label = :choice
+      end
     end
   end
 
@@ -34,6 +46,12 @@ describe 'pipeline api' do
     expect(pipeline.all.first.id).to eq(2)
   end
 
+  it 'traverses to second-degree outgoing nodes' do
+    pipeline = graph.n(1).out.out
+    expect(pipeline.all.count).to eq(1)
+    expect(pipeline.all.first.id).to eq(4)
+  end
+
   it 'traverses to outgoing edges' do
     pipeline = graph.n(1).out_e
     expect(pipeline.all.count).to eq(1)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mementus
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - maetl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-07 00:00:00.000000000 Z
+date: 2016-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,6 +82,7 @@ files:
 - lib/mementus/query/step.rb
 - lib/mementus/query/traversal.rb
 - lib/mementus/structure/adjacency_list.rb
+- lib/mementus/structure/incidence_list.rb
 - lib/mementus/version.rb
 - mementus.gemspec
 - spec/direction_spec.rb