red_grape 0.0.11 → 0.0.12

data/.gitignore

@@ -2,3 +2,4 @@
 dbfile.bin
 pkg/
 red_grape-*.gem
+public

data/README.md

@@ -99,6 +99,7 @@ Changes on a graph are not committed until the put_graph method is called.
 ## Requirements:
 
 * Nokogiri (http://nokogiri.org/)
+* Sinatra (http://www.sinatrarb.com/)
 
 ## Developers:
 

data/bin/juicer

@@ -0,0 +1,111 @@
+#!/usr/bin/env ruby
+$: << File.expand_path('../../lib', __FILE__)
+
+require 'sinatra'
+require 'red_grape'
+
+use Rack::Static, :urls => ['/cellar', '/js', '/css'], :root => 'public'
+
+graphs = {
+  'tinkergraph' => RedGrape.create_tinker_graph
+}
+
+get '/' do
+  {
+    version: RedGrape::VERSION,
+    supportedPaths: {
+      GET: [
+        '/graphs',
+        '/graphs/[graph]',
+        '/graphs/[graph]/vertices',
+        '/graphs/[graph]/vertices?key=[key]&value=[value]',
+        '/graphs/[graph]/vertices/[vertex]',
+        '/graphs/[graph]/vertices/[vertex]/out',
+        '/graphs/[graph]/vertices/[vertex]/in',
+        '/graphs/[graph]/vertices/[vertex]/both',
+        '/graphs/[graph]/vertices/[vertex]/[dir]?_label=[label]',
+        '/graphs/[graph]/edges',
+        '/graphs/[graph]/edges/[edge]',
+        '/graphs/[graph]/vertices/[edge]/outE',
+        '/graphs/[graph]/vertices/[edge]/inE',
+        '/graphs/[graph]/vertices/[edge]/bothE',
+        '/graphs/[graph]/vertices/[edge]/[dir]E?_label=[label]',
+      ],
+      POST: [
+        #'/graphs/[graph]/vertices',
+        #'/graphs/[graph]/vertices/[vertex]',
+        #'/graphs/[graph]/vertices/[vertex]?[key1]=[value1]&[key2]=[value2]',
+        #'/graphs/[graph]/edges?_outV=[vertex1]&_label=[label]&_inV=[vertex2]&[key1]=[value1]&=[key2]=[value2]',
+        #'/graphs/[graph]/edges/[edge]?_outV=[vertex1]&_label=[label]&_inV=[vertex2]&[key1]=[value1]&=[key2]=[value2]',
+        #'/graphs/[graph]/edges/[edge]?[key1]=[key2]'
+      ],
+      PUT: [
+        #'/graphs/[graph]/vertices/[vertex]?[key1]=[value1]&[key2]=[value2]',
+        #'/graphs/[graph]/edges/[edge]?[key1]=[value1]&[key2]=[value2]'
+      ],
+      DELETE: [
+        #'/graphs/[graph]/vertices/[vertex]',
+        #'/graphs/[graph]/vertices/[vertex]?[key1]&[key2]',
+        #'/graphs/[graph]/edges/[edge]',
+        #'/graphs/[graph]/edges/[edge]?[key1]&[key2]'
+      ]
+    }
+  }.to_pretty_json
+end
+
+get %r{/graphs/?$} do
+  {
+    version: RedGrape::VERSION,
+    name: 'Juicer: A Graph Server',
+    graphs: graphs.keys
+  }.to_pretty_json
+end
+
+get %r{/graphs/([^/]+)/?$} do |graph_id|
+  graphs[graph_id].to_h.to_pretty_json
+end
+
+get %r{/graphs/([^/]+)/vertices/?$} do |graph_id|
+  graph = graphs[graph_id]
+  k, v = params['key'], params['value']
+  vertices =
+    if k
+      graph.vertex.find_all{|e| e[k].to_s == v}
+    else
+      graph.vertex
+    end
+  vertices.map(&:to_h).to_pretty_json
+end
+
+get %r{/graphs/([^/]+)/vertices/([^/]+)/?$} do |graph_id, vertex_id|
+  graphs[graph_id].vertex(vertex_id).to_h.to_pretty_json
+end
+
+get %r{/graphs/([^/]+)/vertices/([^/]+)/(out|in|both)/?$} do |graph_id, vertex_id, dir|
+  label = params['_label']
+  vertex = graphs[graph_id].vertex(vertex_id)
+  if label
+    vertex.send(dir, label)[].map(&:to_h).to_pretty_json
+  else
+    vertex.send(dir)[].map(&:to_h).to_pretty_json
+  end
+end
+
+get %r{/graphs/([^/]+)/edges/?$} do |graph_id|
+  graphs[graph_id].edge.map(&:to_h).to_pretty_json
+end
+
+get %r{/graphs/([^/]+)/edges/([^/]+)/?$} do |graph_id, edge_id|
+  graphs[graph_id].edge(edge_id).to_h.to_pretty_json
+end
+
+get %r{/graphs/([^/]+)/vertices/([^/]+)/(out_e|in_e|both_e|outE|inE|bothE)/?$} do |graph_id, vertex_id, dir|
+  label = params['_label']
+  vertex = graphs[graph_id].vertex(vertex_id)
+  if label
+    vertex.send(dir, label)[].map(&:to_h).to_pretty_json
+  else
+    vertex.send(dir)[].map(&:to_h).to_pretty_json
+  end
+end
+

data/lib/ext/object_ext.rb

@@ -1,3 +1,4 @@
+require 'json'
 require 'red_grape/pipe/underscore_pipe'
 
 class Object
@@ -6,4 +7,8 @@ class Object
   def pass_through(pipe, context)
     pipe.pass self, context
   end
+
+  def to_pretty_json
+    JSON.pretty_generate self
+  end
 end

data/lib/red_grape/edge.rb

@@ -29,5 +29,18 @@ module RedGrape
     def to_s
       "e[#{@id}][#{@source.id}-#{@label}->#{@target.id}]"
     end
+
+    def to_h
+      {
+        version: RedGrape::VERSION,
+        results: {
+          _type: '_edge',
+          _id: @id,
+          _label: @label,
+          _source: @source.id,
+          _target: @target.id
+        }.merge(@property)
+      }
+    end
   end
 end

data/lib/red_grape/graph.rb

@@ -243,5 +243,16 @@ module RedGrape
     def to_s
       "redgrape[vertices:#{@vertices.size} edges:#{@edges.size}]"
     end
+
+    def to_h
+      {
+        version:RedGrape::VERSION,
+        name:'-',
+        graph:to_s,
+        features:self.class.features,
+        readOnly:readonly?,
+        type:self.class.name
+      }
+    end
   end
 end

data/lib/red_grape/pipe/as_pipe.rb

@@ -17,4 +17,3 @@ module RedGrape
     end
   end
 end
-

data/lib/red_grape/pipe/base.rb

@@ -57,12 +57,15 @@ module RedGrape
       def take(context=Context.new)
         if first?
           val = @prev.pass_through self, context
+          # TODO: should be refactored
           if context.aggregating?
             context.resume_from_aggregating
           elsif context.grouping?
             context.resume_from_grouping
           elsif context.gathering?
             context.resume_from_gathering
+          elsif context.counting?
+            context.resume_from_counting
           else
             val
           end

data/lib/red_grape/pipe/both_pipe.rb

@@ -0,0 +1,30 @@
+require 'red_grape/pipe/base'
+
+module RedGrape
+  module Pipe
+    module Both
+      def both(*opts)
+        BothPipe.new self, *opts
+      end
+    end
+
+    class BothPipe < Pipe::Base
+      def pipe_name
+        @opts.empty? ? super : "#{super}(#{@opts.first})"
+      end
+
+      def pass(obj, context)
+        group =
+          if self.opts.empty? or self.opts.first.empty? # TODO なぜかlabelに[]が入ってる
+            (obj.out_edges.map(&:target) + obj.in_edges.map(&:source)).uniq
+          else
+            label = self.opts.first
+            out_edges = obj.out_edges.find_all{|e| e.label == label}.map(&:target)
+            in_edges = obj.in_edges.find_all{|e| e.label == label}.map(&:source)
+            (out_edges + in_edges).uniq
+          end
+        pass_next context, obj, group
+      end
+    end
+  end
+end

data/lib/red_grape/pipe/context.rb

@@ -2,7 +2,7 @@ module RedGrape
   module Pipe
     class Context
       attr_accessor :it, :loops
-      attr_reader :history, :grouping_items
+      attr_reader :history, :grouping_items, :marks
 
       def initialize
         @history = []
@@ -11,6 +11,7 @@ module RedGrape
         @aggregated_items = {}
         @grouping_items = {}
         @gathering_items = []
+        @counting_items = []
         @loops = 1
       end
 
@@ -113,6 +114,20 @@ module RedGrape
         end
       end
 
+      def count(obj, next_pipe)
+        @counting_items << obj
+      end
+
+      def counting?
+        not @counting_items.empty?
+      end
+
+      def resume_from_counting
+        size = @counting_items.size
+        @counting_items.clear
+        size
+      end
+
       def eval(args={}, &block)
         args.each {|k, v| self.send "#{k}=", v}
         instance_eval(&block)

data/lib/red_grape/pipe/count_pipe.rb

@@ -0,0 +1,14 @@
+require 'red_grape/pipe/base'
+
+module RedGrape
+  module Pipe
+    class CountPipe < Pipe::Base
+      def pass(obj, context)
+        context.count obj, self.next
+        obj
+      end
+    end
+
+    SizePipe = CountPipe
+  end
+end

data/lib/red_grape/pipe/map_pipe.rb

@@ -0,0 +1,11 @@
+require 'red_grape/pipe/base'
+
+module RedGrape
+  module Pipe
+    class MapPipe < Pipe::Base
+      def pass(obj, context)
+        obj.property
+      end
+    end
+  end
+end

data/lib/red_grape/pipe/select_pipe.rb

@@ -0,0 +1,11 @@
+require 'red_grape/pipe/base'
+
+module RedGrape
+  module Pipe
+    class SelectPipe < Pipe::Base
+      def pass(obj, context)
+        context.marks
+      end
+    end
+  end
+end

data/lib/red_grape/vertex.rb

@@ -2,6 +2,7 @@ require 'red_grape/element'
 
 module RedGrape
   class Vertex < Element
+    include RedGrape::Pipe::Both
     include RedGrape::Pipe::Out
     include RedGrape::Pipe::OutE
     include RedGrape::Pipe::In
@@ -47,5 +48,15 @@ module RedGrape
     def to_s
       "v[#{@id}]"
     end
+
+    def to_h
+      {
+        version: RedGrape::VERSION,
+        results: {
+          _type: '_vertex',
+          _id: @id
+        }.merge(@property)
+      }
+    end
   end
 end

data/lib/red_grape.rb

@@ -1,5 +1,5 @@
 module RedGrape
-  VERSION = '0.0.11'
+  VERSION = '0.0.12'
 end
 
 require 'ext/nil_class_ext'
@@ -8,8 +8,10 @@ require 'ext/array_ext'
 require 'red_grape/pipe/aggregate_pipe'
 require 'red_grape/pipe/as_pipe'
 require 'red_grape/pipe/back_pipe'
+require 'red_grape/pipe/both_pipe'
 require 'red_grape/pipe/cap_pipe'
 require 'red_grape/pipe/copy_split_pipe'
+require 'red_grape/pipe/count_pipe'
 require 'red_grape/pipe/except_pipe'
 require 'red_grape/pipe/exhaust_merge_pipe'
 require 'red_grape/pipe/fill_pipe'
@@ -24,6 +26,7 @@ require 'red_grape/pipe/in_pipe'
 require 'red_grape/pipe/in_e_pipe'
 require 'red_grape/pipe/in_v_pipe'
 require 'red_grape/pipe/loop_pipe'
+require 'red_grape/pipe/map_pipe'
 require 'red_grape/pipe/out_pipe'
 require 'red_grape/pipe/out_e_pipe'
 require 'red_grape/pipe/out_v_pipe'
@@ -31,6 +34,7 @@ require 'red_grape/pipe/property_pipe'
 require 'red_grape/pipe/paths_pipe'
 require 'red_grape/pipe/retain_pipe'
 require 'red_grape/pipe/scatter_pipe'
+require 'red_grape/pipe/select_pipe'
 require 'red_grape/pipe/side_effect_pipe'
 require 'red_grape/pipe/transform_pipe'
 require 'red_grape/pipe/v_pipe'

data/test/test_count_pipe.rb

@@ -0,0 +1,13 @@
+require 'test/unit'
+require 'red_grape'
+
+class CountPipeTest < Test::Unit::TestCase
+  def setup
+    @g1 = RedGrape.load_graph 'data/graph-example-1.xml'
+  end
+
+  def test_count
+    assert_equal 6, @g1.V.count[]
+    assert_equal 3, @g1.v(1).out.count[]
+  end
+end

data/test/test_map_pipe.rb

@@ -0,0 +1,21 @@
+require 'test/unit'
+require 'red_grape'
+
+class MapPipeTest < Test::Unit::TestCase
+  def setup
+    @g1 = RedGrape.load_graph 'data/graph-example-1.xml'
+  end
+
+  def test_map
+    assert_equal [
+      {"name"=>"marko", "age"=>29},
+      {"name"=>"vadas", "age"=>27},
+      {"name"=>"lop", "lang"=>"java"},
+      {"name"=>"josh", "age"=>32},
+      {"name"=>"ripple", "lang"=>"java"},
+      {"name"=>"peter", "age"=>35}
+    ] , @g1.V.map[]
+
+    assert_equal({"name"=>"marko", "age"=>29}, @g1.v(1).map[])
+  end
+end

data/test/test_on_the_nature_of_pipes.rb

@@ -9,15 +9,16 @@ class OnTheNatureOfPipesTest < Test::Unit::TestCase
 
   def test_basic
     assert_equal '1',
-      @graph.v(1).take.id
+      @graph.v(1)[].id
 
     assert_equal %w(2 3 4), 
-      @graph.v(1).out.take.map(&:id).sort
+      @graph.v(1).out[].map(&:id).sort
 
     assert_equal %w(josh lop vadas), 
-      @graph.v(1).out.name.take.sort
+      @graph.v(1).out.name[].sort
 
-    paths = @graph.v(1).out.name.paths.take
+    #paths = @graph.v(1).out.name.paths[]
+    paths = @graph.v(1).out.name.paths[]
     assert_equal 3, 
       paths.size
 
@@ -30,16 +31,16 @@ class OnTheNatureOfPipesTest < Test::Unit::TestCase
 
   def test_filter
     assert_equal %w(2 4), 
-      @graph.v(1).out('knows').take.map(&:id).sort
+      @graph.v(1).out('knows')[].map(&:id).sort
 
     assert_equal %w(2), 
-      @graph.v(1).out('knows').filter{it.age < 30}.take.map(&:id).sort
+      @graph.v(1).out('knows').filter{it.age < 30}[].map(&:id).sort
 
     assert_equal %w(vadas),
-      @graph.v(1).out('knows').filter{it.age < 30}.name.take.sort
+      @graph.v(1).out('knows').filter{it.age < 30}.name[].sort
 
     assert_equal [5], 
-      @graph.v(1).out('knows').filter{it.age < 30}.name.transform{it.size}.take.sort
+      @graph.v(1).out('knows').filter{it.age < 30}.name.transform{it.size}[].sort
 
     assert_equal %w[V Out(knows) Filter Property(name) Transform], 
       @graph.v(1).out('knows').filter{it.age < 30}.name.transform{it.size}.to_a
@@ -47,16 +48,16 @@ class OnTheNatureOfPipesTest < Test::Unit::TestCase
 
   def test_side_effect
     assert_equal 'marko', 
-      @graph.v(1).side_effect{@x = it}.take.name
+      @graph.v(1).side_effect{@x = it}[].name
 
     assert_equal %w(3), 
-      @graph.v(1).side_effect{@x = it}.out('created').take.map(&:id).sort
+      @graph.v(1).side_effect{@x = it}.out('created')[].map(&:id).sort
 
     assert_equal %w(1 4 6), 
-      @graph.v(1).side_effect{@x = it}.out('created').in('created').take.map(&:id).sort
+      @graph.v(1).side_effect{@x = it}.out('created').in('created')[].map(&:id).sort
 
     assert_equal %w(4 6), 
-      @graph.v(1).side_effect{@x = it}.out('created').in('created').filter{it != @x}.take.map(&:id).sort
+      @graph.v(1).side_effect{@x = it}.out('created').in('created').filter{it != @x}[].map(&:id).sort
 
     assert_equal %w(V SideEffect Out(created) In(created) Filter), 
       @graph.v(1).side_effect{@x = it}.out('created').in('created').filter{it != @x}.to_a
@@ -65,35 +66,35 @@ class OnTheNatureOfPipesTest < Test::Unit::TestCase
   def test_if_then_else
     #assert_equal ['vadas', ['ripple', 'lop']], 
     assert_equal ['vadas', 'ripple', 'lop'], 
-      @graph.v(1).out('knows').if_then_else(_{it.age < 30}, _{it.name}, _{it.out('created').name}).take.to_a
+      @graph.v(1).out('knows').if_then_else(_{it.age < 30}, _{it.name}, _{it.out('created').name})[].to_a
   end
 
   def test_back
     assert_equal %w(josh vadas),
-      @graph.v(1).out('knows').name.take.to_a.sort
+      @graph.v(1).out('knows').name[].to_a.sort
 
     assert_equal %w(vadas),
-      @graph.v(1).out('knows').name.filter{it[0] == 'v'}.take.to_a
+      @graph.v(1).out('knows').name.filter{it[0] == 'v'}[].to_a
 
     assert_equal %w(2),
-      @graph.v(1).out('knows').name.filter{it[0] == 'v'}.back(2).take.to_a.map(&:id)
+      @graph.v(1).out('knows').name.filter{it[0] == 'v'}.back(2)[].to_a.map(&:id)
 
     assert_equal %w(V Out(knows) Property(name) Filter Back),
       @graph.v(1).out('knows').name.filter{it[0] == 'v'}.back(2).to_a
 
     assert_equal %w(2),
-      @graph.v(1).out('knows').as('here').name.filter{it[0] == 'v'}.back('here').take.to_a.map(&:id)
+      @graph.v(1).out('knows').as('here').name.filter{it[0] == 'v'}.back('here')[].to_a.map(&:id)
   end
 
   def test_loop
     assert_equal %w(3 5),
-      @graph.v(1).out.out.take.to_a.map(&:id).sort
+      @graph.v(1).out.out[].to_a.map(&:id).sort
 
     assert_equal %w(3 5),
-      @graph.v(1).out.loop(1){loops < 3}.take.to_a.map(&:id).sort
+      @graph.v(1).out.loop(1){loops < 3}[].to_a.map(&:id).sort
 
     assert_equal %w(lop ripple),
-      @graph.v(1).out.loop(1){loops < 3}.name.take.sort
+      @graph.v(1).out.loop(1){loops < 3}.name[].sort
 
     assert_equal %w(V Out Loop Property(name)),
       @graph.v(1).out.loop(1){loops < 3}.name.to_a

data/test/test_out_pipe.rb

@@ -0,0 +1,26 @@
+require 'test/unit'
+require 'red_grape'
+
+class OutPipeTest < Test::Unit::TestCase
+  def setup
+    @g1 = RedGrape.load_graph 'data/graph-example-1.xml'
+  end
+
+  def test_out
+    out = @g1.v(1).out[]
+    assert_equal 3, out.size
+    assert_equal RedGrape::Vertex, out[0].class
+    assert_equal '2', out[0].id
+    assert_equal RedGrape::Vertex, out[1].class
+    assert_equal '4', out[1].id
+    assert_equal RedGrape::Vertex, out[2].class
+    assert_equal '3', out[2].id
+
+    out2 = @g1.v(1).out.out[]
+    assert_equal 2, out2.size
+    assert_equal RedGrape::Vertex, out2[0].class
+    assert_equal '5', out2[0].id
+    assert_equal RedGrape::Vertex, out2[1].class
+    assert_equal '3', out2[1].id
+  end
+end

data/test/test_select_pipe.rb

@@ -0,0 +1,15 @@
+require 'test/unit'
+require 'red_grape'
+
+class SelectPipeTest < Test::Unit::TestCase
+  def setup
+    @g1 = RedGrape.load_graph 'data/graph-example-1.xml'
+  end
+
+  def test_select
+    assert_equal(
+      '[{"v1"=>v[1], "children"=>v[3]}, {"v1"=>v[1], "children"=>v[3]}, {"v1"=>v[1], "children"=>v[3]}]', 
+      @g1.v(1).as('v1').out.as('children').select[].to_s
+    )
+  end
+end

data/test/test_traversal_patterns.rb

@@ -8,32 +8,32 @@ class TraversalPatternsTest < Test::Unit::TestCase
 
   # https://github.com/tinkerpop/gremlin/wiki/Backtrack-Pattern
   def test_backtrack_pattern
-    assert_equal [29], @g1.V.out('knows').has('age', :gt, 30).back(2).age.take
-    assert_equal [29], @g1.V.as('x').outE('knows').inV.has('age', :gt, 30).back('x').age.take
+    assert_equal [29], @g1.V.out('knows').has('age', :gt, 30).back(2).age[]
+    assert_equal [29], @g1.V.as('x').outE('knows').inV.has('age', :gt, 30).back('x').age[]
   end
 
   # https://github.com/tinkerpop/gremlin/wiki/Except-Retain-Pattern
   def test_except_retain_pattern
-    assert_equal %w(2 3 4), @g1.v(1).out.take.map(&:id).sort
-    assert_equal %w(3 5), @g1.v(1).out.out.take.map(&:id).sort
-    assert_equal %w(5), @g1.v(1).out.aggregate(:x).out.except(:x).take.map(&:id).sort
-    assert_equal %w(3), @g1.v(1).out.aggregate(:x).out.retain(:x).take.map(&:id).sort
+    assert_equal %w(2 3 4), @g1.v(1).out[].map(&:id).sort
+    assert_equal %w(3 5), @g1.v(1).out.out[].map(&:id).sort
+    assert_equal %w(5), @g1.v(1).out.aggregate(:x).out.except(:x)[].map(&:id).sort
+    assert_equal %w(3), @g1.v(1).out.aggregate(:x).out.retain(:x)[].map(&:id).sort
   end
 
   # https://github.com/tinkerpop/gremlin/wiki/Flow-Rank-Pattern
   def test_flow_rank_pattern
-    assert_equal %w(3 5), @g1.V('lang', 'java').take.map(&:id).sort
+    assert_equal %w(3 5), @g1.V('lang', 'java')[].map(&:id).sort
     software = []
-    @g1.V('lang', 'java').fill(software).take
+    @g1.V('lang', 'java').fill(software)[]
     assert_equal %w(3 5), software.map(&:id).sort
-    assert_equal %w(marko josh peter josh), software._.in('created').name.take
+    assert_equal %w(marko josh peter josh), software._.in('created').name[]
     assert_equal(
       {'marko' => 1, 'josh' => 2, 'peter' => 1}, 
-      software._.in('created').name.groupCount.cap.take
+      software._.in('created').name.groupCount.cap[]
     )
 
     m = {}
-    assert_equal %w(marko josh peter josh), software._.in('created').name.groupCount(m).take
+    assert_equal %w(marko josh peter josh), software._.in('created').name.groupCount(m)[]
     assert_equal({'marko' => 1, 'josh' => 2, 'peter' => 1}, m)
   end
 
@@ -41,28 +41,28 @@ class TraversalPatternsTest < Test::Unit::TestCase
   def test_path_pattern
     v1 = @g1.vertex(1)
 
-    assert_equal %w(josh lop vadas), v1.out.name.take.sort
+    assert_equal %w(josh lop vadas), v1.out.name[].sort
 
-    path = v1.out.name.path.take
+    path = v1.out.name.path[]
     assert_equal 3, path.size
     assert_equal 3, path.first.size
     assert_equal '[[v[1], v[2], "vadas"], [v[1], v[4], "josh"], [v[1], v[3], "lop"]]', path.to_s
 
-    path = v1.outE.inV.name.path.take
+    path = v1.outE.inV.name.path[]
     assert_equal '[[v[1], e[7][1-knows->2], v[2], "vadas"], [v[1], e[8][1-knows->4], v[4], "josh"], [v[1], e[9][1-created->3], v[3], "lop"]]', path.to_s
 
     assert_equal(
       [["marko", 0.5, "vadas"], ["marko", 1.0, "josh"], ["marko", 0.4, "lop"]].to_s, 
-      v1.outE.inV.path(_{it.name}, _{it.weight}, _{it.name}).take.to_s
+      v1.outE.inV.path(_{it.name}, _{it.weight}, _{it.name})[].to_s
     )
   end
 
   def test_loop_pattern
     @g2 ||= RedGrape.load_graph 'data/graph-example-2.xml'
     v89 = @g2.vertex 89
-    assert_equal 36, v89.outE.inV.path.take.size
+    assert_equal 36, v89.outE.inV.path[].size
     
-    path = v89.outE.inV.loop(2){it.loops < 3}.path.take.first
+    path = v89.outE.inV.loop(2){it.loops < 3}.path[].first
     assert_equal '[v[89], e[7006][89-followed_by->127], v[127], e[7786][127-sung_by->340], v[340]]', path.to_s
     assert_equal RedGrape::Vertex, path[0].class
     assert_equal RedGrape::Edge, path[1].class
@@ -70,7 +70,7 @@ class TraversalPatternsTest < Test::Unit::TestCase
     assert_equal RedGrape::Edge, path[3].class
     assert_equal RedGrape::Vertex, path[4].class
 
-    path = v89.as('x').outE.inV.loop('x'){it.loops < 3}.path.take.first
+    path = v89.as('x').outE.inV.loop('x'){it.loops < 3}.path[].first
     assert_equal '[v[89], e[7006][89-followed_by->127], v[127], e[7786][127-sung_by->340], v[340]]', path.to_s
     assert_equal RedGrape::Vertex, path[0].class
     assert_equal RedGrape::Edge, path[1].class
@@ -78,7 +78,7 @@ class TraversalPatternsTest < Test::Unit::TestCase
     assert_equal RedGrape::Edge, path[3].class
     assert_equal RedGrape::Vertex, path[4].class
 
-    path = v89.outE.inV.outE.inV.path.take.first
+    path = v89.outE.inV.outE.inV.path[].first
     assert_equal '[v[89], e[7006][89-followed_by->127], v[127], e[7786][127-sung_by->340], v[340]]', path.to_s
     assert_equal RedGrape::Vertex, path[0].class
     assert_equal RedGrape::Edge, path[1].class
@@ -88,17 +88,17 @@ class TraversalPatternsTest < Test::Unit::TestCase
 
     #assert_equal(
     #  70307, 
-    #  v89.out.loop(1, _{it.loops < 4}).take.size
+    #  v89.out.loop(1, _{it.loops < 4})[].size
     #) #=> OK
 
     #assert_equal(
     #  71972, 
-    #  v89.out.loop(1, _{it.loops < 4}, _{true}).take.size
+    #  v89.out.loop(1, _{it.loops < 4}, _{true})[].size
     #) #=> 70307
 
     #assert_equal(
     #  582, 
-    #  v89.out.loop(1, _{it.loops < 4}, _{it.object.id == '89'}).take.size 
+    #  v89.out.loop(1, _{it.loops < 4}, _{it.object.id == '89'})[].size 
     #) #=> 564
   end
 
@@ -108,12 +108,12 @@ class TraversalPatternsTest < Test::Unit::TestCase
 
     #assert_equal(
     #  ['ripple', 27, 'lop', 32], 
-    #  v1.out('knows').copy_split(_.out('created').name, _.age).fair_merge.take
+    #  v1.out('knows').copy_split(_.out('created').name, _.age).fair_merge[]
     #) # TODO: not yet
 
     assert_equal(
       [27, 'ripple', 'lop', 32], 
-      v1.out('knows').copy_split(_.out('created').name, _.age).exhaust_merge.take
+      v1.out('knows').copy_split(_.out('created').name, _.age).exhaust_merge[]
     )
   end
 
@@ -122,17 +122,17 @@ class TraversalPatternsTest < Test::Unit::TestCase
     @g2 ||= RedGrape.load_graph 'data/graph-example-2.xml'
     assert_equal(
       {'cover'=>313, 'original'=>184}, 
-      @g2.V.has_not('song_type', nil).group_count(_{it.song_type}).cap.take
+      @g2.V.has_not('song_type', nil).group_count(_{it.song_type}).cap[]
     )
 
-    ret = @g2.V.has_not('song_type', nil).group_by(_{it.song_type}, _{it}).cap.take
+    ret = @g2.V.has_not('song_type', nil).group_by(_{it.song_type}, _{it}).cap[]
     assert_equal 2, ret.keys.size
     assert_equal 313, ret.values[0].size
     assert ret.values[0].all?{|e| e.is_a? RedGrape::Vertex}
     assert_equal 184, ret.values[1].size
     assert ret.values[1].all?{|e| e.is_a? RedGrape::Vertex}
 
-    ret = @g2.V.has_not('song_type', nil).group_by(_{it.song_type}, _{it.name}).cap.take
+    ret = @g2.V.has_not('song_type', nil).group_by(_{it.song_type}, _{it.name}).cap[]
     assert_equal 2, ret.keys.size
     assert_equal 313, ret.values[0].size
     assert ret.values[0].all?{|e| e.is_a? String}
@@ -141,23 +141,23 @@ class TraversalPatternsTest < Test::Unit::TestCase
     assert_equal 'HEY BO DIDDLEY', ret.values[0][0]
     assert_equal 'BERTHA', ret.values[1][0]
 
-    ret = @g2.V.has_not('song_type', nil).group_by(_{it.song_type}, _{1}).cap.take
+    ret = @g2.V.has_not('song_type', nil).group_by(_{it.song_type}, _{1}).cap[]
     assert_equal 2, ret.keys.size
     assert ret.values[0].all?{|e| e == 1}
     assert ret.values[1].all?{|e| e == 1}
 
-    ret = @g2.V.has_not('song_type', nil).group_by(_{it.song_type}, _{1}, _{it.size}).cap.take
+    ret = @g2.V.has_not('song_type', nil).group_by(_{it.song_type}, _{1}, _{it.size}).cap[]
     assert_equal 313, ret.values[0]
     assert_equal 184, ret.values[1]
 
-    ret = @g2.V.has_not('song_type', nil).group_by(_{it.song_type}, _{it.out('sung_by').take}, _{it._.name.group_count.cap.take}).cap.take
+    ret = @g2.V.has_not('song_type', nil).group_by(_{it.song_type}, _{it.out('sung_by')[]}, _{it._.name.group_count.cap[]}).cap[]
     assert_equal 66, ret[0]['cover']['Weir']
     assert_equal 33, ret[0]['original']['Weir']
   end
 
   # https://github.com/tinkerpop/gremlin/wiki/Depth-First-vs.-Breadth-First
   def test_depth_first_vs_bredth_first
-    assert_equal %w(1 4 6), @g1.v(1).out_e('created').in_v.in_e('created').out_v.take.map(&:id)
-    assert_equal %w(1 4 6), @g1.v(1).out_e('created').gather.scatter.in_v.gather.scatter.in_e('created').gather.scatter.out_v.gather.scatter.take.map(&:id)
+    assert_equal %w(1 4 6), @g1.v(1).out_e('created').in_v.in_e('created').out_v[].map(&:id)
+    assert_equal %w(1 4 6), @g1.v(1).out_e('created').gather.scatter.in_v.gather.scatter.in_e('created').gather.scatter.out_v.gather.scatter[].map(&:id)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: red_grape
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-18 00:00:00.000000000 Z
+date: 2012-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70365490452460 !ruby/object:Gem::Requirement
+  requirement: &70277502305260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,13 +21,14 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70365490452460
+  version_requirements: *70277502305260
 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.
 email:
 - andyjpn@gmail.com
 executables:
+- juicer
 - redgrape
 - trellis
 extensions: []
@@ -37,6 +38,7 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- bin/juicer
 - bin/redgrape
 - bin/trellis
 - data/graph-example-1.xml
@@ -53,9 +55,11 @@ files:
 - lib/red_grape/pipe/as_pipe.rb
 - lib/red_grape/pipe/back_pipe.rb
 - lib/red_grape/pipe/base.rb
+- lib/red_grape/pipe/both_pipe.rb
 - lib/red_grape/pipe/cap_pipe.rb
 - lib/red_grape/pipe/context.rb
 - lib/red_grape/pipe/copy_split_pipe.rb
+- lib/red_grape/pipe/count_pipe.rb
 - lib/red_grape/pipe/e_pipe.rb
 - lib/red_grape/pipe/except_pipe.rb
 - lib/red_grape/pipe/exhaust_merge_pipe.rb
@@ -71,6 +75,7 @@ files:
 - lib/red_grape/pipe/in_pipe.rb
 - lib/red_grape/pipe/in_v_pipe.rb
 - lib/red_grape/pipe/loop_pipe.rb
+- lib/red_grape/pipe/map_pipe.rb
 - lib/red_grape/pipe/out_e_pipe.rb
 - lib/red_grape/pipe/out_pipe.rb
 - lib/red_grape/pipe/out_v_pipe.rb
@@ -78,6 +83,7 @@ files:
 - lib/red_grape/pipe/property_pipe.rb
 - lib/red_grape/pipe/retain_pipe.rb
 - lib/red_grape/pipe/scatter_pipe.rb
+- lib/red_grape/pipe/select_pipe.rb
 - lib/red_grape/pipe/side_effect_pipe.rb
 - lib/red_grape/pipe/transform_pipe.rb
 - lib/red_grape/pipe/underscore_pipe.rb
@@ -89,11 +95,15 @@ files:
 - lib/red_grape/vertex.rb
 - red_grape.gemspec
 - test/all.rb
+- test/test_count_pipe.rb
 - test/test_element.rb
 - test/test_graph.rb
+- test/test_map_pipe.rb
 - test/test_on_the_nature_of_pipes.rb
+- test/test_out_pipe.rb
 - test/test_pipe.rb
 - test/test_pipe_base.rb
+- test/test_select_pipe.rb
 - test/test_traversal_patterns.rb
 - test/test_vertex.rb
 homepage: https://github.com/technohippy/red-grape
@@ -122,10 +132,14 @@ specification_version: 3
 summary: RedGrape - Extremely Simple GraphDB
 test_files:
 - test/all.rb
+- test/test_count_pipe.rb
 - test/test_element.rb
 - test/test_graph.rb
+- test/test_map_pipe.rb
 - test/test_on_the_nature_of_pipes.rb
+- test/test_out_pipe.rb
 - test/test_pipe.rb
 - test/test_pipe_base.rb
+- test/test_select_pipe.rb
 - test/test_traversal_patterns.rb
 - test/test_vertex.rb