pacer-neo4j 1.1.1-java → 2.0.0-java

data/Rakefile

@@ -22,8 +22,14 @@ file Pacer::Neo4j::JAR_PATH => 'pom.xml' do
 end
 
 task :note do
-  puts "NOTE: touch lib/pacer-neo4j/version.rb to force everything to rebuild"
+  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/graph.rb

@@ -1,8 +1,6 @@
 require 'yaml'
 
 module Pacer
-  Neo4jGraph = com.tinkerpop.blueprints.pgm.impls.neo4j.Neo4jGraph
-  Neo4jElement = com.tinkerpop.blueprints.pgm.impls.neo4j.Neo4jElement
 
   # Add 'static methods' to the Pacer namespace.
   class << self
@@ -12,137 +10,41 @@ module Pacer
     # If the graph is opened from a path, it will be registered to be closed by
     # Ruby's at_exit callback, but if an already open graph is given, it will
     # not.
+    #
+    # Please note that Pacer turns on Neo4j's checkElementsInTransaction
+    # feature by default. For some sort of performance improvement at
+    # the expense of an odd consistency model within transactions that
+    # require considerable more complexity in client code, you can use
+    # `graph.setCheckElementsInTransaction(false)` to disable the
+    # feature.
     def neo4j(path_or_graph, args = nil)
+      neo = com.tinkerpop.blueprints.impls.neo4j.Neo4jGraph
       if path_or_graph.is_a? String
         path = File.expand_path(path_or_graph)
-        Pacer.starting_graph(self, path) do
-          if args
-            Neo4jGraph.new(path, args.to_hash_map)
-          else
-            Neo4jGraph.new(path)
-          end
-        end
-      else
-        # Don't register the new graph so that it won't be automatically closed.
-        Neo4jGraph.new(path_or_graph)
-      end
-    end
-  end
-
-
-  # Extend the java class imported from blueprints.
-  class Neo4jGraph
-    include GraphMixin
-    include GraphIndicesMixin
-    include GraphTransactionsMixin
-    include ManagedTransactionsMixin
-    include Pacer::Core::Route
-    include Pacer::Core::Graph::GraphRoute
-    include Pacer::Core::Graph::GraphIndexRoute
-
-    # Override to return an enumeration-friendly array of vertices.
-    def get_vertices
-      getVertices.to_route(:graph => self, :element_type => :vertex)
-    end
-
-    # Override to return an enumeration-friendly array of edges.
-    def get_edges
-      getEdges.to_route(:graph => self, :element_type => :edge)
-    end
-
-    def element_class
-      Neo4jElement
-    end
-
-    def vertex_class
-      Neo4jVertex
-    end
-
-    def edge_class
-      Neo4jEdge
-    end
-
-    def sanitize_properties(props)
-      pairs = props.map do |name, value|
-        [name, encode_property(value)]
-      end
-      Hash[pairs]
-    end
-
-    def encode_property(value)
-      case value
-      when nil
-        nil
-      when String
-        value = value.strip
-        value = nil if value == ''
-        value
-      when Numeric
-        if value.is_a? Bignum
-          value.to_yaml
-        else
-          value
-        end
-      when true, false
-        value
-      when Array
-        if value.length == 0
-          value_type = Fixnum
-        else
-          value_type = value.first.class
-          value_type = TrueClass if value_type == FalseClass
-          value.each do |v|
-            if value_type != v.class or (value == true or value == false and value_type == TrueClass)
-              value_type = nil
-              break
+        open = proc do
+          graph = Pacer.open_graphs[path]
+          unless graph
+            if args
+              graph = neo.new(path, args.to_hash_map)
+            else
+              graph = neo.new(path)
             end
+            Pacer.open_graphs[path] = graph
+            graph.setCheckElementsInTransaction true
           end
+          graph
         end
-        case value_type
-        when Fixnum
-          value.to_java :long
-        when Float
-          value.to_java :double
-        when TrueClass
-          value.to_java :boolean
-        when String
-          value.to_java :string
-        else
-          value.to_yaml
+        shutdown = proc do |g|
+          g.blueprints_graph.shutdown
+          Pacer.open_graphs[path] = nil
         end
+        PacerGraph.new(Pacer::YamlEncoder, open, shutdown)
       else
-        value.to_yaml
-      end
-    end
-
-    if 'x'.to_yaml[0, 5] == '%YAML'
-      def decode_property(value)
-        if value.is_a? String and value[0, 5] == '%YAML'
-          YAML.load(value)
-        elsif value.is_a? ArrayJavaProxy
-          value.to_a
-        else
-          value
-        end
-      end
-    else
-      def decode_property(value)
-        if value.is_a? String and value[0, 3] == '---'
-          YAML.load(value)
-        elsif value.is_a? ArrayJavaProxy
-          value.to_a
-        else
-          value
-        end
+        # Don't register the new graph so that it won't be automatically closed.
+        PacerGraph.new Pacer::YamlEncoder, proc { graph.neo.new(path_or_graph) }
       end
     end
+  end
 
-    def supports_circular_edges?
-      false
-    end
 
-    def supports_custom_element_ids?
-      false
-    end
-  end
 end

data/lib/pacer-neo4j/rspec.rb

@@ -33,11 +33,7 @@ class RSpec::GraphRunner
       dir = Pathname.new(path3)
       dir.rmtree if dir.exist?
       @neo_graph_no_indices = Pacer.neo4j(path3)
-      @neo_graph_no_indices.drop_index :vertices
-      @neo_graph_no_indices.drop_index :edges
       @neo_graph_no_indices
     end
   end
-
-  include Neo4j
 end

data/lib/pacer-neo4j/version.rb

@@ -1,9 +1,10 @@
 module Pacer
   module Neo4j
-    VERSION = "1.1.1"
+    VERSION = "2.0.0"
     JAR = "pacer-neo4j-#{ VERSION }-standalone.jar"
     JAR_PATH = "lib/#{ JAR }"
-    BLUEPRINTS_VERSION = "1.0"
-    PIPES_VERSION = "0.8"
+    BLUEPRINTS_VERSION = "2.1.0"
+    PIPES_VERSION = "2.1.0"
+    PACER_REQ = ">= 1.0.0"
   end
 end

data/lib/pacer-neo4j.rb

@@ -3,8 +3,4 @@ require 'pacer-neo4j/version'
 require 'pacer'
 require Pacer::Neo4j::JAR
 
-require 'pacer-neo4j/vertex'
-require 'pacer-neo4j/edge'
-require 'pacer-neo4j/index'
 require 'pacer-neo4j/graph'
-require 'pacer-neo4j/rspec' if defined? RSpec

data/pacer-neo4j.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.summary     = %q{Neo4J jars and related code for Pacer}
   s.description = s.summary
 
-  s.add_dependency 'pacer', '>= 0.9.1.1'
+  s.add_dependency 'pacer', Pacer::Neo4j::PACER_REQ
 
   s.rubyforge_project = "pacer-neo4j"
 

data/pom.xml

@@ -7,9 +7,9 @@
     <artifactId>pacer-neo4j</artifactId>
     <!-- NOTE: the following properties are automatically updated based on the values in lib/pacer-neo4j/version.rb -->
     <properties>
-      <gem.version>1.1.1</gem.version>
-      <blueprints.version>1.0</blueprints.version>
-      <pipes.version>0.8</pipes.version>
+      <gem.version>2.0.0</gem.version>
+      <blueprints.version>2.1.0</blueprints.version>
+      <pipes.version>2.1.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>

metadata

@@ -1,25 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: pacer-neo4j
 version: !ruby/object:Gem::Version
+  version: 2.0.0
   prerelease:
-  version: 1.1.1
 platform: java
 authors:
 - Darrick Wiebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-05-23 00:00:00.000000000Z
+date: 2012-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pacer
-  version_requirements: &2056 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.1.1
+        version: 1.0.0
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
     none: false
-  requirement: *2056
   prerelease: false
   type: :runtime
 description: Neo4J jars and related code for Pacer
@@ -34,16 +39,13 @@ files:
 - README.md
 - Rakefile
 - lib/pacer-neo4j.rb
-- lib/pacer-neo4j/edge.rb
 - lib/pacer-neo4j/graph.rb
-- lib/pacer-neo4j/index.rb
 - lib/pacer-neo4j/rspec.rb
 - lib/pacer-neo4j/version.rb
-- lib/pacer-neo4j/vertex.rb
 - pacer-neo4j.gemspec
 - pom.xml
 - pom/standalone.xml
-- lib/pacer-neo4j-1.1.1-standalone.jar
+- lib/pacer-neo4j-2.0.0-standalone.jar
 homepage: http://neo4j.org
 licenses: []
 post_install_message:
@@ -54,20 +56,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
   none: false
 requirements: []
 rubyforge_project: pacer-neo4j
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key:
 specification_version: 3
 summary: Neo4J jars and related code for Pacer
 test_files: []
 has_rdoc:
-...

data/lib/pacer-neo4j/edge.rb

@@ -1,36 +0,0 @@
-require 'yaml'
-
-module Pacer
-  Neo4jEdge = com.tinkerpop.blueprints.pgm.impls.neo4j.Neo4jEdge
-
-  # Extend the java class imported from blueprints.
-  class Neo4jEdge
-    include Pacer::Core::Graph::EdgesRoute
-    include ElementMixin
-    include EdgeMixin
-
-    def in_vertex(extensions = nil)
-      v = inVertex
-      v.graph = graph
-      if extensions.is_a? Enumerable
-        v.add_extensions extensions
-      elsif extensions
-        v.add_extensions [extensions]
-      else
-        v
-      end
-    end
-
-    def out_vertex(extensions = nil)
-      v = outVertex
-      v.graph = graph
-      if extensions.is_a? Enumerable
-        v.add_extensions extensions
-      elsif extensions
-        v.add_extensions [extensions]
-      else
-        v
-      end
-    end
-  end
-end

data/lib/pacer-neo4j/index.rb

@@ -1,45 +0,0 @@
-require 'yaml'
-
-module Pacer
-  import com.tinkerpop.blueprints.pgm.impls.neo4j.Neo4jIndex
-  import com.tinkerpop.blueprints.pgm.impls.neo4j.Neo4jAutomaticIndex
-
-  class Neo4jIndex
-    include IndexMixin
-    JVertex = com.tinkerpop.blueprints.pgm.Vertex.java_class.to_java
-    JEdge = com.tinkerpop.blueprints.pgm.Edge.java_class.to_java
-    JNeo4jVertex = com.tinkerpop.blueprints.pgm.impls.neo4j.Neo4jVertex.java_class.to_java
-    JNeo4jEdge = com.tinkerpop.blueprints.pgm.impls.neo4j.Neo4jEdge.java_class.to_java
-
-    def index_class
-      et = getIndexClass
-      if et == JVertex
-        JNeo4jVertex
-      elsif et == JEdge
-        JNeo4jEdge
-      else
-        et
-      end
-    end
-  end
-
-
-  class Neo4jAutomaticIndex
-    include IndexMixin
-    JVertex = com.tinkerpop.blueprints.pgm.Vertex.java_class.to_java
-    JEdge = com.tinkerpop.blueprints.pgm.Edge.java_class.to_java
-    JNeo4jVertex = com.tinkerpop.blueprints.pgm.impls.neo4j.Neo4jVertex.java_class.to_java
-    JNeo4jEdge = com.tinkerpop.blueprints.pgm.impls.neo4j.Neo4jEdge.java_class.to_java
-
-    def index_class
-      et = getIndexClass
-      if et == JVertex
-        JNeo4jVertex
-      elsif et == JEdge
-        JNeo4jEdge
-      else
-        et
-      end
-    end
-  end
-end

data/lib/pacer-neo4j/vertex.rb

@@ -1,11 +0,0 @@
-require 'yaml'
-
-module Pacer
-  Neo4jVertex = com.tinkerpop.blueprints.pgm.impls.neo4j.Neo4jVertex
-  # Extend the java class imported from blueprints.
-  class Neo4jVertex
-    include Pacer::Core::Graph::VerticesRoute
-    include ElementMixin
-    include VertexMixin
-  end
-end