pacer 0.9.1.1-java → 1.0.0-java

data/lib/pacer/wrappers/wrapping_pipe_function.rb

@@ -0,0 +1,90 @@
+module Pacer
+  module Wrappers
+    class WrappingPipeFunction
+      include com.tinkerpop.pipes.PipeFunction
+
+      attr_reader :block, :graph, :wrapper, :extensions, :back
+
+      def initialize(back, block)
+        @back = back
+        @block = block
+        if back
+          @graph = back.graph
+          @extensions = back.extensions + [Pacer::Extensions::BlockFilterElement]
+          element_type = back.element_type
+        end
+        @wrapper = WrapperSelector.build element_type, extensions
+      end
+
+      def arity
+        block.arity
+      end
+
+      def compute(element)
+        e = wrapper.new element
+        e.graph = graph if e.respond_to? :graph=
+        e.back = back if e.respond_to? :back=
+        block.call e
+      end
+
+      alias call compute
+
+      def call_with_args(element, *args)
+        e = wrapper.new element
+        e.graph = graph if e.respond_to? :graph=
+        e.back = back if e.respond_to? :back=
+        block.call e, *args
+      end
+
+      def wrap_path(path)
+        path.collect do |item|
+          if item.is_a? Pacer::Vertex
+            wrapped = Pacer::Wrappers::VertexWrapper.new item
+            wrapped.graph = graph
+            wrapped
+          elsif item.is_a? Pacer::Edge
+            wrapped = Pacer::Wrappers::EdgeWrapper.new item
+            wrapped.graph = graph
+            wrapped
+          else
+            item
+          end
+        end
+      end
+    end
+
+    class UnwrappingPipeFunction
+      include com.tinkerpop.pipes.PipeFunction
+
+      attr_reader :block
+
+      def initialize(block)
+        @block = block
+      end
+
+      def arity
+        block.arity
+      end
+
+      def compute(element)
+        e = block.call element
+        if e.is_a? ElementWrapper
+          e.element
+        else
+          e
+        end
+      end
+
+      alias call compute
+
+      def call_with_args(element, *args)
+        e = block.call element, *args
+        if e.is_a? ElementWrapper
+          e.element
+        else
+          e
+        end
+      end
+    end
+  end
+end

data/lib/pacer/wrappers.rb

@@ -13,7 +13,9 @@ module Pacer
   end
 end
 
-require 'pacer/wrappers/new_element'
 require 'pacer/wrappers/element_wrapper'
 require 'pacer/wrappers/vertex_wrapper'
 require 'pacer/wrappers/edge_wrapper'
+require 'pacer/wrappers/index_wrapper'
+require 'pacer/wrappers/wrapper_selector'
+require 'pacer/wrappers/wrapping_pipe_function'

data/lib/pacer.rb

@@ -1,11 +1,11 @@
-if not defined?(JRUBY_VERSION) or JRUBY_VERSION =~ /^(0|1\.[0-5]|1\.6\.[0-3])/
+if not defined?(JRUBY_VERSION) or JRUBY_VERSION =~ /^(0|1\.[0-6])/
   # NOTE: This is because JRuby 1.6.4 fixes a bug that made it impossible to
   # instantiate Java classes with a varargs constructor signature  with 0
   # arguments. Marko would not accept a patch to create a 0 args constructor to
   # work around the problem, therefore this version of Pacer will not work
   # under any older versions of JRuby. The oldest Pacer version that will work
   # is 0.8.1.
-  raise Exception, 'Pacer >= 0.8.2 requires JRuby version 1.6.4 or higher. It is strongly recommended that you use the latest JRuby release.'
+  raise Exception, 'Pacer >= 1.0.0 requires JRuby version 1.7.0 preview or higher. It is strongly recommended that you use the latest JRuby release.'
 end
 
 if RUBY_VERSION == '1.8.7'
@@ -15,6 +15,7 @@ WARNING: Pacer is developed using JRuby in 1.9 mode. I recommend you
   defaulting to 1.9 mode by setting the environment variable
   JRUBY_OPTS=--1.9
 WARNING
+  raise Exception, "Pacer must be run in JRuby 1.9 mode"
 end
 
 require 'java'
@@ -39,9 +40,9 @@ module Pacer
   require JAR
 
   require 'pacer/exceptions'
-  require 'pacer/graph'
   require 'pacer/pipes'
   require 'pacer/core'
+  require 'pacer/graph'
   require 'pacer/routes'
   require 'pacer/wrappers'
   require 'pacer/route'
@@ -49,6 +50,7 @@ module Pacer
   require 'pacer/blueprints'
   require 'pacer/support'
   require 'pacer/utils'
+  require 'pacer/visitors'
   require 'pacer/filter'
   require 'pacer/transform'
   require 'pacer/side_effect'
@@ -181,16 +183,12 @@ module Pacer
 
     # Is the object a vertex?
     def vertex?(element)
-      element.is_a? Pacer::Vertex or
-        (element.respond_to? :element and
-         element.element.is_a? Pacer::Vertex)
+      element.is_a? Pacer::Wrappers::VertexWrapper
     end
 
     # Is the object an edge?
     def edge?(element)
-      element.is_a? Pacer::Edge
-        (element.respond_to? :element and
-         element.element.is_a? Pacer::Edge)
+      element.is_a? Pacer::Wrappers::EdgeWrapper
     end
 
     def vertex_route?(obj)
@@ -203,18 +201,6 @@ module Pacer
     end
     alias edges_route? edge_route?
 
-    # Blueprints constant for manual index.
-    # @return [com.tinkerpop.blueprints.pgm.Index::Type::MANUAL]
-    def manual_index
-      com.tinkerpop.blueprints.pgm.Index::Type::MANUAL
-    end
-
-    # Blueprints constant for automatic index.
-    # @return [com.tinkerpop.blueprints.pgm.Index::Type::AUTOMATIC]
-    def automatic_index
-      com.tinkerpop.blueprints.pgm.Index::Type::AUTOMATIC
-    end
-
     # If a pipe is giving you trouble, you can get all of the
     # intermediate pipes by using this method.
     #
@@ -245,28 +231,10 @@ module Pacer
     # or a url or address.
     # @return [Hash] address => graph
     def open_graphs
-      @open_graphs = Hash.new { |h, k| h[k] = {} } unless defined? @open_graphs
+      @open_graphs = {} unless defined? @open_graphs
       @open_graphs
     end
 
-    def next_graph_id
-      @next_graph_id = 0 unless defined? @next_graph_id
-      @next_graph_id += 1
-    end
-
-    # Tell pacer to record that we're starting a graph.
-    #
-    # @param [Class] type type of graph
-    # @param [String] key address of the graph
-    # @yield the block should return the instantiated graph.
-    # @return [GraphMixin] the instantiated graph
-    def starting_graph(type, key)
-      graph = open_graphs[type][key]
-      return graph if graph
-      graph = yield
-      open_graphs[type][key] = graph
-    end
-
     # Used internally to collect debug information while using
     # {#debug_pipe}
     attr_accessor :debug_source
@@ -278,13 +246,11 @@ end
 
 at_exit do
   # Close all open graphs
-  Pacer.open_graphs.each do |type, graphs|
-    graphs.each do |path, graph|
-      begin
-        graph.shutdown
-      rescue Exception, StandardError => e
-        pp e
-      end
+  Pacer.open_graphs.each do |path, graph|
+    begin
+      graph.shutdown
+    rescue Exception, StandardError => e
+      puts "Exception on graph shutdown: #{ e.class } #{ e.message }\n\n#{e.backtrace.join "\n" }"
     end
   end
 end

data/pacer.gemspec

@@ -14,14 +14,6 @@ Gem::Specification.new do |s|
   s.description = %Q{Pacer defines routes through a graph and then traverses them very quickly.}
 
   s.add_dependency 'fastercsv', '>= 1.5.4'
-  s.add_development_dependency 'rspec', '~> 2.7.0'
-  s.add_development_dependency 'rr', '~> 1.0'
-  s.add_development_dependency 'rcov'
-  s.add_development_dependency 'yard'
-  s.add_development_dependency 'rake'
-
-  s.add_development_dependency 'pacer-neo4j', '1.0.7.1'
-  s.add_development_dependency 'autotest'
 
   s.files = `git ls-files`.split("\n") + [Pacer::JAR_PATH]
   s.test_files = `git ls-files -- spec/*`.split("\n")

data/pom.xml

@@ -7,9 +7,10 @@
     <artifactId>pacer</artifactId>
     <!-- NOTE: the following properties are automatically updated based on the values in lib/pacer-neo4j/version.rb -->
     <properties>
-      <gem.version>0.9.1.1</gem.version>
-      <blueprints.version>1.0</blueprints.version>
-      <pipes.version>0.8</pipes.version>
+      <gem.version>1.0.0</gem.version>
+      <blueprints.version>2.1.0</blueprints.version>
+      <pipes.version>2.1.0</pipes.version>
+      <gremlin.version>2.1.0</gremlin.version>
     </properties>
     <!-- NOTE: the following properties are automatically updated based on the values in lib/pacer-neo4j/version.rb -->
     <version>${gem.version}</version>
@@ -40,6 +41,12 @@
             <artifactId>pipes</artifactId>
             <version>${pipes.version}</version>
         </dependency>
+        <!-- MOAR GRAPH TRAVERSAL SUPPORT -->
+        <dependency>
+            <groupId>com.tinkerpop.gremlin</groupId>
+            <artifactId>gremlin-java</artifactId>
+            <version>${gremlin.version}</version>
+        </dependency>
     </dependencies>
 
     <repositories>

data/spec/pacer/blueprints/dex_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 Run.dex do
-  describe Pacer::DexGraph do
+  describe Pacer::Dex do
     let(:v0) { graph.create_vertex }
     let(:v1) { graph.create_vertex }
     let(:e0) { graph.create_edge '0', v0, v1, :default }
@@ -13,60 +13,60 @@ Run.dex do
 
       context ':vertex' do
         subject { graph.element_type(:vertex) }
-        it { should == com.tinkerpop.blueprints.pgm.impls.dex.DexVertex }
+        it { should == :vertex }
       end
 
       context 'a vertex' do
         subject { graph.element_type(v0) }
-        it { should == com.tinkerpop.blueprints.pgm.impls.dex.DexVertex }
+        it { should == :vertex }
       end
 
       context ':edge' do
         subject { graph.element_type(:edge) }
-        it { should == com.tinkerpop.blueprints.pgm.impls.dex.DexEdge }
+        it { should == :edge }
       end
 
       context 'an edge' do
         subject { graph.element_type(e0) }
-        it { should == com.tinkerpop.blueprints.pgm.impls.dex.DexEdge }
+        it { should == :edge }
       end
 
       context ':mixed' do
         subject { graph.element_type(:mixed) }
-        it { should == com.tinkerpop.blueprints.pgm.impls.dex.DexElement }
+        it { should == :mixed }
       end
 
       context ':object' do
         subject { graph.element_type(:object) }
-        it { should == Object }
+        it { should == :object }
       end
 
       context 'from element_type' do
         context ':vertex' do
           subject { graph.element_type(graph.element_type :vertex) }
-          it { should == com.tinkerpop.blueprints.pgm.impls.dex.DexVertex }
+          it { should == :vertex }
         end
 
         context ':edge' do
           subject { graph.element_type(graph.element_type :edge) }
-          it { should == com.tinkerpop.blueprints.pgm.impls.dex.DexEdge }
+          it { should == :edge }
         end
 
         context ':mixed' do
           subject { graph.element_type(graph.element_type :mixed) }
-          it { should == com.tinkerpop.blueprints.pgm.impls.dex.DexElement }
+          it { should == :mixed }
         end
 
         context ':object' do
           subject { graph.element_type(graph.element_type :object) }
-          it { should == Object }
+          it { should == :object }
         end
       end
 
       context 'from index_class' do
         context ':vertex' do
           subject { graph.element_type(graph.index_class :vertex) }
-          it { should == com.tinkerpop.blueprints.pgm.impls.dex.DexVertex }
+          it { should == :vertex }
         end
       end
     end
@@ -154,19 +154,5 @@ Run.dex do
         v.extensions.should include(Tackle::SimpleMixin)
       end
     end
-
-    describe '#get_vertices' do
-      before { e0 }
-      subject { graph.get_vertices }
-      it { should be_a(Pacer::Core::Route) }
-      its(:count) { should == 2 }
-    end
-
-    describe '#get_edges' do
-      before { e0 }
-      subject { graph.get_edges }
-      it { should be_a(Pacer::Core::Route) }
-      its(:count) { should == 1 }
-    end
   end
 end

data/spec/pacer/blueprints/neo4j_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 Run.neo4j do
-  describe Pacer::Neo4jGraph do
+  describe 'neo4j graph' do
     let(:v0) { graph.create_vertex }
     let(:v1) { graph.create_vertex }
     let(:e0) { graph.create_edge '0', v0, v1, :default }
@@ -13,72 +13,72 @@ Run.neo4j do
 
       context ':vertex' do
         subject { graph.element_type(:vertex) }
-        it { should == com.tinkerpop.blueprints.pgm.impls.neo4j.Neo4jVertex }
+        it { should == :vertex }
       end
 
       context 'a vertex' do
         subject { graph.element_type(v0) }
-        it { should == com.tinkerpop.blueprints.pgm.impls.neo4j.Neo4jVertex }
+        it { should == :vertex }
       end
 
       context ':edge' do
         subject { graph.element_type(:edge) }
-        it { should == com.tinkerpop.blueprints.pgm.impls.neo4j.Neo4jEdge }
+        it { should == :edge }
       end
 
       context 'an edge' do
         subject { graph.element_type(e0) }
-        it { should == com.tinkerpop.blueprints.pgm.impls.neo4j.Neo4jEdge }
+        it { should == :edge }
       end
 
       context ':mixed' do
         subject { graph.element_type(:mixed) }
-        it { should == com.tinkerpop.blueprints.pgm.impls.neo4j.Neo4jElement }
+        it { should == :mixed }
       end
 
       context ':object' do
         subject { graph.element_type(:object) }
-        it { should == Object }
+        it { should == :object }
       end
 
       context 'from element_type' do
         context ':vertex' do
           subject { graph.element_type(graph.element_type :vertex) }
-          it { should == com.tinkerpop.blueprints.pgm.impls.neo4j.Neo4jVertex }
+          it { should == :vertex }
         end
 
         context ':edge' do
           subject { graph.element_type(graph.element_type :edge) }
-          it { should == com.tinkerpop.blueprints.pgm.impls.neo4j.Neo4jEdge }
+          it { should == :edge }
         end
 
         context ':mixed' do
           subject { graph.element_type(graph.element_type :mixed) }
-          it { should == com.tinkerpop.blueprints.pgm.impls.neo4j.Neo4jElement }
+          it { should == :mixed }
         end
 
         context ':object' do
           subject { graph.element_type(graph.element_type :object) }
-          it { should == Object }
+          it { should == :object }
         end
       end
 
       context 'from index_class' do
         context ':vertex' do
           subject { graph.element_type(graph.index_class :vertex) }
-          it { should == com.tinkerpop.blueprints.pgm.impls.neo4j.Neo4jVertex }
+          it { should == :vertex }
         end
 
         context ':edge' do
           subject { graph.element_type(graph.index_class :edge) }
-          it { should == com.tinkerpop.blueprints.pgm.impls.neo4j.Neo4jEdge }
+          it { should == :edge }
         end
       end
     end
 
     describe '#indices' do
       subject { graph.indices.to_a }
-      its(:count) { should == 2 }
+      its(:count) { should == 0 }
     end
 
     describe '#sanitize_properties' do
@@ -159,19 +159,5 @@ Run.neo4j do
         v.extensions.should include(Tackle::SimpleMixin)
       end
     end
-
-    describe '#get_vertices' do
-      before { e0 }
-      subject { graph.get_vertices }
-      it { should be_a(Pacer::Core::Route) }
-      its(:count) { should == 2 }
-    end
-
-    describe '#get_edges' do
-      before { e0 }
-      subject { graph.get_edges }
-      it { should be_a(Pacer::Core::Route) }
-      its(:count) { should == 1 }
-    end
   end
 end

data/spec/pacer/blueprints/tg_spec.rb

@@ -13,66 +13,32 @@ Run.tg do
 
       context ':vertex' do
         subject { Pacer.tg.element_type(:vertex) }
-        it { should == com.tinkerpop.blueprints.pgm.impls.tg.TinkerVertex }
+        it { should == :vertex }
       end
 
       context 'a vertex' do
         subject { graph.element_type(v0) }
-        it { should == com.tinkerpop.blueprints.pgm.impls.tg.TinkerVertex }
+        it { should == :vertex }
       end
 
       context ':edge' do
         subject { graph.element_type(:edge) }
-        it { should == com.tinkerpop.blueprints.pgm.impls.tg.TinkerEdge }
+        it { should == :edge }
       end
 
       context 'an edge' do
         subject { graph.element_type(e0) }
-        it { should == com.tinkerpop.blueprints.pgm.impls.tg.TinkerEdge }
+        it { should == :edge }
       end
 
       context ':mixed' do
         subject { graph.element_type(:mixed) }
-        it { should == com.tinkerpop.blueprints.pgm.impls.tg.TinkerElement }
+        it { should == :mixed }
       end
 
       context ':object' do
         subject { graph.element_type(:object) }
-        it { should == Object }
-      end
-
-      context 'from result' do
-        context ':vertex' do
-          subject { Pacer.tg.element_type(Pacer.tg.element_type :vertex) }
-          it { should == com.tinkerpop.blueprints.pgm.impls.tg.TinkerVertex }
-        end
-
-        context ':edge' do
-          subject { graph.element_type(Pacer.tg.element_type :edge) }
-          it { should == com.tinkerpop.blueprints.pgm.impls.tg.TinkerEdge }
-        end
-
-        context ':mixed' do
-          subject { graph.element_type(Pacer.tg.element_type :mixed) }
-          it { should == com.tinkerpop.blueprints.pgm.impls.tg.TinkerElement }
-        end
-
-        context ':object' do
-          subject { graph.element_type(Pacer.tg.element_type :object) }
-          it { should == Object }
-        end
-      end
-
-      context 'from index_class' do
-        context ':vertex' do
-          subject { graph.element_type(graph.index_class :vertex) }
-          it { should == com.tinkerpop.blueprints.pgm.impls.tg.TinkerVertex }
-        end
-
-        context ':edge' do
-          subject { graph.element_type(graph.index_class :edge) }
-          it { should == com.tinkerpop.blueprints.pgm.impls.tg.TinkerEdge }
-        end
+        it { should == :object }
       end
     end
 
@@ -110,19 +76,5 @@ Run.tg do
         v.extensions.should include(Tackle::SimpleMixin)
       end
     end
-
-    describe '#get_vertices' do
-      before { e0 }
-      subject { graph.get_vertices }
-      it { should be_a(Pacer::Core::Route) }
-      its(:count) { should == 2 }
-    end
-
-    describe '#get_edges' do
-      before { e0 }
-      subject { graph.get_edges }
-      it { should be_a(Pacer::Core::Route) }
-      its(:count) { should == 1 }
-    end
   end
 end

data/spec/pacer/core/graph/edges_route_spec.rb

@@ -35,7 +35,7 @@ Run.all(:read_only) do
     describe '#labels' do
       subject { graph.e.labels }
       it { should be_a Pacer::Core::Route }
-      its(:element_type) { should == Object }
+      its(:element_type) { should == :object }
       its(:count) { should == 14 }
     end
 

data/spec/pacer/core/graph/element_route_spec.rb

@@ -4,7 +4,7 @@ shared_examples_for Pacer::Core::Graph::ElementRoute do
   describe '#properties' do
     subject { r.properties }
     its(:count) { should == r.count }
-    its(:element_type) { should == Object }
+    its(:element_type) { should == :object }
     specify 'should all be hashes' do
       props = subject.each
       elements = r.each
@@ -15,7 +15,7 @@ shared_examples_for Pacer::Core::Graph::ElementRoute do
   end
 
   context 'with extensions' do
-    let(:route) { r.add_extension(Tackle::SimpleMixin) }
+    let(:route) { r.add_extensions([Tackle::SimpleMixin]) }
     describe '#each without a block' do
       subject { route.each }
       specify 'elements should be wrapped' do

data/spec/pacer/core/graph/graph_route_spec.rb

@@ -70,13 +70,13 @@ Run.all(:read_only, false) do
 
       context 'extension search 2' do
         subject { graph.v(TP::Pangloss) }
-        it { should be_a(Pacer::Filter::IndexFilter) }
+        its(:back) { should be_a(Pacer::Filter::IndexFilter) }
         its(:to_a) { should_not be_empty }
         its(:count) { should == 1 }
       end
     end
 
-    context 'with vertex auto index' do
+    pending 'with vertex auto index' do
       before :all do
         graph.build_automatic_index :v_auto, :vertex, [:type] if graph
       end

data/spec/pacer/core/graph/vertices_route_spec.rb

@@ -75,7 +75,9 @@ Run.tg(:read_only) do
       it { graph.v.out_e(:label) { |x| true }.should be_a(Pacer::Route) }
       it { graph.v.out_e { |x| true }.should be_a(Pacer::Route) }
 
-      it { Set[*graph.v.out_e].should == Set[*graph.edges] }
+      it('should have all edges') do
+        Set[*graph.v.out_e].should == Set[*graph.e]
+      end
 
       it { graph.v.out_e.count.should >= 1 }
 
@@ -129,9 +131,9 @@ Run.tg do
         subject { people.add_edges_to(:uses, projects) }
 
         it { should be_a(Pacer::Core::Route) }
-        its(:element_type) { should == graph.element_type(:edge) }
+        its(:element_type) { should == :edge }
         its(:count) { should == 8 }
-        its('back.back.element_type') { should == Object }
+        its('back.back.element_type') { should == :object }
         its('back.count') { should == 8 }
 
         specify 'all edges in rasge should exist' do
@@ -163,6 +165,11 @@ Run.tg do
           result = pangloss.add_edges_to(:likes, nil)
           result.should be_nil
         end
+
+        it 'should work if the source is a simple vertex' do
+          result = pangloss.first.add_edges_to(:likes, pacer)
+          result.should_not be_empty
+        end
       end
     end
   end