RubyGems - pacer-neo4j - Versions diffs - 2.2.0-java → 2.3.0.pre-java - Mend

pacer-neo4j 2.2.0-java → 2.3.0.pre-java

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4e2f4799c8d87972b92c8fcc4ebb3df610377b0
-  data.tar.gz: 0dbaf31fea689bc02660fbf0f87c1a6fc2c1ab65
+  metadata.gz: a4f8db3353a00a093f59302a59a8191e2911d69a
+  data.tar.gz: 0c7b58d580985e4f7e3977a38332c5fd70db2ae2
 SHA512:
-  metadata.gz: c879465f031361c0bcad1798094b73306ae5f1d7e6d283ae34693eef69058c0dcd21589c55e2f0368f285c554c45053b52bb1c7f06ac469bfa4de89efdf8ad12
-  data.tar.gz: c66b87930abc129bbe5026ff4c8083c2a0a44748fefc17597dbfc1974f957df089eff6d421025fe5d125c6461b4b8254292073f48e86f8187a04c0d4e1863a89
+  metadata.gz: 14401e12817dae511f5dce5f0158ca3425361315f5387eda075a0f5191dbf0c759c7de47f908387b7b03ea35f078a26e135ab044d75a1eb4697c194223baf5b8
+  data.tar.gz: 141d32bc1cf37cbd03d0606e2abc7a6737e608ab19e30f46ab224c365cc752935a178ef5badb960e139076f495e3a242e5f8198410191c03d45f512176998c2e

data/.gitignore CHANGED Viewed

@@ -4,3 +4,5 @@ Gemfile.lock
 pkg/*
 target/*
 lib/*.jar
+Gemfile-custom
+Jarfile.lock

data/Gemfile CHANGED Viewed

@@ -2,3 +2,7 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in pacer-graph.gemspec
 gemspec
+# 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/Jarfile ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ jar "com.tinkerpop.blueprints:blueprints-neo4j-graph:2.6.0"
2	+ jar "org.neo4j:neo4j:1.9.7"

data/Rakefile CHANGED Viewed

@@ -1,35 +1,3 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
-file 'pom.xml' => 'lib/pacer-neo4j/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::Neo4j::VERSION }</gem.version>")
-        line.sub!(%r{<blueprints.version>.*</blueprints.version>}, "<blueprints.version>#{ Pacer::Neo4j::BLUEPRINTS_VERSION }</blueprints.version>")
-        line.sub!(%r{<pipes.version>.*</pipes.version>}, "<pipes.version>#{ Pacer::Neo4j::PIPES_VERSION }</pipes.version>")
-        f << line
-      end
-    end
-  end
-end
-file Pacer::Neo4j::JAR_PATH => 'pom.xml' do
-  when_writing("Execute 'mvn package' task") do
-    system('mvn clean package')
-  end
-end
-task :note do
-  puts "NOTE: touch lib/pacer-neo4j/version.rb (or rake touch) to force everything to rebuild"
-end
-task :build => [:note, Pacer::Neo4j::JAR_PATH]
-task :install => [:note, Pacer::Neo4j::JAR_PATH]
-desc 'Touch version.rb so that the jar rebuilds'
-task :touch do
-  system 'touch', 'lib/pacer-neo4j/version.rb'
-end

data/lib/pacer-neo4j.rb CHANGED Viewed

@@ -5,7 +5,9 @@ $:.unshift lib_path unless $:.any? { |path| path == lib_path }
 require 'pacer-neo4j/version'
-require Pacer::Neo4j::JAR
+require 'lock_jar'
+LockJar.lock(File.join(File.dirname(__FILE__), "..", "Jarfile"))
+LockJar.load
 require 'pacer-neo4j/graph'
 require 'pacer-neo4j/algo/wrapping'

data/lib/pacer-neo4j/graph.rb CHANGED Viewed

@@ -160,24 +160,27 @@ module Pacer
       end
       def build_query(type, filters)
+        empty = false
         indexed = index_properties type, filters
-        if indexed.any?
-          indexed.map do |k, v|
-            k = k.to_s.gsub '/', '\\/'
-            if v.is_a? Range
-              lucene_range(k, v)
-            elsif v.class.name == 'RangeSet'
-              s = v.ranges.map { |r| lucene_range(k, r) }.join " OR "
-              "(#{s})"
-            elsif v.is_a? Set
-              lucene_set(k, v)
+        q = if indexed.any?
+              indexed.map do |k, v|
+                k = k.to_s.gsub '/', '\\/'
+                if v.is_a? Range
+                  lucene_range(k, v)
+                elsif v.class.name == 'RangeSet'
+                  s = v.ranges.map { |r| lucene_range(k, r) }.join " OR "
+                  "(#{s})"
+                elsif v.is_a? Set
+                  empty = true if v.empty?
+                  lucene_set(k, v)
+                else
+                  "#{k}:#{lucene_value v}"
+                end
+              end.compact.join " AND "
             else
-              "#{k}:#{lucene_value v}"
+              nil
             end
-          end.compact.join " AND "
-        else
-          nil
-        end
+        [empty, q]
       end
       def lucene_value(v)
@@ -211,18 +214,21 @@ module Pacer
         else
           filters.graph = self
           filters.use_lookup!
-          query = build_query(element_type, filters)
+          empty, query = build_query(element_type, filters)
           if query
             route = lucene query, element_type: element_type, extensions: filters.extensions, wrapper: filters.wrapper
             filters.remove_property_keys key_indices(element_type)
             if filters.any?
-              Pacer::Route.property_filter(route, filters, block)
-            else
-              route
+              route = Pacer::Route.property_filter(route, filters, block)
             end
           elsif filters.route_modules.any?
             mod = filters.route_modules.shift
-            Pacer::Route.property_filter(mod.route(self), filters, block)
+            route = Pacer::Route.property_filter(mod.route(self), filters, block)
+          end
+          if empty
+            [].to_route based_on: route
+          else
+            route
           end
         end
       end

data/lib/pacer-neo4j/version.rb CHANGED Viewed

@@ -1,9 +1,6 @@
 module Pacer
   module Neo4j
-    VERSION = "2.2.0"
-    JAR = "pacer-neo4j-#{ VERSION }-standalone.jar"
-    JAR_PATH = "lib/#{ JAR }"
-    BLUEPRINTS_VERSION = "2.6.0-SNAPSHOT"
-    PACER_REQ = ">= 1.5.0"
+    VERSION = "2.3.0.pre"
+    PACER_REQ = ">= 2.0.0.pre"
   end
 end

data/pacer-neo4j.gemspec CHANGED Viewed

@@ -7,16 +7,17 @@ Gem::Specification.new do |s|
   s.version     = Pacer::Neo4j::VERSION
   s.platform    = 'java'
   s.authors     = ["Darrick Wiebe"]
-  s.email       = ["darrick@innatesoftware.com"]
+  s.email       = ["dw@xnlogic.com"]
   s.homepage    = "http://neo4j.org"
   s.summary     = %q{Neo4J jars and related code for Pacer}
   s.description = s.summary
   s.add_dependency 'pacer', Pacer::Neo4j::PACER_REQ
+  s.add_dependency "lock_jar", "~> 0.10.0"
   s.rubyforge_project = "pacer-neo4j"
-  s.files         = `git ls-files`.split("\n") + [Pacer::Neo4j::JAR_PATH]
+  s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pacer-neo4j
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0.pre
 platform: java
 authors:
 - Darrick Wiebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-08-22 00:00:00.000000000 Z
+date: 2014-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pacer
@@ -16,23 +16,38 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 2.0.0.pre
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 2.0.0.pre
+  prerelease: false
+  type: :runtime
+- !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: Neo4J jars and related code for Pacer
 email:
-- darrick@innatesoftware.com
+- dw@xnlogic.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- Jarfile
 - README.md
 - Rakefile
 - lib/pacer-neo4j.rb
@@ -54,9 +69,6 @@ files:
 - lib/pacer-neo4j/tx_data_wrapper.rb
 - lib/pacer-neo4j/version.rb
 - pacer-neo4j.gemspec
-- pom.xml
-- pom/standalone.xml
-- lib/pacer-neo4j-2.2.0-standalone.jar
 homepage: http://neo4j.org
 licenses: []
 metadata: {}
@@ -71,9 +83,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: pacer-neo4j
 rubygems_version: 2.1.9

data/pom.xml DELETED Viewed

@@ -1,95 +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-neo4j</artifactId>
-    <!-- NOTE: the following properties are automatically updated based on the values in lib/pacer-neo4j/version.rb -->
-    <properties>
-      <blueprints.version>2.6.0-SNAPSHOT</blueprints.version>
-      <gem.version>2.2.0</gem.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 Neo4J dependencies and related code.</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>
-        <dependency>
-            <groupId>com.tinkerpop.blueprints</groupId>
-            <artifactId>blueprints-neo4j-graph</artifactId>
-            <version>${blueprints.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>

data/pom/standalone.xml DELETED Viewed

@@ -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>