fix a bug

Author: technohippy

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,8 +14,10 @@
 require 'red_grape/pipe/exhaust_merge_pipe'
 require 'red_grape/pipe/fill_pipe'
 require 'red_grape/pipe/filter_pipe'
+require 'red_grape/pipe/group_by_pipe'
 require 'red_grape/pipe/group_count_pipe'
 require 'red_grape/pipe/has_pipe'
+require 'red_grape/pipe/has_not_pipe'
 require 'red_grape/pipe/if_then_else_pipe'
 require 'red_grape/pipe/in_pipe'
 require 'red_grape/pipe/in_e_pipe'

lib/red_grape/pipe/base.rb

@@ -23,7 +23,7 @@ def self.set_auto_take(val=true)
     end
 
     class Base
-      attr_accessor :opts, :prev, :next, :value
+      attr_accessor :opts, :prev, :next, :value, :it
 
       def initialize(prev, *opts, &block)
         @prev = prev
@@ -56,7 +56,6 @@ def done?
 
       def take(context=Context.new)
         if first?
-          #context = Context.new
           val = @prev.pass_through self, context
           if context.aggregating?
             context.resume_from_aggregating
@@ -87,6 +86,11 @@ def pass_next(context, pushed_obj, next_obj=nil, &block)
         end
       end
 
+      def pipe_eval(params={}, &block)
+        params.each {|k, v| self.send "#{k}=", v}
+        instance_eval(&block)
+      end
+
       def to_s
         Pipe.auto_take ? take.to_s : super
       end

lib/red_grape/pipe/context.rb

@@ -76,7 +76,7 @@ def grouping?
       end
 
       def resume_from_grouping
-        obj, pipe = *@grouping_items.first # TODO: is '.first' ok?
+        obj, pipe = *@grouping_items.first # TODO: '.first' is used to get next_pipe.
         if pipe
           push_history obj do |ctx|
             obj.pass_through(pipe, ctx)

lib/red_grape/pipe/group_count_pipe.rb

@@ -5,7 +5,11 @@ module Pipe
     class GroupCountPipe < Pipe::Base
       def pass(obj, context)
         if self.opts.empty?
+          #context.group({obj => 1}, self.next)
           context.group obj, self.next
+        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
         else
           self.opts.first[obj] ||= 0
           self.opts.first[obj] += 1

lib/red_grape/tools/irg.rb

@@ -55,7 +55,7 @@ def start(port=nil, &block)
       def start(port=nil, &block)
         Kernel.module_eval %Q{
           def redgrape?(key=nil)
-            RedGrape::IRG::Help.redgrape? key
+            RedGrape::Tools::IRG::Help.redgrape? key
           end
           alias rg? redgrape?
         }

red_grape.gemspec

@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "red_grape/version"
+#require "red_grape/version"
+require "red_grape"
 
 Gem::Specification.new do |s|
   s.name        = "red_grape"

test/test_traversal_patterns.rb

@@ -3,28 +3,28 @@
 
 class TraversalPatternsTest < Test::Unit::TestCase
   def setup
-    @graph = RedGrape.load_graph 'data/graph-example-1.xml'
+    @g1 = RedGrape.load_graph 'data/graph-example-1.xml'
   end
 
   # https://github.com/tinkerpop/gremlin/wiki/Backtrack-Pattern
   def test_backtrack_pattern
-    assert_equal [29], @graph.V.out('knows').has('age', :gt, 30).back(2).age.take
-    assert_equal [29], @graph.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.take
+    assert_equal [29], @g1.V.as('x').outE('knows').inV.has('age', :gt, 30).back('x').age.take
   end
 
   # https://github.com/tinkerpop/gremlin/wiki/Except-Retain-Pattern
   def test_except_retain_pattern
-    assert_equal %w(2 3 4), @graph.v(1).out.take.map(&:id).sort
-    assert_equal %w(3 5), @graph.v(1).out.out.take.map(&:id).sort
-    assert_equal %w(5), @graph.v(1).out.aggregate(:x).out.except(:x).take.map(&:id).sort
-    assert_equal %w(3), @graph.v(1).out.aggregate(:x).out.retain(:x).take.map(&:id).sort
+    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
   end
 
   # https://github.com/tinkerpop/gremlin/wiki/Flow-Rank-Pattern
   def test_flow_rank_pattern
-    assert_equal %w(3 5), @graph.V('lang', 'java').take.map(&:id).sort
+    assert_equal %w(3 5), @g1.V('lang', 'java').take.map(&:id).sort
     software = []
-    @graph.V('lang', 'java').fill(software).take
+    @g1.V('lang', 'java').fill(software).take
     assert_equal %w(3 5), software.map(&:id).sort
     assert_equal %w(marko josh peter josh), software._.in('created').name.take
     assert_equal(
@@ -39,7 +39,7 @@ def test_flow_rank_pattern
 
   # https://github.com/tinkerpop/gremlin/wiki/Path-Pattern
   def test_path_pattern
-    v1 = @graph.vertex(1)
+    v1 = @g1.vertex(1)
 
     assert_equal %w(josh lop vadas), v1.out.name.take.sort
 
@@ -58,9 +58,9 @@ def test_path_pattern
   end
 
   def test_loop_pattern
-    g = RedGrape.load_graph 'data/graph-example-2.xml'
-    v89 = g.vertex 89
-    assert_equal 36, g.v(89).outE.inV.path.take.size
+    @g2 ||= RedGrape.load_graph 'data/graph-example-2.xml'
+    v89 = @g2.vertex 89
+    assert_equal 36, v89.outE.inV.path.take.size
 
     path = v89.outE.inV.loop(2){it.loops < 3}.path.take.first
     assert_equal '[v[89], e[7006][89-followed_by->127], v[127], e[7786][127-sung_by->340], v[340]]', path.to_s
@@ -86,15 +86,46 @@ def test_loop_pattern
     assert_equal RedGrape::Edge, path[3].class
     assert_equal RedGrape::Vertex, path[4].class
 
-    #assert_equal 70307, v89.out.loop(1, proc{it.loops < 4}).take.size #=> OK
-    #assert_equal 71972, v89.out.loop(1, proc{it.loops < 4}, proc{true}).take.size #=> 70307
-    #assert_equal 582, v89.out.loop(1, proc{it.loops < 4}, proc{it.object.id == '89'}).take.size #=> 564
+    #assert_equal(
+    #  70307, 
+    #  v89.out.loop(1, proc{it.loops < 4}).take.size
+    #) #=> OK
+
+    #assert_equal(
+    #  71972, 
+    #  v89.out.loop(1, proc{it.loops < 4}, proc{true}).take.size
+    #) #=> 70307
+
+    #assert_equal(
+    #  582, 
+    #  v89.out.loop(1, proc{it.loops < 4}, proc{it.object.id == '89'}).take.size 
+    #) #=> 564
   end
 
   # https://github.com/tinkerpop/gremlin/wiki/Split-Merge-Pattern
-  def test_split_marge
-    v1 = @graph.vertex 1
-    #assert_equal ['ripple', 27, 'lop', 32], v1.out('knows').copy_split(_.out('created').name, _.age).fair_merge.take # TODO: not yet
-    assert_equal [27, 'ripple', 'lop', 32], v1.out('knows').copy_split(_.out('created').name, _.age).exhaust_merge.take
+  def test_split_marge_pattern
+    v1 = @g1.vertex 1
+
+    #assert_equal(
+    #  ['ripple', 27, 'lop', 32], 
+    #  v1.out('knows').copy_split(_.out('created').name, _.age).fair_merge.take
+    #) # TODO: not yet
+
+    assert_equal(
+      [27, 'ripple', 'lop', 32], 
+      v1.out('knows').copy_split(_.out('created').name, _.age).exhaust_merge.take
+    )
+  end
+
+  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
+    )
+    assert_equal(
+      {},
+      @g2.V.has_not('song_type', nil).group_by(proc{it.song_type}, proc{it}).cap.take
+    )
   end
 end