red_grape 0.0.2 → 0.0.3

data/Manifest.txt

@@ -4,15 +4,15 @@ Rakefile
 README.txt
 History.txt
 bin/redgrape
+bin/trellis
 data/graph-example-1.xml
 data/graph-example-2.xml
 lib/ext/array_ext.rb
 lib/ext/object_ext.rb
-lib/red_grape.rb
-lib/red_grape/vertex.rb
 lib/red_grape/edge.rb
 lib/red_grape/element.rb
 lib/red_grape/graph.rb
+lib/red_grape/graph_store.rb
 lib/red_grape/path_group.rb
 lib/red_grape/pipe/aggregate_pipe.rb
 lib/red_grape/pipe/as_pipe.rb
@@ -38,6 +38,8 @@ lib/red_grape/pipe/side_effect_pipe.rb
 lib/red_grape/pipe/transform_pipe.rb
 lib/red_grape/property_description.rb
 lib/red_grape/serializer/graphml_serializer.rb
+lib/red_grape/vertex.rb
+lib/red_grape.rb
 test/test_element.rb
 test/test_graph.rb
 test/test_on_the_nature_of_pipes.rb

data/README.txt

@@ -4,7 +4,7 @@
 
 ## DESCRIPTION:
 
-RedGrape is an in-memory graph database written in ruby. I made this in order to learn how graph databases work so that please do not use this for serious purposes.
+RedGrape is an in-memory graph database written in ruby. I made this in order to learn how graph databases work so that please do not use this for any serious purpose.
 
 ## FEATURES/PROBLEMS:
 
@@ -25,7 +25,7 @@ RedGrape is an in-memory graph database written in ruby. I made this in order to
 
 ## REPL:
 
-  $ bin/redgrape 
+  $ bin/redgrape
           T
         ooooo
   -----  ooo  -----
@@ -64,6 +64,35 @@ RedGrape is an in-memory graph database written in ruby. I made this in order to
 
 In REPL, the `take' method which invokes all pipes is automatically called.
 
+## CLIENT/SERVER:
+
+### SERVER:
+
+    $ ./bin/trellis
+    Start server: druby://localhost:28282
+    [Ctrl+C to stop]
+
+### CLIENT:
+
+    $ ./bin/redgrape 
+             T
+           ooooo
+    ------  ooo  ------
+      RED    o   GRAPE
+    -------------------
+    ruby-1.9.3-head :001 > store = RedGrape::GraphStore.open
+     => #<RedGrape::GraphStore:0x007fb615137a90> 
+    ruby-1.9.3-head :002 > store.graphs
+     => [:tinker] 
+    ruby-1.9.3-head :003 > g = store.graph :tinker
+     => redgrape[vertices:6 edges:6] 
+    ruby-1.9.3-head :004 > g.v
+     => [v[1], v[2], v[3], v[4], v[5], v[6]] 
+    ruby-1.9.3-head :005 > g.v.out
+     => [v[2], v[4], v[3], v[5], v[3], v[3]] 
+    ruby-1.9.3-head :006 > g.v.out.name
+     => ["vadas", "josh", "lop", "ripple", "lop", "lop"] 
+
 ## REQUIREMENTS:
 
 * Nokogiri (http://nokogiri.org/)

data/bin/redgrape

@@ -1,10 +1,12 @@
 #!/usr/bin/env ruby
 $: << File.expand_path('../../lib', __FILE__)
 
+require 'drb/drb'
 require 'irb'
 require 'irb/completion'
 require 'optparse'
 require 'red_grape'
+require 'red_grape/graph_store'
 
 RedGrape.set_auto_take
 module RedGrape
@@ -67,6 +69,8 @@ opts.on_tail('-h', '--help', 'Show this message.'){puts(opts.help); exit}
 opts.order! ARGV
 CMD = ARGV.shift
 
+$store = RedGrape::GraphStore.open
+
 puts %Q{         T
        ooooo
 ------  ooo  ------

data/bin/trellis

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+$: << File.expand_path('../../lib', __FILE__)
+require 'red_grape/graph_store'
+
+RedGrape::GraphStore.start(:default, 'dbfile.bin') do
+  puts <<-EOS
+Start server: #{DRb.uri}
+[Ctrl+C to stop]
+  EOS
+end

data/lib/red_grape/edge.rb

@@ -14,6 +14,11 @@ module RedGrape
       @label = label
     end
 
+    def connected?(v)
+      id = v.is_a?(Vertex) ? v.id : v
+      @source.id == id.to_s || @target.id == id.to_s
+    end
+
     def to_s
       "e[#{@id}][#{@source.id}-#{@label}->#{@target.id}]"
     end

data/lib/red_grape/graph.rb

@@ -93,7 +93,7 @@ module RedGrape
       else
         if id.is_a? Hash
           v = id
-          id = v[:id] || v['id']
+          id = (v[:id] || v['id']).to_s
         elsif id.respond_to?(:id)
           v = id
           id = v.id
@@ -102,9 +102,24 @@ module RedGrape
         end
         v = Vertex.new self, id, v
       end
-      raise ArgumentError.new 'invalid id' unless id == v.id
+      id = id.to_s
+      raise ArgumentError.new "invalid id" unless id == v.id
 
-      @vertices[id.to_s] = v
+      @vertices[id] = v
+    end
+
+    def remove_vertex(id)
+      id = id.id if id.is_a? Vertex
+      v = @vertices.delete id.to_s
+      if v
+        v.out_edges.each do |e| 
+          remove_edge e
+        end
+        v.in_edges.each do |e|
+          remove_edge e
+        end
+      end
+      v
     end
 
     def add_edge(id, from, to, label, opts={})
@@ -112,8 +127,8 @@ module RedGrape
           id
         else
           id = id.to_s
-          from = self.vertex[from.to_s] unless from.is_a? Vertex
-          to = self.vertex[to.to_s] unless to.is_a? Vertex
+          from = self.vertex(from.to_s) unless from.is_a? Vertex
+          to = self.vertex(to.to_s) unless to.is_a? Vertex
           add_vertex from unless self.vertex(from.id)
           add_vertex to unless self.vertex(to.id)
           Edge.new self, id, from, to, label, opts
@@ -121,6 +136,22 @@ module RedGrape
       @edges[edge.id] = edge
     end
 
+    def remove_edge(id)
+      if id.is_a? Edge
+        e = id
+        id = id.id
+      else
+        id = id.to_s
+        e = @edges[id]
+      end
+      @edges.delete id
+      if e
+        e.source.out_edges.delete e
+        e.target.in_edges.delete e
+      end
+      e
+    end
+
     def load(filename)
       @serializer.load filename
     end

data/lib/red_grape/graph_store.rb

@@ -0,0 +1,64 @@
+require 'drb/drb'
+require 'red_grape'
+
+module RedGrape
+  class GraphStore
+    DEFAULT_PORT = 28282
+    DEFAULT_URI = "druby://localhost:#{DEFAULT_PORT}"
+
+    class << self
+      def start(uri=nil, filename=nil, &block)
+        self.new(filename).start uri, &block
+      end
+
+      def open(uri=nil)
+        DRbObject.new_with_uri(uri || DEFAULT_URI)
+      end
+    end
+
+    def initialize(filename=nil)
+      @filename = filename
+      @graphs =
+        if @filename && File.exist?(@filename)
+          File.open @filename, 'r' do |file|
+            Marshal.load file
+          end
+        else
+          {tinker:RedGrape::Graph.create_tinker_graph}
+        end
+    end
+
+    def graphs
+      @graphs.keys.sort
+    end
+
+    def graph(key)
+      self[key]
+    end
+
+    def put_graph(key, graph)
+      self[key] = graph
+    end
+
+    def [](key)
+      @graphs[key.to_sym]
+    end
+
+    def []=(key, graph)
+      @graphs[key.to_sym] = graph
+    end
+
+    def start(uri=nil, &block)
+      at_exit do
+        File.open @filename, 'w' do |file|
+          Marshal.dump @graphs, file
+        end if @filename
+      end
+
+      uri = DEFAULT_URI if uri.nil? || uri == :default
+      DRb.start_service uri, self
+      block.call if block
+      sleep
+    end
+  end
+end

data/lib/red_grape/vertex.rb

@@ -13,7 +13,7 @@ module RedGrape
 
     def initialize(graph, id, opts={})
       super graph, opts
-      @id = id
+      @id = id.to_s
       @out_edges = []
       @in_edges = []
     end

data/lib/red_grape.rb

@@ -23,7 +23,7 @@ require 'red_grape/pipe/cap_pipe'
 require 'red_grape/graph'
 
 module RedGrape
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 
   module_function
   def set_auto_take(val=true)

data/test/test_graph.rb

@@ -9,7 +9,7 @@ class GraphTest < Test::Unit::TestCase
     graph.add_vertex id:3, val:'c'
 
     assert_equal 3, graph.vertex.size
-    assert_equal 1, graph.vertex(1).id
+    assert_equal '1', graph.vertex(1).id
     #assert_equal 2, graph.vertex(1, 2).size # TODO
     assert_equal 3, graph.vertex(1, 2, 3).size
     assert_equal 2, graph.vertex([1, 2]).size
@@ -68,4 +68,76 @@ class GraphTest < Test::Unit::TestCase
     assert_equal 'marko', graph.edge(5).source.name
     assert_equal 'lop', graph.edge(5).target.name
   end
+
+  def test_add_vertex
+    g = RedGrape::Graph.new
+    g.add_vertex id:1, val:'a'
+    v1 = g.v(1)
+    assert_equal '1', v1.id
+    assert_equal 'a', v1.val
+
+    g.add_vertex '2', val:'b'
+    v2 = g.v(2)
+    assert_equal '2', v2.id
+    assert_equal 'b', v2.val
+
+    v3 = RedGrape::Vertex.new nil, 3, val:'c'
+    g.add_vertex '3', v3
+    assert_equal v3, g.v(3)
+    assert_equal '3', v3.id
+    assert_equal 'c', v3.val
+
+    assert_raise(ArgumentError) do
+      g.add_vertex '4', v3
+    end
+  end
+
+  def test_remove_vertex
+    g = RedGrape::Graph.new
+    v1 = g.add_vertex 1
+    v2 = g.add_vertex 2
+    v3 = g.add_vertex 3
+    e12 = g.add_edge 1, 1, 2, :connect
+    e23 = g.add_edge 1, 2, 3, :connect
+    assert v1.out_edges.map(&:id).include?(e12.id)
+    assert v2.in_edges.map(&:id).include?(e12.id)
+    assert v2.out_edges.map(&:id).include?(e23.id)
+    assert v3.in_edges.map(&:id).include?(e23.id)
+
+    g.remove_vertex v2
+    assert !v1.out_edges.map(&:id).include?(e12.id)
+    assert !v3.in_edges.map(&:id).include?(e23.id)
+  end
+
+  def test_add_edge
+    g = RedGrape::Graph.new
+    v1 = g.add_vertex 1
+    v2 = g.add_vertex 2
+    v3 = g.add_vertex 3
+    e12 = g.add_edge 1, 1, 2, :connect
+    e23 = g.add_edge 1, 2, 3, :connect
+    assert v1.out_edges.map(&:id).include?(e12.id)
+    assert v2.in_edges.map(&:id).include?(e12.id)
+    assert v2.out_edges.map(&:id).include?(e23.id)
+    assert v3.in_edges.map(&:id).include?(e23.id)
+  end
+
+  def test_remove_edge
+    g = RedGrape::Graph.new
+    v1 = g.add_vertex 1
+    v2 = g.add_vertex 2
+    v3 = g.add_vertex 3
+    e12 = g.add_edge 1, 1, 2, :connect
+    e23 = g.add_edge 1, 2, 3, :connect
+    assert v1.out_edges.map(&:id).include?(e12.id)
+    assert v2.in_edges.map(&:id).include?(e12.id)
+    assert v2.out_edges.map(&:id).include?(e23.id)
+    assert v3.in_edges.map(&:id).include?(e23.id)
+
+    g.remove_edge e12
+    assert !v1.out_edges.map(&:id).include?(e12.id)
+    assert !v2.in_edges.map(&:id).include?(e12.id)
+    assert v2.out_edges.map(&:id).include?(e23.id)
+    assert v3.in_edges.map(&:id).include?(e23.id)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: red_grape
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-04 00:00:00.000000000 Z
+date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70172128259100 !ruby/object:Gem::Requirement
+  requirement: &70272812464840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *70172128259100
+  version_requirements: *70272812464840
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70172128258660 !ruby/object:Gem::Requirement
+  requirement: &70272812464400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,14 +32,15 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70172128258660
+  version_requirements: *70272812464400
 description: RedGrape is an in-memory graph database written in ruby. I made this
-  in order to learn how graph databases work so that please do not use this for serious
-  purposes.
+  in order to learn how graph databases work so that please do not use this for any
+  serious purpose.
 email:
 - andyjpn@gmail.com
 executables:
 - redgrape
+- trellis
 extensions: []
 extra_rdoc_files:
 - Manifest.txt
@@ -52,15 +53,15 @@ files:
 - README.txt
 - History.txt
 - bin/redgrape
+- bin/trellis
 - data/graph-example-1.xml
 - data/graph-example-2.xml
 - lib/ext/array_ext.rb
 - lib/ext/object_ext.rb
-- lib/red_grape.rb
-- lib/red_grape/vertex.rb
 - lib/red_grape/edge.rb
 - lib/red_grape/element.rb
 - lib/red_grape/graph.rb
+- lib/red_grape/graph_store.rb
 - lib/red_grape/path_group.rb
 - lib/red_grape/pipe/aggregate_pipe.rb
 - lib/red_grape/pipe/as_pipe.rb
@@ -86,6 +87,8 @@ files:
 - lib/red_grape/pipe/transform_pipe.rb
 - lib/red_grape/property_description.rb
 - lib/red_grape/serializer/graphml_serializer.rb
+- lib/red_grape/vertex.rb
+- lib/red_grape.rb
 - test/test_element.rb
 - test/test_graph.rb
 - test/test_on_the_nature_of_pipes.rb