pacer 1.3.5-java → 1.4.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c1a23e3e54a2756db3922e88510185ad2ccf8bc
-  data.tar.gz: 7f2fd6f0f42832e55b91c8dbaf230bb0c3050549
+  metadata.gz: b1719e006a5a547e01b900999a76df5df6ada73c
+  data.tar.gz: 9ef6e2292108bd5b4f817bca04fb8747a9e64581
 SHA512:
-  metadata.gz: a1b4a54c3a52d987414be288ededf52c8a18d3c4243bb3ec9fb0166e0b0df5fd8efe524a118c53b1469a2fb841eda2e1568e45bf87cd86ba7dac52706db6e1fc
-  data.tar.gz: 898247e0abb0e20b9f1b5eab079cc366bb046d356239ccb0fc3ab4c31e9bcdff83bf5b0d75fa01d44ac3709f50e94ca5cd533a8ff20f58084d8e57f5368a9647
+  metadata.gz: 3084c5a67393a3a6ed28d1ba4239ea030bce9ae540a975721cf88d2dddccab927328e4f34ee44c9f9919e7080ebc96eff77d9d1157954564b33646e8a1880d39
+  data.tar.gz: e2388b84181c61a15d09af7d02b802ab59842ffdc208a538d0358a5320e5b1d2ca3cb8d105b18f3527ef330d579a9d9fc5a7acbcf62ebcaa53c99bff592c9d79

data/.gitignore

@@ -30,4 +30,5 @@ bin
 .jitcache
 coverage/*
 dex.log
-vendor/
+vendor/
+private/

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

@@ -43,7 +43,9 @@ module Pacer::Core::Graph
 
     # Delete all matching elements.
     def delete!
-      uniq.bulk_job { |e| e.delete! }
+      count = 0
+      uniq.bulk_job { |e| count += 1; e.delete! }
+      count
     end
 
     # Stores the result of the current route in a new route so it will not need

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

@@ -3,14 +3,23 @@ module Pacer::Core::Graph
   # This module adds indexed route methods to the basic graph classes returned from the
   # blueprints library.
   module GraphIndexRoute
+    # If never_scan is true, raise an exception if a graph route does not
+    # start with an indexed property. Large databases could spend hours
+    # scanning!
+    attr_accessor :never_scan
+    attr_accessor :choose_best_index
+    attr_accessor :search_manual_indices
+
     # Returns a new route to all graph vertices. Standard filter options.
     def v(*args, &block)
-      filters = Pacer::Route.filters(args)
+      filters = Pacer::Route.filters(self, args)
       if features.supportsKeyIndices or (search_manual_indices and features.supportsIndices)
         route = indexed_route(:vertex, filters, block)
       end
       if route
         route
+      elsif never_scan
+        fail Pacer::ClientError, "No indexed properties found among: #{ filters.property_keys.join ', ' }"
       else
         super(filters, &block)
       end
@@ -18,20 +27,19 @@ module Pacer::Core::Graph
 
     # Returns a new route to all graph edges. Standard filter options.
     def e(*args, &block)
-      filters = Pacer::Route.edge_filters(args)
+      filters = Pacer::Route.edge_filters(self, args)
       if features.supportsKeyIndices or (search_manual_indices and features.supportsIndices)
         route = indexed_route(:edge, filters, block)
       end
       if route
         route
+      elsif never_scan
+        fail Pacer::ClientError, "No indexed properties found among: #{ filters.property_keys.join ', ' }"
       else
         super(filters, &block)
       end
     end
 
-    attr_accessor :choose_best_index
-    attr_accessor :search_manual_indices
-
     private
 
     def indexed_route(element_type, filters, block)

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

@@ -5,7 +5,7 @@ module Pacer::Core::Graph
   module GraphRoute
     # Returns a new route to all graph vertices. Standard filter options.
     def v(*filters, &block)
-      filters = Pacer::Route.filters(filters)
+      filters = Pacer::Route.filters(self, filters)
       route = chain_route :element_type => :vertex,
         :pipe_class => Pacer::Pipes::VerticesPipe,
         :route_name => 'GraphV'
@@ -14,7 +14,7 @@ module Pacer::Core::Graph
 
     # Returns a new route to all graph edges. Standard filter options.
     def e(*filters, &block)
-      filters = Pacer::Route.edge_filters(filters)
+      filters = Pacer::Route.edge_filters(self, filters)
       route = chain_route :element_type => :edge,
         :pipe_class => Pacer::Pipes::EdgesPipe,
         :route_name => 'GraphE'

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

@@ -140,8 +140,10 @@ module Pacer::Core::Graph
     # Delete all matching vertices and all edges which link to this
     # vertex.
     def delete!
-      uniq.both_e.uniq.bulk_job { |e| e.delete! }
-      uniq.bulk_job { |e| e.delete! }
+      count = 0
+      uniq.both_e.uniq.bulk_job { |e| count += 1; e.delete! }
+      uniq.bulk_job { |e| count += 1; e.delete! }
+      count
     end
 
     # Create associations with the given label from all vertices
@@ -209,7 +211,7 @@ module Pacer::Core::Graph
     end
 
     def extract_labels(filters)
-      filters = Pacer::Route.edge_filters(filters)
+      filters = Pacer::Route.edge_filters(self, filters)
       @route_labels = filters.labels
       filters.labels = []
       filters

data/lib/pacer/core/route.rb

@@ -485,6 +485,7 @@ HELP
       # Return an iterator for this route loading data from all previous routes
       # in the chain.
       def iterator
+        Pacer.executing_route self
         start, end_pipe = build_pipeline
         if start
           src = source_iterator

data/lib/pacer/filter/object_filter.rb

@@ -61,6 +61,15 @@ module Pacer
         pipe
       end
 
+      def inspect_class_name
+        if negate
+          "is_not(#{section.inspect})"
+        else
+          "is(#{section.inspect})"
+        end
+      end
+
+
       class FilterSectionPipe < Pacer::Pipes::RubyPipe
         attr_reader :section, :negate
         attr_accessor :other

data/lib/pacer/filter/property_filter/edge_filters.rb

@@ -10,7 +10,7 @@ module Pacer
 
         public
 
-        def initialize(filters)
+        def initialize(graph, filters)
           @best_index = nil
           self.labels = []
           self.non_ext_labels = []

data/lib/pacer/filter/property_filter/filters.rb

@@ -59,7 +59,8 @@ module Pacer
         # @attr [Boolean] search_manual_indices
         attr_accessor :search_manual_indices
 
-        def initialize(filters)
+        def initialize(graph, filters)
+          @graph = graph
           @properties = []
           @blocks = []
           @extensions = []
@@ -90,6 +91,10 @@ module Pacer
           non_ext_props.delete_if { |a| keys.include? a.first }
         end
 
+        def property_keys
+          properties.map(&:first).uniq
+        end
+
         # Set which indices are available to be used to determine the
         # best_index.
         #
@@ -183,9 +188,12 @@ module Pacer
         def use_lookup!
           extensions.each do |ext|
             if ext.respond_to? :lookup
-              add_filters ext.lookup, ext
+              add_filters ext.lookup(graph), ext
             end
           end
+          if wrapper and wrapper.respond_to? :lookup
+            add_filters wrapper.lookup(graph), nil
+          end
         end
 
       protected
@@ -229,7 +237,7 @@ module Pacer
 
         def extract_conditions(filter)
           if filter.respond_to? :route_conditions
-            add_filters filter.route_conditions, filter
+            add_filters filter.route_conditions(graph), filter
           end
         end
 

data/lib/pacer/filter/property_filter.rb

@@ -4,23 +4,23 @@ require 'pacer/filter/property_filter/edge_filters'
 module Pacer
   class Route
     class << self
-      def filters(filters)
+      def filters(graph, filters)
         if filters? filters
           filters
         elsif filters? filters.first
           filters.first
         else
-          Pacer::Filter::PropertyFilter::Filters.new(filters)
+          Pacer::Filter::PropertyFilter::Filters.new(graph, filters)
         end
       end
 
-      def edge_filters(filters)
+      def edge_filters(graph, filters)
         if filters? filters
           filters
         elsif filters? filters.first
           filters.first
         else
-          Pacer::Filter::PropertyFilter::EdgeFilters.new(filters)
+          Pacer::Filter::PropertyFilter::EdgeFilters.new(graph, filters)
         end
       end
 
@@ -29,7 +29,7 @@ module Pacer
       end
 
       def property_filter_before(base, args, block)
-        filters = Pacer::Route.edge_filters(args)
+        filters = Pacer::Route.edge_filters(base.graph, args)
         filters.blocks = [block] if block
         args = chain_args(filters)
         if filters.extensions_only? and base.is_a? Route
@@ -42,7 +42,7 @@ module Pacer
       end
 
       def property_filter(base, args, block)
-        filters = Pacer::Route.edge_filters(args)
+        filters = Pacer::Route.edge_filters(base.graph, args)
         filters.blocks = [block] if block
         args = chain_args(filters)
         if filters.extensions_only? and base.is_a? Route
@@ -75,13 +75,13 @@ module Pacer
         if f.is_a? Filters
           @filters = f
         else
-          @filters = EdgeFilters.new(f)
+          @filters = EdgeFilters.new(graph, f)
         end
       end
 
       # Return an array of filter options for the current route.
       def filters
-        @filters ||= EdgeFilters.new(nil)
+        @filters ||= EdgeFilters.new(graph, nil)
       end
 
       def block=(block)

data/lib/pacer/utils/graph_analysis.rb

@@ -79,7 +79,7 @@ module Pacer
       end
 
       module Vertices
-        def self.route_conditions
+        def self.route_conditions(graph)
           { :element_type => 'vertex' }
         end
 
@@ -105,7 +105,7 @@ module Pacer
       end
 
       module Edges
-        def self.route_conditions
+        def self.route_conditions(graph)
           { :element_type => 'edge' }
         end
 
@@ -117,7 +117,7 @@ module Pacer
       end
 
       module Properties
-        def self.route_conditions
+        def self.route_conditions(graph)
           { :element_type => 'property keys' }
         end
       end

data/lib/pacer/utils/trie.rb

@@ -10,7 +10,7 @@ module Pacer::Utils
         end
       end
 
-      def route_conditions
+      def route_conditions(graph)
         { :type => 'Trie' }
       end
     end

data/lib/pacer/utils/y_files.rb

@@ -30,17 +30,19 @@ module Pacer
       end
 
       # Export the given graph to the given path in an extended .graphml format.
-      def export(graph, path)
-        x = xml(graph)
+      def export(route, path)
+        x = xml(route)
+        puts "\n\nWriting XML"
         File.open(File.expand_path(path), 'w') do |f|
           f.puts x.to_xml
         end
       end
 
       # Returns the xml builder used to construct the xml for the given graph.
-      def xml(graph)
+      def xml(route)
         node_keys = Set[]
         edge_keys = Set[]
+        n = 0
         builder = Nokogiri::XML::Builder.new do |xml|
           xml.graphml('xmlns' => "http://graphml.graphdrawing.org/xmlns",
                       'xmlns:xsi' => "http://www.w3.org/2001/XMLSchema-instance",
@@ -49,7 +51,11 @@ module Pacer
             xml.key 'for' => "node", 'id' => "y.nodegraphics", 'yfiles.type' => "nodegraphics"
             xml.key 'attr.name' => "description", 'attr.type' => "string", 'for' => "node", 'id' => "d2"
             xml.key 'for' => "edge", 'id' => "y.edgegraphics", 'yfiles.type' => "edgegraphics"
-            graph.v.each do |v|
+            puts "Building XML data structure"
+            puts "Vertices"
+            route.paths.vertices.scatter(element_type: :vertex).uniq.each do |v|
+              n += 1
+              print '.' if n % 100 == 0
               xml.node :id => v.element_id do
                 xml.data :key => 'y.nodegraphics' do
                   xml['y'].ShapeNode do
@@ -81,7 +87,10 @@ module Pacer
                 end
               end
             end
-            graph.e.each do |e|
+            puts "\n\nEdges"
+            route.paths.edges.scatter(element_type: :edge).uniq.each do |e|
+              n += 1
+              print '.' if n % 100 == 0
               xml.edge :id => e.element_id, :source => e.out_vertex.element_id, :target => e.in_vertex.element_id, :label => e.label do
                 xml.data :key => 'y.edgegraphics' do
                   xml['y'].PolyLineEdge do

data/lib/pacer/version.rb

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

data/lib/pacer/visitors/section.rb

@@ -42,6 +42,10 @@ module Pacer
         end
         pipe
       end
+
+      def inspect_class_name
+        "#{super}(#{section_name.inspect})"
+      end
     end
   end
 end

data/lib/pacer/wrappers/element_wrapper.rb

@@ -35,11 +35,11 @@ module Pacer::Wrappers
         caches.each { |c| c.clear_cache } if caches
       end
 
-      def route_conditions
+      def route_conditions(graph)
         return @route_conditions if defined? @route_conditions
         @route_conditions = extensions.inject({}) do |h, ext|
           if ext.respond_to? :route_conditions
-            h.merge! ext.route_conditions
+            h.merge! ext.route_conditions(graph)
           else
             h
           end
@@ -47,11 +47,11 @@ module Pacer::Wrappers
         @route_conditions
       end
 
-      def lookup
+      def lookup(graph)
         return @lookup if defined? @lookup
         @lookup = extensions.inject({}) do |h, ext|
           if ext.respond_to? :lookup
-            h.merge! ext.lookup
+            h.merge! ext.lookup(graph)
           else
             h
           end

data/lib/pacer/wrappers/vertex_wrapper.rb

@@ -100,7 +100,7 @@ module Pacer::Wrappers
     def as?(*exts)
       has_exts = extensions_missing(exts).all? do |ext|
         if ext.respond_to? :route_conditions
-          ext.route_conditions.all? do |k, v|
+          ext.route_conditions(graph).all? do |k, v|
             self[k] == v
           end
         else

data/lib/pacer.rb

@@ -160,6 +160,10 @@ module Pacer
     end
     alias verbose verbose?
 
+    def executing_route(route)
+      # override this if you want to know when a pipeline is about to be built.
+    end
+
     # Clear all cached data that may become invalid when {#reload!} is
     # called.
     #

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.5</gem.version>
+      <gem.version>1.4.0</gem.version>
       <pipes.version>2.3.0</pipes.version>
       <gremlin.version>2.3.0</gremlin.version>
     </properties>

data/samples/grateful_dead.rb

@@ -1,6 +1,6 @@
 module GD
   module Artist
-    def self.route_conditions
+    def self.route_conditions(graph)
       { type: 'artist' }
     end
 
@@ -24,7 +24,7 @@ module GD
   end
 
   module Song
-    def self.route_conditions
+    def self.route_conditions(graph)
       { type: 'song' }
     end
 

data/spec/pacer/blueprints/neo4j_spec.rb

@@ -2,13 +2,13 @@ require 'spec_helper'
 
 module NeoSpec
   class Person < Pacer::Wrappers::VertexWrapper
-    def self.route_conditions
+    def self.route_conditions(graph)
       { type: 'person' }
     end
   end
 
   class Frog < Pacer::Wrappers::VertexWrapper
-    def self.route_conditions
+    def self.route_conditions(graph)
       { frog: 'yes' }
     end
   end
@@ -40,7 +40,8 @@ module NeoSpec
         # sanity checks
         it { should be_a Pacer::Filter::LuceneFilter }
         its(:query) { should == 'type:"person"' }
-        its(:count) { should == 2 }
+        # This doesn't work because neo indices are out of sync before the transaction finalizes
+        #its(:count) { should == 2 }
 
         its(:wrapper) { should == Person }
       end

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

@@ -22,7 +22,9 @@ Run.all(:read_write) do
       graph.v.property?(:name).count.should == 7
       graph.v.property?(:zero).count.should == 1
 
-      graph.v.property?(:falsy).count.should == 1
+      unless graph_name == 'mcfly'
+        graph.v.property?(:falsy).count.should == 1
+      end
     end
   end
 end

data/spec/pacer/filter/property_filter/edge_filters_spec.rb

@@ -7,7 +7,7 @@ module Pacer::Filter::PropertyFilter
       subject { filters }
 
       context 'symbol label' do
-        let(:filters) { Pacer::Route.edge_filters [:label] }
+        let(:filters) { Pacer::Route.edge_filters graph, [:label] }
 
         its(:any?) { should be_true }
         its(:labels) { should == ['label'] }
@@ -20,21 +20,21 @@ module Pacer::Filter::PropertyFilter
       end
 
       context 'symbol labels' do
-        let(:filters) { Pacer::Route.edge_filters [:label, :label2] }
+        let(:filters) { Pacer::Route.edge_filters graph, [:label, :label2] }
 
         its(:any?) { should be_true }
         its(:labels) { should == ['label', 'label2'] }
       end
 
       context 'labels arrays' do
-        let(:filters) { Pacer::Route.edge_filters ["label", [:label2]] }
+        let(:filters) { Pacer::Route.edge_filters graph, ["label", [:label2]] }
 
         its(:any?) { should be_true }
         its(:labels) { should == ['label', 'label2'] }
       end
 
       context 'labels and properties' do
-        let(:filters) { Pacer::Route.edge_filters [:label, { prop: 'value' }] }
+        let(:filters) { Pacer::Route.edge_filters graph, [:label, { prop: 'value' }] }
 
         its(:any?) { should be_true }
         its(:labels) { should == ['label'] }
@@ -42,7 +42,7 @@ module Pacer::Filter::PropertyFilter
       end
 
       context 'labels and extension' do
-        let(:filters) { Pacer::Route.edge_filters [:label, TP::Person] }
+        let(:filters) { Pacer::Route.edge_filters graph, [:label, TP::Person] }
 
         its(:any?) { should be_true }
         its(:labels) { should == ['label'] }
@@ -51,7 +51,7 @@ module Pacer::Filter::PropertyFilter
       end
 
       context 'labels and simple extension' do
-        let(:filters) { Pacer::Route.edge_filters [:label, Tackle::SimpleMixin] }
+        let(:filters) { Pacer::Route.edge_filters graph, [:label, Tackle::SimpleMixin] }
 
         its(:any?) { should be_true }
         its(:labels) { should == ['label'] }

data/spec/pacer/filter/property_filter/filters_spec.rb

@@ -7,13 +7,13 @@ module Pacer::Filter::PropertyFilter
       subject { filters }
 
       context 'no properties' do
-        let(:filters) { Pacer::Route.send filter_method, [] }
+        let(:filters) { Pacer::Route.send filter_method, graph, [] }
 
         its(:any?) { should be_false }
       end
 
       context 'no properties' do
-        let(:filters) { Pacer::Route.send filter_method, [Tackle::SimpleMixin] }
+        let(:filters) { Pacer::Route.send filter_method, graph, [Tackle::SimpleMixin] }
 
         its(:any?) { should be_true }
         its(:extensions_only?) { should be_true }
@@ -25,7 +25,7 @@ module Pacer::Filter::PropertyFilter
       end
 
       context 'simple properties' do
-        let(:filters) { Pacer::Route.send filter_method, [name: 'Darrick', nickname: 'pangloss'] }
+        let(:filters) { Pacer::Route.send filter_method, graph, [name: 'Darrick', nickname: 'pangloss'] }
 
         its(:any?) { should be_true }
         its(:extensions_only?) { should be_false }
@@ -37,7 +37,7 @@ module Pacer::Filter::PropertyFilter
       end
 
       context 'With a Set of properties' do
-        let(:filters) { Pacer::Route.send filter_method, [nickname: Set['pangloss', 'someone']] }
+        let(:filters) { Pacer::Route.send filter_method, graph, [nickname: Set['pangloss', 'someone']] }
 
         before { subject.graph = graph }
 
@@ -58,7 +58,7 @@ module Pacer::Filter::PropertyFilter
       end
 
       context 'with extensions' do
-        let(:filters) { Pacer::Route.send filter_method, [TP::Person, name: 'Darrick', nickname: 'pangloss'] }
+        let(:filters) { Pacer::Route.send filter_method, graph, [TP::Person, name: 'Darrick', nickname: 'pangloss'] }
 
         its(:any?) { should be_true }
         its(:extensions) { should == [TP::Person] }
@@ -134,7 +134,7 @@ module Pacer::Filter::PropertyFilter
 
       context 'with route module' do
         # TODO: should this feature be removed?
-        let(:filters) { Pacer::Route.send filter_method, [TP::Pangloss] }
+        let(:filters) { Pacer::Route.send filter_method, graph, [TP::Pangloss] }
 
         its(:any?) { should be_true }
         its(:extensions_only?) { should be_false }
@@ -146,7 +146,7 @@ module Pacer::Filter::PropertyFilter
       end
 
       context 'with manual index' do
-        let(:filters) { Pacer::Route.send filter_method, [tokens: { short: '555555' }, name: 'Darrick'] }
+        let(:filters) { Pacer::Route.send filter_method, graph, [tokens: { short: '555555' }, name: 'Darrick'] }
 
         its(:any?) { should be_true }
         its(:extensions) { should be_empty }

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

@@ -29,9 +29,9 @@ Run.all do
       subject { route }
 
       its(:inspect) do
-        should be_one_of "#<V-Index(name: \"gremlin\") -> V-Section -> :grem -> inE(:wrote)>",
-                         /#<V-Lucene\(name:"gremlin"\) ~ \d+ -> V-Section -> :grem -> inE\(:wrote\)>/,
-                         "#<GraphV -> V-Property(name==\"gremlin\") -> V-Section -> :grem -> inE(:wrote)>"
+        should be_one_of "#<V-Index(name: \"gremlin\") -> V-Section(:grem) -> inE(:wrote)>",
+                         /#<V-Lucene\(name:"gremlin"\) ~ \d+ -> V-Section\(:grem\) -> inE\(:wrote\)>/,
+                         "#<GraphV -> V-Property(name==\"gremlin\") -> V-Section(:grem) -> inE(:wrote)>"
       end
       its(:out_v) { should_not be_nil }
     end
@@ -106,9 +106,9 @@ Run.all(:read_only) do
         r = r.out_e(:wrote) { |e| true }
         r = r.in_v
         r = r.is_not(:grem)
-        r.inspect.should be_one_of "#<V-Index(name: \"gremlin\") -> V-Section -> :grem -> inE(:wrote) -> outV -> outE(:wrote) -> E-Property(&block) -> inV -> V-Property(&block)>",
-                                   /#<V-Lucene\(name:"gremlin"\) ~ \d+ -> V-Section -> :grem -> inE\(:wrote\) -> outV -> outE\(:wrote\) -> E-Property\(&block\) -> inV -> V-Property\(&block\)>/,
-                                   "#<GraphV -> V-Property(name==\"gremlin\") -> V-Section -> :grem -> inE(:wrote) -> outV -> outE(:wrote) -> E-Property(&block) -> inV -> V-Property(&block)>"
+        r.inspect.should be_one_of "#<V-Index(name: \"gremlin\") -> V-Section(:grem) -> inE(:wrote) -> outV -> outE(:wrote) -> E-Property(&block) -> inV -> is_not(:grem)>",
+                                   /#<V-Lucene\(name:"gremlin"\) ~ \d+ -> V-Section\(:grem\) -> inE\(:wrote\) -> outV -> outE\(:wrote\) -> E-Property\(&block\) -> inV -> is_not\(:grem\)>/,
+                                   "#<GraphV -> V-Property(name==\"gremlin\") -> V-Section(:grem) -> inE(:wrote) -> outV -> outE(:wrote) -> E-Property(&block) -> inV -> is_not(:grem)>"
       end
     end
 

data/spec/pacer/side_effect/{as_spec.rb → as_var_spec.rb}

@@ -3,17 +3,17 @@ require 'spec_helper'
 Run.all(:read_only) do
   use_pacer_graphml_data(:read_only)
 
-  describe '#as' do
+  describe '#as_var' do
     it 'should set the variable to the correct node' do
       vars = Set[]
-      route = graph.v.as(:a_vertex)
+      route = graph.v.as_var(:a_vertex)
       route.in_e(:wrote) { |edge| vars << route.vars[:a_vertex] }.count
       vars.should == Set[*graph.e.e(:wrote).in_v]
     end
 
     it 'should not break path generation (simple)' do
       who = nil
-      r1 = graph.v.as(:who)
+      r1 = graph.v.as_var(:who)
       r = r1.in_e(:wrote).out_v.v { |v|
         who = r1.vars[:who]
       }.paths
@@ -25,8 +25,8 @@ Run.all(:read_only) do
 
     it 'should not break path generation' do
       who_wrote_what = nil
-      r1 = graph.v.as(:who)
-      r = r1.in_e(:wrote).as(:wrote).out_v.as(:what).v { |v|
+      r1 = graph.v.as_var(:who)
+      r = r1.in_e(:wrote).as_var(:wrote).out_v.as_var(:what).v { |v|
         who_wrote_what = [r1.vars[:who], r1.vars[:wrote], r1.vars[:what]]
       }.paths
       r.each do |path|

data/spec/pacer/wrapper/edge_wrapper_spec.rb

@@ -10,7 +10,7 @@ Run.all :read_only do
     subject { e_wrapper_class }
 
     it { should_not be_nil }
-    its(:route_conditions) { should == { label: 'wrote' } }
+    it { subject.route_conditions(graph).should == { label: 'wrote' } }
     its(:extensions) { should == e_exts }
 
     describe 'instance' do
@@ -135,6 +135,7 @@ describe Pacer::Wrappers::EdgeWrapper do
     end
 
     it 'should reuse the element id' do
+      return if graph_name == 'mcfly'
       unless graph.features.ignoresSuppliedIds
         e0
         c = example.metadata[:graph_commit]

data/spec/pacer/wrapper/vertex_wrapper_spec.rb

@@ -11,7 +11,7 @@ Run.all :read_only do
     subject { v_wrapper_class }
 
     it { should_not be_nil }
-    its(:route_conditions) { should == { type: 'project' } }
+    it { subject.route_conditions(graph).should == { type: 'project' } }
     its(:extensions) { should == v_exts }
 
     describe 'instance' do
@@ -36,7 +36,7 @@ end
 
 module VertexWrapperSpec
   module Project
-    def self.route_conditions
+    def self.route_conditions(graph)
       { :type => 'project' }
     end
 
@@ -45,7 +45,7 @@ module VertexWrapperSpec
   end
 
   module IsRuby
-    def self.route_conditions
+    def self.route_conditions(graph)
       { :language => 'ruby' }
     end
 

data/spec/support/graph_runner.rb

@@ -38,6 +38,7 @@ class RSpec::GraphRunner
     def tg(usage_style = :read_write, indices = true, &block)
       return unless use_graph? 'tg'
       describe 'tg' do
+        let(:graph_name) { 'tg' }
         let(:graph) { Pacer.tg }
         let(:graph2) { Pacer.tg }
         instance_eval(&block)
@@ -78,6 +79,7 @@ protected
     return unless use_graph? name
     clear_graph ||= proc { |g| clear g }
     describe name do
+      let(:graph_name) { name }
       let(:graph) do
         if indices
           source_graph_1

data/spec/tackle/tinkerpop_graph_mixins.rb

@@ -1,6 +1,6 @@
 module TP
   module Person
-    def self.route_conditions
+    def self.route_conditions(graph)
       { :type => 'person' }
     end
 
@@ -13,7 +13,7 @@ module TP
 
 
   class Project
-    def self.route_conditions
+    def self.route_conditions(graph)
       { :type => 'project' }
     end
 
@@ -47,7 +47,7 @@ module TP
   end
 
   module Wrote
-    def self.route_conditions
+    def self.route_conditions(graph)
       { label: 'wrote' }
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pacer
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.4.0
 platform: java
 authors:
 - Darrick Wiebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-08-30 00:00:00.000000000 Z
+date: 2013-09-09 00:00:00.000000000 Z
 dependencies: []
 description: Pacer defines routes through a graph and then traverses them very quickly.
 email: darrick@innatesoftware.com
@@ -199,7 +199,7 @@ files:
 - spec/pacer/route/mixin/base_spec.rb
 - spec/pacer/route/mixin/bulk_operations_spec.rb
 - spec/pacer/route/mixin/route_operations_spec.rb
-- spec/pacer/side_effect/as_spec.rb
+- spec/pacer/side_effect/as_var_spec.rb
 - spec/pacer/side_effect/is_unique_spec.rb
 - spec/pacer/support/array_list_spec.rb
 - spec/pacer/support/enumerable_spec.rb
@@ -220,7 +220,7 @@ files:
 - spec/support/use_transactions.rb
 - spec/tackle/simple_mixin.rb
 - spec/tackle/tinkerpop_graph_mixins.rb
-- lib/pacer-1.3.5-standalone.jar
+- lib/pacer-1.4.0-standalone.jar
 homepage: http://github.com/pangloss/pacer
 licenses:
 - MIT
@@ -278,7 +278,7 @@ test_files:
 - spec/pacer/route/mixin/base_spec.rb
 - spec/pacer/route/mixin/bulk_operations_spec.rb
 - spec/pacer/route/mixin/route_operations_spec.rb
-- spec/pacer/side_effect/as_spec.rb
+- spec/pacer/side_effect/as_var_spec.rb
 - spec/pacer/side_effect/is_unique_spec.rb
 - spec/pacer/support/array_list_spec.rb
 - spec/pacer/support/enumerable_spec.rb