mementus 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e42c083e1ae9ae809d54f14f7b591e2bc284f3d
-  data.tar.gz: fae1ead8b3ad28db5f8577dede5f050009cc0006
+  metadata.gz: 8406a5839e15190df819f220a4c566c36a9e721c
+  data.tar.gz: 2fc2e1681f4595f12dee0553c74fc7f88fb9ba8b
 SHA512:
-  metadata.gz: bbb064bc33f02815ecbb090150fa9a312ab96e4f4b42fea44f5fecd1c58cdfa7ee7d103f90e0b9bae6b93dac09d7aef46e68bf0c83a90535401fba7e5f3dd4b3
-  data.tar.gz: 27bbf6b5a7962eef54d519207d710123cafc7a4b247cafec5beefeba23c0c3669cd01823662464c8aef497141bfadf1dd7e153ab72fc46dc99cf4c478309c1be
+  metadata.gz: f546423c0cb1b6909b70961311dc99133792df82f787cf385af94be5405a03e5bdd7b2d04ae491ec86fefbdf8f8f49677cc7ae753c194ce9f5c007cd179616f7
+  data.tar.gz: b8e268030552f7b44f61cf786946e019c7fd58bc5681b80c783cc68cc5f7f54affbec1b5901ad1120b74d82e102cc64730fa47aa4fcd22b5c4f1360118687a62

data/.travis.yml

@@ -5,6 +5,5 @@ rvm:
   - ruby-head
   - jruby-9.1.13.0
   - jruby-head
-  - rbx-3
 before_install: gem install bundler
 script: bundle exec rspec

data/lib/mementus/breadth_first_search.rb

@@ -14,7 +14,7 @@ module Mementus
     private
 
     def visit(id, &block)
-      @queue.concat(@graph.outgoing(id))
+      @queue << @graph.node(id)
 
       while next_node = @queue.shift
         next if @visited[next_node]

data/lib/mementus/depth_first_search.rb

@@ -7,18 +7,18 @@ module Mementus
     end
 
     def each(&block)
-      visit(@start_id, &block)
+      visit(@graph.node(@start_id), &block)
     end
 
     private
 
-    def visit(id, &block)
-      @graph.outgoing(id).each do |adj_node|
-        next if @visited[adj_node.id]
+    def visit(node, &block)
+      block.call(node)
+      @visited[node.id] = true
 
-        @visited[adj_node.id] = true
-        block.call(adj_node)
-        visit(adj_node.id, &block)
+      @graph.outgoing(node.id).each do |adj_node|
+        next if @visited[adj_node.id]
+        visit(adj_node, &block)
       end
     end
   end

data/lib/mementus/graph.rb

@@ -1,11 +1,17 @@
 module Mementus
   class Graph
-    def initialize(is_directed=true, &block)
+    def initialize(is_mutable: false, is_directed: true, &block)
       builder = GraphBuilder.new(is_directed)
 
       BindingDelegator.new(builder, block.binding).instance_eval(&block) if block_given?
 
       @structure = builder.graph
+
+      if is_mutable
+        self.class.include Mutators
+        @node_ids = IntegerId.new
+        @edge_ids = IntegerId.new
+      end
     end
 
     def nodes_count

data/lib/mementus/version.rb

@@ -1,3 +1,3 @@
 module Mementus
-  VERSION = '0.7.1'.freeze
+  VERSION = '0.7.2'.freeze
 end

data/spec/mutable_graph_spec.rb

@@ -1,15 +1,15 @@
 require 'spec_helper'
 
-describe Mementus::MutableGraph do
+describe Mementus::Graph do
   specify '#new' do
-    graph = Mementus::MutableGraph.new
+    graph = Mementus::Graph.new(is_mutable: true)
 
     expect(graph.nodes_count).to eq(0)
     expect(graph.edges_count).to eq(0)
   end
 
   specify '#set_node' do
-    graph = Mementus::MutableGraph.new
+    graph = Mementus::Graph.new(is_mutable: true)
     graph.set_node(node_1)
 
     expect(graph.nodes_count).to eq(1)
@@ -17,7 +17,7 @@ describe Mementus::MutableGraph do
   end
 
   specify '#add_node' do
-    graph = Mementus::MutableGraph.new
+    graph = Mementus::Graph.new(is_mutable: true)
     graph.add_node(id: 1)
 
     expect(graph.nodes_count).to eq(1)
@@ -26,21 +26,21 @@ describe Mementus::MutableGraph do
   end
 
   specify '#add_node -> with auto id' do
-    graph = Mementus::MutableGraph.new
+    graph = Mementus::Graph.new(is_mutable: true)
     graph.add_node
 
     expect(graph.node(1).id).to eq(1)
   end
 
   specify '#add_node -> with props' do
-    graph = Mementus::MutableGraph.new
+    graph = Mementus::Graph.new(is_mutable: true)
     graph.add_node(props: { title: 'Vertex' })
 
     expect(graph.node(1)[:title]).to eq('Vertex')
   end
 
   specify '#create_node' do
-    graph = Mementus::MutableGraph.new
+    graph = Mementus::Graph.new(is_mutable: true)
     graph.create_node do |node|
       node.id = 20
       node.label = :vertex
@@ -58,7 +58,7 @@ describe Mementus::MutableGraph do
   end
 
   specify '#set_edge' do
-    graph = Mementus::MutableGraph.new
+    graph = Mementus::Graph.new(is_mutable: true)
     graph.set_edge(edge_1_2)
 
     expect(graph.nodes_count).to eq(2)
@@ -68,7 +68,7 @@ describe Mementus::MutableGraph do
   end
 
   specify '#add_edge' do
-    graph = Mementus::MutableGraph.new
+    graph = Mementus::Graph.new(is_mutable: true)
     graph.add_edge(id: 3, from: 1, to: 2)
 
     expect(graph.nodes_count).to eq(2)
@@ -79,21 +79,21 @@ describe Mementus::MutableGraph do
   end
 
   specify '#add_edge -> with auto id' do
-    graph = Mementus::MutableGraph.new
+    graph = Mementus::Graph.new(is_mutable: true)
     graph.add_edge(from: 1, to: 2)
 
     expect(graph.edge(1).id).to eq(1)
   end
 
   specify '#add_edge -> with props' do
-    graph = Mementus::MutableGraph.new
+    graph = Mementus::Graph.new(is_mutable: true)
     graph.add_edge(from: 1, to: 2, props: { title: 'Relationship' })
 
     expect(graph.edge(1)[:title]).to eq('Relationship')
   end
 
   specify '#create_edge' do
-    graph = Mementus::MutableGraph.new
+    graph = Mementus::Graph.new(is_mutable: true)
     graph.create_edge do |edge|
       edge.id = 123
       edge.label = :relationship
@@ -115,7 +115,7 @@ describe Mementus::MutableGraph do
   end
 
   specify '#remove_node' do
-    graph = Mementus::MutableGraph.new
+    graph = Mementus::Graph.new(is_mutable: true)
     graph.add_edge(from: 1, to: 2)
 
     graph.remove_node(2)
@@ -124,7 +124,7 @@ describe Mementus::MutableGraph do
   end
 
   specify '#remove_edge' do
-    graph = Mementus::MutableGraph.new
+    graph = Mementus::Graph.new(is_mutable: true)
     graph.add_edge(from: 1, to: 2)
 
     graph.remove_edge(1)

data/spec/traversal_spec.rb

@@ -16,7 +16,7 @@ describe 'Basic graph traversals' do
   specify 'DepthFirstSearch#each' do
     traversal = Mementus::DepthFirstSearch.new(graph, 1)
 
-    expected = [2,3,5,9,7,8,6]
+    expected = [1,2,3,5,9,7,8,6]
     actual = []
     traversal.each { |n| actual << n.id }
 
@@ -26,7 +26,7 @@ describe 'Basic graph traversals' do
   specify 'BreadthFirstSearch#each' do
     traversal = Mementus::BreadthFirstSearch.new(graph, 1)
 
-    expected = [2,6,3,5,7,9,8]
+    expected = [1,2,6,3,5,7,9,8]
 
     actual = []
     traversal.each { |n| actual << n.id }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mementus
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - maetl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-14 00:00:00.000000000 Z
+date: 2018-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler