mementus 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a5329b3dc6e0429a47324ea39971d0cd87320ea
-  data.tar.gz: e4e2469c67e5368f014d7ef870bb9846c6b57521
+  metadata.gz: a0126b1888b05fb3dd49b14c39ba3cadfe20cbe2
+  data.tar.gz: a67cd6c07c156e995837918d0a9267c6230dd7a1
 SHA512:
-  metadata.gz: 9c551118086f9c08fe6d60127c7f7bf8eb41a4ee2a0c9a0834dde157e05087316ae2189dffc5d2f16ab8f35273dab928a4fc65e4269dab5d25945c465aa725a2
-  data.tar.gz: cac72cbf24feba518297dcf86e9a331a058920ec9d1bf15213f3fa294d4fb36ecffb4b4cabc2e66b0e5f22613b71907946be6f0f9103aa95c5c808e074b97f31
+  metadata.gz: 88b26e50130d2ebddf6d58ecff8d5925f237fddbe4b218e7b2270a53152c33092d1dd41ed03140d8c23eb2614c5506f1d0c1292654814b8ddc3fd589383e5345
+  data.tar.gz: 63630f975adab34a760e7127795eabe30b756e74bf84fa3cfc68280fc0c6c34a3ef4900e6b7da8c8bc25637e0e6d2e63661126d877a5eebfecd3adfde7aefc86

data/lib/mementus/graph_builder.rb

@@ -1,7 +1,7 @@
 module Mementus
   class GraphBuilder
     def initialize(is_directed)
-      @structure = Structure.new(is_directed)
+      @structure = Structure::AdjacencyList.new(is_directed)
     end
 
     def add_node(node)

data/lib/mementus/node_proxy.rb

@@ -9,10 +9,6 @@ module Mementus
       @id
     end
 
-    def label
-      @node.label
-    end
-
     def each_adjacent(&block)
       @graph.each_adjacent(@id, &block)
     end

data/lib/mementus/pipeline.rb

@@ -0,0 +1,63 @@
+module Mementus
+  class Processor
+    def initialize(graph, start_pipe)
+      @graph = graph
+      @pipeline = [start_pipe]
+    end
+
+    def append_next(pipe)
+      @pipeline << pipe
+    end
+
+    def process
+      output = nil
+      @pipeline.each do |pipe|
+        output = pipe.process(@graph, output)
+      end
+      output
+    end
+
+    def id
+      process.id
+    end
+
+    def one
+      output = process
+
+      if output.respond_to?(:each)
+        output.first
+      else
+        output
+      end
+    end
+
+    def all
+      process.to_a
+    end
+
+    def out
+      append_next(Pipes::Out.new)
+      self
+    end
+  end
+
+  module Pipes
+    class Node
+      def initialize(id)
+        @id = id
+      end
+
+      def process(graph, id)
+        graph.node(id || @id)
+      end
+    end
+
+    class Out
+      def process(graph, node)
+        graph.each_adjacent(node.id).map do |id|
+          Mementus::NodeProxy.new(id, graph)
+        end
+      end
+    end
+  end
+end

data/lib/mementus/structure/adjacency_list.rb

@@ -0,0 +1,76 @@
+module Mementus
+  module Structure
+    class AdjacencyList
+      def initialize(is_directed=true)
+        @index = {}
+        @is_directed = is_directed
+      end
+
+      def nodes_count
+        @index.size
+      end
+
+      def edges_count
+        c = 0
+        each_edge { c += 1 }
+        c
+      end
+
+      def directed?
+        @is_directed
+      end
+
+      def 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.id].add(edge.to.id)
+        @index[edge.to.id].add(edge.from.id) unless directed?
+      end
+
+      def has_node?(node)
+        @index.key?(node.id)
+      end
+
+      def has_edge?(edge)
+        has_node?(edge.from) && @index[edge.from.id].include?(edge.to.id)
+      end
+
+      def node(id)
+        NodeProxy.new(id, self)
+      end
+
+      def nodes
+        @index.keys.map { |id| NodeProxy.new(id, self) }
+      end
+
+      def adjacent(id)
+        @index[id].to_a
+      end
+
+      def each_node(&blk)
+        nodes.each(&blk)
+      end
+
+      def each_adjacent(id, &blk)
+        @index[id].each(&blk)
+      end
+
+      def each_edge(&blk)
+        if directed?
+          each_node do |from|
+            each_adjacent(from.id) do |to|
+              yield Edge.new(from, to)
+            end
+          end
+        else
+          raise 'Edge traversal unsupported for undirected graphs'
+        end
+      end
+    end
+  end
+end

data/lib/mementus/version.rb

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

data/lib/mementus.rb

@@ -1,8 +1,9 @@
 require_relative 'mementus/graph'
-require_relative 'mementus/structure'
+require_relative 'mementus/structure/adjacency_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'
@@ -14,4 +15,3 @@ 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/pipeline_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe 'pipeline api' do
+  let(:graph) do
+    Mementus::Graph.new do
+      create_node do |node|
+        node.id = 1
+        node.label = :passage
+      end
+
+      create_node do |node|
+        node.id = 2
+        node.label = :passage
+      end
+
+      create_edge do |edge|
+        edge.id = 3
+        edge.from = 1
+        edge.to = 2
+        edge.label = :choice
+      end
+    end
+  end
+
+  it 'starts a traversal from the given node' do
+    pipeline = graph.n(1)
+    expect(pipeline.id).to eq(1)
+    expect(pipeline.one.id).to eq(1)
+  end
+
+  it 'traverses to adjacent nodes' do
+    pipeline = graph.n(1).out
+    expect(pipeline.all.count).to eq(1)
+    expect(pipeline.all.first.id).to eq(2)
+  end
+end

data/spec/structure_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Mementus::Structure do
   let(:structure) do
-    Mementus::Structure.new
+    Mementus::Structure::AdjacencyList.new
   end
 
   specify '#new' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mementus
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - maetl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-24 00:00:00.000000000 Z
+date: 2016-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -77,16 +77,18 @@ files:
 - lib/mementus/node.rb
 - lib/mementus/node_builder.rb
 - lib/mementus/node_proxy.rb
+- lib/mementus/pipeline.rb
 - lib/mementus/query/source.rb
 - lib/mementus/query/step.rb
 - lib/mementus/query/traversal.rb
-- lib/mementus/structure.rb
+- lib/mementus/structure/adjacency_list.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
+- spec/pipeline_spec.rb
 - spec/query_spec.rb
 - spec/spec_helper.rb
 - spec/structure_spec.rb
@@ -120,6 +122,7 @@ test_files:
 - spec/graph_spec.rb
 - spec/integer_id_spec.rb
 - spec/node_proxy_spec.rb
+- spec/pipeline_spec.rb
 - spec/query_spec.rb
 - spec/spec_helper.rb
 - spec/structure_spec.rb

data/lib/mementus/structure.rb

@@ -1,74 +0,0 @@
-module Mementus
-  class Structure
-    def initialize(is_directed=true)
-      @index = {}
-      @is_directed = is_directed
-    end
-
-    def nodes_count
-      @index.size
-    end
-
-    def edges_count
-      c = 0
-      each_edge { c += 1 }
-      c
-    end
-
-    def directed?
-      @is_directed
-    end
-
-    def 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.id].add(edge.to.id)
-      @index[edge.to.id].add(edge.from.id) unless directed?
-    end
-
-    def has_node?(node)
-      @index.key?(node.id)
-    end
-
-    def has_edge?(edge)
-      has_node?(edge.from) && @index[edge.from.id].include?(edge.to.id)
-    end
-
-    def node(id)
-      NodeProxy.new(id, self)
-    end
-
-    def nodes
-      @index.keys.map { |id| NodeProxy.new(id, self) }
-    end
-
-    def adjacent(id)
-      @index[id].to_a
-    end
-
-    def each_node(&blk)
-      nodes.each(&blk)
-    end
-
-    def each_adjacent(id, &blk)
-      @index[id].each(&blk)
-    end
-
-    def each_edge(&blk)
-      if directed?
-        each_node do |from|
-          each_adjacent(from.id) do |to|
-            yield Edge.new(from, to)
-          end
-        end
-      else
-        raise 'Edge traversal unsupported for undirected graphs'
-      end
-    end
-  end
-end