mementus 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9008afd3cf8e01e46d74afdb9ba4421ba5fa6576
-  data.tar.gz: 3a23ffd82033bad559238dd80ec316efb86feb60
+  metadata.gz: 4513413f72d998079932e3f00c021ed47b11df04
+  data.tar.gz: c2ffeff4b00e94c2753b198e039298f4be9ec22a
 SHA512:
-  metadata.gz: a51672c818d3883aeecf5a599e8b33c6f5f342e8434345e3c93d60749a591781b8557dd640c3e74b98abb222702dd6a2a28ade00702f452f723f7144be3fb9a6
-  data.tar.gz: c35706222b866937ad4439a762df37969cd800bae904f91751c6eb2b557c293cdd2085676e53a4dee70ca667b09b5086244af3e05b84dea4db0daa9258b29c87
+  metadata.gz: bea03fed5e0f750561ea11d1dac5788f14f5e0223db893ad4df88d617554e9814ffff0146f1161c23580de3bbe16b46218049a073faa389b98bb1a89710dbfb1
+  data.tar.gz: 83e39ec2a2981bced0d5f928e48d0e8cc231430a76efc394f56b4399e84135395f68fec57dc92202e82ec092e340763b180ee5dfac4a2fecff7cd6d3d36b5d6f

data/lib/mementus/graph.rb

@@ -3,82 +3,63 @@ require 'set'
 module Mementus
   class Graph
     def initialize(is_directed=true)
-      @index = {}
-      @is_directed = is_directed
+      @structure = Structure.new(is_directed)
     end
 
     def nodes_count
-      @index.size
+      @structure.nodes_count
     end
 
     def edges_count
-      c = 0
-      each_edge { c += 1 }
-      c
+      @structure.edges_count
     end
 
     def directed?
-      @is_directed
+      @structure.directed?
     end
 
     def add_node(node)
-      @index[node] ||= Set.new
+      @structure.add_node(node)
     end
 
     def create_edge(&block)
-      edge = Edge.new
-      yield edge
-      add_edge(edge)
+      @structure.create_edge(&block)
     end
 
     def create_node(&block)
-      node = Node.new
-      yield node
-      add_node(node)
+      @structure.create_node(&block)
     end
 
     def add_edge(edge)
-      add_node(edge.from)
-      add_node(edge.to)
-
-      @index[edge.from].add(edge.to)
-      @index[edge.to].add(edge.from) unless directed?
+      @structure.add_edge(edge)
     end
 
     def has_node?(node)
-      @index.key?(node)
+      @structure.has_node?(node)
     end
 
     def has_edge?(edge)
-      has_node?(edge.from) && @index[edge.from].include?(edge.to)
+      @structure.has_edge?(edge)
     end
 
     def node(id)
-      @index.keys.find { |node| node.id == id }
+      @structure.node(id)
     end
 
     def nodes
-      @index.keys
+      @structure.nodes
     end
 
     def each_node(&blk)
-      @index.each_key(&blk)
+      @structure.each_node(&blk)
     end
 
     def each_adjacent(node, &blk)
-      @index[node].each(&blk)
+      @structure.each_adjacent(node, &blk)
     end
 
     def each_edge(&blk)
-      if directed?
-        each_node do |from|
-          each_adjacent(from) do |to|
-            yield Edge.new(from, to)
-          end
-        end
-      else
-        raise 'Edge traversal unsupported for undirected graphs'
-      end
+      @structure.each_edge(&blk)
     end
   end
 end

data/lib/mementus/structure.rb

@@ -0,0 +1,82 @@
+module Mementus
+  class Structure
+    def initialize(is_directed)
+      @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 create_edge(&block)
+      edge = Edge.new
+      yield edge
+      add_edge(edge)
+    end
+
+    def add_node(node)
+      @index[node] ||= Set.new
+    end
+
+    def create_node(&block)
+      node = Node.new
+      yield node
+      add_node(node)
+    end
+
+    def add_edge(edge)
+      add_node(edge.from)
+      add_node(edge.to)
+
+      @index[edge.from].add(edge.to)
+      @index[edge.to].add(edge.from) unless directed?
+    end
+
+    def has_node?(node)
+      @index.key?(node)
+    end
+
+    def has_edge?(edge)
+      has_node?(edge.from) && @index[edge.from].include?(edge.to)
+    end
+
+    def node(id)
+      @index.keys.find { |node| node.id == id }
+    end
+
+    def nodes
+      @index.keys
+    end
+
+    def each_node(&blk)
+      @index.each_key(&blk)
+    end
+
+    def each_adjacent(node, &blk)
+      @index[node].each(&blk)
+    end
+
+    def each_edge(&blk)
+      if directed?
+        each_node do |from|
+          each_adjacent(from) do |to|
+            yield Edge.new(from, to)
+          end
+        end
+      else
+        raise 'Edge traversal unsupported for undirected graphs'
+      end
+    end
+  end
+end

data/lib/mementus/version.rb

@@ -1,3 +1,3 @@
 module Mementus
-  VERSION = '0.2.4'.freeze
+  VERSION = '0.2.5'.freeze
 end

data/lib/mementus.rb

@@ -1,9 +1,11 @@
 require_relative 'mementus/graph'
+require_relative 'mementus/structure'
 require_relative 'mementus/node'
 require_relative 'mementus/edge'
 require_relative 'mementus/node_proxy'
 require_relative 'mementus/depth_first_search'
 require_relative 'mementus/breadth_first_search'
+require_relative 'mementus/query/traversal'
 require_relative 'mementus/query/source'
 require_relative 'mementus/query/step'
 require_relative 'mementus/query/traversal'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mementus
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - maetl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-13 00:00:00.000000000 Z
+date: 2016-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -76,6 +76,7 @@ files:
 - lib/mementus/query/step.rb
 - lib/mementus/query/traversal.rb
 - lib/mementus/relation.rb
+- lib/mementus/structure.rb
 - lib/mementus/version.rb
 - mementus.gemspec
 - spec/graph_spec.rb