red_grape 0.0.4 → 0.0.5

data/README.md

@@ -26,11 +26,10 @@ RedGrape is an in-memory graph database written in ruby. I made this in order to
 ## REPL:
 
     $ bin/redgrape
-            T
-          ooooo
-    -----  ooo  -----
-     RED    o   GRAPE
-    -----------------
+             T
+           oOOOo
+            oOo
+    -------- O --------
     ruby :001 > g = RedGrape.create_tinker_graph
      => redgrape[vertices:6 edges:6] 
     ruby :002 > g.class
@@ -69,6 +68,11 @@ In REPL, the `take' method which invokes all pipes is automatically called.
 ### SERVER:
 
     $ ./bin/trellis
+      +=================+
+      |  +     T     +  |
+      | oOo  oOOOo  oOo |
+      |  8    oOo    8  |
+      |        O        |       
     Start server: druby://localhost:28282
     [Ctrl+C to stop]
 
@@ -76,10 +80,9 @@ In REPL, the `take' method which invokes all pipes is automatically called.
 
     $ ./bin/redgrape 
              T
-           ooooo
-    ------  ooo  ------
-      RED    o   GRAPE
-    -------------------
+           oOOOo
+            oOo
+    -------- O --------
     ruby-1.9.3-head :001 > store = RedGrape::GraphStore.open
      => #<RedGrape::GraphStore:0x007fb615137a90> 
     ruby-1.9.3-head :002 > store.graphs

data/bin/redgrape

@@ -1,80 +1,30 @@
 #!/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'
+require 'red_grape/irg'
+require 'red_grape/version'
 
-RedGrape.set_auto_take
-module RedGrape
-  module Help
-    module_function
-
-    def redgrape?(key=nil)
-      case key
-      when NilClass
-        puts help_message
-        :OK
-      when 'pipe', 'pipes', :pipe, :pieps
-        puts pipe_help_message
-        :OK
-      else
-        puts '?'
-        :NG
-      end
-    end
-
-    def help_message
-      <<-EOS
-Subcommands:
-  redgrape? :pipe         : list all pipes.
-      EOS
-  #redgrape? '[pipe name]' : describe the given pipe.
-    end
-
-    def pipe_help_message
-      pipes = RedGrape::Pipe.constants.map(&:to_s).select{|p| 
-        p =~ /.*Pipe$/}.map{|p| underscore p.sub(/Pipe$/, '')}
-      "Available pipes:\n  #{pipes.sort.join ', '}"
-    end
-
-    def underscore(str)
-      str.sub(/^[A-Z]/){|p| p.downcase}.gsub(/([a-z])([A-Z])/){"#{$1}_#{$2.downcase}"}
-    end
-
-    def camelcase(str)
-      str.sub(/^[a-z]/){|p| p.upcase}.gsub(/_([a-z])/){"#{$1.upcase}"}
-    end
-  end
-end
-
-def redgrape?(key=nil)
-  RedGrape::Help.redgrape? key 
-end
-
-alias rg? redgrape?
-
+# interprete options
+::Version = RedGrape::VERSION
 COMMAND_LINE = "#{$0} #{ARGV.join(' ')}"
-OPT = {}
+OPT = {
+  port:RedGrape::GraphStore::DEFAULT_PORT
+}
 opts = OptionParser.new
-#opts.on('-a <abc>'){|v| OPT[:abc] = v}
-#opts.on('-x', '--xyz <xyz>'){|v| OPT[:xyz] = v}
+opts.on('-p', '--port <port number>', 
+  "Set the port number for the connected datastore (default: #{OPT[:port]})"){|v| OPT[:port] = v.to_i}
 opts.on_tail('-v', '--version', 'Show version.'){puts(opts.ver); exit}
 opts.on_tail('-h', '--help', 'Show this message.'){puts(opts.help); exit}
-
-::Version = RedGrape::VERSION
 opts.order! ARGV
-CMD = ARGV.shift
 
-$store = RedGrape::GraphStore.open
-
-puts %Q{         T
-       o000o
-        o0o 
--------- 0 --oo-o--
-}
-
-IRB.start
+# start
+RedGrape::IRG.start(OPT[:port]) do
+  puts <<-EOS
+         T
+       oOOOo
+        oOo
+-------- O --------
+  EOS
+end

data/bin/trellis

@@ -5,23 +5,31 @@ require 'optparse'
 require 'red_grape/graph_store'
 require 'red_grape/version'
 
-DEFAULT_DBFILE = 'dbfile.bin'
-
+# interprete options
 ::Version = RedGrape::VERSION
 COMMAND_LINE = "#{$0} #{ARGV.join(' ')}"
-OPT = {}
+OPT = {
+  port:RedGrape::GraphStore::DEFAULT_PORT,
+  dbfile:'dbfile.bin'
+}
 opts = OptionParser.new
 opts.on('-p', '--port <port number>', 
-  "Set the port number (default: #{RedGrape::GraphStore::DEFAULT_PORT})"){|v| OPT[:port] = v}
+  "Set the port number (default: #{OPT[:port]})"){|v| OPT[:port] = v.to_i}
 opts.on('-d', '--file <datafile>', 
-  "Set the name of a file to store data (default: #{DEFAULT_DBFILE})"){|v| OPT[:dbfile] = v}
+  "Set the filename to store data (default: #{OPT[:dbfile]})"){|v| OPT[:dbfile] = v}
 opts.on_tail('-v', '--version', 'Show version'){puts(opts.ver); exit}
 opts.on_tail('-h', '--help', 'Show this message'){puts(opts.help); exit}
 opts.order! ARGV
 
+# start
 Signal.trap :INT, 'EXIT'
-RedGrape::GraphStore.start(:default, DEFAULT_DBFILE) do
+RedGrape::GraphStore.start(OPT[:port], OPT[:dbfile]) do
   puts <<-EOS
+  +=================+
+  |  +     T     +  |
+  | oOo  oOOOo  oOo |
+  |  8    oOo    8  |
+  |        O        |       
 Start server: #{DRb.uri}
 [Ctrl+C to stop]
   EOS

data/lib/red_grape/element.rb

@@ -27,16 +27,18 @@ module RedGrape
       end
     end
     
-    # set property value with type checking
+    # set property value with type checking if its definition exists
     def set_property(kid, v)
-      # TODO: should be refactored
-      desc = @property_description[kid]
-      if desc.accessible? v
-        self[desc.name] = v
-      elsif desc.convertable? v
-        self[desc.name] = desc.convert v
+      if @property_description && desc = @property_description[kid]
+        if desc.accessible? v
+          self[desc.name] = v
+        elsif desc.convertable? v
+          self[desc.name] = desc.convert v
+        else
+          raise ArgumentError.new "#{kid} should be #{desc.type}."
+        end
       else
-        raise ArgumentError.new "#{kid} should be #{desc.type}."
+        self[kid] = v
       end
     end
 

data/lib/red_grape/graph.rb

@@ -120,6 +120,7 @@ module RedGrape
     def add_vertex(id, v=nil)
       if v
         if v.is_a? Hash
+          id = id.to_s
           v = Vertex.new self, id, v
         end
       else
@@ -128,14 +129,15 @@ module RedGrape
           id = (v[:id] || v['id']).to_s
         elsif id.respond_to?(:id)
           v = id
-          id = v.id
+          id = v.id.to_s
         else
+          id = id.to_s
           v = {}
         end
         v = Vertex.new self, id, v
       end
-      id = id.to_s
       raise ArgumentError.new "invalid id" unless id == v.id
+      raise ArgumentError.new "#{id} already exists." if @vertices[id]
 
       @vertices[id] = v
     end
@@ -155,17 +157,19 @@ module RedGrape
     end
 
     def add_edge(id, from, to, label, opts={})
-      edge = if id.is_a? Edge
-          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
-          add_vertex from unless self.vertex(from.id)
-          add_vertex to unless self.vertex(to.id)
-          Edge.new self, id, from, to, label, opts
-        end
-      @edges[edge.id] = edge
+      if id.is_a? Edge
+        raise ArgumentError.new "#{id.id} already exists." if @edges[id.id]
+        @edges[id.id] = id
+      else
+        id = id.to_s
+        raise ArgumentError.new "#{id} already exists." if @edges[id]
+
+        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)
+        @edges[id] = Edge.new self, id, from, to, label, opts
+      end
     end
 
     def remove_edge(id)

data/lib/red_grape/graph_store.rb

@@ -4,15 +4,18 @@ 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
+      def start(port=nil, filename=nil, &block)
+        self.new(filename).start port, &block
       end
 
-      def open(uri=nil)
-        DRbObject.new_with_uri(uri || DEFAULT_URI)
+      def uri(port=nil)
+        "druby://localhost:#{port || DEFAULT_PORT}"
+      end
+
+      def open(port=nil)
+        DRbObject.new_with_uri(uri port)
       end
     end
 
@@ -48,22 +51,14 @@ module RedGrape
       @graphs[key.to_sym] = graph
     end
 
-    def start(uri=nil, &block)
+    def start(port=nil, &block)
       at_exit do
         File.open @filename, 'w' do |file|
           Marshal.dump @graphs, file
         end if @filename
       end
 
-      uri = case uri
-        when NilClass, :default
-          DEFAULT_URI
-        when Integer
-          "druby://localhost:#{uri}"
-        else
-          uri
-        end
-      DRb.start_service uri, self
+      DRb.start_service self.class.uri(port), self
       block.call if block
       sleep
     end

data/lib/red_grape/irg.rb

@@ -0,0 +1,68 @@
+require 'drb/drb'
+require 'irb'
+require 'irb/completion'
+require 'red_grape'
+require 'red_grape/graph_store'
+
+module RedGrape
+  class IRG
+    module Help
+      module_function
+      def redgrape?(key=nil)
+        case key
+        when NilClass
+          puts help_message
+          :OK
+        when 'pipe', 'pipes', :pipe, :pieps
+          puts pipe_help_message
+          :OK
+        else
+          puts '?'
+          :NG
+        end
+      end
+
+      def help_message
+        <<-EOS
+Subcommands:
+  redgrape? :pipe         : list all pipes.
+        EOS
+  #redgrape? '[pipe name]' : describe the given pipe.
+      end
+
+      def pipe_help_message
+        pipes = RedGrape::Pipe.constants.map(&:to_s).select{|p| 
+          p =~ /.*Pipe$/}.map{|p| underscore p.sub(/Pipe$/, '')}
+        "Available pipes:\n  #{pipes.sort.join ', '}"
+      end
+
+      def underscore(str)
+        str.sub(/^[A-Z]/){|p| p.downcase}.gsub(/([a-z])([A-Z])/){"#{$1}_#{$2.downcase}"}
+      end
+
+      def camelcase(str)
+        str.sub(/^[a-z]/){|p| p.upcase}.gsub(/_([a-z])/){"#{$1.upcase}"}
+      end
+    end
+
+    class << self
+      def start(port=nil, &block)
+        self.new.start port, &block
+      end
+    end
+
+    def start(port=nil, &block)
+      Kernel.module_eval %Q{
+        def redgrape?(key=nil)
+          RedGrape::IRG::Help.redgrape? key
+        end
+        alias rg? redgrape?
+      }
+
+      RedGrape.set_auto_take
+      $store = RedGrape::GraphStore.open port if port
+      block.call if block
+      IRB.start
+    end
+  end
+end

data/lib/red_grape/version.rb

@@ -1,3 +1,3 @@
 module RedGrape
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/test/all.rb

@@ -0,0 +1,4 @@
+require 'test/unit'
+Dir["#{File.dirname(__FILE__)}/test_*.rb"].each do |name|
+  require name
+end

data/test/test_graph.rb

@@ -7,6 +7,9 @@ class GraphTest < Test::Unit::TestCase
     graph.add_vertex id:1, val:'a'
     graph.add_vertex id:2, val:'b'
     graph.add_vertex id:3, val:'c'
+    assert_raise(ArgumentError) do
+      graph.add_vertex id:3, val:'d'
+    end
 
     assert_equal 3, graph.vertex.size
     assert_equal '1', graph.vertex(1).id
@@ -104,7 +107,7 @@ class GraphTest < Test::Unit::TestCase
     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
+    e23 = g.add_edge 2, 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)
@@ -128,7 +131,7 @@ class GraphTest < Test::Unit::TestCase
     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
+    e23 = g.add_edge 2, 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)
@@ -141,7 +144,7 @@ class GraphTest < Test::Unit::TestCase
     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
+    e23 = g.add_edge 2, 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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: red_grape
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-07 00:00:00.000000000 Z
+date: 2012-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70245490551240 !ruby/object:Gem::Requirement
+  requirement: &70107699251780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70245490551240
+  version_requirements: *70107699251780
 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 any
   serious purpose.
@@ -36,10 +36,8 @@ files:
 - .autotest
 - .gitignore
 - Gemfile
-- History.txt
 - README.md
 - Rakefile
-- TODO.txt
 - bin/redgrape
 - bin/trellis
 - data/graph-example-1.xml
@@ -52,6 +50,7 @@ files:
 - lib/red_grape/element.rb
 - lib/red_grape/graph.rb
 - lib/red_grape/graph_store.rb
+- lib/red_grape/irg.rb
 - lib/red_grape/path_group.rb
 - lib/red_grape/pipe/aggregate_pipe.rb
 - lib/red_grape/pipe/as_pipe.rb
@@ -80,6 +79,7 @@ files:
 - lib/red_grape/version.rb
 - lib/red_grape/vertex.rb
 - red_grape.gemspec
+- test/all.rb
 - test/test_element.rb
 - test/test_graph.rb
 - test/test_on_the_nature_of_pipes.rb
@@ -112,6 +112,7 @@ signing_key:
 specification_version: 3
 summary: RedGrape - Extremely Simple GraphDB
 test_files:
+- test/all.rb
 - test/test_element.rb
 - test/test_graph.rb
 - test/test_on_the_nature_of_pipes.rb

data/History.txt

@@ -1,6 +0,0 @@
-=== 1.0.0 / 2012-05-16
-
-* 1 major enhancement
-
-  * Birthday!
-

data/TODO.txt

@@ -1,23 +0,0 @@
-TODO
-* serialize a graph
-* implement tinkerpop methods
-* use symbols for keys
-* customize irb prompt
-
-DONE
-* show features
-* marshal
-* readonly graph
-* use dRuby for persistence
-* cut a GraphML reader function from Graph class
-
-MEMO
-#IRB.init_config 'redgrape'
-#IRB.conf[:PROMPT][:RED_GRAPE] = {
-#  :PROMPT_I => "abc%N(%m):%03n:%i> ",
-#  :PROMPT_S => "abc%N(%m):%03n:%i%l ",
-#  :PROMPT_C => "abc%N(%m):%03n:%i* ",
-#  :RETURN => "%s\n"
-#}
-#IRB.conf[:PROMPT_MODE] = :RED_GRAPE
-