mementus 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fae8986161bdb24824b5897e0f09b4b62e0d18ae
-  data.tar.gz: 592ce7d666d1c5f7e9368716092b7158f22e1c91
+SHA256:
+  metadata.gz: 223874927cc970ab0f6649817e5e43d2d8e95603df9bb26ac3a7b911ce3b8599
+  data.tar.gz: 5f9fc630c6bc787ba209be9696a1e0fb961e0a1deaf349d4912e56ea12bc2e65
 SHA512:
-  metadata.gz: d5b5f9d0c563bc3173e45c6a88ba8b88769c8c8f504e78b28fe9823d4fc42207045b9cc169c66173bead90380e9fe3ac47ec17e9930911cb90eb8f9a3b1c0e8c
-  data.tar.gz: 669cc8a2bf3dd25f0ecbfa6528c0ca806f4492f96081550b65243aed13b32133c2b266c48e12080f4b4190d36f8cfd1e18141ac937fb08b95565bfbc027eb39b
+  metadata.gz: 88591917460dd9a4ba48115741612b89553b3ec871b1e782aefbe471f7fa210f12c67f027f4d89e7e8dbe93739c4f20c699af635fbb89e7343a023eb3dac4143
+  data.tar.gz: d09e3a0b83523b5d4210802ecfd4f4001768ee596cbb53e626564d40580834673eb520931a189c3855f2a1e4845f406a483cbbc61d4a5a0b13ed648c955d88fc

data/lib/mementus.rb

@@ -6,6 +6,7 @@ require 'mementus/structure/adjacency_list'
 require 'mementus/structure/incidence_list'
 require 'mementus/node'
 require 'mementus/edge'
+require 'mementus/criteria'
 require 'mementus/node_proxy'
 require 'mementus/edge_proxy'
 require 'mementus/pipeline/pipe'

data/lib/mementus/graph.rb

@@ -52,7 +52,7 @@ module Mementus
       @structure.edge(id)
     end
 
-    def nodes(match=nil)
+    def nodes(*match)
       @structure.nodes(match)
     end
 

data/lib/mementus/node_proxy.rb

@@ -34,7 +34,7 @@ module Mementus
     end
 
     def in_e(match=nil)
-      Pipeline::Step.new([self], Pipeline::Pipe.new(@graph), @graph).in(match)
+      Pipeline::Step.new([self], Pipeline::Pipe.new(@graph), @graph).in_e(match)
     end
 
     def each_adjacent(&block)

data/lib/mementus/structure/incidence_list.rb

@@ -74,19 +74,25 @@ module Mementus
         @nodes[id]
       end
 
-      def nodes(match=nil)
-        return @nodes.values unless match
+      def nodes(*match)
+        return @nodes.values if match.empty?
 
-        if match.is_a?(Hash)
-          @nodes.values.select do |node|
-            key = match.first.first
-            val = match.first.last
-            node[key] == val
+        criteria = Mementus::Criteria.new(match)
+
+        @nodes.values.select do |node|
+          selected = false
+
+          if criteria.label
+            selected = node.label == criteria.label
           end
-        elsif match.is_a?(Symbol)
-          @nodes.values.select do |node|
-            node.label == match
+
+          if criteria.props
+            key = criteria.props.first.first
+            val = criteria.props.first.last
+            selected = node[key] == val
           end
+
+          selected
         end
       end
 

data/lib/mementus/version.rb

@@ -1,3 +1,3 @@
 module Mementus
-  VERSION = '0.8.1'.freeze
+  VERSION = '0.8.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mementus
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - maetl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-30 00:00:00.000000000 Z
+date: 2018-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Graph data structure toolkit for Ruby applications.