pacer 1.1.1-java → 1.2.0-java

data/lib/pacer/graph/yaml_encoder.rb

@@ -21,6 +21,8 @@ module Pacer
         end
       when true, false
         value.to_java
+      when DateTime, Time, Date
+        value.strftime ' time %Y-%m-%d %H:%M:%S.%L %z'
       when Array
         if value.length == 0
           value_type = Fixnum
@@ -53,7 +55,12 @@ module Pacer
 
     def self.decode_property(value)
       if value.is_a? String and value[0, 1] == ' '
-        YAML.load(value[1..-1])
+        if value[1, 4] == 'time'
+          # FIXME: we lose the milliseconds here...
+          Time.parse value[6..-1]
+        else
+          YAML.load(value[1..-1])
+        end
       elsif value.is_a? ArrayJavaProxy
         value.to_a
       else

data/lib/pacer/loader.rb

@@ -97,6 +97,7 @@ require 'pacer/transform/scatter'
 require 'pacer/transform/has_count_cap'
 require 'pacer/transform/sort_section'
 require 'pacer/transform/payload'
+require 'pacer/transform/lookup_ids'
 
 require 'pacer/side_effect/aggregate'
 require 'pacer/side_effect/as'

data/lib/pacer/pipe/loop_pipe.rb

@@ -6,7 +6,7 @@ module Pacer::Pipes
       super()
       @graph = graph
       @control_block = control_block
-      @wrapper = Pacer::Wrappers::WrapperSelector.build
+      @wrapper = Pacer::Wrappers::WrapperSelector.build graph
 
       @expando = ExpandablePipe.new
       empty = ArrayList.new

data/lib/pacer/pipe/path_wrapping_pipe.rb

@@ -7,8 +7,8 @@ module Pacer
       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[]
+        @vertex_wrapper = Pacer::Wrappers::WrapperSelector.build graph, :vertex, vertex_extensions || Set[]
+        @edge_wrapper = Pacer::Wrappers::WrapperSelector.build graph, :edge, edge_extensions || Set[]
       end
 
       def getCurrentPath

data/lib/pacer/pipe/wrapping_pipe.rb

@@ -8,7 +8,7 @@ module Pacer
         @graph = graph
         @element_type = element_type
         @extensions = extensions || []
-        @wrapper = Pacer::Wrappers::WrapperSelector.build element_type, @extensions
+        @wrapper = Pacer::Wrappers::WrapperSelector.build graph, element_type, @extensions
       end
 
       def getSideEffect

data/lib/pacer/route/mixin/bulk_operations.rb

@@ -25,15 +25,15 @@ module Pacer::Routes
           size ||= target_graph.bulk_job_size
           counter = 0
           target_graph.transaction(nesting: true) do |commit, rollback|
+            print "Bulk job ->" if Pacer.verbose?
             each_slice(size) do |slice|
-              print counter if Pacer.verbose?
+              print " #{counter}" if Pacer.verbose?
               counter += size
               slice.each do |element|
                 yield element
               end
               commit.call
             end
-            print '.' if Pacer.verbose?
           end
         ensure
           puts '!' if Pacer.verbose?

data/lib/pacer/support/awesome_print.rb

@@ -0,0 +1,44 @@
+begin
+  require 'awesome_print'
+rescue LoadError
+end
+
+# Fix the way ap indents hashes:
+
+# for awesome_print <= 0.4.0
+class AwesomePrint
+# for awesome_print >= 1.0.0
+#class AwesomePrint::Formatter
+  private
+
+  # Format a hash. If @options[:indent] if negative left align hash keys.
+  #------------------------------------------------------------------------------
+  def awesome_hash(h)
+    return "{}" if h == {}
+
+    keys = @options[:sorted_hash_keys] ? h.keys.sort { |a, b| a.to_s <=> b.to_s } : h.keys
+    data = keys.map do |key|
+      plain_single_line do
+        #[ @inspector.awesome(key), h[key] ]
+        [ awesome(key), h[key] ]
+      end
+    end
+      
+    data = data.map do |key, value|
+      if @options[:multiline]
+        formatted_key = indent + key
+      else
+        formatted_key = key
+      end
+      indented do
+        #formatted_key << colorize(" => ", :hash) << @inspector.awesome(value)
+        formatted_key << colorize(" => ", :hash) << awesome(value)
+      end
+    end
+    if @options[:multiline]
+      "{\n" << data.join(",\n") << "\n#{outdent}}"
+    else
+      "{ #{data.join(', ')} }"
+    end
+  end
+end

data/lib/pacer/transform/join.rb

@@ -42,7 +42,7 @@ module Pacer
         def initialize(from_graph, multi_graph)
           super()
           @from_graph = from_graph
-          @wrapper = Pacer::Wrappers::WrapperSelector.build
+          @wrapper = Pacer::Wrappers::WrapperSelector.build from_graph
           @multi_graph = multi_graph || Pacer::MultiGraph.blank
           @values_pipes = []
           @current_keys = []
@@ -133,6 +133,20 @@ module Pacer
       attr_accessor :existing_multi_graph, :key_route, :values_routes, :from_graph
       attr_writer :join_on
 
+      # FIXME: the pipe changes the graph. This does not fit with the idea of immutable routes.
+      def graph
+        @graph or super
+      end
+
+      def run!
+        super
+        @graph
+      end
+
+      def graph=(g)
+        @graph = g
+      end
+
       def key(&block)
         self.key_route = Pacer::Route.block_branch(self, block)
         self

data/lib/pacer/transform/lookup_ids.rb

@@ -0,0 +1,36 @@
+module Pacer
+  module Routes
+    # TODO: this should only apply to ID routes...do we want to be that granular with route types?
+    module RouteOperations
+      # args is (optional) extensions followed by an (optional) options hash
+      def lookup_ids(*args)
+        if args.last.is_a? Hash
+          opts = args.pop
+        else
+          opts = {}
+        end
+        chain_route({transform: :lookup_ids, element_type: :vertex, extensions: args, wrapper: nil}.merge(opts))
+      end
+    end
+  end
+
+  module Transform
+    module LookupIds
+      import com.tinkerpop.gremlin.pipes.transform.IdVertexPipe
+      import com.tinkerpop.gremlin.pipes.transform.IdEdgePipe
+
+      def attach_pipe(end_pipe)
+        fail ClientError, 'Can not look up elements without the graph' unless graph
+        if element_type == :vertex
+          pipe = IdVertexPipe.new graph.blueprints_graph
+        elsif element_type == :vertex
+          pipe = IdEdgePipe.new graph.blueprints_graph
+        else
+          fail ClientError, 'Can not look up elements without the element_type'
+        end
+        pipe.setStarts end_pipe
+        pipe
+      end
+    end
+  end
+end

data/lib/pacer/transform/path.rb

@@ -38,7 +38,9 @@ This is especially useful for graph traversals.
                                         #    #<E[40]:38-document-id-39>,
                                         #    #<V[39]>]
 
-See the :paths section for more details and general information about paths.
+See:
+  :paths  - for more details and general information about paths.
+  :arrays - for general operations that work on arrays or paths.
 
 HELP
         else

data/lib/pacer/transform/path_tree.rb

@@ -15,7 +15,7 @@ module Pacer
 
         # The default comparator block is { |prev, current| prev == current }
         def tree(&block)
-          wrapped.chain_route transform: :path_tree, element_type: :object, compare: block
+          wrapped.chain_route transform: :path_tree, element_type: :array, compare: block
         end
       end
     end

data/lib/pacer/version.rb

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

data/lib/pacer/visitors/section.rb

@@ -31,7 +31,7 @@ module Pacer
       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 = Pacer::Pipes::SimpleVisitorPipe.new Pacer::Wrappers::WrapperSelector.build(graph, element_type, extensions), graph
           pipe.setStarts end_pipe if end_pipe
           end_pipe = pipe
         end

data/lib/pacer/wrappers/edge_wrapper.rb

@@ -18,7 +18,7 @@ module Pacer::Wrappers
 
       def wrapper_for(exts)
         if exts
-          EdgeWrapper.wrappers[exts] ||= build_edge_wrapper(exts)
+          base_edge_wrapper.wrappers[exts] ||= build_edge_wrapper(exts)
         else
           fail Pacer::LogicError, "Extensions should not be nil"
         end
@@ -31,7 +31,7 @@ module Pacer::Wrappers
       protected
 
       def build_edge_wrapper(exts)
-        build_extension_wrapper(exts, [:Route, :Edge], EdgeWrapper)
+        build_extension_wrapper(exts, [:Route, :Edge], base_edge_wrapper)
       end
     end
 
@@ -48,11 +48,11 @@ module Pacer::Wrappers
     def in_vertex(extensions = nil)
       v = element.getVertex Pacer::Pipes::IN
       if extensions.is_a? Enumerable
-        VertexWrapper.wrapper_for(extensions).new graph, v
+        self.class.base_vertex_wrapper.wrapper_for(extensions).new graph, v
       elsif extensions
-        VertexWrapper.wrapper_for([extensions]).new graph, v
+        self.class.base_vertex_wrapper.wrapper_for([extensions]).new graph, v
       else
-        VertexWrapper.new graph, v
+        self.class.base_vertex_wrapper.new graph, v
       end
     end
 
@@ -61,11 +61,11 @@ module Pacer::Wrappers
     def out_vertex(extensions = nil)
       v = element.getVertex Pacer::Pipes::OUT
       if extensions.is_a? Enumerable
-        VertexWrapper.wrapper_for(extensions).new graph, v
+        self.class.base_vertex_wrapper.wrapper_for(extensions).new graph, v
       elsif extensions
-        VertexWrapper.wrapper_for([extensions]).new graph, v
+        self.class.base_vertex_wrapper.wrapper_for([extensions]).new graph, v
       else
-        VertexWrapper.new graph, v
+        self.class.base_vertex_wrapper.new graph, v
       end
     end
 
@@ -94,7 +94,7 @@ module Pacer::Wrappers
     # Returns the element with a new simple wrapper.
     # @return [EdgeWrapper]
     def no_extensions
-      EdgeWrapper.new graph, element
+      self.class.base_edge_wrapper.new graph, element
     end
 
     # Returns a human-readable representation of the edge using the

data/lib/pacer/wrappers/element_wrapper.rb

@@ -7,6 +7,16 @@ module Pacer::Wrappers
     include Pacer::Core::Graph::ElementRoute
 
     class << self
+      attr_accessor :caches
+
+      def base_vertex_wrapper
+        VertexWrapper
+      end
+
+      def base_edge_wrapper
+        EdgeWrapper
+      end
+
       def wrap(element, exts)
         wrapper_for(exts).new(element.graph, element.element)
       end
@@ -22,6 +32,7 @@ module Pacer::Wrappers
       def clear_cache
         VertexWrapper.clear_cache
         EdgeWrapper.clear_cache
+        caches.each { |c| c.clear_cache } if caches
       end
 
       def route_conditions

data/lib/pacer/wrappers/index_wrapper.rb

@@ -13,7 +13,7 @@ module Pacer::Wrappers
     end
 
     def wrapper
-      WrapperSelector.build element_type
+      WrapperSelector.build graph, element_type
     end
 
     def first(key, value, extensions = nil)

data/lib/pacer/wrappers/path_wrapping_pipe_function.rb

@@ -10,7 +10,7 @@ module Pacer
         if back
           @graph = back.graph
         end
-        @wrapper = WrapperSelector.build
+        @wrapper = WrapperSelector.build graph
       end
 
       def arity

data/lib/pacer/wrappers/vertex_wrapper.rb

@@ -18,7 +18,7 @@ module Pacer::Wrappers
 
       def wrapper_for(exts)
         if exts
-          VertexWrapper.wrappers[exts.to_set] ||= build_vertex_wrapper(exts)
+          base_vertex_wrapper.wrappers[exts.to_set] ||= build_vertex_wrapper(exts)
         else
           fail Pacer::LogicError, "Extensions should not be nil"
         end
@@ -31,7 +31,7 @@ module Pacer::Wrappers
       protected
 
       def build_vertex_wrapper(exts)
-        build_extension_wrapper(exts, [:Route, :Vertex], VertexWrapper)
+        build_extension_wrapper(exts, [:Route, :Vertex], base_vertex_wrapper)
       end
     end
 
@@ -64,7 +64,7 @@ module Pacer::Wrappers
     # Returns the element with a new simple wrapper.
     # @return [VertexWrapper]
     def no_extensions
-      VertexWrapper.new graph, element
+      self.class.base_vertex_wrapper.new graph, element
     end
 
     # Checks that the given extensions can be applied to the vertex. If

data/lib/pacer/wrappers/wrapper_selector.rb

@@ -3,13 +3,23 @@ module Pacer::Wrappers
     import com.tinkerpop.blueprints.Vertex
     import com.tinkerpop.blueprints.Edge
 
-    def self.build(element_type = nil, extensions = [])
-      if element_type == :vertex
-        Pacer::Wrappers::VertexWrapper.wrapper_for extensions
-      elsif element_type == :edge
-        Pacer::Wrappers::EdgeWrapper.wrapper_for extensions
+    def self.build(graph, element_type = nil, extensions = [])
+      if graph
+        if element_type == :vertex
+          graph.base_vertex_wrapper.wrapper_for extensions
+        elsif element_type == :edge
+          graph.base_edge_wrapper.wrapper_for extensions
+        else
+          new extensions
+        end
       else
-        new extensions
+        if element_type == :vertex
+          Pacer::Wrappers::VertexWrapper.wrapper_for extensions
+        elsif element_type == :edge
+          Pacer::Wrappers::EdgeWrapper.wrapper_for extensions
+        else
+          new extensions
+        end
       end
     end
 
@@ -20,16 +30,24 @@ module Pacer::Wrappers
       @extensions = extensions
     end
 
-    def wrapper(element)
-      if element.is_a? Vertex
-        self.vertex_wrapper ||= Pacer::Wrappers::VertexWrapper.wrapper_for extensions
-      elsif element.is_a? Edge
-        self.edge_wrapper ||= Pacer::Wrappers::EdgeWrapper.wrapper_for extensions
+    def wrapper(graph, element)
+      if graph
+        if element.is_a? Vertex
+          self.vertex_wrapper ||= graph.base_vertex_wrapper.wrapper_for extensions
+        elsif element.is_a? Edge
+          self.edge_wrapper ||= graph.base_edge_wrapper.wrapper_for extensions
+        end
+      else
+        if element.is_a? Vertex
+          self.vertex_wrapper ||= Pacer::Wrappers::VertexWrapper.wrapper_for extensions
+        elsif element.is_a? Edge
+          self.edge_wrapper ||= Pacer::Wrappers::EdgeWrapper.wrapper_for extensions
+        end
       end
     end
 
     def new(graph, element)
-      w = wrapper(element)
+      w = wrapper(graph, element)
       if w
         w.new graph, element
       else

data/lib/pacer/wrappers/wrapping_pipe_function.rb

@@ -12,7 +12,7 @@ module Pacer
           @extensions = back.extensions
           element_type = back.element_type
         end
-        @wrapper = WrapperSelector.build element_type, extensions
+        @wrapper = WrapperSelector.build graph, element_type, extensions
       end
 
       def arity
@@ -20,14 +20,14 @@ module Pacer
       end
 
       def compute(element)
-        e = wrapper.new graph, element
+        e = wrapper.new graph, element if element
         block.call e
       end
 
       alias call compute
 
       def call_with_args(element, *args)
-        e = wrapper.new graph, element
+        e = wrapper.new graph, element if element
         block.call e, *args
       end