pacer 0.9.1.1-java → 1.0.0-java

data/lib/pacer/support.rb

@@ -2,9 +2,9 @@ module Pacer
   module Support
   end
 end
-require 'pacer/support/iterator_mixins'
 require 'pacer/support/array_list'
 require 'pacer/support/enumerable'
 require 'pacer/support/proc'
 require 'pacer/support/hash'
 require 'pacer/support/native_exception'
+require 'pacer/support/nil_class'

data/lib/pacer/transform/cap.rb

@@ -26,7 +26,7 @@ module Pacer
       def side_effect_pipe(end_pipe)
         old_back = @side_effect.back
         begin
-          empty = Pacer::Route.new :filter => :empty, :back => self
+          empty = Pacer::Route.empty self
           @side_effect.back = empty
           _, side_effect_pipe = @side_effect.send :build_pipeline
           side_effect_pipe.setStarts end_pipe if end_pipe

data/lib/pacer/transform/has_count_cap.rb

@@ -2,7 +2,7 @@ module Pacer
   module Routes
     module RouteOperations
       def has_count_route(opts = {})
-        chain_route({ :transform => :has_count_cap }.merge(opts))
+        chain_route({ :transform => :has_count_cap, element_type: :object }.merge(opts))
       end
 
       def has_count?(opts = {})

data/lib/pacer/transform/join.rb

@@ -1,11 +1,15 @@
 module Pacer
   module Routes
     module RouteOperations
+      def key(&block)
+        join(:key, &block)
+      end
+
       def join(name = nil, options = {}, &block)
         args = {
           :transform => :join,
           element_type: :vertex,
-          graph: options.fetch(:multi_graph, Pacer::MultiGraph.new),
+          graph: options.fetch(:multi_graph, Pacer::MultiGraph.blank),
           from_graph: graph
         }
         args[:multi_graph] = options[:multi_graph] if options[:multi_graph]
@@ -33,12 +37,13 @@ module Pacer
         include SideEffectPipe rescue nil # may raise exception on reload.
 
         attr_accessor :multi_graph, :current_keys, :current_values, :join_on
-        attr_reader :key_expando, :key_end, :values_pipes, :from_graph
+        attr_reader :key_expando, :key_end, :values_pipes, :from_graph, :wrapper
 
         def initialize(from_graph, multi_graph)
           super()
           @from_graph = from_graph
-          @multi_graph = multi_graph || Pacer::MultiGraph.new
+          @wrapper = Pacer::Wrappers::WrapperSelector.build
+          @multi_graph = multi_graph || Pacer::MultiGraph.blank
           @values_pipes = []
           @current_keys = []
           @current_values = []
@@ -61,31 +66,25 @@ module Pacer
         def processNextStart
           while true
             if current_keys.empty?
-              element = starts.next
+              element = wrapper.new starts.next
               element.graph = from_graph if element.respond_to? :graph
               self.current_keys = get_keys(element)
               self.current_values = get_values(element) unless current_keys.empty?
             else
               key = current_keys.removeFirst
               if key
-                combined = multi_graph.send(:getVertex, key) || multi_graph.send(:addVertex, key)
+                combined = multi_graph.vertex(key) || multi_graph.create_vertex(key)
               else
-                combined = multi_graph.send(:addVertex, nil)
+                combined = multi_graph.create_vertex
               end
               combined.join_on join_on if join_on
               combined[:key] = key
               current_values.each do |key, values|
-                combined.append_property_array key, values
+                combined.element.append_property_array key, values
               end
               return combined
             end
           end
-        rescue NativeException => e
-          if e.cause.getClass == Pacer::NoSuchElementException.getClass
-            raise e.cause
-          else
-            raise e
-          end
         end
 
         def get_keys(element)
@@ -109,8 +108,13 @@ module Pacer
           pipe.reset
           expando.add element, ArrayList.new, nil
           array = pipe.next
-          array.each { |element| element.graph = from_graph if element.respond_to? :graph }
-          array
+          array.map do |element|
+            if element.is_a? Pacer::Element
+              element = wrapper.new element
+              element.graph = from_graph if element.respond_to? :graph
+            end
+            element
+          end
         end
 
         def prepare_aggregate_pipe(from_pipe, to_pipe)
@@ -178,4 +182,4 @@ module Pacer
     end
   end
 end
-    
+

data/lib/pacer/transform/map.rb

@@ -2,7 +2,7 @@ module Pacer
   module Routes
     module RouteOperations
       def map(opts = {}, &block)
-        chain_route({:transform => :map, :block => block, :element_type => :object}.merge(opts))
+        chain_route({:transform => :map, :block => block, :element_type => :object, :extensions => []}.merge(opts))
       end
     end
   end
@@ -14,7 +14,11 @@ module Pacer
       protected
 
       def attach_pipe(end_pipe)
-        pipe = Pacer::Pipes::MapPipe.new(back, block)
+        # Must wrap based on parent pipe because the element in the block has
+        # not yet been affected by any of this block's transforms.
+        pf = Pacer::Wrappers::WrappingPipeFunction.new back || source, block
+        pf = Pacer::Wrappers::UnwrappingPipeFunction.new pf
+        pipe = com.tinkerpop.pipes.transform.TransformFunctionPipe.new pf
         pipe.setStarts end_pipe if end_pipe
         pipe
       end

data/lib/pacer/transform/path.rb

@@ -1,36 +1,57 @@
 module Pacer
   module Core
     module Route
-      def paths
-        chain_route :transform => :path, :element_type => :object
+      def paths(*exts)
+        route = chain_route :transform => :path, :element_type => :object
+        if exts.any?
+          exts = exts.map { |e| Array.wrap(e) if e }
+          route.map(modules: Pacer::Transform::Path::Methods) do |path|
+            path.zip(exts).map { |element, ext| ext ? element.add_extensions(ext) : element }
+          end
+        else
+          route
+        end
       end
     end
   end
 
   module Transform
     module Path
-      import com.tinkerpop.pipes.transform.PathPipe
-
-      def transpose
-        collect { |arraylist| arraylist.to_a }.transpose
-      end
+      module Methods
+        def transpose
+          collect { |arraylist| arraylist.to_a }.transpose
+        end
 
-      def subgraph(target_graph = nil)
-        raise "Can't create a subgraph within itself." if target_graph == graph
-        target_graph ||= Pacer.tg
-        target_graph.vertex_name ||= graph.vertex_name
-        bulk_job(nil, target_graph) do |path|
-          path_route = path.to_route(:graph => graph, :element_type => :mixed)
-          path_route.v.each do |vertex|
-            vertex.clone_into target_graph
+        def subgraph(target_graph = nil, opts = {})
+          raise "Can't create a subgraph within itself." if target_graph == graph
+          target_graph ||= Pacer.tg
+          target_graph.vertex_name ||= graph.vertex_name
+          missing_edges = Set[]
+          bulk_job(nil, target_graph) do |path|
+            path.select { |e| e.is_a? Pacer::Vertex }.each do |vertex|
+              vertex.clone_into target_graph
+            end
+            path.select { |e| e.is_a? Pacer::Edge }.each do |edge|
+              unless edge.clone_into target_graph, ignore_missing_vertices: true
+                missing_edges << edge
+              end
+            end
           end
-          path_route.e.each do |edge|
-            edge.clone_into target_graph
+          if missing_edges.any?
+            missing_edges.to_route(graph: graph, element_type: :edge).bulk_job nil, target_graph do |edge|
+              edge.clone_into target_graph,
+                ignore_missing_vertices: opts[:ignore_missing_vertices],
+                show_missing_vertices: opts[:show_missing_vertices]
+            end
           end
+          target_graph
         end
-        target_graph
       end
 
+      import com.tinkerpop.pipes.transform.PathPipe
+
+      include Methods
+
       protected
 
       def attach_pipe(end_pipe)
@@ -41,8 +62,11 @@ module Pacer
 
       def configure_iterator(iter)
         if respond_to? :graph
-          iter.extend Pacer::Core::Route::IteratorPathMixin
-          iter.graph = graph
+          pipe = Pacer::Pipes::PathWrappingPipe.new(graph)
+          pipe.setStarts iter
+          pipe
+        else
+          iter
         end
       end
     end

data/lib/pacer/transform/sort_section.rb

@@ -7,49 +7,77 @@ module Pacer
     end
   end
 
+
   module Transform
     module SortSection
+      # VisitsSection module provides:
+      #  section=
+      #  section_visitor
+      include Pacer::Visitors::VisitsSection
+
+      attr_accessor :block
+
+      protected
+
+      def attach_pipe(end_pipe)
+        pf = Pacer::Wrappers::WrappingPipeFunction.new self, block if block
+        pipe = SortSectionPipe.new(self, section_visitor, pf)
+        pipe.setStarts end_pipe if end_pipe
+        pipe
+      end
+
+
       class SortSectionPipe < Pacer::Pipes::RubyPipe
-        attr_reader :block_1, :block_2, :to_sort, :to_emit, :section
+        attr_reader :pf_1, :pf_2, :to_sort, :to_emit, :section
+        attr_reader :getPathToHere
 
-        def initialize(section, block)
+        def initialize(route, section, pipe_function)
           super()
           @to_emit = []
           @section = section
           @to_sort = []
+          @paths = []
           if section
             section.visitor = self
           else
             on_element nil
           end
-          if block
-            if block.arity == 1
-              @block_1 = block
+          if pipe_function
+            if pipe_function.arity == 1
+              @pf_1 = pipe_function
               section.use_on_element = false
-            elsif block.arity == 2 or block.arity < 0
-              @block_2 = block
+            else
+              @pf_2 = pipe_function
             end
           else
             section.use_on_element = false
           end
         end
 
+        def setStarts(starts)
+          super
+          enablePath(true) if pf_2
+        end
+
         def processNextStart
-          while to_emit.empty?
-            element = @starts.next
-            to_sort << element
-          end
-          to_emit.shift
-        rescue NativeException => e
-          if e.cause.getClass == Pacer::NoSuchElementException.getClass
-            if to_emit.empty?
-              raise e.cause
-            else
-              after_element
-              retry
+          if pathEnabled
+            while to_emit.empty?
+              to_sort << [starts.next, starts.getCurrentPath]
             end
           else
-            raise e
+            while to_emit.empty?
+              to_sort << [starts.next, nil]
+            end
+          end
+          raise EmptyPipe.instance if to_emit.empty?
+          element, @getPathToHere = to_emit.shift
+          element
+        rescue EmptyPipe, java.util.NoSuchElementException
+          if to_emit.empty?
+            raise EmptyPipe.instance
+          else
+            after_element
+            retry
           end
         end
 
@@ -59,45 +87,24 @@ module Pacer
 
         def after_element
           if to_sort.any?
-            if block_1
-              sorted = to_sort.sort_by do |element|
-                block_1.call element
+            if pf_1
+              sorted = to_sort.sort_by do |element, path|
+                pf_1.call element
               end
-            elsif block_2
-              sorted = to_sort.sort_by do |element|
-                block_2.call element, @section_element
+            elsif pf_2
+              sorted = to_sort.sort_by do |element, path|
+                pf_2.call_with_args element, @section_element, pf_2.wrap_path(path)
               end
             else
-              sorted = to_sort.sort
+              sorted = to_sort.sort_by do |element, path|
+                element
+              end
             end
             to_emit.concat sorted
-            @to_sort = []
+            @to_sort.clear
           end
         end
       end
-
-      attr_accessor :block
-      attr_reader :section_name, :section_route
-
-      def section=(section)
-        if section.is_a? Symbol
-          @section_name = section
-          @section_route = @back.get_section_route(section)
-        elsif section.is_a? Pacer::Route and section.respond_to? :section_name
-          @section_name = section.section_name
-          @section_route = section
-        else
-          raise ArgumentError, "Unknown section #{ section }. Provide either a name or a route created with the #section methed."
-        end
-      end
-
-      protected
-
-      def attach_pipe(end_pipe)
-        pipe = SortSectionPipe.new(@section_route.send(:section_visitor), block)
-        pipe.setStarts end_pipe if end_pipe
-        pipe
-      end
     end
   end
 end

data/lib/pacer/utils/tsort.rb

@@ -15,6 +15,11 @@ module Pacer
         # into a route.
         def dependencies(&block)
           anon_mod = Module.new
+          class << anon_mod
+            def inspect
+              '<TSort anon mixin module>'
+            end
+          end
           anon_mod.const_set :Route, TSort::Route
           anon_mod.const_set :Vertex, Module.new
           anon_mod::Vertex.const_set :DependenciesBlock, block
@@ -23,7 +28,7 @@ module Pacer
               target.const_set :DependenciesBlock, self::DependenciesBlock
             end
           end
-          route = v(*(extensions - [TSort] + [anon_mod]))
+          route = v.add_extensions [TSort, anon_mod]
           route.tsort_anon_mod = anon_mod
           route
         end
@@ -54,7 +59,7 @@ module Pacer
 
         def tsort_dependencies(tsort_anon_mod = nil)
           if self.class.const_defined? :DependenciesBlock
-            self.class::DependenciesBlock.call(self).add_extension(tsort_anon_mod)
+            self.class::DependenciesBlock.call(self).add_extensions([tsort_anon_mod])
           else
             self.in
           end

data/lib/pacer/utils.rb

@@ -4,7 +4,6 @@ module Pacer
     autoload :GraphAnalysis, 'pacer/utils/graph_analysis'
     autoload :TSort, 'pacer/utils/tsort'
     autoload :Trie, 'pacer/utils/trie'
-    import com.tinkerpop.blueprints.pgm.util.AutomaticIndexHelper
   end
 end
 

data/lib/pacer/version.rb

@@ -1,13 +1,14 @@
 module Pacer
   unless const_defined? :VERSION
-    VERSION = "0.9.1.1"
+    VERSION = "1.0.0"
 
     JAR = "pacer-#{ VERSION }-standalone.jar"
     JAR_PATH = "lib/#{ JAR }"
 
     START_TIME = Time.now
 
-    BLUEPRINTS_VERSION = "1.0"
-    PIPES_VERSION = "0.8"
+    BLUEPRINTS_VERSION = "2.1.0"
+    PIPES_VERSION = "2.1.0"
+    GREMLIN_VERSION = "2.1.0"
   end
 end

data/lib/pacer/visitors/section.rb

@@ -0,0 +1,42 @@
+module Pacer
+  module Routes
+    module RouteOperations
+      def section(section_name = nil, visitor_target = nil)
+        chain_route visitor: :section, section_name: section_name, visitor_target: visitor_target
+      end
+    end
+  end
+
+  module Visitors
+    module Section
+      attr_accessor :section_name, :visitor_target
+
+      def will_visit!
+        @visitor_count = visitor_count + 1
+      end
+
+      def section_visitor
+        section_visitors.pop
+      end
+
+      protected
+
+      def visitor_count
+        @visitor_count = 0 unless defined? @visitor_count
+        @visitor_count
+      end
+
+      attr_reader :section_visitors
+
+      def attach_pipe(end_pipe)
+        pipe = end_pipe
+        @section_visitors = (1..visitor_count).map do
+          pipe = Pacer::Pipes::SimpleVisitorPipe.new Pacer::Wrappers::WrapperSelector.build(element_type, extensions), graph
+          pipe.setStarts end_pipe if end_pipe
+          end_pipe = pipe
+        end
+        pipe
+      end
+    end
+  end
+end

data/lib/pacer/visitors/visits_section.rb

@@ -0,0 +1,32 @@
+module Pacer
+  module Visitors
+    # This module is mixed in to the route that actually refers to this section.
+    module VisitsSection
+      attr_reader :section, :section_route
+
+      def section=(section)
+        if section.is_a? Symbol
+          @section = section
+          @section_route = @back.get_section_route(section)
+        elsif section.is_a? Pacer::Route and section.respond_to? :section_name
+          @section = section.section_name
+          @section_route = section
+        else
+          raise ArgumentError, "Unknown section #{ section }. Provide either a name or a route created with the #section methed."
+        end
+        @section_route.will_visit!
+        @section_route
+      end
+
+      protected
+
+      def section_visitor
+        section_route.section_visitor if section_route
+      end
+
+      def section_visitor_target
+        section_route.visitor_target if section_route
+      end
+    end
+  end
+end

data/lib/pacer/visitors.rb

@@ -0,0 +1,7 @@
+module Pacer
+  module Visitors
+  end
+end
+
+require 'pacer/visitors/visits_section'
+require 'pacer/visitors/section'