pacer 1.0.1-java → 1.0.2-java

data/lib/pacer/wrappers/vertex_wrapper.rb

@@ -49,9 +49,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
@@ -60,9 +58,7 @@ module Pacer::Wrappers
     # Returns the element with a new simple wrapper.
     # @return [VertexWrapper]
     def no_extensions
-      e = VertexWrapper.new element
-      e.graph = graph
-      e
+      VertexWrapper.new graph, element
     end
 
     # Checks that the given extensions can be applied to the vertex. If
@@ -176,13 +172,20 @@ module Pacer::Wrappers
     # If the other instance is an unwrapped vertex, this will always return
     # false because otherwise the == method would not be symetrical.
     #
-    # @see #eql?
     # @param other
     def ==(other)
       other.is_a? VertexWrapper 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
 
     protected
 

data/lib/pacer/wrappers/wrapper_selector.rb

@@ -28,10 +28,10 @@ module Pacer::Wrappers
       end
     end
 
-    def new(element)
+    def new(graph, element)
       w = wrapper(element)
       if w
-        w.new element
+        w.new graph, element
       else
         element
       end

data/lib/pacer/wrappers/wrapping_pipe_function.rb

@@ -3,14 +3,13 @@ module Pacer
     class WrappingPipeFunction
       include com.tinkerpop.pipes.PipeFunction
 
-      attr_reader :block, :graph, :wrapper, :extensions, :back
+      attr_reader :block, :graph, :wrapper, :extensions
 
       def initialize(back, block)
-        @back = back
         @block = block
         if back
           @graph = back.graph
-          @extensions = back.extensions + [Pacer::Extensions::BlockFilterElement]
+          @extensions = back.extensions
           element_type = back.element_type
         end
         @wrapper = WrapperSelector.build element_type, extensions
@@ -21,30 +20,24 @@ module Pacer
       end
 
       def compute(element)
-        e = wrapper.new element
-        e.graph = graph if e.respond_to? :graph=
-        e.back = back if e.respond_to? :back=
+        e = wrapper.new graph, element
         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=
+        e = wrapper.new graph, element
         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 = Pacer::Wrappers::VertexWrapper.new graph, item
             wrapped
           elsif item.is_a? Pacer::Edge
-            wrapped = Pacer::Wrappers::EdgeWrapper.new item
-            wrapped.graph = graph
+            wrapped = Pacer::Wrappers::EdgeWrapper.new graph, item
             wrapped
           else
             item

data/lib/pacer.rb

@@ -46,7 +46,6 @@ module Pacer
   require 'pacer/routes'
   require 'pacer/wrappers'
   require 'pacer/route'
-  require 'pacer/extensions'
   require 'pacer/blueprints'
   require 'pacer/support'
   require 'pacer/utils'

data/pacer.gemspec

@@ -13,8 +13,6 @@ Gem::Specification.new do |s|
   s.summary = %Q{A very efficient and easy to use graph traversal engine.}
   s.description = %Q{Pacer defines routes through a graph and then traverses them very quickly.}
 
-  s.add_dependency 'fastercsv', '>= 1.5.4'
-
   s.files = `git ls-files`.split("\n") + [Pacer::JAR_PATH]
   s.test_files = `git ls-files -- spec/*`.split("\n")
   s.require_paths = ['lib']

data/pom.xml

@@ -7,7 +7,7 @@
     <artifactId>pacer</artifactId>
     <!-- NOTE: the following properties are automatically updated based on the values in lib/pacer-neo4j/version.rb -->
     <properties>
-      <gem.version>1.0.1</gem.version>
+      <gem.version>1.0.2</gem.version>
       <blueprints.version>2.1.0</blueprints.version>
       <pipes.version>2.1.0</pipes.version>
       <gremlin.version>2.1.0</gremlin.version>

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

@@ -37,6 +37,10 @@ Run.all(:read_only) do
         its(:count) { should == 9 }
         it { subject.to_a.should == graph.v.out_e(:uses, :wrote).in_v.to_a }
       end
+
+      it 'should not apply extensions to new route' do
+        graph.v(Tackle::SimpleMixin).out.extensions.should == []
+      end
     end
 
     describe '#in' do
@@ -49,6 +53,10 @@ Run.all(:read_only) do
         its(:count) { should == 9 }
         it { subject.to_a.should == graph.v.in_e(:uses, :wrote).out_v.to_a }
       end
+
+      it 'should not apply extensions to new route' do
+        graph.v(Tackle::SimpleMixin).in.extensions.should == []
+      end
     end
 
     describe '#both' do
@@ -61,6 +69,10 @@ Run.all(:read_only) do
         # These element ids only work under TinkerGraph:
         #it { subject.element_ids.to_a.should == %w[5 5 0 1 4 2 3 5] }
       end
+
+      it 'should not apply extensions to new route' do
+        graph.v(Tackle::SimpleMixin).both.extensions.should == []
+      end
     end
   end
 end

data/spec/pacer/filter/property_filter_spec.rb

@@ -84,16 +84,14 @@ Run.tg(:read_only) do
       describe 'v(wrapper_class)' do
         subject { graph.v(wrapper_class) }
         its(:wrapper) { should == wrapper_class }
-        its(:extensions) { should == [] }
-        its(:all_extensions) { should ==  exts }
+        its(:extensions) { should == exts }
         its(:first) { should be_a wrapper_class }
       end
 
       describe 'v(wrapper_class, Pacer::Utils::TSort)' do
         subject { graph.v(wrapper_class, Pacer::Utils::TSort) }
         its(:wrapper) { should == wrapper_class }
-        its(:extensions) { should == [Pacer::Utils::TSort] }
-        its(:all_extensions) { should == (exts + [Pacer::Utils::TSort]) }
+        its(:extensions) { should == (exts + [Pacer::Utils::TSort]) }
         it { should_not be_empty }
         its('first.class') { should_not == wrapper_class }
         its('first.class.extensions') { should == exts + [Pacer::Utils::TSort] }
@@ -103,8 +101,7 @@ Run.tg(:read_only) do
         subject { graph.v(wrapper_class, :name => 'pacer') }
         its(:count) { should == 1 }
         its(:wrapper) { should == wrapper_class }
-        its(:all_extensions) { should == exts }
-        its(:extensions) { should == [] }
+        its(:extensions) { should == exts }
         its(:first) { should be_a wrapper_class }
         its(:filters) { should_not be_nil }
         its('filters.wrapper') { should == wrapper_class }

data/spec/pacer/side_effect/as_spec.rb

@@ -6,14 +6,16 @@ Run.all(:read_only) do
   describe '#as' do
     it 'should set the variable to the correct node' do
       vars = Set[]
-      graph.v.as(:a_vertex).in_e(:wrote) { |edge| vars << edge.vars[:a_vertex] }.count
+      route = graph.v.as(: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
-      r = graph.v.as(:who).in_e(:wrote).out_v.v { |v|
-        who = v.vars[:who]
+      r1 = graph.v.as(:who)
+      r = r1.in_e(:wrote).out_v.v { |v|
+        who = r1.vars[:who]
       }.paths
       r.each do |path|
         path.to_a[0].should == who
@@ -23,8 +25,9 @@ Run.all(:read_only) do
 
     it 'should not break path generation' do
       who_wrote_what = nil
-      r = graph.v.as(:who).in_e(:wrote).as(:wrote).out_v.as(:what).v { |v|
-        who_wrote_what = [v.vars[:who], v.vars[:wrote], v.vars[:what]]
+      r1 = graph.v.as(:who)
+      r = r1.in_e(:wrote).as(:wrote).out_v.as(:what).v { |v|
+        who_wrote_what = [r1.vars[:who], r1.vars[:wrote], r1.vars[:what]]
       }.paths
       r.each do |path|
         path.to_a.should == who_wrote_what

data/spec/pacer/side_effect/is_unique_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe '#unique?' do
+  it 'should be true if unique' do
+    [1, 2, 3].to_route.unique?.should be_true
+  end
+
+  it 'should be true if unique' do
+    [1, 2, 3, 1, 4].to_route.unique?.should be_false
+  end
+end

data/spec/pacer/transform/map_spec.rb

@@ -15,7 +15,7 @@ shared_examples_for '#map' do
 
     subject { extended.map { |v| v.extensions } }
 
-    its(:first) { should == [Tackle::SimpleMixin, Pacer::Extensions::BlockFilterElement] }
+    its(:first) { should == [Tackle::SimpleMixin] }
     its(:element_type) { should == :object }
 
     context 'with vertex result type' do
@@ -32,7 +32,7 @@ shared_examples_for '#map' do
       it 'should use the source - not the result - extension in the block' do
         v = subject.first
         v.extensions.should == [TP::Person]
-        exts.first.should == [Tackle::SimpleMixin, Pacer::Extensions::BlockFilterElement]
+        exts.first.should == [Tackle::SimpleMixin]
       end
     end
   end

data/spec/pacer/transform/process_spec.rb

@@ -20,7 +20,7 @@ shared_examples_for '#process' do
 
     it 'should have the right extensions in the block' do
       subject.first
-      exts.first.should == [Tackle::SimpleMixin, Pacer::Extensions::BlockFilterElement]
+      exts.first.should == [Tackle::SimpleMixin]
     end
   end
 end

data/spec/pacer/wrapper/edge_wrapper_spec.rb

@@ -16,9 +16,7 @@ Run.all :read_only do
 
     describe 'instance' do
       subject do
-        e = e_wrapper_class.new pangloss_wrote_pacer.element
-        e.graph = graph
-        e
+        e_wrapper_class.new graph, pangloss_wrote_pacer.element
       end
       it               { should_not be_nil }
       its(:element)    { should_not be_nil }
@@ -28,7 +26,7 @@ Run.all :read_only do
       its(:extensions) { should == e_exts }
 
       describe 'with more extensions added' do
-        subject { e_wrapper_class.new(pacer.element).add_extensions([Pacer::Utils::TSort]) }
+        subject { e_wrapper_class.new(graph, pacer.element).add_extensions([Pacer::Utils::TSort]) }
         its(:class) { should_not == e_wrapper_class }
         its(:extensions) { should == e_exts + [Pacer::Utils::TSort] }
       end

data/spec/pacer/wrapper/element_wrapper_spec.rb

@@ -42,6 +42,19 @@ shared_examples_for Pacer::Wrappers::ElementWrapper do
       end
     end
 
+    describe '#hash' do
+      it 'should not collide between vertices and edges' do
+        # different graphs need different numbers
+        600.times { graph.create_edge nil, graph.create_vertex, graph.create_vertex, 'abc' }
+        v_hashes = graph.v.map(&:hash).to_a
+        e_hashes = graph.e.map(&:hash).to_a
+        count = v_hashes.count + e_hashes.count
+        (v_hashes + e_hashes).uniq.count.should == count
+        set = graph.v.to_set + graph.e.to_set
+        set.count.should == count
+      end
+    end
+
     describe '#eql?' do
       subject { Hash.new(0) }
       before do
@@ -398,9 +411,8 @@ Run.tg :read_only do
         end
 
         it 'should have ancestors in the correct order' do
-          subject.ancestors[0...7].should == [
-            Pacer::Wrap::VertexWrapperTP_PersonTackle_SimpleMixinTP_CoderPacer_Extensions_BlockFilterElement,
-            Pacer::Extensions::BlockFilterElement::Route,
+          subject.ancestors[0...6].should == [
+            Pacer::Wrap::VertexWrapperTP_PersonTackle_SimpleMixinTP_Coder,
             TP::Coder::Route,
             Tackle::SimpleMixin::Vertex,
             Tackle::SimpleMixin::Route,
@@ -438,9 +450,8 @@ Run.tg :read_only do
 
           it { should_not be_nil }
           it 'should have ancestors in the correct order' do
-            subject.ancestors[0...7].should == [
-              Pacer::Wrap::VertexWrapperTackle_SimpleMixinTP_PersonTP_CoderPacer_Extensions_BlockFilterElement,
-              Pacer::Extensions::BlockFilterElement::Route,
+            subject.ancestors[0...6].should == [
+              Pacer::Wrap::VertexWrapperTackle_SimpleMixinTP_PersonTP_Coder,
               TP::Coder::Route,
               TP::Person::Route,
               Tackle::SimpleMixin::Vertex,

data/spec/pacer/wrapper/vertex_wrapper_spec.rb

@@ -16,9 +16,7 @@ Run.all :read_only do
 
     describe 'instance' do
       subject do
-        v = v_wrapper_class.new pacer.element
-        v.graph = graph
-        v
+        v_wrapper_class.new graph, pacer.element
       end
       it               { should_not be_nil }
       its(:element)    { should_not be_nil }
@@ -28,7 +26,7 @@ Run.all :read_only do
       its(:extensions) { should == v_exts }
 
       describe 'with more extensions added' do
-        subject { v_wrapper_class.new(pacer.element).add_extensions([Pacer::Utils::TSort]) }
+        subject { v_wrapper_class.new(graph, pacer.element).add_extensions([Pacer::Utils::TSort]) }
         its(:class) { should_not == v_wrapper_class }
         its(:extensions) { should == v_exts + [Pacer::Utils::TSort] }
       end

metadata

@@ -1,32 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: pacer
 version: !ruby/object:Gem::Version
-  version: 1.0.1
   prerelease:
+  version: 1.0.2
 platform: java
 authors:
 - Darrick Wiebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-09-04 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: fastercsv
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.4
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.4
-    none: false
-  prerelease: false
-  type: :runtime
+date: 2012-09-08 00:00:00.000000000 Z
+dependencies: []
 description: Pacer defines routes through a graph and then traverses them very quickly.
 email: darrick@innatesoftware.com
 executables: []
@@ -39,8 +23,6 @@ files:
 - .rspec
 - CONTRIBUTORS
 - Gemfile
-- Gemfile-dev
-- Gemfile-release
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -68,8 +50,6 @@ files:
 - lib/pacer/core/route.rb
 - lib/pacer/core/side_effect.rb
 - lib/pacer/exceptions.rb
-- lib/pacer/extensions.rb
-- lib/pacer/extensions/block_filter_element.rb
 - lib/pacer/filter.rb
 - lib/pacer/filter/block_filter.rb
 - lib/pacer/filter/collection_filter.rb
@@ -203,6 +183,7 @@ files:
 - 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/is_unique_spec.rb
 - spec/pacer/support/array_list_spec.rb
 - spec/pacer/support/enumerable_spec.rb
 - spec/pacer/transform/join_spec.rb
@@ -222,8 +203,7 @@ files:
 - spec/support/use_transactions.rb
 - spec/tackle/simple_mixin.rb
 - spec/tackle/tinkerpop_graph_mixins.rb
-- tags
-- lib/pacer-1.0.1-standalone.jar
+- lib/pacer-1.0.2-standalone.jar
 homepage: http://github.com/pangloss/pacer
 licenses:
 - MIT
@@ -235,6 +215,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 2
       version: !binary |-
         MA==
   none: false
@@ -242,6 +225,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 2
       version: !binary |-
         MA==
   none: false
@@ -281,6 +267,7 @@ test_files:
 - 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/is_unique_spec.rb
 - spec/pacer/support/array_list_spec.rb
 - spec/pacer/support/enumerable_spec.rb
 - spec/pacer/transform/join_spec.rb

data/Gemfile-dev

@@ -1,33 +0,0 @@
-# A sample Gemfile
-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/Gemfile-release

@@ -1,4 +0,0 @@
-# A sample Gemfile
-source "http://rubygems.org"
-
-gemspec

data/lib/pacer/extensions/block_filter_element.rb

@@ -1,17 +0,0 @@
-module Pacer
-  module Extensions
-    module BlockFilterElement
-      module Route
-        def back=(back)
-          @back = back
-        end
-
-        # The vars hash contains variables that were set earlier in the processing
-        # of the route. Vars may also be set within the block.
-        def vars
-          @back.vars
-        end
-      end
-    end
-  end
-end

data/lib/pacer/extensions.rb

@@ -1,6 +0,0 @@
-module Pacer
-  module Extensions
-  end
-end
-
-require 'pacer/extensions/block_filter_element'