pacer 1.6.0-java → 2.0.0.pre-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e492827750d0f50e895dea5a6b847634f5800d7
-  data.tar.gz: 21025ddf6898e6f432c9466cf61f3ff04b0d286d
+  metadata.gz: b34d5a129efd227a81ed3a38ae6ec7d4691422f3
+  data.tar.gz: e57767503cfc83db3fc921065bcf588e029df734
 SHA512:
-  metadata.gz: e20c5e2ee2b402909c8ade3b8116ea01496d9e2c5947b5cef83abf4680136d78ee05395cc41f18604d49a6e0514ba8538b03b62f3072cedd76beb3e5b3c5bac7
-  data.tar.gz: ef58e5ca6852f6b9ed63ce2386c647c1ae378aa416d9e27d4489bcf2546cc1546b0291cffbe676638545967d4b13467c7cea679826e77ea9f8c936c056c24ddf
+  metadata.gz: 84f28ee240a81f2d782073d9bf3d867342f68334d08b9b769f12135475c71120a1b878435997481183a238601c70e39d25f86d740bc117661679707c28a64f49
+  data.tar.gz: 5100e3160ad530c4bed327d002fc6855b64675cb90f4dd4423b34c01c55ecc42a15b036b8b35fc5319f4bb8c53ee079a8c5b508008b30e5d6c8233cbf572accc

data/.gitignore

@@ -32,3 +32,5 @@ coverage/*
 dex.log
 vendor/
 private/
+Gemfile-custom
+Jarfile.lock

data/Gemfile

@@ -8,44 +8,13 @@ group :development do
   gem 'rr', '~> 1.0'
   gem 'simplecov'
   gem 'rake'
-
-  # pacer-* gems are required for testing pacer.
-  # If you have the gem repos cloned locally, we'll use them.
-  #
-  [ '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
-
-
-   
   gem 'autotest-standalone'
   gem 'autotest-growl'
   gem 'pry'
   gem 'awesome_print', '0.4.0'
 end
 
+
+# Gemfile-custom is .gitignored, but eval'd here so you can add
+# whatever dev tools you like to use to your local environment.
+eval File.read('Gemfile-custom') if File.exist?('Gemfile-custom')

data/Gemfile-custom.sample

@@ -0,0 +1,41 @@
+group :development do
+  # pacer-* gems are required for testing pacer.
+  # If you have the gem repos cloned locally, we'll use them.
+  #
+  [ '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
+  #
+
+  neo_test_ver = ENV.fetch('neo') do
+    if File.directory?("../pacer-neo4j2")
+      '2'
+    elsif File.directory?("../pacer-neo4j")
+      '1'
+    else
+      '0'
+    end
+  end
+  if neo_test_ver == '1'
+    gem 'pacer-neo4j', :path => "../pacer-neo4j"
+  elsif neo_test_ver == '2'
+    gem 'pacer-neo4j2', :path => "../pacer-neo4j2"
+  end
+
+  if File.directory? "../mcfly"
+    gem 'pacer-mcfly', :path => "../mcfly" 
+  end
+end

data/Jarfile

@@ -0,0 +1,2 @@
+jar "com.tinkerpop.blueprints:blueprints-core:2.6.0"
+jar "com.tinkerpop:pipes:2.5.0"

data/Rakefile

@@ -11,49 +11,9 @@ end
 
 task :default => :spec
 
-desc 'update pom.xml with current versions from lib/pacer/version.rb'
-file 'pom.xml' => 'lib/pacer/version.rb' do
-  pom = File.read 'pom.xml'
-  when_writing('Update pom.xml version number') do
-    open 'pom.xml', 'w' do |f|
-      pom.each_line do |line|
-        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>")
-        f << line
-      end
-    end
-  end
-end
-
-file Pacer::JAR_PATH => 'pom.xml' do
-  when_writing("Execute 'mvn package' task") do
-    system 'mvn', 'clean'
-    system 'mvn', 'package'
-  end
-end
-
 task :check_18_mode do
   if RUBY_VERSION !~ /1\.8/
     warn 'Releasing gems in 1.9 mode does not work as of JRuby 1.6.5'
     raise 'Nooooooo!'
   end
 end
-
-task :gemfile_devel do
-  File.delete 'Gemfile' if File.exists? 'Gemfile'
-  File.symlink 'Gemfile-dev', 'Gemfile'
-end
-
-desc 'Touch version.rb so that the jar rebuilds'
-task :touch do
-  system 'touch', 'lib/pacer/version.rb'
-end
-
-desc "build the JAR at #{ Pacer::JAR_PATH }"
-task :jar => Pacer::JAR_PATH
-
-# Add dependency to bundler default tasks:
-task :build => Pacer::JAR_PATH
-task :install => Pacer::JAR_PATH
-task :release => Pacer::JAR_PATH

data/lib/pacer/loader.rb

@@ -101,6 +101,7 @@ require 'pacer/transform/sort_section'
 require 'pacer/transform/intersect_sections'
 require 'pacer/transform/payload'
 require 'pacer/transform/lookup_ids'
+require 'pacer/transform/count_section'
 
 require 'pacer/side_effect/aggregate'
 require 'pacer/side_effect/as_var'

data/lib/pacer/route.rb

@@ -100,7 +100,7 @@ module Pacer
     #
     # @param [Hash] args
     # @option args [Graph] :graph the graph this route is based on
-    # @option args [Route] :bace the previous route in the chain
+    # @option args [Route] :back the previous route in the chain
     # @option args [element type] :element_type
     # @option args [Module] :modules additional modules to mix in
     # @option args [Symbol, Module] :filter the filter to use as this

data/lib/pacer/transform/count_section.rb

@@ -0,0 +1,80 @@
+module Pacer
+  module Routes
+    module RouteOperations
+      def count_section(section = nil, &block)
+        chain_route transform: Pacer::Transform::CountSection, key_block: block, section: section,
+          element_type: :array
+      end
+    end
+  end
+
+
+  module Transform
+    module CountSection
+      # VisitsSection module provides:
+      #  section=
+      #  section_visitor
+      #  section_route
+      include Pacer::Visitors::VisitsSection
+
+      attr_accessor :key_block
+
+      protected
+
+      def attach_pipe(end_pipe)
+        block = key_block || proc { |x| x }
+        pf = Pacer::Wrappers::WrappingPipeFunction.new section_route, block
+        pipe = CountSectionPipe.new(section_visitor, pf)
+        pipe.setStarts end_pipe if end_pipe
+        pipe
+      end
+
+      class CountSectionPipe < Pacer::Pipes::RubyPipe
+        attr_reader :pf, :to_emit, :section, :count, :section_key
+
+        def initialize(section, pipe_function)
+          super()
+          @count = 0
+          @section = section
+          if section
+            section.visitor = self
+          else
+            on_element nil
+          end
+          @pf = pipe_function
+        end
+
+        def processNextStart
+          until to_emit
+            starts.next
+            @count += 1
+          end
+          raise EmptyPipe.instance if to_emit.empty?
+          emit = to_emit
+          @to_emit = nil
+          emit
+        rescue EmptyPipe, java.util.NoSuchElementException
+          if count == 0
+            raise EmptyPipe.instance
+          else
+            after_element
+            to_emit
+          end
+        end
+
+        def getPathToHere
+          section.getCurrentPath
+        end
+
+        def on_element(element)
+          @section_key = pf.compute element
+        end
+
+        def after_element
+          @to_emit = [section_key, count]
+          @count = 0
+        end
+      end
+    end
+  end
+end

data/lib/pacer/version.rb

@@ -1,13 +1,7 @@
 module Pacer
   unless const_defined? :VERSION
-    VERSION = "1.6.0"
-
-    JAR = "pacer-#{ VERSION }-standalone.jar"
-    JAR_PATH = "lib/#{ JAR }"
+    VERSION = "2.0.0.pre"
 
     START_TIME = Time.now
-
-    BLUEPRINTS_VERSION = "2.6.0"
-    PIPES_VERSION = "2.5.0"
   end
 end

data/lib/pacer.rb

@@ -22,6 +22,10 @@ require 'java'
 require 'pp'
 require 'rubygems'
 
+require 'lock_jar'
+LockJar.lock(File.join(File.dirname(__FILE__), "..", "Jarfile"))
+LockJar.load
+
 module Pacer
   unless const_defined? :PATH
     PATH = File.expand_path(File.join(File.dirname(__FILE__), '..'))
@@ -37,7 +41,6 @@ module Pacer
     Enumerator = Enumerable::Enumerator
   end
 
-  require JAR
 
   require 'pacer/loader'
 

data/pacer.gemspec

@@ -7,14 +7,15 @@ Gem::Specification.new do |s|
   s.version = Pacer::VERSION
   s.platform = 'java'
   s.authors = ["Darrick Wiebe"]
-  s.email = "darrick@innatesoftware.com"
+  s.email = "dw@xnlogic.com"
   s.homepage = "http://github.com/pangloss/pacer"
   s.license = "MIT"
   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.description = %Q{Pacer defines composeable routes through a graph and then traverses them very quickly.}
 
-  s.files = `git ls-files`.split("\n") + [Pacer::JAR_PATH]
+  s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- spec/*`.split("\n")
   s.require_paths = ['lib']
+  s.add_dependency "lock_jar", "~> 0.10.0"
 end
 

metadata

@@ -1,17 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: pacer
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 2.0.0.pre
 platform: java
 authors:
 - Darrick Wiebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
-dependencies: []
-description: Pacer defines routes through a graph and then traverses them very quickly.
-email: darrick@innatesoftware.com
+date: 2014-11-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: lock_jar
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+  prerelease: false
+  type: :runtime
+description: Pacer defines composeable routes through a graph and then traverses them very quickly.
+email: dw@xnlogic.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -22,6 +36,8 @@ files:
 - .rspec
 - CONTRIBUTORS
 - Gemfile
+- Gemfile-custom.sample
+- Jarfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -127,6 +143,7 @@ files:
 - lib/pacer/support/proc.rb
 - lib/pacer/transform/branch.rb
 - lib/pacer/transform/cap.rb
+- lib/pacer/transform/count_section.rb
 - lib/pacer/transform/flat_map.rb
 - lib/pacer/transform/gather.rb
 - lib/pacer/transform/has_count_cap.rb
@@ -163,8 +180,6 @@ files:
 - lib/pacer/wrappers/wrapper_selector.rb
 - lib/pacer/wrappers/wrapping_pipe_function.rb
 - pacer.gemspec
-- pom.xml
-- pom/standalone.xml
 - samples/grateful-dead.xml
 - samples/grateful_dead.rb
 - samples/profile.rb
@@ -218,7 +233,6 @@ files:
 - spec/support/use_transactions.rb
 - spec/tackle/simple_mixin.rb
 - spec/tackle/tinkerpop_graph_mixins.rb
-- lib/pacer-1.6.0-standalone.jar
 homepage: http://github.com/pangloss/pacer
 licenses:
 - MIT
@@ -234,9 +248,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project:
 rubygems_version: 2.1.9
@@ -294,3 +308,4 @@ test_files:
 - spec/support/use_transactions.rb
 - spec/tackle/simple_mixin.rb
 - spec/tackle/tinkerpop_graph_mixins.rb
+has_rdoc:

data/pom/standalone.xml

@@ -1,22 +0,0 @@
-<assembly>
-    <id>standalone</id>
-    <formats>
-        <format>jar</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-
-    <fileSets>
-        <fileSet>
-            <directory>target/classes</directory>
-            <outputDirectory>/</outputDirectory>
-        </fileSet>
-    </fileSets>
-
-    <dependencySets>
-        <dependencySet>
-            <outputDirectory>/</outputDirectory>
-            <unpack>true</unpack>
-            <scope>runtime</scope>
-        </dependencySet>
-    </dependencySets>
-</assembly>

data/pom.xml

@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.tinkerpop.pacer</groupId>
-    <artifactId>pacer</artifactId>
-    <!-- NOTE: the following properties are automatically updated based on the values in lib/pacer-neo4j/version.rb -->
-    <properties>
-      <blueprints.version>2.6.0</blueprints.version>
-      <gem.version>1.6.0</gem.version>
-      <pipes.version>2.5.0</pipes.version>
-    </properties>
-    <!-- NOTE: the following properties are automatically updated based on the values in lib/pacer-neo4j/version.rb -->
-    <version>${gem.version}</version>
-    <packaging>pom</packaging>
-    <url>https://github.com/pangloss/pacer</url>
-    <name>Pacer Tinkerpop core dependencies including Blueprints Core
-      and Pipes.</name>
-    <description>
-    </description>
-    <inceptionYear>2011</inceptionYear>
-    <developers>
-        <developer>
-            <name>Darrick Wiebe</name>
-            <email>darrick@innatesoftware.com</email>
-            <url>http://github.com/pangloss</url>
-        </developer>
-    </developers>
-    <dependencies>
-        <!-- PROPERTY GRAPH MODEL SUPPORT -->
-        <dependency>
-            <groupId>com.tinkerpop.blueprints</groupId>
-            <artifactId>blueprints-core</artifactId>
-            <version>${blueprints.version}</version>
-        </dependency>
-        <!-- GRAPH TRAVERSAL SUPPORT -->
-        <dependency>
-            <groupId>com.tinkerpop</groupId>
-            <artifactId>pipes</artifactId>
-            <version>${pipes.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <directory>${basedir}/target</directory>
-        <finalName>${project.artifactId}-${project.version}</finalName>
-        <resources>
-            <resource>
-                <directory>${basedir}/src/main/resources
-                </directory>
-            </resource>
-        </resources>
-        <testResources>
-            <testResource>
-                <directory>${basedir}/src/test/resources
-                </directory>
-            </testResource>
-        </testResources>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.2-beta-4</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attached</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <descriptors>
-                        <descriptor>pom/standalone.xml</descriptor>
-                    </descriptors>
-                    <finalName>${project.artifactId}-${project.version}</finalName>
-                    <outputDirectory>lib</outputDirectory>
-                    <workDirectory>target/assembly/work</workDirectory>
-                    <tarLongFileMode>warn</tarLongFileMode>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.6.1</version>
-            </plugin>
-        </plugins>
-        <extensions>
-            <extension>
-                <groupId>org.apache.maven.wagon</groupId>
-                <artifactId>wagon-ftp</artifactId>
-                <version>1.0-alpha-6</version>
-            </extension>
-        </extensions>
-    </build>
-
-</project>