pacer 1.3.1-java → 1.3.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 873067a94942616e42ecb659e821bdf1f13c6bd4
-  data.tar.gz: 91c4e71707fa23b969e6205d650a981464d2b4a5
+  metadata.gz: 941518faaec723674b8421588ee147d210b65b7a
+  data.tar.gz: 5624f8bf440519e6335d7f850d8cb0b3403c4d49
 SHA512:
-  metadata.gz: bacb0e4e165bd10005d090cc7e1cd1fae2954b88901725078729c2fdd62e202c7f42237ed1d62b2d08aa5b1864b061eceb6638bc3900dbf9ccfbedfef32179fa
-  data.tar.gz: 687bc677f5ca3682ef2b012ed278731d2a2963f85f399ef4829b55a4dc35d6e82d504d4470e50a60c6dc5d19f8d2b19e93411801ef6ac60815b0ed22d84ed167
+  metadata.gz: 85df9faed211d24e9a2810867194a41494955d76e03918b99150b03720eb93c2c83e1d4832215424b7f30d07138d0226333c634782950cd31a1d903c42004585
+  data.tar.gz: 25b18a28d5f9f25ee014ae6ea3940dc0c6dce0abfebdab76414394252018aa6d8da58da5e5faf45eec324861e7d910a3f84344151a67b8da72b0b0a4157f0e01

data/.gitignore

@@ -15,6 +15,9 @@ Gemfile.lock
 # jeweler generated
 pkg
 
+# mac custom attributes files
+.DS_Store
+
 # Project specific
 *.graph
 *.db
@@ -27,3 +30,4 @@ bin
 .jitcache
 coverage/*
 dex.log
+vendor/

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

@@ -7,7 +7,7 @@ module Pacer::Core::Graph
     def v(*args, &block)
       route = chain_route :element_type => :vertex,
         :pipe_class => Pacer::Pipes::TypeFilterPipe,
-        :pipe_args => graph.base_vertex_wrapper,
+        :pipe_args => Pacer::Vertex,
         :wrapper => wrapper,
         :extensions => extensions
       Pacer::Route.property_filter(route, args, block)
@@ -17,7 +17,7 @@ module Pacer::Core::Graph
     def e(*args, &block)
       route = chain_route :element_type => :edge,
         :pipe_class => Pacer::Pipes::TypeFilterPipe,
-        :pipe_args => graph.base_edge_wrapper,
+        :pipe_args => Pacer::Edge,
         :wrapper => wrapper,
         :extensions => extensions
       Pacer::Route.property_filter(route, args, block)
@@ -68,13 +68,13 @@ module Pacer::Core::Graph
     end
 
     def element_type
-      graph.element_type(:mixed)
+      :mixed
     end
 
     # Calculate and save result.
     def result(name = nil)
       ids = collect do |element|
-        if element.is_a? Pacer::Wrappers::VertexWrapper
+        if element.is_a? Pacer::Vertex
           [:vertex, element.element_id]
         else
           [:edge, element.element_id]

data/lib/pacer/filter/future_filter.rb

@@ -35,7 +35,7 @@ module Pacer
 
       def attach_pipe(end_pipe)
         pipe = FutureFilterPipe.new(lookahead_pipe)
-        pipe.set_starts(end_pipe) if end_pipe
+        pipe.setStarts(end_pipe) if end_pipe
         pipe
       end
 

data/lib/pacer/filter/loop_filter.rb

@@ -5,6 +5,20 @@ module Pacer
         chain_route :filter => :loop, :looping_route => block
       end
 
+      def all(&block)
+        loop(&block).while do |e, depth|
+          if depth == 0
+            :loop
+          else
+            :loop_and_recur
+          end
+        end
+      end
+
+      def deepest(&block)
+        loop(&block).deepest!
+      end
+
       # Apply the given path fragment multiple times in succession. If a Range
       # or Array of numbers is given, the results are a combination of the
       # results from all of the specified repetition levels. That is useful if
@@ -145,18 +159,45 @@ HELP
         self
       end
 
+      # this could have concurrency problems if multiple instances of the same
+      # route
+      def deepest!
+        @deepest = true
+        self
+      end
+
       protected
 
       def attach_pipe(end_pipe)
-        unless @control_block
+        if @deepest
+          control_block = deepest_control_block
+        elsif @control_block
+          control_block = @control_block
+        else
           fail ClientError, 'No loop control block specified. Use either #while or #until after #loop.'
         end
-
-        pipe = Pacer::Pipes::LoopPipe.new(graph, looping_pipe, @control_block)
+        pipe = Pacer::Pipes::LoopPipe.new(graph, looping_pipe, control_block)
         pipe.setStarts(end_pipe) if end_pipe
         pipe
       end
 
+      def deepest_control_block
+        expando = Pacer::Pipes::ExpandablePipe.new
+        empty = java.util.ArrayList.new
+        expando.setStarts empty.iterator
+        control_pipe = looping_pipe
+        control_pipe.setStarts expando
+        proc do |el, depth|
+          control_pipe.reset
+          expando.add el.element
+          if control_pipe.hasNext
+            :loop
+          elsif depth > 0
+            :emit
+          end
+        end
+      end
+
       def looping_pipe
         Pacer::Route.pipeline(looping_route)
       end

data/lib/pacer/filter/object_filter.rb

@@ -32,7 +32,8 @@ module Pacer
       protected
 
       def attach_pipe(end_pipe)
-        pipe = ObjectFilterPipe.new(value, negate ? Pacer::Pipes::NOT_EQUAL : Pacer::Pipes::EQUAL)
+        obj  = if value.respond_to?(:element) then value.element else value end
+        pipe = ObjectFilterPipe.new(obj, negate ? Pacer::Pipes::NOT_EQUAL : Pacer::Pipes::EQUAL)
         pipe.set_starts end_pipe if end_pipe
         pipe
       end

data/lib/pacer/filter/where_filter.rb

@@ -33,7 +33,7 @@ module Pacer
 
       def where_statement=(str)
         @where_statement = str
-        @built = @parsed = @intermediate = nil
+        @parsed = @intermediate = nil
       end
 
       def parsed
@@ -49,7 +49,7 @@ module Pacer
       end
 
       def build!
-        @built ||= intermediate.build
+        intermediate.build
       end
 
       protected

data/lib/pacer/loader.rb

@@ -80,6 +80,7 @@ require 'pacer/filter/block_filter'
 require 'pacer/filter/object_filter'
 require 'pacer/filter/random_filter'
 
+require 'pacer/transform/branch'
 require 'pacer/transform/cap'
 require 'pacer/transform/stream_sort'
 require 'pacer/transform/stream_uniq'

data/lib/pacer/transform/branch.rb

@@ -0,0 +1,127 @@
+module Pacer
+  module Core
+    module Route
+      def branch(&block)
+        route = chain_route transform: ::Pacer::Transform::Branch
+        route.add_block! &block
+      end
+
+      def cond(where, &block)
+        route = chain_route transform: ::Pacer::Transform::Branch
+        route.add_cond! where, &block
+      end
+    end
+  end
+
+  module Transform
+    module Branch
+      import com.tinkerpop.pipes.branch.CopySplitPipe;
+      import com.tinkerpop.pipes.branch.ExhaustMergePipe
+      import com.tinkerpop.pipes.branch.FairMergePipe
+
+      attr_accessor :branches, :split_pipe_class, :merge_pipe_class, :conds
+
+      def after_initialize
+        super
+        self.branches ||= []
+        self.conds ||= []
+        self.split_pipe_class ||= CopySplitPipe
+        self.merge_pipe_class ||= FairMergePipe
+      end
+
+      def clone(conf = {})
+        back.chain_route({transform: Branch,
+                          branches: branches.clone,
+                          element_type: element_type,
+                          conds: conds.clone,
+                          extensions: extensions.clone,
+                          split_pipe_class: split_pipe_class,
+                          merge_pipe_class: merge_pipe_class
+                         }.merge(conf))
+      end
+
+      def branch(&block)
+        route = clone
+        route.add_block! &block
+      end
+
+      def cond(where, &block)
+        route = clone
+        route.add_cond! where, &block
+      end
+
+      def otherwise(&block)
+        where = "(#{ conds.compact.map { |c| "not (#{c})" }.join " and " })"
+        cond where, &block
+      end
+
+      def merge
+        route = clone
+        route.merge_pipe_class = FairMergePipe
+        route.chain_route transform: MergedBranch
+      end
+
+      def merge_exhaustive
+        route = clone
+        route.merge_pipe_class = ExhaustMergePipe
+        route.chain_route transform: MergedBranch
+      end
+
+      def add_block!(&block)
+        will_clone = false
+        branch = block.call(Pacer::Route.empty(self))
+        branches.push branch
+        conf = {}
+
+        exts = branches.
+          map { |b| b.extensions }.
+          map { |a| a ? a.to_set : Set[] }.
+          reduce { |r, e| r.intersection(e) }
+        if exts.to_a != config[:extensions]
+          conf[:extensions] = exts.to_a
+        end
+
+        types = branches.map { |b| b.element_type }.to_set
+        if types.length == 1
+          type = types.first
+        elsif types.difference([:vertex, :edge, :mixed]).empty?
+          type = :mixed
+        elsif types.difference([:path, :array]).empty?
+          type = :array
+        else
+          type = :object
+        end
+        if type != element_type
+          conf[:element_type] = type
+        end
+        if conf.empty?
+          self
+        else
+          clone conf
+        end
+      end
+
+      def add_cond!(where, &block)
+        conds[branches.length] = where
+        add_block! do |r|
+          block.call r.where(where)
+        end
+      end
+
+      def attach_pipe(end_pipe)
+        branch_pipes = branches.map { |b| Pacer::Route.pipeline(b) }
+        split = split_pipe_class.new branch_pipes
+        split.setStarts end_pipe if end_pipe
+        merge = merge_pipe_class.new branch_pipes
+        merge.setStarts split
+        merge
+      end
+    end
+
+    module MergedBranch
+      # This just exists so that if I merge and then branch again,
+      # the new branches will be against the merged source.
+    end
+  end
+end
+

data/lib/pacer/transform/path.rb

@@ -5,7 +5,7 @@ module Pacer
         route = chain_route :transform => :path, :element_type => :path
         if exts.any?
           exts = exts.map { |e| Array.wrap(e) if e }
-          route.map(modules: Pacer::Transform::Path::Methods) do |path|
+          route.map(element_type: :path) do |path|
             path.zip(exts).map { |element, ext| ext ? element.add_extensions(ext) : element }
           end
         else

data/lib/pacer/version.rb

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

data/pom.xml

@@ -8,7 +8,7 @@
     <!-- NOTE: the following properties are automatically updated based on the values in lib/pacer-neo4j/version.rb -->
     <properties>
       <blueprints.version>2.3.0</blueprints.version>
-      <gem.version>1.3.1</gem.version>
+      <gem.version>1.3.2</gem.version>
       <pipes.version>2.3.0</pipes.version>
       <gremlin.version>2.3.0</gremlin.version>
     </properties>

data/spec/pacer/filter/object_filter_spec.rb

@@ -1,15 +1,35 @@
 require 'spec_helper'
 
-describe Pacer::Filter::ObjectFilter do
-  it '#is' do
-    [1, 2, 3, 2, 3].to_route.is(2).to_a.should == [2, 2]
-  end
+Run.tg(:read_only) do
+  use_pacer_graphml_data(:read_only)
+  
+  describe Pacer::Filter::ObjectFilter do
+    it '#is' do
+      [1, 2, 3, 2, 3].to_route.is(2).to_a.should == [2, 2]
+    end
 
-  it '#is_not' do
-    [1, 2, 3, 2, 3].to_route.is_not(2).to_a.should == [1, 3, 3]
-  end
+    it '#is_not' do
+      [1, 2, 3, 2, 3].to_route.is_not(2).to_a.should == [1, 3, 3]
+    end
+
+    it '#compact' do
+      [1, nil, 2, 3].to_route.compact.to_a.should == [1, 2, 3]
+    end
+
+    describe '#vertex filter' do
 
-  it '#compact' do
-    [1, nil, 2, 3].to_route.compact.to_a.should == [1, 2, 3]
+      let (:filter_node) { graph.vertex 3 }
+    
+      it "#is_not" do
+        all_nodes = graph.v.to_a.select { |n| n.getId != filter_node.getId }
+        graph.v.is_not(filter_node).to_a.should == all_nodes
+      end
+
+      it "#is" do
+        graph.v.is(filter_node).to_a.should == [filter_node]
+      end
+
+    end
   end
+
 end

data/spec/pacer/graph/pacer_graph_spec.rb

@@ -362,13 +362,13 @@ Run.all :read_write do
       it 'should create a file that can be read back' do
         graph.v.count.should == 2
         graph.e.count.should == 2
-        Pacer::GraphML.export graph, 'tmp/graph_mixin_spec_export.graphml'
+        Pacer::GraphML.export graph, '/tmp/graph_mixin_spec_export.graphml'
         graph2.e.delete!
         graph2.v.delete!
         graph2.v.count.should == 0
         graph2.e.count.should == 0
-        Pacer::GraphML.import graph2, 'tmp/graph_mixin_spec_export.graphml'
-        puts File.read 'tmp/graph_mixin_spec_export.graphml'
+        Pacer::GraphML.import graph2, '/tmp/graph_mixin_spec_export.graphml'
+        puts File.read '/tmp/graph_mixin_spec_export.graphml'
         graph2.v.count.should == 2
         graph2.e.count.should == 2
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pacer
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: java
 authors:
 - Darrick Wiebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-07-04 00:00:00.000000000 Z
+date: 2013-08-21 00:00:00.000000000 Z
 dependencies: []
 description: Pacer defines routes through a graph and then traverses them very quickly.
 email: darrick@innatesoftware.com
@@ -124,6 +124,7 @@ files:
 - lib/pacer/support/native_exception.rb
 - lib/pacer/support/nil_class.rb
 - lib/pacer/support/proc.rb
+- lib/pacer/transform/branch.rb
 - lib/pacer/transform/cap.rb
 - lib/pacer/transform/flat_map.rb
 - lib/pacer/transform/gather.rb
@@ -217,7 +218,7 @@ files:
 - spec/support/use_transactions.rb
 - spec/tackle/simple_mixin.rb
 - spec/tackle/tinkerpop_graph_mixins.rb
-- lib/pacer-1.3.1-standalone.jar
+- lib/pacer-1.3.2-standalone.jar
 homepage: http://github.com/pangloss/pacer
 licenses:
 - MIT