red_grape 0.0.9 → 0.0.10

data/lib/ext/array_ext.rb

@@ -1,12 +1,18 @@
 class Array
+  attr_accessor :should_pass_through_whole #TODO
+
   def pass_through(pipe, context)
-    loops = context.loops
-    map! do |e| 
+    if @should_pass_through_whole
+      super
+    else
+      loops = context.loops
+      map! do |e| 
+        context.loops = loops
+        pipe.pass e, context
+      end
       context.loops = loops
-      pipe.pass e, context
+      normalize_for_graph
     end
-    context.loops = loops
-    normalize_for_graph
   end
 
   def normalize_for_graph

data/lib/red_grape/pipe/base.rb

@@ -61,6 +61,8 @@ module RedGrape
             context.resume_from_aggregating
           elsif context.grouping?
             context.resume_from_grouping
+          elsif context.gathering?
+            context.resume_from_gathering
           else
             val
           end

data/lib/red_grape/pipe/cap_pipe.rb

@@ -5,9 +5,9 @@ module RedGrape
     class CapPipe < Pipe::Base
       def pass(obj, context)
         ret = {}
-        context.grouping_items.each do |e|
-          ret[e.first] ||= 0
-          ret[e.first] += 1
+        context.grouping_items.each do |k, v|
+          v = v.map &:first
+          ret[k] = self.pipe_eval(it:v, &self.prev.reduce_function)
         end
         ret
       end

data/lib/red_grape/pipe/context.rb

@@ -9,7 +9,8 @@ module RedGrape
         @marks = {}
         @aggregating_items = {}
         @aggregated_items = {}
-        @grouping_items = []
+        @grouping_items = {}
+        @gathering_items = []
         @loops = 1
       end
 
@@ -66,8 +67,8 @@ module RedGrape
         ret.normalize_for_graph
       end
 
-      def group(val, next_pipe)
-        @grouping_items << [val, next_pipe]
+      def group(next_pipe, key, val=key)
+        (@grouping_items[key] ||= []) << [val, next_pipe]
         val
       end
 
@@ -76,16 +77,42 @@ module RedGrape
       end
 
       def resume_from_grouping
-        obj, pipe = *@grouping_items.first # TODO: '.first' is used to get next_pipe.
+        obj, pipe = *@grouping_items.values.first.first # TODO: '.first' is used to get next_pipe.
         if pipe
           push_history obj do |ctx|
-            obj.pass_through(pipe, ctx)
+            obj.pass_through pipe, ctx
           end
         else
           obj
         end
       end
 
+      def gather(obj, next_pipe)
+        @gathering_items << [obj, next_pipe]
+      end
+
+      def gathering?
+        not @gathering_items.empty?
+      end
+
+      def clear_gathering
+        @gathering_items.clear
+      end
+
+      def resume_from_gathering
+        obj, pipe = *@gathering_items.first
+        objs = @gathering_items.map &:first
+        objs.should_pass_through_whole = true
+        if pipe
+          push_history objs do |ctx|
+            pipe.prev = objs
+            pipe.take ctx
+          end
+        else
+          objs
+        end
+      end
+
       def eval(args={}, &block)
         args.each {|k, v| self.send "#{k}=", v}
         instance_eval(&block)

data/lib/red_grape/pipe/gather_pipe.rb

@@ -0,0 +1,12 @@
+require 'red_grape/pipe/base'
+
+module RedGrape
+  module Pipe
+    class GatherPipe < Pipe::Base
+      def pass(obj, context)
+        context.gather obj, self.next
+        obj
+      end
+    end
+  end
+end

data/lib/red_grape/pipe/group_by_pipe.rb

@@ -0,0 +1,29 @@
+require 'red_grape/pipe/base'
+
+module RedGrape
+  module Pipe
+    class GroupByPipe < Pipe::Base
+      attr_accessor :reduce_function
+
+      def pass(obj, context)
+        key_function, value_function, @reduce_function = *self.opts
+        value_function ||= proc{it}
+        @reduce_function ||= proc{it}
+        if self.opts.empty?
+          context.group self.next, obj
+        elsif self.opts.first.is_a? Proc
+          context.group(
+            self.next, 
+            pipe_eval(it:obj, &key_function), 
+            pipe_eval(it:obj, &value_function)
+          )
+        else
+          self.opts.first[obj] ||= []
+          self.opts.first[obj] << obj 
+        end
+        obj
+      end
+    end
+  end
+end
+

data/lib/red_grape/pipe/group_count_pipe.rb

@@ -3,13 +3,13 @@ require 'red_grape/pipe/base'
 module RedGrape
   module Pipe
     class GroupCountPipe < Pipe::Base
+      attr_accessor :reduce_function
       def pass(obj, context)
+        @reduce_function = proc{it.size}
         if self.opts.empty?
-          #context.group({obj => 1}, self.next)
-          context.group obj, self.next
+          context.group self.next, obj
         elsif self.opts.first.is_a? Proc
-          #context.group({pipe_eval(it:obj, &self.opts.first) => 1}, self.next)
-          context.group pipe_eval(it:obj, &self.opts.first), self.next
+          context.group self.next, pipe_eval(it:obj, &self.opts.first)
         else
           self.opts.first[obj] ||= 0
           self.opts.first[obj] += 1

data/lib/red_grape/pipe/has_not_pipe.rb

@@ -0,0 +1,19 @@
+require 'red_grape/pipe/base'
+
+module RedGrape
+  module Pipe
+    class HasNotPipe < Pipe::Base
+      def pass(obj, context)
+        prop, val = *self.opts
+        filter = proc{it[prop] == val}
+
+        # TODO: same as filter_pipe (has_pipe)
+        unless context.eval :it => obj, &filter
+          pass_next context, obj
+        else
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/red_grape/pipe/scatter_pipe.rb

@@ -0,0 +1,13 @@
+require 'red_grape/pipe/base'
+
+module RedGrape
+  module Pipe
+    class ScatterPipe < Pipe::Base
+      def pass(obj, context)
+        obj.should_pass_through_whole = false
+        context.clear_gathering
+        pass_next context, obj
+      end
+    end      
+  end
+end

data/lib/red_grape/pipe/underscore_pipe.rb

@@ -3,8 +3,12 @@ require 'red_grape/pipe/base'
 module RedGrape
   module Pipe
     module Underscore
-      def _(*opts)
-        UnderscorePipe.new self.dup, *opts#
+      def _(*opts, &block)
+        if block
+          Proc.new &block
+        else
+          UnderscorePipe.new self.dup, *opts#
+        end
       end
     end
 

data/lib/red_grape.rb

@@ -1,7 +1,10 @@
+module RedGrape
+  VERSION = '0.0.10'
+end
+
 require 'ext/nil_class_ext'
 require 'ext/object_ext'
 require 'ext/array_ext'
-require 'red_grape/version'
 require 'red_grape/pipe/aggregate_pipe'
 require 'red_grape/pipe/as_pipe'
 require 'red_grape/pipe/back_pipe'
@@ -11,6 +14,7 @@ require 'red_grape/pipe/except_pipe'
 require 'red_grape/pipe/exhaust_merge_pipe'
 require 'red_grape/pipe/fill_pipe'
 require 'red_grape/pipe/filter_pipe'
+require 'red_grape/pipe/gather_pipe'
 require 'red_grape/pipe/group_by_pipe'
 require 'red_grape/pipe/group_count_pipe'
 require 'red_grape/pipe/has_pipe'
@@ -26,6 +30,7 @@ require 'red_grape/pipe/out_v_pipe'
 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/side_effect_pipe'
 require 'red_grape/pipe/transform_pipe'
 require 'red_grape/pipe/v_pipe'
@@ -33,8 +38,6 @@ require 'red_grape/pipe/e_pipe'
 require 'red_grape/graph'
 
 module RedGrape
-  VERSION = "0.0.9"
-
   module_function
   def set_auto_take(val=true)
     Pipe.set_auto_take val

data/test/test_traversal_patterns.rb

@@ -117,17 +117,47 @@ class TraversalPatternsTest < Test::Unit::TestCase
     )
   end
 
+  # https://github.com/tinkerpop/gremlin/wiki/MapReduce-Pattern
   def test_map_reduce_pattern
     @g2 ||= RedGrape.load_graph 'data/graph-example-2.xml'
     assert_equal(
       {'cover'=>313, 'original'=>184}, 
       @g2.V.has_not('song_type', nil).group_count(proc{it.song_type}).cap.take
     )
-=begin
-    assert_equal(
-      {},
-      @g2.V.has_not('song_type', nil).group_by(proc{it.song_type}, proc{it}).cap.take
-    )
-=end
+
+    ret = @g2.V.has_not('song_type', nil).group_by(proc{it.song_type}, proc{it}).cap.take
+    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
+    assert_equal 2, ret.keys.size
+    assert_equal 313, ret.values[0].size
+    assert ret.values[0].all?{|e| e.is_a? String}
+    assert_equal 184, ret.values[1].size
+    assert ret.values[1].all?{|e| e.is_a? String}
+    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
+    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
+    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
+    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)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: red_grape
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-15 00:00:00.000000000 Z
+date: 2012-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70205221723480 !ruby/object:Gem::Requirement
+  requirement: &70324009053140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70205221723480
+  version_requirements: *70324009053140
 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.
@@ -61,7 +61,10 @@ files:
 - lib/red_grape/pipe/exhaust_merge_pipe.rb
 - lib/red_grape/pipe/fill_pipe.rb
 - lib/red_grape/pipe/filter_pipe.rb
+- lib/red_grape/pipe/gather_pipe.rb
+- lib/red_grape/pipe/group_by_pipe.rb
 - lib/red_grape/pipe/group_count_pipe.rb
+- lib/red_grape/pipe/has_not_pipe.rb
 - lib/red_grape/pipe/has_pipe.rb
 - lib/red_grape/pipe/if_then_else_pipe.rb
 - lib/red_grape/pipe/in_e_pipe.rb
@@ -74,6 +77,7 @@ files:
 - lib/red_grape/pipe/paths_pipe.rb
 - 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/side_effect_pipe.rb
 - lib/red_grape/pipe/transform_pipe.rb
 - lib/red_grape/pipe/underscore_pipe.rb
@@ -82,7 +86,6 @@ files:
 - lib/red_grape/serializer/graphml_serializer.rb
 - lib/red_grape/tools/graph_store.rb
 - lib/red_grape/tools/irg.rb
-- lib/red_grape/version.rb
 - lib/red_grape/vertex.rb
 - red_grape.gemspec
 - test/all.rb

data/lib/red_grape/version.rb

@@ -1,3 +0,0 @@
-module RedGrape
-  VERSION = "0.0.8"
-end