mementus 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d0e0ff3ecc407016774cd2c78afd992296f7a4a
-  data.tar.gz: 0a9d6fcedc13f06dbec244662182cfa0a319fcab
+  metadata.gz: 75d9e45b6f61e81a565778acd8ca1a93a763d8fb
+  data.tar.gz: 1ce3f1e3a209c02a36fcb84600ac565896a47b6f
 SHA512:
-  metadata.gz: 3c8c9a6a494b072019580ad80edf5ddcdf15781b0269e747bf615e9c8eb90235c59d7453daf4b90323ae0bd588565d09b7bbfa742459952f6c8f47a7e8c8ce7a
-  data.tar.gz: 93e7943eca3b04fb38eb957a0cc6c453e6065fefc7137c895279117ff1d8f66920ff18de51582cd920392424895852a0aa017a9007d74efa0917450370b37588
+  metadata.gz: 94efd5b8b753183f713b8eb2b66970de1c697b53af99631aa1e31606460b71fd6a0008f5c83e8bdda327243a55b420c494c91e134b799b1bf4780c66a3771f1b
+  data.tar.gz: 1296fc4d4dd27f4d268b8365241ed0e0c383449c4b79a52ada9f7b0b3f721ef4039d62ee7937289e73f405a04e35d86e2bf8d2e7e30c7488df60c0b91b120cc8

data/.travis.yml

@@ -2,7 +2,9 @@ language: ruby
 rvm:
   - 2.1
   - 2.2
-  - rbx-2
+  - 2.3.1
+  - 2.4.0-preview1
+  - ruby-head
   - jruby-9
   - jruby-head
 before_install: gem install bundler -v 1.10.6

data/lib/mementus/breadth_first_search.rb

@@ -14,14 +14,14 @@ module Mementus
     private
 
     def visit(id, &block)
-      @queue.concat(@graph.adjacent(id))
+      @queue.concat(@graph.outgoing(id))
 
       while next_node = @queue.shift
         next if @visited[next_node]
 
         @visited[next_node] = true
         block.call(next_node)
-        @queue.concat(@graph.adjacent(next_node.id))
+        @queue.concat(@graph.outgoing(next_node.id))
       end
     end
   end

data/lib/mementus/depth_first_search.rb

@@ -13,7 +13,7 @@ module Mementus
     private
 
     def visit(id, &block)
-      @graph.adjacent(id).each do |adj_node|
+      @graph.outgoing(id).each do |adj_node|
         next if @visited[adj_node.id]
 
         @visited[adj_node.id] = true

data/lib/mementus/graph.rb

@@ -52,7 +52,7 @@ module Mementus
       @structure.nodes(match)
     end
 
-    def adjacent(id, match=nil)
+    def outgoing(id, match=nil)
       @structure.adjacent(id, match)
     end
 
@@ -60,8 +60,8 @@ module Mementus
       @structure.incoming(id, match)
     end
 
-    def adjacent_edges(id, match=nil)
-      @structure.adjacent_edges(id, match)
+    def outgoing_edges(id, match=nil)
+      @structure.outgoing_edges(id, match)
     end
 
     def incoming_edges(id, match=nil)

data/lib/mementus/library/story_graph.rb

@@ -29,6 +29,7 @@ module Mementus
             edge.from = "start"
             edge.to = "happy-ending"
             edge.props[:text] = "Choose wisely."
+            edge.props[:happiness] = 1
           end
 
           create_edge do |edge|
@@ -37,6 +38,7 @@ module Mementus
             edge.from = "start"
             edge.to = "tragic-ending"
             edge.props[:text] = "Choose poorly."
+            edge.props[:happiness] = -1
           end
         end
       end

data/lib/mementus/node_proxy.rb

@@ -33,16 +33,17 @@ module Mementus
       @graph.each_adjacent(@node.id, &block)
     end
 
-    def adjacent(match=nil)
-      @graph.adjacent(@node.id, match)
+    def outgoing(match=nil)
+      @graph.outgoing(@node.id, match)
     end
 
     def incoming(match=nil)
       @graph.incoming(@node.id, match)
     end
 
-    def adjacent_edges(match=nil)
-      @graph.adjacent_edges(@node.id, match)
+    # TODO: Fix
+    def outgoing_edges(match=nil)
+      @graph.outgoing_edges(@node.id, match)
     end
   end
 end

data/lib/mementus/pipeline/step.rb

@@ -60,7 +60,7 @@ module Mementus
       # Traverse to the outgoing nodes adjacent to the source elements.
       def out(match=nil)
         outgoing_nodes = source.inject([]) do |result, node|
-          result.concat(node.adjacent(match))
+          result.concat(node.outgoing(match))
         end
 
         Step.new(outgoing_nodes)
@@ -78,7 +78,7 @@ module Mementus
       # Traverse to the outgoing edges from the source elements.
       def out_e(match=nil)
         outgoing_edges = source.inject([]) do |result, node|
-          result.concat(graph.adjacent_edges(node.id, match))
+          result.concat(graph.outgoing_edges(node.id, match))
         end
 
         Step.new(outgoing_edges)

data/lib/mementus/structure/adjacency_list.rb

@@ -25,19 +25,27 @@ module Mementus
       end
 
       def set_edge(edge)
-        set_node(edge.from) unless has_node?(edge.from)
-        set_node(edge.to) unless has_node?(edge.to)
+        set_node(edge.from) unless has_node?(edge.from.id)
+        set_node(edge.to) unless has_node?(edge.to.id)
 
         @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)
+        if node.is_a?(Mementus::Node) || node.is_a?(Mementus::NodeProxy)
+          @index.key?(node.id)
+        else
+          @index.key?(node)
+        end
       end
 
       def has_edge?(edge)
-        has_node?(edge.from) && @index[edge.from.id].include?(edge.to.id)
+        if edge.is_a?(Mementus::Edge) || edge.is_a?(Mementus::EdgeProxy)
+          has_node?(edge.from.id) && @index[edge.from.id].include?(edge.to.id)
+        else
+          raise 'Edge IDs are not supported by this data structure'
+        end
       end
 
       def node(id)

data/lib/mementus/structure/incidence_list.rb

@@ -24,7 +24,11 @@ module Mementus
       end
 
       def has_node?(node)
-        @nodes.key?(node.id)
+        if node.is_a?(Mementus::Node) || node.is_a?(Mementus::NodeProxy)
+          @nodes.key?(node.id)
+        else
+          @nodes.key?(node)
+        end
       end
 
       def has_edge?(edge)
@@ -40,8 +44,8 @@ module Mementus
       end
 
       def set_edge(edge)
-        set_node(edge.from) unless has_node?(edge.from)
-        set_node(edge.to) unless has_node?(edge.to)
+        set_node(edge.from) unless has_node?(edge.from.id)
+        set_node(edge.to) unless has_node?(edge.to.id)
 
         @edges[edge.id] = EdgeProxy.new(edge, self)
         @outgoing[edge.from.id] << edge.to.id
@@ -119,7 +123,7 @@ module Mementus
         adjacent(id, match, :in)
       end
 
-      def adjacent_edges(id, match=nil, direction=:out)
+      def incident_edges(id, match=nil, direction=:out)
         directional_index = case direction
         when :out then @outgoing_e
         when :in then @incoming_e
@@ -141,11 +145,11 @@ module Mementus
       end
 
       def outgoing_edges(id, match=nil)
-        adjacent_edges(id, match, :out)
+        incident_edges(id, match, :out)
       end
 
       def incoming_edges(id, match=nil)
-        adjacent_edges(id, match, :in)
+        incident_edges(id, match, :in)
       end
     end
   end

data/lib/mementus/version.rb

@@ -1,3 +1,3 @@
 module Mementus
-  VERSION = '0.5.6'.freeze
+  VERSION = '0.5.7'.freeze
 end

data/spec/graph_spec.rb

@@ -140,7 +140,7 @@ describe Mementus::Graph do
       set_node(node_1)
     end
 
-    expect(graph.has_node?(node_1)).to be true
+    expect(graph.has_node?(node_1.id)).to be true
   end
 
   specify '#has_edge?' do

data/spec/node_proxy_spec.rb

@@ -1,23 +1,23 @@
 require 'spec_helper'
 
 describe Mementus::NodeProxy do
-  specify '#adjacent' do
+  specify '#outgoing' do
     graph = Mementus::Graph.new do
       set_edge(edge_1_2)
       set_edge(edge_1_3)
     end
 
     node_proxy = Mementus::NodeProxy.new(node_1, graph)
-    expect(node_proxy.adjacent.map { |node| node.id }).to eq([node_2.id, node_3.id])
+    expect(node_proxy.outgoing.map { |node| node.id }).to eq([node_2.id, node_3.id])
   end
 
-  specify '#adjacent_edges' do
+  specify '#outgoing_edges' do
     graph = Mementus::Graph.new do
       set_edge(edge_1_2)
       set_edge(edge_1_3)
     end
 
     node_proxy = Mementus::NodeProxy.new(node_1, graph)
-    expect(node_proxy.adjacent_edges.map { |edge| edge.to.id }).to eq([node_2.id, node_3.id])
+    expect(node_proxy.outgoing_edges.map { |edge| edge.to.id }).to eq([node_2.id, node_3.id])
   end
 end

data/spec/structure/indexed_graph_example.rb

@@ -30,16 +30,23 @@ shared_examples_for "an indexed graph data structure" do
   end
 
   describe '#has_node?' do
-    it 'tests for the presence of a given node' do
+    it 'tests for the presence of a given node by value' do
       node = Mementus::Node.new(id: 1)
       structure.set_node(node)
 
       expect(structure.has_node?(node)).to be true
     end
+
+    it 'tests for the presence of a given node by id' do
+      node = Mementus::Node.new(id: 1)
+      structure.set_node(node)
+
+      expect(structure.has_node?(1)).to be true
+    end
   end
 
   describe '#has_edge?' do
-    it 'tests for the presence of a given edge' do
+    it 'tests for the presence of a given edge by value' do
       edge = Mementus::Edge.new(from: Mementus::Node.new(id: 1), to: Mementus::Node.new(id: 2))
       structure.set_edge(edge)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mementus
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - maetl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-17 00:00:00.000000000 Z
+date: 2016-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler