pacer 0.9.1.1-java → 1.0.0-java

data/lib/pacer/pipe/expandable_pipe.rb

@@ -15,12 +15,6 @@ module Pacer::Pipes
 
     def next
       super
-    rescue NativeException => e
-      if e.cause.getClass == Pacer::NoSuchElementException.getClass
-        raise e.cause
-      else
-        raise e
-      end
     ensure
       @path = @next_path
       @metadata = @next_metadata
@@ -32,8 +26,8 @@ module Pacer::Pipes
       if @queue.isEmpty
         @next_metadata = nil
         r = @starts.next
-        if @starts.respond_to? :getPath
-          @next_path = @starts.getPath
+        if pathEnabled and @starts.respond_to? :getCurrentPath
+          @next_path = @starts.getCurrentPath
         else
           @next_path = java.util.ArrayList.new
         end
@@ -42,12 +36,6 @@ module Pacer::Pipes
         element, @next_metadata, @next_path = @queue.remove
         element
       end
-    rescue NativeException => e
-      if e.cause.getClass == Pacer::NoSuchElementException.getClass
-        raise e.cause
-      else
-        raise e
-      end
     end
 
     def getPathToHere

data/lib/pacer/pipe/id_collection_filter_pipe.rb

@@ -10,24 +10,18 @@ module Pacer::Pipes
       if @comparison == Pacer::Pipes::EQUAL
         while true
           element = @starts.next
-          if element and @ids.include? element.element_id
+          if element and @ids.include? element.getId
             return element
           end
         end
       else
         while true
           element = @starts.next
-          if element and not @ids.include? element.element_id
+          if element and not @ids.include? element.getId
             return element
           end
         end
       end
-    rescue NativeException => e
-      if e.cause.getClass == Pacer::NoSuchElementException.getClass
-        raise e.cause
-      else
-        raise e
-      end
     end
   end
 end

data/lib/pacer/pipe/is_empty_pipe.rb

@@ -6,20 +6,13 @@ module Pacer::Pipes
     end
 
     def processNextStart
-      raise Pacer::NoSuchElementException if @raise
-      @starts.next
+      raise EmptyPipe.instance if @raise
+      starts.next
       @raise = true
-    rescue NativeException => e
-      if e.cause.getClass == NoSuchElementException.getClass
-        # This is the only case where we return true.
-        # The only time we get here is if the first call to next
-        # has no results.
-        true
-      else
-        raise e
-      end
+    rescue EmptyPipe, java.util.NoSuchElementException
+      true
     else
-      raise Pacer::NoSuchElementException
+      raise EmptyPipe.instance
     end
 
     def reset

data/lib/pacer/pipe/is_unique_pipe.rb

@@ -2,7 +2,7 @@ module Pacer::Pipes
   class IsUniquePipe < RubyPipe
     import java.util.ArrayList
     import com.tinkerpop.pipes.sideeffect.SideEffectPipe
-    import com.tinkerpop.pipes.util.ExpandableIterator
+    import com.tinkerpop.pipes.util.iterators.ExpandableIterator
     import com.tinkerpop.pipes.filter.DuplicateFilterPipe
 
     include SideEffectPipe
@@ -16,12 +16,6 @@ module Pacer::Pipes
       value = starts.next
       check_uniqueness value if @unique
       value
-    rescue NativeException => e
-      if e.cause.getClass == Pacer::NoSuchElementException.getClass
-        raise e.cause
-      else
-        raise e
-      end
     end
 
     def reset
@@ -42,12 +36,8 @@ module Pacer::Pipes
     def check_uniqueness(value)
       @expando.add value
       @unique_pipe.next
-    rescue NativeException => e
-      if e.cause.getClass == Pacer::NoSuchElementException.getClass
-        @unique = false
-      else
-        raise e
-      end
+    rescue EmptyPipe, java.util.NoSuchElementException
+      @unique = false
     end
 
     def prepare_state

data/lib/pacer/pipe/label_collection_filter_pipe.rb

@@ -8,13 +8,7 @@ module Pacer::Pipes
     def processNextStart
       while true
         edge = @starts.next
-        return edge if edge and @labels.include? edge.label
-      end
-    rescue NativeException => e
-      if e.cause.getClass == Pacer::NoSuchElementException.getClass
-        raise e.cause
-      else
-        raise e
+        return edge if edge and @labels.include? edge.getLabel
       end
     end
   end

data/lib/pacer/pipe/label_prefix_pipe.rb

@@ -10,12 +10,6 @@ module Pacer::Pipes
         edge = @starts.next
         return edge if edge.label =~ @prefix
       end
-    rescue NativeException => e
-      if e.cause.getClass == Pacer::NoSuchElementException.getClass
-        raise e.cause
-      else
-        raise e
-      end
     end
   end
 end

data/lib/pacer/pipe/loop_pipe.rb

@@ -4,73 +4,75 @@ module Pacer::Pipes
 
     def initialize(graph, looping_pipe, control_block)
       super()
+      @graph = graph
       @control_block = control_block
+      @wrapper = Pacer::Wrappers::WrapperSelector.build
 
       @expando = ExpandablePipe.new
       empty = ArrayList.new
       @expando.setStarts empty.iterator
       looping_pipe.setStarts(@expando)
+      #if control_block.arity < 0 and 1 < control_block.arity
+        @yield_paths = true
+        looping_pipe.enablePath true
+      #end
       @looping_pipe = looping_pipe
     end
 
     def next
       super
-    rescue NativeException => e
-      if e.cause.getClass == Pacer::NoSuchElementException.getClass
-        raise e.cause
-      else
-        raise e
-      end
     ensure
       @path = @next_path
     end
 
     def setStarts(starts)
-      @starts_has_path = starts.respond_to? :getPath
       super
+      enablePath true if yield_paths
     end
 
     protected
 
+    attr_reader :wrapper, :control_block, :expando, :looping_pipe, :graph, :yield_paths
+
     def processNextStart
       while true
         # FIXME: hasNext shouldn't be raising an exception...
-        has_next = @looping_pipe.hasNext rescue nil
+        has_next = looping_pipe.hasNext
         if has_next
-          element = @looping_pipe.next
-          depth = (@expando.metadata || 0) + 1
-          @next_path = @looping_pipe.getPath
+          element = looping_pipe.next
+          depth = (expando.metadata || 0) + 1
+          @next_path = looping_pipe.getCurrentPath if yield_paths
         else
-          element = @starts.next
-          if @starts_has_path
-            @next_path = @starts.getPath
+          element = starts.next
+          if pathEnabled
+            @next_path = starts.getCurrentPath
           else
             @next_path = ArrayList.new
             @next_path.add element
           end
           depth = 0
         end
-        element.graph ||= @graph if element.respond_to? :graph=
-        case @control_block.call element, depth, @next_path
+        wrapped = wrapper.new(element)
+        wrapped.graph = graph if wrapped.respond_to? :graph=
+        path = @next_path.map do |e|
+          w = wrapper.new e
+          w.graph = graph if w.respond_to? :graph=
+          w
+        end
+        case control_block.call wrapped, depth, path
         when :loop
-          @expando.add element, depth, @next_path
+          expando.add element, depth, @next_path
         when :emit
           return element
         when :emit_and_loop, :loop_and_emit
-          @expando.add element, depth, @next_path
+          expando.add element, depth, @next_path
           return element
         when false, nil
         else
-          @expando.add element, depth, @next_path
+          expando.add element, depth, @next_path
           return element
         end
       end
-    rescue NativeException => e
-      if e.cause.getClass == Pacer::NoSuchElementException.getClass
-        raise e.cause
-      else
-        raise e
-      end
     end
 
     def getPathToHere

data/lib/pacer/pipe/never_pipe.rb

@@ -3,7 +3,7 @@ module Pacer::Pipes
     protected
 
     def processNextStart
-      raise NoSuchElementException
+      raise EmptyPipe.instance
     end
   end
 end

data/lib/pacer/pipe/path_wrapping_pipe.rb

@@ -0,0 +1,40 @@
+module Pacer
+  module Pipes
+    class PathWrappingPipe < RubyPipe
+      attr_reader :graph
+      attr_accessor :vertex_wrapper, :edge_wrapper, :other_wrapper
+
+      def initialize(graph, vertex_extensions = [], edge_extensions = [])
+        super()
+        @graph = graph
+        @vertex_wrapper = Pacer::Wrappers::WrapperSelector.build :vertex, vertex_extensions || Set[]
+        @edge_wrapper = Pacer::Wrappers::WrapperSelector.build :edge, edge_extensions || Set[]
+      end
+
+      def getCurrentPath
+        starts.getCurrentPath
+      end
+
+      def processNextStart
+        path = starts.next
+        path.collect do |item|
+          if item.is_a? Pacer::Vertex
+            wrapped = vertex_wrapper.new item
+            wrapped.graph = graph
+            wrapped
+          elsif item.is_a? Pacer::Edge
+            wrapped = edge_wrapper.new item
+            wrapped.graph = graph
+            wrapped
+          elsif other_wrapper
+            wrapped = other_wrapper.new item
+            wrapped.graph = graph if wrapped.respond_to? :graph
+            wrapped
+          else
+            item
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pacer/pipe/process_pipe.rb

@@ -5,33 +5,15 @@ module Pacer::Pipes
 
     def initialize(back, block)
       super()
-      @block = block
-      @back = back
-      @graph = back.graph if back
-      @extensions = back.extensions + [Pacer::Extensions::BlockFilterElement]
-      @is_element = graph.element_type?(back.element_type) if graph
+      @block = Pacer::Wrappers::WrappingPipeFunction.new back, block
     end
 
     def processNextStart
       while true
         obj = starts.next
-        begin
-          if is_element
-            obj = obj.add_extensions(extensions)
-            obj.back = back
-            obj.graph = graph
-          end
-        rescue
-        end
-        result = block.call(obj)
+        block.call(obj)
         return obj
       end
-    rescue NativeException => e
-      if e.cause.getClass == Pacer::NoSuchElementException.getClass
-        raise e.cause
-      else
-        raise e
-      end
     end
   end
 end

data/lib/pacer/pipe/property_comparison_pipe.rb

@@ -29,12 +29,6 @@ module Pacer::Pipes
           return obj if l and r and l <= r
         end
       end
-    rescue NativeException => e
-      if e.cause.getClass == Pacer::NoSuchElementException.getClass
-        raise e.cause
-      else
-        raise e
-      end
     end
   end
 end

data/lib/pacer/pipe/ruby_pipe.rb

@@ -1,5 +1,7 @@
 module Pacer::Pipes
   class RubyPipe < AbstractPipe
+    field_reader :pathEnabled
+
     attr_reader :starts
 
     def setStarts(starts)
@@ -9,14 +11,19 @@ module Pacer::Pipes
 
     def reset
       super
-      @starts.reset if starts.respond_to? :reset
+      starts.reset if starts.respond_to? :reset
+    end
+
+    def enablePath(b)
+      super
+      starts.enablePath b if starts.respond_to? :enablePath
     end
 
     protected
 
     def getPathToHere
-      if starts.respond_to? :getPath
-        starts.getPath
+      if starts.respond_to? :getCurrentPath
+        starts.getCurrentPath
       else
         java.util.ArrayList.new
       end

data/lib/pacer/pipe/simple_visitor_pipe.rb

@@ -1,14 +1,15 @@
 module Pacer
   module Pipes
     class SimpleVisitorPipe < Pacer::Pipes::RubyPipe
-      attr_reader :visitor, :in_section
+      attr_reader :visitor, :in_section, :wrapper, :graph
 
       attr_accessor :use_on_element, :use_after_element, :use_reset
 
-      def initialize(visitor = nil)
+      def initialize(wrapper, graph)
         super()
-        self.visitor = visitor if visitor
         @in_section = false
+        @wrapper = wrapper
+        @graph = graph
       end
 
       def visitor=(visitor)
@@ -22,15 +23,15 @@ module Pacer
         visitor.after_element if use_after_element and in_section
         current = starts.next
         @in_section = true unless in_section
-        visitor.on_element(current) if use_on_element
-        return current
-      rescue NativeException => e
-        if e.cause.getClass == Pacer::NoSuchElementException.getClass
-          @in_section = false
-          raise e.cause
-        else
-          raise
+        if use_on_element
+          wrapped = wrapper.new current
+          wrapped.graph = graph
+          visitor.on_element(wrapped)
         end
+        return current
+      rescue EmptyPipe, java.util.NoSuchElementException
+        @in_section = false
+        raise EmptyPipe.instance
       end
 
       def reset

data/lib/pacer/pipe/stream_sort_pipe.rb

@@ -72,13 +72,7 @@ module Pacer::Pipes
         @clearing = @first_silo + @second_silo.sort! + @third_silo.sort!
         return processNextStart if @clearing.any?
       end
-      raise Pacer::NoSuchElementException
-    rescue NativeException => e
-      if e.cause.getClass == NoSuchElementException.getClass
-        raise e.cause
-      else
-        raise e
-      end
+      raise EmptyPipe.instance
     end
   end
 end

data/lib/pacer/pipe/stream_uniq_pipe.rb

@@ -22,12 +22,6 @@ module Pacer::Pipes
           return obj
         end
       end
-    rescue NativeException => e
-      if e.cause.getClass == NoSuchElementException.getClass
-        raise e.cause
-      else
-        raise e
-      end
     end
   end
 end

data/lib/pacer/pipe/type_filter_pipe.rb

@@ -10,13 +10,7 @@ module Pacer::Pipes
         s = @starts.next
         return s if s.is_a? @type
       end
-      raise Pacer::NoSuchElementException
-    rescue NativeException => e
-      if e.cause.getClass == Pacer::NoSuchElementException.getClass
-        raise e.cause
-      else
-        raise e
-      end
+      raise EmptyPipe.instance
     end
   end
 end

data/lib/pacer/pipe/unary_transform_pipe.rb

@@ -1,7 +1,7 @@
 module Pacer::Pipes
   class UnaryTransformPipe < RubyPipe
     import com.tinkerpop.pipes.Pipe
-    import com.tinkerpop.pipes.util.SingleIterator
+    import com.tinkerpop.pipes.util.iterators.SingleIterator
 
     attr_reader :branch_a, :method
 
@@ -21,12 +21,6 @@ module Pacer::Pipes
     def processNextStart
       next_a
       a.send method rescue nil if a.respond_to? method
-    rescue NativeException => e
-      if e.cause.getClass == Pacer::NoSuchElementException.getClass
-        raise e.cause
-      else
-        raise e
-      end
     end
 
     protected
@@ -42,8 +36,12 @@ module Pacer::Pipes
       if branch_a
         begin
           self.a = branch_a.next
+        rescue EmptyPipe
+          next_element
+          branch_a.setStarts SingleIterator.new(element) if branch_a
+          retry
         rescue NativeException => e
-          if e.cause.getClass == Pacer::NoSuchElementException.getClass or @first
+          if @first
             next_element
             branch_a.setStarts SingleIterator.new(element) if branch_a
             retry

data/lib/pacer/pipe/unwrapping_pipe.rb

@@ -0,0 +1,13 @@
+module Pacer
+  module Pipes
+    class UnwrappingPipe < RubyPipe
+      def processNextStart
+        starts.next.element
+      end
+
+      def getCurrentPath
+        starts.getCurrentPath
+      end
+    end
+  end
+end

data/lib/pacer/pipe/vertices_pipe.rb

@@ -0,0 +1,22 @@
+module Pacer::Pipes
+  class VerticesPipe < AbstractPipe
+    attr_reader :starts
+
+    def setStarts(starts)
+      @starts = starts.first
+      self.iter = @starts.getVertices.iterator
+    end
+
+    def processNextStart
+      iter.next
+    end
+
+    def reset
+      self.iter = @starts.getVertices.iterator
+    end
+
+    private
+
+    attr_accessor :iter
+  end
+end

data/lib/pacer/pipe/visitor_pipe.rb

@@ -47,13 +47,9 @@ module Pacer
             end
           end
         end
-      rescue NativeException => e
-        if e.cause.getClass == Pacer::NoSuchElementException.getClass
-          @in_section = false
-          raise e.cause
-        else
-          raise
-        end
+      rescue EmptyPipe, java.util.NoSuchElementException
+        @in_section = false
+        raise EmptyPipe.instance
       end
 
       def reset

data/lib/pacer/pipe/wrapping_pipe.rb

@@ -0,0 +1,37 @@
+module Pacer
+  module Pipes
+    class WrappingPipe < RubyPipe
+      attr_reader :graph, :element_type, :extensions, :wrapper
+
+      def initialize(graph, element_type = nil, extensions = [])
+        super()
+        @graph = graph
+        @element_type = element_type
+        @extensions = extensions || []
+        @wrapper = Pacer::Wrappers::WrapperSelector.build element_type, @extensions
+      end
+
+      def getCurrentPath
+        starts.getCurrentPath
+      end
+
+      def wrapper=(w)
+        if extensions.any? and w.respond_to? :add_extensions
+          @wrapper = w.add_extensions extensions
+        else
+          @wrapper = w
+        end
+      end
+
+      def processNextStart
+        e = wrapper.new starts.next
+        if element_type == :vertex or element_type == :edge or element_type == :mixed
+          e.graph = graph
+        elsif e.respond_to? :graph=
+          e.graph = graph
+        end
+        e
+      end
+    end
+  end
+end

data/lib/pacer/pipes.rb

@@ -5,8 +5,7 @@ module Pacer
     import com.tinkerpop.pipes.AbstractPipe
     import com.tinkerpop.pipes.transform.IdentityPipe
     import com.tinkerpop.pipes.util.Pipeline
-    import com.tinkerpop.pipes.util.ExpandableIterator
-    import com.tinkerpop.pipes.util.MultiIterator
+    import com.tinkerpop.pipes.util.iterators.MultiIterator
     import com.tinkerpop.pipes.util.PipeHelper
 
     import com.tinkerpop.pipes.filter.RandomFilterPipe
@@ -14,8 +13,12 @@ module Pacer
     import com.tinkerpop.pipes.filter.RangeFilterPipe
     import com.tinkerpop.pipes.filter.FilterPipe
 
-    import com.tinkerpop.pipes.transform.IdPipe
-    import com.tinkerpop.pipes.transform.PropertyPipe
+    import com.tinkerpop.gremlin.pipes.transform.IdPipe
+    import com.tinkerpop.gremlin.pipes.transform.PropertyPipe
+
+    IN = com.tinkerpop.blueprints.Direction::IN
+    OUT = com.tinkerpop.blueprints.Direction::OUT
+    BOTH = com.tinkerpop.blueprints.Direction::BOTH
 
     EQUAL = FilterPipe::Filter::EQUAL
     NOT_EQUAL = FilterPipe::Filter::NOT_EQUAL
@@ -23,23 +26,22 @@ module Pacer
   end
 
   import java.util.Iterator
-  begin
-    java.util.ArrayList.new.iterator.next
-  rescue NativeException => e
-    NoSuchElementException = e.cause
-    Pipes::NoSuchElementException = e.cause
-  end
+
+  EmptyPipe = com.tinkerpop.pipes.util.FastNoSuchElementException
+  Pipes::EmptyPipe = EmptyPipe
 end
 
 require 'pacer/pipe/ruby_pipe'
 
+require 'pacer/pipe/vertices_pipe'
+require 'pacer/pipe/edges_pipe'
+
 require 'pacer/pipe/never_pipe'
 require 'pacer/pipe/block_filter_pipe'
 require 'pacer/pipe/collection_filter_pipe'
 require 'pacer/pipe/enumerable_pipe'
 require 'pacer/pipe/expandable_pipe'
 require 'pacer/pipe/loop_pipe'
-require 'pacer/pipe/map_pipe'
 require 'pacer/pipe/process_pipe'
 require 'pacer/pipe/visitor_pipe'
 require 'pacer/pipe/simple_visitor_pipe'
@@ -51,7 +53,6 @@ require 'pacer/pipe/type_filter_pipe'
 require 'pacer/pipe/label_collection_filter_pipe'
 require 'pacer/pipe/id_collection_filter_pipe'
 require 'pacer/pipe/label_prefix_pipe'
-require 'pacer/pipe/variable_store_iterator_wrapper'
 
 require 'pacer/pipe/property_comparison_pipe'
 
@@ -59,3 +60,7 @@ require 'pacer/pipe/blackbox_pipeline'
 
 require 'pacer/pipe/unary_transform_pipe'
 require 'pacer/pipe/cross_product_transform_pipe'
+
+require 'pacer/pipe/wrapping_pipe'
+require 'pacer/pipe/path_wrapping_pipe'
+require 'pacer/pipe/unwrapping_pipe'