mementus 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1a81084582c056ebd9ffc11f636e3633bbdb35a
-  data.tar.gz: 51a351b8653e9c56d3d1b6cf80035c90ab181b58
+  metadata.gz: 72100572fe7d20e4135b4663a269a8d2bd73cc80
+  data.tar.gz: 0b337f00327f6090a323f91eb5450f4f80c692c6
 SHA512:
-  metadata.gz: 54473a495eaed1580a4d90020154707bb45476162952e83ce2eda7f23a99e7ac39f7f4a0da3dc6a90eac17762c61df4f8b78adb70fbecd61dfcff17faea3f27a
-  data.tar.gz: 0e8d597eff99b132875226ba868ce25e498d00c6011839e9836808f5da76e0df617e596743ad086a8ecf6a057e0e405daa30547f546dc8cb9b39108e234b38f3
+  metadata.gz: 271a2b5486669883f8ea63c1cd615418195628481dcc1e939511e218bed016032a03b66cc19d03bb2bb856d603223c5a70fc43d45f0f2e7a9e22eeb76f10b063
+  data.tar.gz: b641562129543c2db046c924ad6fbcabc3cc033bdebe3f127c819ddec5af18ab8d907921f59ac505b20fb66456067b6c65ba67d54aa6125e7914ff31cd6b2a02

data/lib/mementus/graph.rb

@@ -23,7 +23,7 @@ module Mementus
     end
 
     def n(match)
-      if match.is_a?(Hash)
+      if match.is_a?(Hash) || match.is_a?(Symbol)
         source = nodes(match)
       else
         source = [node(match)]

data/lib/mementus/structure/incidence_list.rb

@@ -65,20 +65,32 @@ module Mementus
       def nodes(match=nil)
         return @nodes.values unless match
 
-        @nodes.values.select do |node|
-          key = match.first.first
-          val = match.first.last
-          node[key] == val
+        if match.is_a?(Hash)
+          @nodes.values.select do |node|
+            key = match.first.first
+            val = match.first.last
+            node[key] == val
+          end
+        elsif match.is_a?(Symbol)
+          @nodes.values.select do |node|
+            node.label == match
+          end
         end
       end
 
       def edges(match=nil)
         return @edges.values unless match
 
-        @edges.values.select do |edge|
-          key = match.first.first
-          val = match.first.last
-          edge[key] == val
+        if match.is_a?(Hash)
+          @edges.values.select do |edge|
+            key = match.first.first
+            val = match.first.last
+            edge[key] == val
+          end
+        elsif match.is_a?(Symbol)
+          @edges.values.select do |edge|
+            edge.label == match
+          end
         end
       end
 

data/lib/mementus/version.rb

@@ -1,3 +1,3 @@
 module Mementus
-  VERSION = '0.5.4'.freeze
+  VERSION = '0.5.5'.freeze
 end

data/lib/mementus.rb

@@ -5,7 +5,6 @@ require 'mementus/structure/incidence_list'
 require 'mementus/node'
 require 'mementus/edge'
 require 'mementus/node_proxy'
-require 'mementus/processor'
 require 'mementus/pipeline/pipe'
 require 'mementus/pipeline/filter'
 require 'mementus/pipeline/transform'

data/spec/pipeline_spec.rb

@@ -49,6 +49,12 @@ describe 'pipeline api' do
     expect(pipeline.first.id).to eq(1)
   end
 
+  it 'traverses from the given label match' do
+    pipeline = graph.n(:passage)
+    expect(pipeline.id).to eq([1, 2, 4])
+    expect(pipeline.first.id).to eq(1)
+  end
+
   it 'traverses to outgoing nodes' do
     pipeline = graph.n(1).out
     expect(pipeline.all.count).to eq(1)

data/spec/structure_spec.rb

@@ -88,9 +88,21 @@ describe Mementus::Structure::IncidenceList do
       structure.set_node(Mementus::Node.new(id: 2, props: { tag: 'point'}))
       structure.set_node(Mementus::Node.new(id: 3))
 
-      matched = structure.nodes(tag: 'point')
-      expect(matched.first.id).to eq(1)
-      expect(matched.last.id).to eq(2)
+      structure.nodes(tag: 'point').tap do |matched|
+        expect(matched.first.id).to eq(1)
+        expect(matched.last.id).to eq(2)
+      end
+    end
+
+    it 'matches all nodes with the given label' do
+      structure.set_node(Mementus::Node.new(id: 1, label: :point))
+      structure.set_node(Mementus::Node.new(id: 2, label: :point))
+      structure.set_node(Mementus::Node.new(id: 3))
+
+      structure.nodes(:point).tap do |matched|
+        expect(matched.first.id).to eq(1)
+        expect(matched.last.id).to eq(2)
+      end
     end
   end
 
@@ -99,22 +111,35 @@ describe Mementus::Structure::IncidenceList do
       edge = Mementus::Edge.new(id: 3, from: Mementus::Node.new(id: 1), to: Mementus::Node.new(id: 2))
       structure.set_edge(edge)
 
-      matched = structure.edges
-      expect(matched.first.id).to eq(edge.id)
-      expect(matched.first.from.id).to eq(edge.from.id)
-      expect(matched.first.to.id).to eq(edge.to.id)
+      structure.edges.tap do |matched|
+        expect(matched.first.id).to eq(edge.id)
+        expect(matched.first.from.id).to eq(edge.from.id)
+        expect(matched.first.to.id).to eq(edge.to.id)
+      end
     end
   end
 
   describe '#edges(match)' do
-    it 'lists all edges with the given prop' do
+    it 'matches all edges with the given prop' do
       edge = Mementus::Edge.new(props: { tag: 'link' }, from: Mementus::Node.new(id: 1), to: Mementus::Node.new(id: 2))
       structure.set_edge(edge)
 
-      matched = structure.edges(tag: 'link')
-      expect(matched.first.id).to eq(edge.id)
-      expect(matched.first.from.id).to eq(edge.from.id)
-      expect(matched.first.to.id).to eq(edge.to.id)
+      structure.edges(tag: 'link').tap do |matched|
+        expect(matched.first.id).to eq(edge.id)
+        expect(matched.first.from.id).to eq(edge.from.id)
+        expect(matched.first.to.id).to eq(edge.to.id)
+      end
+    end
+
+    it 'matches all edges with the given label' do
+      edge = Mementus::Edge.new(label: :link, from: Mementus::Node.new(id: 1), to: Mementus::Node.new(id: 2))
+      structure.set_edge(edge)
+
+      structure.edges(:link).tap do |matched|
+        expect(matched.first.id).to eq(edge.id)
+        expect(matched.first.from.id).to eq(edge.from.id)
+        expect(matched.first.to.id).to eq(edge.to.id)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mementus
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - maetl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-07 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,7 +89,6 @@ files:
 - lib/mementus/pipes/node.rb
 - lib/mementus/pipes/outgoing.rb
 - lib/mementus/pipes/outgoing_edges.rb
-- lib/mementus/processor.rb
 - lib/mementus/structure/adjacency_list.rb
 - lib/mementus/structure/incidence_list.rb
 - lib/mementus/version.rb

data/lib/mementus/processor.rb

@@ -1,58 +0,0 @@
-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::Outgoing.new)
-      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
-end