pacer 1.4.2-java → 1.5.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e85b52180f5709fd005a51803e16d98bceacaaa
-  data.tar.gz: 84ded6cf4d5ec23d85688034aabf7e23822f073f
+  metadata.gz: 73b5792b368e7fd7337c32ccceeb591ed47ab3a8
+  data.tar.gz: cb32f1e5e53c44accced47e77ee7fe6177eafeb4
 SHA512:
-  metadata.gz: 87cde3ee51453d0b6a4d171a489828cc7fd3d0a53eed417b07102c2481c60b9df7bc7bf6ba16ef037a362fe566304b907794f099d0c1b58905d3f49992859945
-  data.tar.gz: 1679920a788cf8cee52152835c893a08162e7d09e8036f5d3e597cbd0e604e4a13b9bb8ea031d5c8593d122c77289820b02129cb511a59abf914f0314b0c1ef0
+  metadata.gz: 3eb2c7a98df23b0cce4a79343e601363970bb3a96deb4c4d50982daab3f683ce4d97cd7a957475b8df6ecd6fde41756383bf3fa9c5fef70ad1efd08a44944c01
+  data.tar.gz: aff44e7a64e456465a5e15fe093ed04410d7139f63213bdecddf1ae265cf6cd4fdab1fbcbba25d26b67d20453f3b60e79d2c31479845e795c24cf86895a0e16d

data/Gemfile

@@ -12,12 +12,31 @@ group :development do
   # pacer-* gems are required for testing pacer.
   # If you have the gem repos cloned locally, we'll use them.
   #
-  [ 'pacer-neo4j', 'pacer-orient', 'pacer-dex'].each do |lib|
+  [ 'pacer-orient', 'pacer-dex' ].each do |lib|
     if File.directory? "../#{lib}"
       gem lib, :path => "../#{lib}" 
     end
   end
 
+  # Neo4j versions are mutually incompatible
+  # To test Pacer against Neo4j 1.x when the neo2 gem is present, use:
+  #
+  #   neo=1 bundle
+  #   rspec
+  #
+  # To switch back, just use:
+  #
+  #   bundle
+  #   rspec
+  #
+  if File.directory? "../pacer-neo4j" and (ENV['neo'] == '1' or not File.directory? "../pacer-neo4j2")
+    gem 'pacer-neo4j', :path => "../pacer-neo4j"
+  end
+
+  if File.directory? "../pacer-neo4j2" and ENV['neo'] != '1' 
+    gem 'pacer-neo4j2', :path => "../pacer-neo4j2"
+  end
+
   if File.directory? "../mcfly"
     gem 'pacer-mcfly', :path => "../mcfly" 
   end

data/README.md

@@ -2,8 +2,8 @@
 
 Pacer is a JRuby library that enables very expressive graph traversals.
 
-It currently supports 2 major graph database: [Neo4j](http://neo4j.org)
-and [Dex](http://www.sparsity-technologies.com/dex) using the
+It currently supports all of the major graph databases including [Neo4j](http://neo4j.org)
+and [Dex](http://www.sparsity-technologies.com/dex) thanks to the
 [Tinkerpop](http://tinkerpop.com) graphdb stack. Plus there's a very
 convenient in-memory graph called TinkerGraph which is part of
 [Blueprints](http://blueprints.tinkerpop.com).
@@ -17,19 +17,21 @@ it's very fast!
 
 ## Mailing List
 
-With the release of 0.8.1, I just set up a brand new [pacer google
-group](http://groups.google.com/group/pacer-users?lnk=gcimv). Join and
-let's get the conversation going!
+Pacer has a [google group](http://groups.google.com/group/pacer-users?lnk=gcimv)! Join and feel free to ask questions and discuss about Pacer or graphs in general.
 
 ## Documentation
 
-Pacer is documented with a comprehensive RSpec test suite and with a
+Check out the [wiki](https://github.com/pangloss/pacer/wiki) for detailed explanations of many of Pacer's features. Please contribute to it or open issues against it if there is anything missing that you want to see.
+
+Pacer is also documented with a comprehensive RSpec test suite and with a
 thorough YARD documentation. [Dig in!](http://rubydoc.info/github/pangloss/pacer/develop/frames)
 
 If you like, you can also use the documentation locally via
 
+```
   gem install yard
   yard server
+```
 
 ## JRuby 1.7 Required
 
@@ -57,20 +59,31 @@ compatible with Pacer, but I have not yet implemented the simple
 adapters Pacer needs to use them yet. Here is the list of what's
 supported so far:
 
- * TinkerGraph - In-memory graph db, built in and ready to use without
-   additional dependencies.
- * [Neo4J](http://neo4j.org) - The industry-leading graph db. `gem
-   install pacer-neo4j`
-   [pangloss/pacer-neo4j](https://github.com/pangloss/pacer-neo4j)
- * [Dex](http://sparsity-technologies.com) - A very fast, relatively new graph db. `gem
-   install pacer-dex`
-   [pangloss/pacer-dex](https://github.com/pangloss/pacer-dex)
+| Graph                                          | Info                                     | Gem Required              | Gem address                                                     |
+|------------------------------------------------|------------------------------------------|---------------------------|-----------------------------------------------------------------|
+| TinkerGraph                                    | In-memory graph db. Included with Pacer. |                           |                                                                 |
+| [Neo4J](http://neo4j.org)                      | The industry-leading graph db.           | `gem install pacer-neo4j` | [pangloss/pacer-neo4j](https://github.com/pangloss/pacer-neo4j) |
+| [Dex](http://sparsity-technologies.com)        | A very fast, relatively new graph db.    | `gem install pacer-dex`   | [pangloss/pacer-dex](https://github.com/pangloss/pacer-dex)     |
+| [Titan](http://thinkaurelius.github.io/titan/) | Built on top of a pluggable nosql backend store | `gem install pacer-titan` | [pacer-titan](https://github.com/mrbotch/pacer-titan)           |
+
+
 
 You can run any or all of the above graph databases. Pacer supports
 running them simultaneuosly and even supports having many of any given
 type open at once.
 
-### Interoperation with the neo4j gem
+### Using Pacer with Neo4j
+
+All you need is the [pacer-neo4j](https://github.com/pangloss/pacer-neo4j) gem.
+
+```ruby
+    require 'pacer-neo4j'
+    graph = Pacer.neo4j("path/to/graph")
+```
+
+See the gem repository for more details on Neo4j-specific features and functionality.
+
+#### (optional) Interoperation with the neo4j gem
 
 Pacer can work together with other Ruby GraphDB libraries, too. The
 first functioning example is with theo neo4j gem. Hopefully more will
@@ -82,6 +95,7 @@ as follows:
 ```ruby
     require 'neo4j'
     require 'pacer-neo4j'
+    # start neo4j via the external gem rather than using pacer-neo4j
     Neo4j.db.start
     graph = Pacer.neo4j(Neo4j.db.graph)
 ```

data/Rakefile

@@ -20,7 +20,6 @@ file 'pom.xml' => 'lib/pacer/version.rb' do
         line.sub!(%r{<gem.version>.*</gem.version>}, "<gem.version>#{ Pacer::VERSION }</gem.version>")
         line.sub!(%r{<blueprints.version>.*</blueprints.version>}, "<blueprints.version>#{ Pacer::BLUEPRINTS_VERSION }</blueprints.version>")
         line.sub!(%r{<pipes.version>.*</pipes.version>}, "<pipes.version>#{ Pacer::PIPES_VERSION }</pipes.version>")
-        line.sub!(%r{<gremlin.version>.*</gremlin.version>}, "<gremlin.version>#{ Pacer::GREMLIN_VERSION }</gremlin.version>")
         f << line
       end
     end

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

@@ -2,9 +2,9 @@ module Pacer::Core::Graph
 
   # Basic methods for routes that contain only edges.
   module EdgesRoute
-    import com.tinkerpop.gremlin.pipes.transform.OutVertexPipe
-    import com.tinkerpop.gremlin.pipes.transform.InVertexPipe
-    import com.tinkerpop.gremlin.pipes.transform.BothVerticesPipe
+    import com.tinkerpop.pipes.transform.OutVertexPipe
+    import com.tinkerpop.pipes.transform.InVertexPipe
+    import com.tinkerpop.pipes.transform.BothVerticesPipe
 
     # Extends the route with out vertices from this route's matching edges.
     #
@@ -56,7 +56,7 @@ module Pacer::Core::Graph
     #
     # @return [Core::Route]
     def labels
-      chain_route(:pipe_class => com.tinkerpop.gremlin.pipes.transform.LabelPipe,
+      chain_route(:pipe_class => com.tinkerpop.pipes.transform.LabelPipe,
                   :route_name => 'labels',
                   :element_type => :object)
     end
@@ -84,7 +84,7 @@ module Pacer::Core::Graph
     protected
 
     def id_pipe_class
-      com.tinkerpop.gremlin.pipes.transform.IdEdgePipe
+      com.tinkerpop.pipes.transform.IdEdgePipe
     end
   end
 end

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

@@ -2,12 +2,12 @@ module Pacer::Core::Graph
 
   # Basic methods for routes that contain only vertices.
   module VerticesRoute
-    import com.tinkerpop.gremlin.pipes.transform.OutEdgesPipe
-    import com.tinkerpop.gremlin.pipes.transform.OutPipe
-    import com.tinkerpop.gremlin.pipes.transform.InEdgesPipe
-    import com.tinkerpop.gremlin.pipes.transform.InPipe
-    import com.tinkerpop.gremlin.pipes.transform.BothEdgesPipe
-    import com.tinkerpop.gremlin.pipes.transform.BothPipe
+    import com.tinkerpop.pipes.transform.OutEdgesPipe
+    import com.tinkerpop.pipes.transform.OutPipe
+    import com.tinkerpop.pipes.transform.InEdgesPipe
+    import com.tinkerpop.pipes.transform.InPipe
+    import com.tinkerpop.pipes.transform.BothEdgesPipe
+    import com.tinkerpop.pipes.transform.BothPipe
 
     # Extends the route with out edges from this route's matching vertices.
     #
@@ -219,7 +219,7 @@ module Pacer::Core::Graph
 
     # TODO: move id_pipe_class into the element_type object
     def id_pipe_class
-      com.tinkerpop.gremlin.pipes.transform.IdVertexPipe
+      com.tinkerpop.pipes.transform.IdVertexPipe
     end
   end
 end

data/lib/pacer/core/route.rb

@@ -308,32 +308,37 @@ HELP
         if Pacer.hide_route_elements or hide_elements or source_iterator.nil?
           description
         else
-          Pacer.hide_route_elements do
-            count = 0
-            limit ||= Pacer.inspect_limit
-            results = collect do |v|
-              count += 1
-              return route.inspect if count > limit
-              v.inspect
-            end
-            if count > 0
-              lens = results.collect { |r| r.length }
-              max = lens.max
-              cols = (Pacer.columns / (max + 1).to_f).floor
-              cols = 1 if cols < 1
-              if cols == 1
-                template_part = ['%s']
-              else
-                template_part = ["%-#{max}s"]
+          graph_read_transaction do
+            Pacer.hide_route_elements do
+              count = 0
+              limit ||= Pacer.inspect_limit
+              results = collect do |v|
+                count += 1
+                if count > limit
+                  puts "Total: > #{ limit } (Pacer.inspect_limit)"
+                  return route.inspect
+                end
+                v.inspect
               end
-              template = (template_part * cols).join(' ')
-              results.each_slice(cols) do |row|
-                template = (template_part * row.count).join(' ') if row.count < cols
-                puts template % row
+              if count > 0
+                lens = results.collect { |r| r.length }
+                max = lens.max
+                cols = (Pacer.columns / (max + 1).to_f).floor
+                cols = 1 if cols < 1
+                if cols == 1
+                  template_part = ['%s']
+                else
+                  template_part = ["%-#{max}s"]
+                end
+                template = (template_part * cols).join(' ')
+                results.each_slice(cols) do |row|
+                  template = (template_part * row.count).join(' ') if row.count < cols
+                  puts template % row
+                end
               end
+              puts "Total: #{ count }"
+              description
             end
-            puts "Total: #{ count }"
-            description
           end
         end
       end
@@ -425,6 +430,8 @@ HELP
           self
         elsif @back
           @back.get_section_route(name)
+        elsif @empty_back
+          @empty_back.get_section_route(name)
         else
           raise ArgumentError, "Section #{ name } not found"
         end
@@ -601,6 +608,15 @@ HELP
         s = "#{s} #{ info }" if info
         s
       end
+
+      def graph_read_transaction(&block)
+        if graph
+          graph.read_transaction &block
+        else
+          yield
+        end
+      end
+
     end
   end
 end

data/lib/pacer/filter/collection_filter.rb

@@ -26,6 +26,7 @@ module Pacer
   module Filter
     module CollectionFilter
       import java.util.HashSet
+      import com.tinkerpop.blueprints.Contains
 
       include Pacer::Visitors::VisitsSection
 
@@ -33,24 +34,24 @@ module Pacer
 
       def except=(collection)
         self.collection = collection
-        @comparison = Pacer::Pipes::NOT_EQUAL
+        @comparison = Contains::NOT_IN
       end
 
       def except_var=(var)
         @var = var
         self.section = var
-        @comparison = Pacer::Pipes::NOT_EQUAL
+        @comparison = Contains::NOT_IN
       end
 
       def only=(collection)
         self.collection = collection
-        @comparison = Pacer::Pipes::EQUAL
+        @comparison = Contains::IN
       end
 
       def only_var=(var)
         @var = var
         self.section = var
-        @comparison = Pacer::Pipes::EQUAL
+        @comparison = Contains::IN
       end
 
       protected
@@ -96,7 +97,7 @@ module Pacer
       end
 
       def inspect_class_name
-        if @comparison == Pacer::Pipes::NOT_EQUAL
+        if @comparison == Contains::NOT_IN
           'Except'
         else
           'Only'

data/lib/pacer/filter/empty_filter.rb

@@ -52,6 +52,7 @@ module Pacer
       protected
 
       def after_initialize
+        @empty_back = @back
         @back = @source = nil
         super
       end

data/lib/pacer/filter/loop_filter.rb

@@ -25,9 +25,10 @@ module Pacer
       # a pattern may be nested to varying depths.
       def repeat(arg, &block)
         case arg
+        when 0
+          identity
         when Fixnum
-          range = arg..arg
-          arg.to_enum(:times).inject(self) do |route_end, count|
+          (0...arg).inject(self) do |route_end, count|
             yield route_end
           end
         when Range
@@ -53,6 +54,16 @@ module Pacer
           fail ArgumentError, "Invalid repeat range"
         end
       end
+
+      def breadth_first(opts = {}, &block)
+        min_depth = opts.fetch :min_depth, 0
+        max_depth = opts.fetch :max_depth, 10
+        (min_depth..max_depth).reduce(self) do |route, depth|
+          route.branch do |b|
+            b.repeat depth, &block
+          end
+        end.merge_exhaustive
+      end
     end
   end
 

data/lib/pacer/filter/property_filter.rb

@@ -69,7 +69,7 @@ module Pacer
   module Filter
     module PropertyFilter
       #import com.tinkerpop.pipes.filter.LabelCollectionFilterPipe
-      import com.tinkerpop.gremlin.pipes.filter.PropertyFilterPipe
+      import com.tinkerpop.pipes.filter.PropertyFilterPipe
 
       def filters=(f)
         if f.is_a? Filters

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

@@ -125,7 +125,7 @@ module Pacer
             when NodeVisitor::Value
               # no op
             else
-              new_pipe = PropertyFilterPipe.new(key, value, Pacer::Pipes::EQUAL)
+              new_pipe = PropertyFilterPipe.new(key, Pacer::Pipes::EQUAL, value)
             end
             if new_pipe
               new_pipe.set_starts pipe if pipe

data/lib/pacer/filter/uniq_section.rb

@@ -0,0 +1,56 @@
+module Pacer
+  module Routes
+    module RouteOperations
+      def uniq_in_section(section = nil)
+        chain_route filter: Pacer::Filter::UniqueSectionFilter, section: section
+      end
+    end
+  end
+
+  module Filter
+    module UniqueSectionFilter
+      # VisitsSection module provides:
+      #  section=
+      #  section_visitor
+      include Pacer::Visitors::VisitsSection
+
+      def attach_pipe(end_pipe)
+        pipe = UniqueSectionPipe.new(self, section_visitor)
+        pipe.setStarts end_pipe if end_pipe
+        pipe
+      end
+
+      class UniqueSectionPipe < Pacer::Pipes::RubyPipe
+        attr_reader :seen, :section, :route
+
+
+        def initialize(route, section)
+          super()
+          @seen = Set[]
+          @section = section
+          @route = route
+          section.visitor = self if section
+        end
+
+        def processNextStart
+          while true
+            element = starts.next
+            unless seen.include? element
+              seen << element
+              return element
+            end
+          end
+        end
+
+        def after_element
+          seen.clear
+        end
+
+        def reset
+          seen.clear
+        end
+      end
+    end
+  end
+end
+

data/lib/pacer/filter/where_filter/node_visitor.rb

@@ -9,7 +9,7 @@ module Pacer
         import com.tinkerpop.pipes.filter.AndFilterPipe
         import com.tinkerpop.pipes.filter.OrFilterPipe
         import com.tinkerpop.pipes.filter.ObjectFilterPipe
-        import com.tinkerpop.gremlin.pipes.transform.PropertyPipe
+        import com.tinkerpop.pipes.transform.PropertyPipe
         import com.tinkerpop.pipes.transform.HasCountPipe
         NeverPipe = Pacer::Pipes::NeverPipe
         IdentityPipe = Pacer::Pipes::IdentityPipe
@@ -19,21 +19,22 @@ module Pacer
         UnaryTransformPipe = Pacer::Pipes::UnaryTransformPipe
         BlockFilterPipe = Pacer::Pipes::BlockFilterPipe
 
+        import com.tinkerpop.blueprints.Compare
         Filters = {
-          '==' => FilterPipe::Filter::EQUAL,
-          '='  => FilterPipe::Filter::EQUAL,
-          '!=' => FilterPipe::Filter::NOT_EQUAL,
-          '>'  => FilterPipe::Filter::GREATER_THAN,
-          '<'  => FilterPipe::Filter::LESS_THAN,
-          '>=' => FilterPipe::Filter::GREATER_THAN_EQUAL,
-          '<=' => FilterPipe::Filter::LESS_THAN_EQUAL
+          '==' => Compare::EQUAL,
+          '='  => Compare::EQUAL,
+          '!=' => Compare::NOT_EQUAL,
+          '>'  => Compare::GREATER_THAN,
+          '<'  => Compare::LESS_THAN,
+          '>=' => Compare::GREATER_THAN_EQUAL,
+          '<=' => Compare::LESS_THAN_EQUAL
         }
 
         ReverseFilters = Filters.merge(
-          '<'  => FilterPipe::Filter::GREATER_THAN,
-          '>'  => FilterPipe::Filter::LESS_THAN,
-          '<=' => FilterPipe::Filter::GREATER_THAN_EQUAL,
-          '>=' => FilterPipe::Filter::LESS_THAN_EQUAL
+          '<'  => Compare::GREATER_THAN,
+          '>'  => Compare::LESS_THAN,
+          '<=' => Compare::GREATER_THAN_EQUAL,
+          '>=' => Compare::LESS_THAN_EQUAL
         )
 
         COMPARATORS = %w[ == != > < >= <= ]