mementus 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8d7aae1069c6ccb20e101540608915d4c0b157b
-  data.tar.gz: 2b8273eb17e130395902b111c6d2714fd76ee444
+  metadata.gz: f193ed0050a256b3b529dd997fafe002fbe7697e
+  data.tar.gz: e928862b3e4e55e1ce0ac1050eec7457238a7ce2
 SHA512:
-  metadata.gz: e3080d4ed7e24a87065cf575e3df8675d30053f2afc5313f9f321a9a8b4677a04563e810d4168b4b461e8057a6a831d26c622c5983f9ca21fc747768abc61249
-  data.tar.gz: 39cd8b39a4dac486d3c24d9ccc9e0b53665c5406341d89695e82fc87c364c09b431097b8414e582196026c68222e13e02369a34dbc17a48bcc8f4d136f7181a9
+  metadata.gz: c9f0a1203c8cc72cbcaeb26383f8f38181f50863267f71fe64c3f429cb007fcc311cf8a380cc06690df3b9e1a3340c65c269c19775723b580cac78c782e33ecd
+  data.tar.gz: c0495f33c80d74d81212df81f9314eb198f8c40e5e18bf5cc10697934f72ec9279f0e1e4be2488a46c63f5f90160f00652afbe0533c2fb812b3483d99ebcb7ac

data/lib/mementus/graph_builder.rb

@@ -1,45 +1,13 @@
 module Mementus
   class GraphBuilder
+    include Mutators
+
     def initialize(is_directed)
       @structure = Structure::IncidenceList.new(is_directed)
       @node_ids = IntegerId.new
       @edge_ids = IntegerId.new
     end
 
-    def set_node(node)
-      @structure.set_node(node)
-      node
-    end
-
-    def set_edge(edge)
-      @structure.set_edge(edge)
-      edge
-    end
-
-    def add_node(id: nil, label: nil, props: {})
-      id = @node_ids.next_id unless id
-      set_node(Node.new(id: id, label: label, props: props))
-    end
-
-    def add_edge(id: nil, from: nil, to: nil, label: nil, props: {})
-      id = @edge_ids.next_id unless id
-      set_edge(Edge.new(id: id, from: from, to: to, label: label, props: props))
-    end
-
-    def create_node(&block)
-      builder = NodeBuilder.new
-      yield builder
-      builder.id = @node_ids.next_id unless builder.id
-      set_node(builder.to_node)
-    end
-
-    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
       @structure
     end

data/lib/mementus/mutable_graph.rb

@@ -0,0 +1,11 @@
+module Mementus
+  class MutableGraph < Graph
+    include Mutators
+
+    def initialize
+      @structure = Structure::IncidenceList.new(true)
+      @node_ids = IntegerId.new
+      @edge_ids = IntegerId.new
+    end
+  end
+end

data/lib/mementus/mutators.rb

@@ -0,0 +1,37 @@
+module Mementus
+  module Mutators
+    def set_node(node)
+      @structure.set_node(node)
+      node
+    end
+
+    def set_edge(edge)
+      @structure.set_edge(edge)
+      edge
+    end
+
+    def add_node(id: nil, label: nil, props: {})
+      id = @node_ids.next_id unless id
+      set_node(Node.new(id: id, label: label, props: props))
+    end
+
+    def add_edge(id: nil, from: nil, to: nil, label: nil, props: {})
+      id = @edge_ids.next_id unless id
+      set_edge(Edge.new(id: id, from: from, to: to, label: label, props: props))
+    end
+
+    def create_node(&block)
+      builder = NodeBuilder.new
+      yield builder
+      builder.id = @node_ids.next_id unless builder.id
+      set_node(builder.to_node)
+    end
+
+    def create_edge(&block)
+      builder = EdgeBuilder.new
+      yield builder
+      builder.id = @edge_ids.next_id unless builder.id
+      set_edge(builder.to_edge)
+    end
+  end
+end

data/lib/mementus/version.rb

@@ -1,3 +1,3 @@
 module Mementus
-  VERSION = '0.6.0'.freeze
+  VERSION = '0.7.0'.freeze
 end

data/lib/mementus.rb

@@ -1,5 +1,7 @@
 require 'fiber'
 require 'mementus/graph'
+require 'mementus/mutators'
+require 'mementus/mutable_graph'
 require 'mementus/structure/adjacency_list'
 require 'mementus/structure/incidence_list'
 require 'mementus/node'

data/spec/graph_spec.rb

@@ -123,18 +123,6 @@ describe Mementus::Graph do
     end
   end
 
-  specify '#create_edge -> with props' do
-    graph = Mementus::Graph.new do
-      create_edge do |edge|
-        edge.from = 'A'
-        edge.to = 'B'
-        edge.props = {
-          name: 'Relationship'
-        }
-      end
-    end
-  end
-
   specify '#has_node?' do
     graph = Mementus::Graph.new do
       set_node(node_1)

data/spec/mutable_graph_spec.rb

@@ -0,0 +1,116 @@
+require 'spec_helper'
+
+describe Mementus::MutableGraph do
+  specify '#new' do
+    graph = Mementus::MutableGraph.new
+
+    expect(graph.nodes_count).to eq(0)
+    expect(graph.edges_count).to eq(0)
+  end
+
+  specify '#set_node' do
+    graph = Mementus::MutableGraph.new
+    graph.set_node(node_1)
+
+    expect(graph.nodes_count).to eq(1)
+    expect(graph.edges_count).to eq(0)
+  end
+
+  specify '#add_node' do
+    graph = Mementus::MutableGraph.new
+    graph.add_node(id: 1)
+
+    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_node -> with auto id' do
+    graph = Mementus::MutableGraph.new
+    graph.add_node
+
+    expect(graph.node(1).id).to eq(1)
+  end
+
+  specify '#add_node -> with props' do
+    graph = Mementus::MutableGraph.new
+    graph.add_node(props: { title: 'Vertex' })
+
+    expect(graph.node(1)[:title]).to eq('Vertex')
+  end
+
+  specify '#create_node' do
+    graph = Mementus::MutableGraph.new
+    graph.create_node do |node|
+      node.id = 20
+      node.label = :vertex
+      node.props[:title] = 'Vertex'
+    end
+
+    expect(graph.nodes_count).to eq(1)
+    expect(graph.edges_count).to eq(0)
+
+    graph.node(20).tap do |node|
+      expect(node.id).to eq(20)
+      expect(node.label).to eq(:vertex)
+      expect(node[:title]).to eq('Vertex')
+    end
+  end
+
+  specify '#set_edge' do
+    graph = Mementus::MutableGraph.new
+    graph.set_edge(edge_1_2)
+
+    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::MutableGraph.new
+    graph.add_edge(id: 3, from: 1, to: 2)
+
+    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)
+    expect(graph.edge(3).id).to eq(3)
+  end
+
+  specify '#add_edge -> with auto id' do
+    graph = Mementus::MutableGraph.new
+    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.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.create_edge do |edge|
+      edge.id = 123
+      edge.label = :relationship
+      edge.from = 'A'
+      edge.to = 'B'
+      edge.props[:name] = 'Relationship'
+    end
+
+    expect(graph.nodes_count).to eq(2)
+    expect(graph.edges_count).to eq(1)
+
+    graph.edge(123).tap do |edge|
+      expect(edge.id).to eq(123)
+      expect(edge.label).to eq(:relationship)
+      expect(edge.from.id).to eq('A')
+      expect(edge.to.id).to eq('B')
+      expect(edge[:name]).to eq('Relationship')
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mementus
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - maetl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-12 00:00:00.000000000 Z
+date: 2017-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,6 +79,8 @@ files:
 - lib/mementus/library.rb
 - lib/mementus/library/herschel_graph.rb
 - lib/mementus/library/story_graph.rb
+- lib/mementus/mutable_graph.rb
+- lib/mementus/mutators.rb
 - lib/mementus/node.rb
 - lib/mementus/node_builder.rb
 - lib/mementus/node_proxy.rb
@@ -102,6 +104,7 @@ files:
 - spec/graph_spec.rb
 - spec/herschel_spec.rb
 - spec/integer_id_spec.rb
+- spec/mutable_graph_spec.rb
 - spec/node_proxy_spec.rb
 - spec/node_spec.rb
 - spec/pipeline/step_spec.rb
@@ -134,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Graph data structure toolkit for Ruby applications.
@@ -146,6 +149,7 @@ test_files:
 - spec/graph_spec.rb
 - spec/herschel_spec.rb
 - spec/integer_id_spec.rb
+- spec/mutable_graph_spec.rb
 - spec/node_proxy_spec.rb
 - spec/node_spec.rb
 - spec/pipeline/step_spec.rb
@@ -158,4 +162,3 @@ test_files:
 - spec/structure/mutable_graph_example.rb
 - spec/structure/property_graph_example.rb
 - spec/traversal_spec.rb
-has_rdoc: