mementus 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13343725a3e1defe38d65c9938c53a95755d223b
-  data.tar.gz: 683c929e1e9cc54529498afefb199c005a75868f
+  metadata.gz: 68a2c93ad9bdaedbd2d5ca511da4ac9f7d37e032
+  data.tar.gz: 4c91f58f3e77c009595759c4fc895f496bf2e8d1
 SHA512:
-  metadata.gz: 854588aedd67735d623bd05e92107b7ace162ebe81690f32cb35110316894f0e320b38eb4845ca620dfa7e3013398c0711ab10ee9df09f31cb92a81d502e65e2
-  data.tar.gz: b0290808513880dba332a7c5f59c2471a0a11177d7bbe48d7ef6eab97fd295eacf157817e5ddb22e704e7c572fca9b2d8da7ad8981d4d8d627e504e9e5cab9ed
+  metadata.gz: a3f45b1dd11463fb0259b7c48d4024b0e4de41652acec66d0ea9e531474c26eedf221e4ea2985b8e6fbb6e45c654e3f3fe7bbb392402b25349ef4df204d38ec7
+  data.tar.gz: 822ede8244fb90e52fb8d489ab01b6822b9dadb2120911c1e26c184206405c574b75c1f53c6f84b62aac5d29e617e3024e68a9b86e81aa2bea290bbd0c16e7bf

data/lib/mementus/edge.rb

@@ -1,30 +1,20 @@
 module Mementus
   class Edge
-    attr_reader :from, :to, :label
+    attr_reader :from, :to, :label, :id
 
-    def initialize(from=nil, to=nil, label=:edge)
-      @from = from
-      @to = to
-      @label = label
-    end
-
-    def from=(node, label=:node)
-      if node.is_a?(Node)
-        @from = node
-      else
-        @from = Node.new(node, label)
-      end
-    end
+    def initialize(from, to, label=:edge)
+       @from = if from.is_a?(Integer)
+         Node.new(from)
+       else
+         from
+       end
 
-    def to=(node)
-      if node.is_a?(Node)
-        @to = node
-      else
-        @to = Node.new(node, label)
-      end
-    end
+       @to = if to.is_a?(Integer)
+         Node.new(to)
+       else
+         to
+       end
 
-    def label=(label)
       @label = label
     end
 
@@ -32,8 +22,14 @@ module Mementus
       [@from, @to]
     end
 
-    def other(node)
-      @from == node ? @to : @from
+    def ==(edge)
+      from.id == edge.from.id && to.id == edge.to.id && label == edge.label
+    end
+
+    alias :eql? :==
+
+    def hash
+      [from.id, to.id].hash
     end
   end
 end

data/lib/mementus/pipeline.rb

@@ -40,10 +40,20 @@ module Mementus
       self
     end
 
+    def out_e
+      append_next(Pipes::OutgoingEdges.new)
+      self
+    end
+
     def in
       append_next(Pipes::Incoming.new)
       self
     end
+
+    def in_e
+      append_next(Pipes::IncomingEdges.new)
+      self
+    end
   end
 
   module Pipes
@@ -65,6 +75,14 @@ module Mementus
       end
     end
 
+    class OutgoingEdges
+      def process(graph, node)
+        graph.each_adjacent(node.id).map do |id|
+          Mementus::Edge.new(node, id)
+        end
+      end
+    end
+
     class Incoming
       def process(graph, node)
         incoming = []
@@ -78,5 +96,19 @@ module Mementus
         incoming
       end
     end
+
+    class IncomingEdges
+      def process(graph, node)
+        incoming = []
+
+        graph.each_node do |n|
+          graph.each_adjacent(n.id) do |id|
+            incoming << Mementus::Edge.new(n.id, id)
+          end
+        end
+
+        incoming
+      end
+    end
   end
 end

data/lib/mementus/version.rb

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

data/lib/mementus.rb

@@ -1,5 +1,6 @@
 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'

data/spec/edge_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe Mementus::Edge do
+  it 'should initialize with integer ids' do
+    edge = Mementus::Edge.new(1, 2)
+
+    expect(edge.from).to be_a(Mementus::Node)
+    expect(edge.from.id).to eq(1)
+    expect(edge.to).to be_a(Mementus::Node)
+    expect(edge.to.id).to eq(2)
+  end
+
+  it 'should initialize with node instances' do
+    edge = Mementus::Edge.new(Mementus::Node.new(1), Mementus::Node.new(2))
+
+    expect(edge.from).to be_a(Mementus::Node)
+    expect(edge.from.id).to eq(1)
+    expect(edge.to).to be_a(Mementus::Node)
+    expect(edge.to.id).to eq(2)
+  end
+
+  it 'should initialize with label given' do
+    edge = Mementus::Edge.new(1, 2, :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)
+
+    expect(edge1).to eq(edge2)
+    expect(edge1.hash).to eq(edge2.hash)
+  end
+end

data/spec/pipeline_spec.rb

@@ -34,9 +34,21 @@ describe 'pipeline api' do
     expect(pipeline.all.first.id).to eq(2)
   end
 
+  it 'traverses to outgoing edges' do
+    pipeline = graph.n(1).out_e
+    expect(pipeline.all.count).to eq(1)
+    expect(pipeline.all.first.to.id).to eq(2)
+  end
+
   it 'traverses to incoming nodes' do
     pipeline = graph.n(2).in
     expect(pipeline.all.count).to eq(1)
     expect(pipeline.all.first.id).to eq(1)
   end
+
+  it 'traverses to incoming edges' do
+    pipeline = graph.n(2).in_e
+    expect(pipeline.all.count).to eq(1)
+    expect(pipeline.all.first.from.id).to eq(1)
+  end
 end

data/spec/structure_spec.rb

@@ -1,55 +1,84 @@
 require 'spec_helper'
 
-describe Mementus::Structure do
-  let(:structure) do
-    Mementus::Structure::AdjacencyList.new
+shared_examples_for "a mutable graph data structure" do
+  describe '#new' do
+    it 'starts with empty node list' do
+      expect(structure.nodes_count).to eq(0)
+    end
+
+    it 'starts with empty edge list' do
+      expect(structure.edges_count).to eq(0)
+    end
   end
 
-  specify '#new' do
-    expect(structure.nodes_count).to eq(0)
-    expect(structure.edges_count).to eq(0)
+  describe '#add_node' do
+    it 'adds a node object to the graph' do
+      structure.add_node(Mementus::Node.new(1, :node))
+
+      expect(structure.nodes_count).to eq(1)
+      expect(structure.edges_count).to eq(0)
+    end
   end
 
-  specify '#add_node' do
-    structure.add_node(Mementus::Node.new(1, :node))
+  describe '#add_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)))
 
-    expect(structure.nodes_count).to eq(1)
-    expect(structure.edges_count).to eq(0)
+      expect(structure.nodes_count).to eq(2)
+      expect(structure.edges_count).to eq(1)
+    end
   end
 
-  specify '#add_edge' do
-    structure.add_edge(Mementus::Edge.new(Mementus::Node.new(1, :node), Mementus::Node.new(2, :node)))
+  describe '#has_node?' do
+    it 'tests for the presence of a given node' do
+      node = Mementus::Node.new(1, :node)
+      structure.add_node(node)
 
-    expect(structure.nodes_count).to eq(2)
-    expect(structure.edges_count).to eq(1)
+      expect(structure.has_node?(node)).to be true
+    end
   end
 
-  specify '#has_node?' do
-    node = Mementus::Node.new(1, :node)
-    structure.add_node(node)
+  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)
 
-    expect(structure.has_node?(node)).to be true
+      expect(structure.has_edge?(edge)).to be true
+    end
   end
 
-  specify '#has_edge?' do
-    edge = Mementus::Edge.new(Mementus::Node.new(1, :node), Mementus::Node.new(2, :node))
-    structure.add_edge(edge)
+  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)
 
-    expect(structure.has_edge?(edge)).to be true
+      expect(structure.node(1).id).to eq(edge.from.id)
+    end
   end
 
-  specify '#node(id)' do
-    edge = Mementus::Edge.new(Mementus::Node.new(1, :node), Mementus::Node.new(2, :node))
-    structure.add_edge(edge)
+  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)
+
+      expect(structure.nodes.first.id).to eq(edge.from.id)
+      expect(structure.nodes.last.id).to eq(edge.to.id)
+    end
+  end
+end
 
-    expect(structure.node(1).id).to eq(edge.from.id)
+describe Mementus::Structure::AdjacencyList do
+  let(:structure) do
+    Mementus::Structure::AdjacencyList.new
   end
 
-  specify '#nodes' do
-    edge = Mementus::Edge.new(Mementus::Node.new(1, :node), Mementus::Node.new(2, :node))
-    structure.add_edge(edge)
+  it_behaves_like "a mutable graph data structure"
+end
 
-    expect(structure.nodes.first.id).to eq(edge.from.id)
-    expect(structure.nodes.last.id).to eq(edge.to.id)
+describe Mementus::Structure::IncidenceList do
+  let(:structure) do
+    Mementus::Structure::IncidenceList.new
   end
+
+  it_behaves_like "a mutable graph data structure"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mementus
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - maetl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-05 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,6 +85,7 @@ files:
 - lib/mementus/version.rb
 - mementus.gemspec
 - spec/direction_spec.rb
+- spec/edge_spec.rb
 - spec/graph_spec.rb
 - spec/integer_id_spec.rb
 - spec/node_proxy_spec.rb
@@ -119,6 +120,7 @@ specification_version: 4
 summary: Graph data structure toolkit for Ruby applications.
 test_files:
 - spec/direction_spec.rb
+- spec/edge_spec.rb
 - spec/graph_spec.rb
 - spec/integer_id_spec.rb
 - spec/node_proxy_spec.rb