pacer 1.0.1-java → 1.0.2-java

data/.gitignore

@@ -11,7 +11,6 @@ doc
 # bundler
 .bundle
 Gemfile.lock
-Gemfile
 
 # jeweler generated
 pkg

data/Gemfile

@@ -2,3 +2,32 @@
 source "http://rubygems.org"
 
 gemspec
+
+group :development do
+  gem 'rspec', '~> 2.10.0'
+  gem 'rr', '~> 1.0'
+  gem 'simplecov'
+  gem 'yard'
+  gem 'rake'
+
+  # pacer-* gems are required for testing pacer.
+  # If you have the gem repos cloned locally, we'll use them.
+  #
+  libs = [
+    ['pacer-neo4j', '2.0.0.pre'],
+    ['pacer-orient', '2.0.0.pre'],
+    ['pacer-dex', '2.0.0.pre']
+  ] 
+  libs.each do |lib, version|
+    if File.directory? "../#{lib}"
+      gem lib, :path => "../#{lib}" 
+    end
+  end
+
+   
+  gem 'autotest-standalone'
+  gem 'autotest-growl'
+  gem 'pry'
+  gem 'awesome_print', '0.4.0'
+end
+

data/lib/pacer/core/graph/edges_route.rb

@@ -9,7 +9,7 @@ module Pacer::Core::Graph
     # Extends the route with out vertices from this route's matching edges.
     #
     # @param [Array<Hash, extension>, Hash, extension] filter see {Pacer::Route#property_filter}
-    # @yield [VertexWrapper(Extensions::BlockFilterElement)] filter proc, see {Pacer::Route#property_filter}
+    # @yield [VertexWrapper] filter proc, see {Pacer::Route#property_filter}
     # @return [VerticesRoute]
     def out_v(*filters, &block)
       Pacer::Route.property_filter(chain_route(:element_type => :vertex,
@@ -21,7 +21,7 @@ module Pacer::Core::Graph
     # Extends the route with in vertices from this route's matching edges.
     #
     # @param [Array<Hash, extension>, Hash, extension] filter see {Pacer::Route#property_filter}
-    # @yield [VertexWrapper(Extensions::BlockFilterElement)] filter proc, see {Pacer::Route#property_filter}
+    # @yield [VertexWrapper] filter proc, see {Pacer::Route#property_filter}
     # @return [VerticesRoute]
     def in_v(*filters, &block)
       Pacer::Route.property_filter(chain_route(:element_type => :vertex,
@@ -33,7 +33,7 @@ module Pacer::Core::Graph
     # Extends the route with both in and oud vertices from this route's matching edges.
     #
     # @param [Array<Hash, extension>, Hash, extension] filter see {Pacer::Route#property_filter}
-    # @yield [VertexWrapper(Extensions::BlockFilterElement)] filter proc, see {Pacer::Route#property_filter}
+    # @yield [VertexWrapper] filter proc, see {Pacer::Route#property_filter}
     # @return [VerticesRoute]
     def both_v(*filters, &block)
       Pacer::Route.property_filter(chain_route(:element_type => :vertex,
@@ -45,7 +45,7 @@ module Pacer::Core::Graph
     # Extend route with the additional edge label, property and block filters.
     #
     # @param [Array<Hash, extension>, Hash, extension] filter see {Pacer::Route#property_filter}
-    # @yield [EdgeWrapper(Extensions::BlockFilterElement)] filter proc, see {Pacer::Route#property_filter}
+    # @yield [EdgeWrapper] filter proc, see {Pacer::Route#property_filter}
     # @return [EdgesRoute]
     def e(*filters, &block)
       filter(*filters, &block)

data/lib/pacer/core/graph/element_route.rb

@@ -10,7 +10,7 @@ module Pacer::Core::Graph
     # Attach a filter to the current route.
     #
     # @param [Array<Hash, extension>, Hash, extension] filter see {Pacer::Route#property_filter}
-    # @yield [ElementWrapper(Extensions::BlockFilterElement)] filter proc, see {Pacer::Route#property_filter}
+    # @yield [ElementWrapper] filter proc, see {Pacer::Route#property_filter}
     # @return [ElementRoute] the same type and extensions as the source route.
     def filter(*filters, &block)
       Pacer::Route.property_filter(self, filters, block)

data/lib/pacer/core/graph/vertices_route.rb

@@ -15,7 +15,7 @@ module Pacer::Core::Graph
     #   If string(s) or symbol(s) are given, they will be treated as edge
     #   labels. Unlike other property filters which all must be matched, an
     #   edge will pass the filter if it matches any of the given labels.
-    # @yield [EdgeWrapper(Extensions::BlockFilterElement)] filter proc, see {Pacer::Route#property_filter}
+    # @yield [EdgeWrapper] filter proc, see {Pacer::Route#property_filter}
     # @return [EdgesRoute]
     def out_e(*filters, &block)
       filters = extract_labels(filters)
@@ -32,13 +32,15 @@ module Pacer::Core::Graph
     #   If string(s) or symbol(s) are given, they will be treated as edge
     #   labels. Unlike other property filters which all must be matched, an
     #   edge will pass the filter if it matches any of the given labels.
-    # @yield [VertexWrapper(Extensions::BlockFilterElement)] filter proc, see {Pacer::Route#property_filter}
+    # @yield [VertexWrapper] filter proc, see {Pacer::Route#property_filter}
     # @return [VerticesRoute]
     def out(*filters, &block)
       filters = extract_labels(filters)
       Pacer::Route.property_filter(chain_route(:element_type => :vertex,
                                                :pipe_class => OutPipe,
                                                :pipe_args => route_labels,
+                                               :wrapper => nil,
+                                               :extensions => [],
                                                :route_name => edge_route_name('out')),
                                   filters, block)
     end
@@ -49,7 +51,7 @@ module Pacer::Core::Graph
     #   If string(s) or symbol(s) are given, they will be treated as edge
     #   labels. Unlike other property filters which all must be matched, an
     #   edge will pass the filter if it matches any of the given labels.
-    # @yield [EdgeWrapper(Extensions::BlockFilterElement)] filter proc, see {Pacer::Route#property_filter}
+    # @yield [EdgeWrapper] filter proc, see {Pacer::Route#property_filter}
     # @return [EdgesRoute]
     def in_e(*filters, &block)
       filters = extract_labels(filters)
@@ -66,13 +68,15 @@ module Pacer::Core::Graph
     #   If string(s) or symbol(s) are given, they will be treated as edge
     #   labels. Unlike other property filters which all must be matched, an
     #   edge will pass the filter if it matches any of the given labels.
-    # @yield [VertexWrapper(Extensions::BlockFilterElement)] filter proc, see {Pacer::Route#property_filter}
+    # @yield [VertexWrapper] filter proc, see {Pacer::Route#property_filter}
     # @return [VerticesRoute]
     def in(*filters, &block)
       filters = extract_labels(filters)
       Pacer::Route.property_filter(chain_route(:element_type => :vertex,
                                                :pipe_class => InPipe,
                                                :pipe_args => route_labels,
+                                               :wrapper => nil,
+                                               :extensions => [],
                                                :route_name => edge_route_name('in')),
                                   filters, block)
     end
@@ -83,7 +87,7 @@ module Pacer::Core::Graph
     #   If string(s) or symbol(s) are given, they will be treated as edge
     #   labels. Unlike other property filters which all must be matched, an
     #   edge will pass the filter if it matches any of the given labels.
-    # @yield [EdgeWrapper(Extensions::BlockFilterElement)] filter proc, see {Pacer::Route#property_filter}
+    # @yield [EdgeWrapper] filter proc, see {Pacer::Route#property_filter}
     # @return [EdgesRoute]
     def both_e(*filters, &block)
       filters = extract_labels(filters)
@@ -100,13 +104,15 @@ module Pacer::Core::Graph
     #   If string(s) or symbol(s) are given, they will be treated as edge
     #   labels. Unlike other property filters which all must be matched, an
     #   edge will pass the filter if it matches any of the given labels.
-    # @yield [VertexWrapper(Extensions::BlockFilterElement)] filter proc, see {Pacer::Route#property_filter}
+    # @yield [VertexWrapper] filter proc, see {Pacer::Route#property_filter}
     # @return [VerticesRoute]
     def both(*filters, &block)
       filters = extract_labels(filters)
       Pacer::Route.property_filter(chain_route(:element_type => :vertex,
                                                :pipe_class => BothPipe,
                                                :pipe_args => route_labels,
+                                               :wrapper => nil,
+                                               :extensions => [],
                                                :route_name => edge_route_name('both')),
                                   filters, block)
     end
@@ -117,7 +123,7 @@ module Pacer::Core::Graph
     #   If string(s) or symbol(s) are given, they will be treated as edge
     #   labels. Unlike other property filters which all must be matched, an
     #   edge will pass the filter if it matches any of the given labels.
-    # @yield [VertexWrapper(Extensions::BlockFilterElement)] filter proc, see {Pacer::Route#property_filter}
+    # @yield [VertexWrapper] filter proc, see {Pacer::Route#property_filter}
     # @return [VerticesRoute]
     def v(*filters, &block)
       filter(*filters, &block)
@@ -165,8 +171,6 @@ module Pacer::Core::Graph
       else
         to_vertices = [to_vertices].compact
       end
-      graph = self.graph
-
       has_props = !props.empty?
       edge_ids = []
       counter = 0

data/lib/pacer/core/route.rb

@@ -203,31 +203,6 @@ module Pacer
         chain_route wrapper: wrapper
       end
 
-      def wrapper
-        @wrapper
-      end
-
-      # Get the set of extensions currently on this route.
-      #
-      # The order of extensions for custom defined wrappers are
-      # guaranteed. If a wrapper is iterated with additional extensions,
-      # a new wrapper will be created dynamically with the original
-      # extensions in order followed by any additional extensions in
-      # undefined order.
-      #
-      # Returns an Array
-      #
-      # @return [Array[extension]]
-      attr_reader :extensions
-
-      def all_extensions
-        if wrapper
-          wrapper.extensions + extensions
-        else
-          extensions
-        end
-      end
-
       # If any objects in the given array are modules that contain a Route
       # submodule, extend this route with the Route module.
       # @return [self]

data/lib/pacer/graph/pacer_graph.rb

@@ -9,7 +9,11 @@ module Pacer
     attr_reader :blueprints_graph, :encoder
 
     def initialize(encoder, open, shutdown = nil)
-      @reopen = open
+      if open.is_a? Proc
+        @reopen = open
+      else
+        @reopen = proc { open }
+      end
       @shutdown = shutdown
       reopen
       @encoder = encoder
@@ -62,12 +66,11 @@ module Pacer
       if v
         wrapper = modules.detect { |obj| obj.ancestors.include? Pacer::Wrappers::VertexWrapper }
         if wrapper
-          v = wrapper.new v
+          v = wrapper.new graph, v
           modules.delete wrapper
         else
-          v = Pacer::Wrappers::VertexWrapper.new v
+          v = Pacer::Wrappers::VertexWrapper.new graph, v
         end
-        v.graph = self
         v.add_extensions modules
       else
         v
@@ -90,12 +93,11 @@ module Pacer
       if v
         wrapper = modules.detect { |obj| obj.ancestors.include? Pacer::Wrappers::EdgeWrapper }
         if wrapper
-          v = wrapper.new v
+          v = wrapper.new graph, v
           modules.delete wrapper
         else
-          v = Pacer::Wrappers::EdgeWrapper.new v
+          v = Pacer::Wrappers::EdgeWrapper.new graph, v
         end
-        v.graph = self
         v.add_extensions modules
       end
     end
@@ -116,14 +118,13 @@ module Pacer
       id, wrapper, modules, props = id_modules_properties(args)
       raw_vertex = creating_elements { blueprints_graph.addVertex(id) }
       if wrapper
-        vertex = wrapper.new raw_vertex
+        vertex = wrapper.new graph, raw_vertex
       else
-        vertex = Pacer::Wrappers::VertexWrapper.new raw_vertex
+        vertex = Pacer::Wrappers::VertexWrapper.new graph, raw_vertex
       end
       if modules.any?
         vertex = vertex.add_extensions modules
       end
-      vertex.graph = self
       props.each { |k, v| vertex[k.to_s] = v } if props
       vertex
     end
@@ -143,14 +144,13 @@ module Pacer
       _, wrapper, modules, props = id_modules_properties(args)
       raw_edge = creating_elements { blueprints_graph.addEdge(id, from_v.element, to_v.element, label.to_s) }
       if wrapper
-        edge = wrapper.new raw_edge
+        edge = wrapper.new graph, raw_edge
       else
-        edge = Pacer::Wrappers::EdgeWrapper.new raw_edge
+        edge = Pacer::Wrappers::EdgeWrapper.new graph, raw_edge
       end
       if modules.any?
         edge = edge.add_extensions modules
       end
-      edge.graph = self
       props.each { |k, v| edge[k.to_s] = v } if props
       edge
     end

data/lib/pacer/pipe/loop_pipe.rb

@@ -52,12 +52,9 @@ module Pacer::Pipes
           end
           depth = 0
         end
-        wrapped = wrapper.new(element)
-        wrapped.graph = graph if wrapped.respond_to? :graph=
+        wrapped = wrapper.new(graph, element)
         path = @next_path.map do |e|
-          w = wrapper.new e
-          w.graph = graph if w.respond_to? :graph=
-          w
+          wrapper.new graph, e
         end
         case control_block.call wrapped, depth, path
         when :loop

data/lib/pacer/pipe/path_wrapping_pipe.rb

@@ -19,17 +19,11 @@ module Pacer
         path = starts.next
         path.collect do |item|
           if item.is_a? Pacer::Vertex
-            wrapped = vertex_wrapper.new item
-            wrapped.graph = graph
-            wrapped
+            vertex_wrapper.new graph, item
           elsif item.is_a? Pacer::Edge
-            wrapped = edge_wrapper.new item
-            wrapped.graph = graph
-            wrapped
+            edge_wrapper.new graph, item
           elsif other_wrapper
-            wrapped = other_wrapper.new item
-            wrapped.graph = graph if wrapped.respond_to? :graph
-            wrapped
+            other_wrapper.new graph, item
           else
             item
           end

data/lib/pacer/pipe/simple_visitor_pipe.rb

@@ -24,8 +24,7 @@ module Pacer
         current = starts.next
         @in_section = true unless in_section
         if use_on_element
-          wrapped = wrapper.new current
-          wrapped.graph = graph
+          wrapped = wrapper.new graph, current
           visitor.on_element(wrapped)
         end
         return current

data/lib/pacer/pipe/wrapping_pipe.rb

@@ -24,13 +24,7 @@ module Pacer
       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
+        wrapper.new graph, starts.next
       end
     end
   end

data/lib/pacer/route.rb

@@ -1,4 +1,4 @@
-[Pacer::Core::Route, Pacer::Wrappers::ElementWrapper, Pacer::Wrappers::EdgeWrapper, Pacer::Wrappers::VertexWrapper].each do |klass|
+[Pacer::Core::Route, Pacer::Wrappers::ElementWrapper].each do |klass|
   klass.class_eval %{
     def chain_route(args_hash)
       Pacer::RouteBuilder.current.chain self, args_hash
@@ -182,19 +182,30 @@ module Pacer
 
     attr_reader :config
 
+    # The wrapper object to use to wrap elements in.
+    #
+    # If it responds to #add_extensions and the rout also has additional
+    # extensions, it will be used to generate a new wrapper dynamically.
     def wrapper
       config[:wrapper]
     end
 
+    # Get the set of extensions currently on this route.
+    #
+    # The order of extensions for custom defined wrappers are
+    # guaranteed. If a wrapper is iterated with additional extensions,
+    # a new wrapper will be created dynamically with the original
+    # extensions in order followed by any additional extensions in
+    # undefined order.
+    #
+    # Returns an Array
+    #
+    # @return [Array[extension]]
     def extensions
-      config[:extensions]
-    end
-
-    def all_extensions
       if wrapper
-        (wrapper.extensions + extensions).uniq
+        (wrapper.extensions + config[:extensions]).uniq
       else
-        extensions
+        config[:extensions]
       end
     end
 

data/lib/pacer/side_effect/is_unique.rb

@@ -1,12 +1,22 @@
 module Pacer
   module Routes
     module RouteOperations
-      def is_unique
-        chain_route :side_effect => :is_unique
+      # This method adds the IsUniquePipe to the pipeline and whenever the
+      # pipeline is built, yields the pipe to the block given here.
+      #
+      # See #unique? below for example usage.
+      def is_unique(&block)
+        chain_route side_effect: :is_unique, on_build_pipe: block
       end
 
+      # This method builds a pipe and ataches the IsUniquePipe to the end then
+      # iterates the pipeline until it finds a unique element or hits the end.
       def unique?
-        is_unique.unique?
+        check = nil
+        is_unique { |pipe| check = pipe }.each do
+          return false unless check.unique?
+        end
+        true
       end
     end
   end
@@ -14,19 +24,15 @@ module Pacer
 
   module SideEffect
     module IsUnique
-      def unique?
-        checked = Pacer::Pipes::IsUniquePipe.new
-        checked.setStarts pipe
-        checked.next while checked.unique?
-        false
-      rescue Pacer::EmptyPipe, java.util.NoSuchElementException
-        true
-      end
+      attr_accessor :on_build_pipe
 
       protected
 
       def attach_pipe(end_pipe)
-        end_pipe
+        checked = Pacer::Pipes::IsUniquePipe.new
+        checked.setStarts end_pipe
+        on_build_pipe.call checked if on_build_pipe
+        checked
       end
     end
   end

data/lib/pacer/transform/join.rb

@@ -66,8 +66,7 @@ module Pacer
         def processNextStart
           while true
             if current_keys.empty?
-              element = wrapper.new starts.next
-              element.graph = from_graph if element.respond_to? :graph
+              element = wrapper.new from_graph, starts.next
               self.current_keys = get_keys(element)
               self.current_values = get_values(element) unless current_keys.empty?
             else
@@ -110,10 +109,10 @@ module Pacer
           array = pipe.next
           array.map do |element|
             if element.is_a? Pacer::Element
-              element = wrapper.new element
-              element.graph = from_graph if element.respond_to? :graph
+              wrapper.new from_graph, element
+            else
+              element
             end
-            element
           end
         end
 

data/lib/pacer/utils/trie.rb

@@ -23,9 +23,7 @@ module Pacer::Utils
       def find(array)
         found = find_partial(array)
         if found.length == array.length
-          result = found.last.in_vertex.add_extensions [Trie]
-          result.graph = graph
-          result
+          found.last.in_vertex.add_extensions [Trie]
         end
       end
 
@@ -64,7 +62,6 @@ module Pacer::Utils
           end
         end
         result[:end] = true
-        result.graph = graph
         result.add_extensions [Trie]
       end
 

data/lib/pacer/utils/tsort.rb

@@ -59,9 +59,9 @@ module Pacer
 
         def tsort_dependencies(tsort_anon_mod = nil)
           if self.class.const_defined? :DependenciesBlock
-            self.class::DependenciesBlock.call(self).add_extensions([tsort_anon_mod])
+            self.class::DependenciesBlock.call(self).add_extensions([TSort, tsort_anon_mod])
           else
-            self.in
+            self.in(extensions)
           end
         end
       end

data/lib/pacer/version.rb

@@ -1,6 +1,6 @@
 module Pacer
   unless const_defined? :VERSION
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
 
     JAR = "pacer-#{ VERSION }-standalone.jar"
     JAR_PATH = "lib/#{ JAR }"

data/lib/pacer/wrappers/edge_wrapper.rb

@@ -42,14 +42,12 @@ module Pacer::Wrappers
     def in_vertex(extensions = nil)
       v = element.getVertex Pacer::Pipes::IN
       if extensions.is_a? Enumerable
-        v = VertexWrapper.wrapper_for(extensions).new v
+        VertexWrapper.wrapper_for(extensions).new graph, v
       elsif extensions
-        v = VertexWrapper.wrapper_for([extensions]).new v
+        VertexWrapper.wrapper_for([extensions]).new graph, v
       else
-        v = VertexWrapper.new v
+        VertexWrapper.new graph, v
       end
-      v.graph = graph
-      v
     end
 
     # The outgoing vertex for this edge.
@@ -57,14 +55,12 @@ module Pacer::Wrappers
     def out_vertex(extensions = nil)
       v = element.getVertex Pacer::Pipes::OUT
       if extensions.is_a? Enumerable
-        v = VertexWrapper.wrapper_for(extensions).new v
+        VertexWrapper.wrapper_for(extensions).new graph, v
       elsif extensions
-        v = VertexWrapper.wrapper_for([extensions]).new v
+        VertexWrapper.wrapper_for([extensions]).new graph, v
       else
-        v = VertexWrapper.new v
+        VertexWrapper.new graph, v
       end
-      v.graph = graph
-      v
     end
 
     # This method must be defined here rather than in the superclass in order
@@ -83,9 +79,7 @@ module Pacer::Wrappers
     #   the extensions
     def add_extensions(exts)
       if exts.any?
-        e = self.class.wrap(element, extensions + exts.to_a)
-        e.graph = graph
-        e
+        self.class.wrap(self, extensions + exts.to_a)
       else
         self
       end
@@ -94,7 +88,7 @@ module Pacer::Wrappers
     # Returns the element with a new simple wrapper.
     # @return [EdgeWrapper]
     def no_extensions
-      EdgeWrapper.new element
+      EdgeWrapper.new graph, element
     end
 
     # Returns a human-readable representation of the edge using the
@@ -138,8 +132,7 @@ module Pacer::Wrappers
       unless e
         e = e_idx.first('id', element_id)
         if e
-          e = EdgeWrapper.new(e)
-          e.graph = target_graph
+          e = EdgeWrapper.new(graph, e)
         end
       end
       unless e
@@ -193,12 +186,19 @@ module Pacer::Wrappers
     # If the other instance is an unwrapped edge, this will always return
     # false because otherwise the == method would not be symetrical.
     #
-    # @see #eql?
     # @param other
     def ==(other)
       other.is_a? EdgeWrapper and
         element_id == other.element_id and
         graph == other.graph
     end
+    alias eql? ==
+
+    # Neo4j and Orient both have hash collisions between vertices and
+    # edges which causes problems when making a set out of a path for
+    # instance. Simple fix: negate edge hashes.
+    def hash
+      -element.hash
+    end
   end
 end

data/lib/pacer/wrappers/element_wrapper.rb

@@ -8,11 +8,7 @@ module Pacer::Wrappers
 
     class << self
       def wrap(element, exts)
-        if element.respond_to? :element
-          wrapper_for(exts).new(element.element)
-        else
-          wrapper_for(exts).new(element)
-        end
+        wrapper_for(exts).new(element.graph, element.element)
       end
 
       def extensions
@@ -83,10 +79,11 @@ module Pacer::Wrappers
     # the element.
     #
     # @return [PacerGraph]
-    attr_accessor :graph
+    attr_reader :graph
     attr_reader :element
 
-    def initialize(element)
+    def initialize(graph, element)
+      @graph = graph
       if element.is_a? ElementWrapper
         @element = element.element
       else
@@ -95,10 +92,6 @@ module Pacer::Wrappers
       after_initialize
     end
 
-    def hash
-      element.hash
-    end
-
     # Convenience method to retrieve a property by name.
     #
     # @param [#to_s] key the property name
@@ -177,24 +170,6 @@ module Pacer::Wrappers
       display_name.to_s <=> other.display_name.to_s
     end
 
-    # Test object equality of the element instance.
-    #
-    # Wrappers/extensions (if any) are ignored, the underlying element
-    # only is compared
-    #
-    # If the graphdb instantiates multiple copies of the same element
-    # this method will return false when comparing them.
-    #
-    # @see #==
-    # @param other
-    def eql?(other)
-      if other.respond_to? :element_id
-        other.graph == graph and other.element_id == element_id
-      else
-        element.equals other
-      end
-    end
-
     protected
 
     def after_initialize

data/lib/pacer/wrappers/index_wrapper.rb

@@ -19,9 +19,8 @@ module Pacer::Wrappers
     def first(key, value, extensions = nil)
       e = index.get(key, value).first
       if e
-        e = wrapper.new e
+        e = wrapper.new graph, e
         e = e.add_extensions extensions if extensions
-        e.graph = graph
       end
       e
     end