pacer 1.4.2-java → 1.5.1-java

data/spec/pacer/blueprints/neo4j_spec.rb

@@ -30,12 +30,14 @@ module NeoSpec
 
     describe 'indexed' do
       before do
-        graph.create_key_index :type, :vertex
-        graph.create_key_index :name, :vertex
+        # TODO FIXME: why do the presence of these key indices break lots of
+        # subsequent tests if they are on graph rather than graph2?
+        graph2.create_key_index :type, :vertex
+        graph2.create_key_index :name, :vertex
       end
 
       describe Person do
-        subject { graph.v(Person) }
+        subject { graph2.v(Person) }
 
         # sanity checks
         it { should be_a Pacer::Filter::LuceneFilter }
@@ -47,7 +49,7 @@ module NeoSpec
       end
 
       describe Frog do
-        subject { graph.v(Frog) }
+        subject { graph2.v(Frog) }
 
         # sanity checks
         it { should_not be_a Pacer::Filter::LuceneFilter }

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

@@ -31,12 +31,20 @@ Run.all(:read_only, false) do
 
     context 'with vertex name indexed' do
       before :all do
-        graph.v.build_index :name if graph
-        graph.search_manual_indices = true if graph
+        if graph
+          graph.transaction do
+            graph.v.build_index :name
+          end
+          graph.search_manual_indices = true
+        end
       end
 
       after :all do
-        graph.drop_index :name if graph
+        if graph
+          graph.transaction do
+            graph.drop_index :name
+          end
+        end
       end
 
       context 'basic search' do

data/spec/pacer/core/route_spec.rb

@@ -68,7 +68,7 @@ describe Pacer::Core::Route do
       end
       specify '2 item limit' do
         Pacer.inspect_limit = 2
-        dont_allow(base_route).puts(anything)
+        mock(base_route).puts("Total: > 2 (Pacer.inspect_limit)")
         base_route.inspect.should == '#<Obj>'
       end
     end

data/spec/pacer/filter/empty_filter_spec.rb

@@ -21,7 +21,7 @@ Run.tg(:read_only) do
       it 'should create a pipeline with only the pipe added to it' do
         start_pipe, end_pipe = subject.send :build_pipeline
         start_pipe.should == end_pipe
-        start_pipe.should be_a Java::ComTinkerpopGremlinPipesFilter::PropertyFilterPipe
+        start_pipe.should be_a Java::ComTinkerpopPipesFilter::PropertyFilterPipe
       end
     end
   end

data/spec/pacer/route/mixin/bulk_operations_spec.rb

@@ -4,7 +4,11 @@ Run.all do
   use_pacer_graphml_data
 
   describe RouteOperations, :transactions => false do
-    before { setup_data }
+    before do
+      graph.transaction do
+        setup_data
+      end
+    end
 
     describe '#bulk_job', :transactions => false do
       context 'commit every 2nd record, updating all vertices' do
@@ -13,7 +17,9 @@ Run.all do
             graph.v(Tackle::SimpleMixin).bulk_job(2) do |v|
               v[:updated] = 'yes'
             end
-            graph.v(:updated => 'yes').count.should == 7
+            graph.read_transaction do
+              graph.v(:updated => 'yes').count.should == 7
+            end
           end
         end
 
@@ -21,7 +27,9 @@ Run.all do
           graph.v.bulk_job(2) do |v|
             v[:updated] = 'yup'
           end
-          graph.v(:updated => 'yup').count.should == 7
+          graph.read_transaction do
+            graph.v(:updated => 'yup').count.should == 7
+          end
         end
       end
     end

data/spec/pacer/wrapper/element_wrapper_spec.rb

@@ -91,7 +91,7 @@ shared_examples_for Pacer::Wrappers::ElementWrapper do
     it { should be_a(Pacer::Wrappers::EdgeWrapper) }
     it { should_not be_a(Pacer::Wrappers::VertexWrapper) }
 
-    describe '#e', :transactions => false do
+    describe '#e', :transactions => false, read_transaction: true do
       context '()' do
         subject { e0.e }
         its(:to_a) { should == [e0] }
@@ -124,7 +124,7 @@ shared_examples_for Pacer::Wrappers::ElementWrapper do
       end
     end
 
-    describe '#eql?', :transactions => false do
+    describe '#eql?', :transactions => false, read_transaction: true do
       subject { Hash.new(0) }
       before do
         subject[e0] += 1
@@ -223,7 +223,7 @@ shared_examples_for Pacer::Wrappers::ElementWrapper do
       end
     end
 
-    describe '#result', :transactions => false do
+    describe '#result', :transactions => false, read_transaction: true do
       subject { element.result }
       it { should equal(element) }
     end
@@ -287,22 +287,22 @@ end
 
 Run.all do
   it_uses Pacer::Wrappers::ElementWrapper do
-    let(:v0) { graph.create_vertex :name => 'eliza' }
-    let(:v1) { graph.create_vertex :name => 'darrick' }
-    let(:e0) { graph.create_edge nil, v0, v1, :links }
-    let(:e1) { graph.create_edge nil, v0, v1, :relinks }
+    let(:v0) { graph.transaction(nesting: true) { graph.create_vertex :name => 'eliza' } }
+    let(:v1) { graph.transaction(nesting: true) { graph.create_vertex :name => 'darrick' } }
+    let(:e0) { graph.transaction(nesting: true) { graph.create_edge nil, v0, v1, :links } }
+    let(:e1) { graph.transaction(nesting: true) { graph.create_edge nil, v0, v1, :relinks } }
   end
 
   context 'vertex' do
-    let(:v0) { graph.create_vertex :name => 'eliza' }
+    let(:v0) { graph.transaction(nesting: true) { graph.create_vertex :name => 'eliza' } }
     subject { v0 }
     its(:class) { should == graph.base_vertex_wrapper  }
   end
 
   context 'edge' do
-    let(:v0) { graph.create_vertex :name => 'eliza' }
-    let(:v1) { graph.create_vertex :name => 'darrick' }
-    let(:e0) { graph.create_edge nil, v0, v1, :links }
+    let(:v0) { graph.transaction(nesting: true) { graph.create_vertex :name => 'eliza' } }
+    let(:v1) { graph.transaction(nesting: true) { graph.create_vertex :name => 'darrick' } }
+    let(:e0) { graph.transaction(nesting: true) { graph.create_edge nil, v0, v1, :links } }
     subject { e0 }
     its(:class) { should == graph.base_edge_wrapper }
   end
@@ -312,10 +312,10 @@ Run.all do
   # that wrappers act the same as native elements
   describe 'wrapped elements' do
     it_uses Pacer::Wrappers::ElementWrapper do
-      let(:v0) { graph.create_vertex(Tackle::SimpleMixin, :name => 'eliza') }
-      let(:v1) { graph.create_vertex(Tackle::SimpleMixin, :name => 'darrick') }
-      let(:e0) { graph.create_edge nil, v0, v1, :links, Tackle::SimpleMixin }
-      let(:e1) { graph.create_edge nil, v0, v1, :relinks, Tackle::SimpleMixin }
+      let(:v0) { graph.transaction(nesting: true) { graph.create_vertex(Tackle::SimpleMixin, :name => 'eliza') } }
+      let(:v1) { graph.transaction(nesting: true) { graph.create_vertex(Tackle::SimpleMixin, :name => 'darrick') } }
+      let(:e0) { graph.transaction(nesting: true) { graph.create_edge nil, v0, v1, :links, Tackle::SimpleMixin } }
+      let(:e1) { graph.transaction(nesting: true) { graph.create_edge nil, v0, v1, :relinks, Tackle::SimpleMixin } }
     end
   end
 end

data/spec/pacer/wrapper/vertex_wrapper_spec.rb

@@ -178,14 +178,14 @@ shared_examples_for Pacer::Wrappers::VertexWrapper do
     before { pending 'support temporary hash indices for clone/copy' unless graph.features.supportsIndices }
     let(:dest) { graph2 }
   }) do
-    describe '#clone_into', :transactions => false do
-      subject { v0.clone_into(dest) }
+    describe '#clone_into', :transactions => false, read_transaction: true do
+      subject { dest.transaction { v0.clone_into(dest) } }
       its(:properties) { should == { 'name' => 'eliza' } }
       its(:graph) { should equal(dest) }
       its('element_id.to_s') { should == v0.element_id.to_s unless graph.features.ignoresSuppliedIds }
     end
 
-    describe '#copy_into', :transaction => false do
+    describe '#copy_into', :transaction => false, read_transaction: true do
       subject { v1.copy_into(dest) }
       its(:properties) { should == { 'name' => 'darrick' } }
       its(:graph) { should equal(dest) }
@@ -205,7 +205,7 @@ shared_examples_for Pacer::Wrappers::VertexWrapper do
   end
   it { should_not == v1 }
   it { should == v0 }
-  context 'edge with same element id', :transactions => false do
+  context 'edge with same element id', :transactions => false, read_transaction: true do
     it { should_not == e0 }
   end
 

data/spec/spec_helper.rb

@@ -30,6 +30,7 @@ def in_editor?
 end
 
 maybe_require 'pacer-neo4j'
+maybe_require 'pacer-neo4j2'
 maybe_require 'pacer-orient'
 maybe_require 'pacer-dex'
 maybe_require 'pacer-mcfly'
@@ -38,10 +39,10 @@ Run = RSpec::GraphRunner.new ENV['GRAPHS']
 
 def use_simple_graph_data
   let(:setup_data) { e0; e1 }
-  let(:v0) { graph.create_vertex :name => 'eliza' }
-  let(:v1) { graph.create_vertex :name => 'darrick' }
-  let(:e0) { graph.create_edge nil, v0, v1, :links }
-  let(:e1) { graph.create_edge nil, v0, v1, :relinks }
+  let(:v0) { graph.transaction(nesting: true) { graph.create_vertex :name => 'eliza' } }
+  let(:v1) { graph.transaction(nesting: true) { graph.create_vertex :name => 'darrick' } }
+  let(:e0) { graph.transaction(nesting: true) { graph.create_edge nil, v0, v1, :links } }
+  let(:e1) { graph.transaction(nesting: true) { graph.create_edge nil, v0, v1, :relinks } }
 end
 
 def use_pacer_graphml_data(usage_style = :read_write)

data/spec/support/graph_runner.rb

@@ -1,4 +1,5 @@
 maybe_require 'pacer-neo4j/rspec'
+maybe_require 'pacer-neo4j2/rspec'
 maybe_require 'pacer-orient/rspec'
 maybe_require 'pacer-dex/rspec'
 maybe_require 'pacer-mcfly/rspec'
@@ -14,6 +15,9 @@ class RSpec::GraphRunner
     def neo4j(*args)
     end
 
+    def neo4j2(*args)
+    end
+
     def rg(*args)
     end
 
@@ -49,6 +53,7 @@ class RSpec::GraphRunner
   include Stubs
   include Tg
   include Neo4j if defined? Neo4j
+  include Neo4j2 if defined? Neo4j2
   include Dex if defined? Dex
   include Orient if defined? Orient
   include McFly if defined? McFly
@@ -130,6 +135,12 @@ protected
               end
             end
           end
+        elsif graph and transactions and spec.use_read_transaction?
+          graph.read_transaction do
+            graph2.read_transaction do
+              spec.run
+            end
+          end
         else
           spec.run
         end

data/spec/support/use_transactions.rb

@@ -6,6 +6,10 @@ module RSpec
           find_metadata(metadata, :transactions) != false
         end
 
+        def use_read_transaction?
+          find_metadata(metadata, :read_transaction) != false
+        end
+
         def find_metadata(hash, key)
           return unless hash.is_a? Hash
           if hash.key? key

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pacer
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.1
 platform: java
 authors:
 - Darrick Wiebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-11-28 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies: []
 description: Pacer defines routes through a graph and then traverses them very quickly.
 email: darrick@innatesoftware.com
@@ -67,6 +67,7 @@ files:
 - lib/pacer/filter/random_filter.rb
 - lib/pacer/filter/range_filter.rb
 - lib/pacer/filter/uniq_filter.rb
+- lib/pacer/filter/uniq_section.rb
 - lib/pacer/filter/where_filter.rb
 - lib/pacer/filter/where_filter/node_visitor.rb
 - lib/pacer/function_resolver.rb
@@ -117,7 +118,6 @@ files:
 - lib/pacer/side_effect/group_count.rb
 - lib/pacer/side_effect/is_unique.rb
 - lib/pacer/side_effect/visitor.rb
-- lib/pacer/support/array.rb
 - lib/pacer/support/array_list.rb
 - lib/pacer/support/awesome_print.rb
 - lib/pacer/support/enumerable.rb
@@ -130,6 +130,7 @@ files:
 - lib/pacer/transform/flat_map.rb
 - lib/pacer/transform/gather.rb
 - lib/pacer/transform/has_count_cap.rb
+- lib/pacer/transform/identity.rb
 - lib/pacer/transform/intersect_sections.rb
 - lib/pacer/transform/join.rb
 - lib/pacer/transform/lookup_ids.rb
@@ -170,6 +171,7 @@ files:
 - spec/data/grateful-dead.xml
 - spec/data/pacer.graphml
 - spec/pacer/blueprints/dex_spec.rb
+- spec/pacer/blueprints/neo4j2_spec.rb
 - spec/pacer/blueprints/neo4j_spec.rb
 - spec/pacer/blueprints/orient_spec.rb
 - spec/pacer/blueprints/tg_spec.rb
@@ -220,7 +222,7 @@ files:
 - spec/support/use_transactions.rb
 - spec/tackle/simple_mixin.rb
 - spec/tackle/tinkerpop_graph_mixins.rb
-- lib/pacer-1.4.2-standalone.jar
+- lib/pacer-1.5.1-standalone.jar
 homepage: http://github.com/pangloss/pacer
 licenses:
 - MIT
@@ -249,6 +251,7 @@ test_files:
 - spec/data/grateful-dead.xml
 - spec/data/pacer.graphml
 - spec/pacer/blueprints/dex_spec.rb
+- spec/pacer/blueprints/neo4j2_spec.rb
 - spec/pacer/blueprints/neo4j_spec.rb
 - spec/pacer/blueprints/orient_spec.rb
 - spec/pacer/blueprints/tg_spec.rb

data/lib/pacer/support/array.rb

@@ -1,18 +0,0 @@
-
-class Array
-  PipesPipe = com.tinkerpop.pipes.Pipe
-  unless instance_methods.include? :plus_without_multi
-    alias plus_without_multi +
-    def +(other)
-      plus_with_multi(other)
-    end
-  end
-
-  def plus_with_multi(other)
-    if other.is_a? PipesPipe or other.is_a? Enumerator
-      Pacer::Pipes::MultiPipe.new [self, other]
-    else
-      plus_without_multi(other)
-    end
-  end
-end