neo4j-core 2.1.0-java → 2.2.0-java

data/lib/db/neostore.nodestore.db

@@ -0,0 +1 @@
+
��������NodeStore v0.A.0

data/lib/db/neostore.propertystore.db

@@ -0,0 +1 @@
+PropertyStore v0.A.0

data/lib/db/neostore.propertystore.db.index

@@ -0,0 +1 @@
+PropertyIndexStore v0.A.0

data/lib/db/neostore.relationshipstore.db

@@ -0,0 +1 @@
+RelationshipStore v0.A.0

data/lib/db/neostore.relationshiptypestore.db

@@ -0,0 +1 @@
+RelationshipTypeStore v0.A.0

data/lib/neo4j-core.rb

@@ -6,6 +6,10 @@ module Neo4j
   Enumerator = Enumerable::Enumerator unless defined? Enumerator
 end
 
+require 'set'
+
+require 'neo4j-cypher'
+
 require 'neo4j-core/version'
 require 'neo4j/config'
 
@@ -59,12 +63,8 @@ require 'neo4j-core/traversal/prune_evaluator'
 require 'neo4j-core/traversal/rel_expander'
 require 'neo4j-core/traversal/traversal'
 require 'neo4j-core/traversal/traverser'
-
-require 'neo4j-core/cypher/cypher'
-require 'neo4j-core/cypher/result_wrapper'
 require 'neo4j-core/hash_with_indifferent_access'
 
 require 'neo4j/algo'
-require 'neo4j/cypher'
 require 'neo4j/node'
 require 'neo4j/relationship'

data/lib/neo4j-core/database.rb

@@ -53,6 +53,7 @@ module Neo4j
         return if running?
         @running = true
         @storage_path = Config.storage_path
+        Java::JavaLang::System.setProperty("neo4j.ext.udc.source", "neo4rb")
 
         begin
           if self.class.locked?

data/lib/neo4j-core/index/index_config.rb

@@ -39,7 +39,7 @@ module Neo4j
 
         # Specifies an index with configuration
         # Used in the Index DSL.
-        # @param [Hash] args the field and its configuration TODO
+        # @param [Hash] args the field and its configuration
         # @see Neo4j::Core::Index::ClassMethods#index
         def index(args)
           conf = args.last.kind_of?(Hash) ? args.pop : {}

data/lib/neo4j-core/property/property.rb

@@ -2,6 +2,9 @@ module Neo4j
   module Core
     module Property
 
+      # the valid values on a property, and arrays of those.
+      VALID_PROPERTY_VALUE_CLASSES = Set.new([Array, NilClass, String, Float, TrueClass, FalseClass, Fixnum])
+
       # @return [Hash] all properties plus the id of the node with the key <tt>_neo_id</tt>
       def props
         ret = {"_neo_id" => neo_id}
@@ -69,6 +72,12 @@ module Neo4j
         val.class.superclass == ArrayJavaProxy ? val.to_a : val
       end
 
+      # @param [Object] value the value we want to check if it's a valid neo4j property value
+      # @return [True, False] A false means it can't be persisted.
+      def valid_property?(value)
+        VALID_PROPERTY_VALUE_CLASSES.include?(value.class)
+      end
+
       # Sets the property of this node.
       # Property keys are always strings. Valid property value types are the primitives(<tt>String</tt>, <tt>Fixnum</tt>, <tt>Float</tt>, <tt>FalseClass</tt>, <tt>TrueClass</tt>) or array of those primitives.
       #
@@ -79,6 +88,8 @@ module Neo4j
       # @param [String, Symbol] key of the property to set
       # @param [String,Fixnum,Float,true,false, Array] value to set
       def []=(key, value)
+        raise "Not valid Neo4j Property value #{value.class}, valid: #{VALID_PROPERTY_VALUE_CLASSES.join(', ')}" unless valid_property?(value)
+
         k = key.to_s
         if value.nil?
           remove_property(k)

data/lib/neo4j-core/relationship/class_methods.rb

@@ -45,9 +45,7 @@ module Neo4j
         # @see #load
         def _load(rel_id, db = Neo4j.started_db)
           return nil if rel_id.nil?
-          rel = db.graph.get_relationship_by_id(rel_id.to_i)
-          # TODO
-          rel
+          db.graph.get_relationship_by_id(rel_id.to_i)
         rescue Java::OrgNeo4jGraphdb::NotFoundException
           nil
         end

data/lib/neo4j-core/traversal/traverser.rb

@@ -7,44 +7,34 @@ module Neo4j
         attr_accessor :query, :return_variable
 
         def initialize(start_id, dir, types, query_hash=nil, &block)
-          this = self
-
-          rel_type = ":#{types.map{|x| "`#{x}`"}.join('|')}"
-
-          @query = Neo4j::Cypher.new do
-            default_ret = node(:default_ret)
+          q = Neo4j::Cypher.query do
             n = node(start_id)
-            case dir
-              when :outgoing then
-                n > rel_type > default_ret
-              when :incoming then
-                n < rel_type < default_ret
-              when :both then
-                n - rel_type - default_ret
-            end
-
-            # where statement
-            ret_maybe = block && self.instance_exec(default_ret, &block)
-            ret = ret_maybe.respond_to?(:var_name) ? ret_maybe : default_ret
-            if query_hash
-              expr = []
-              query_hash.each{|pair|  expr << (ret[pair[0]] == pair[1])}.to_a
-              expr.each_with_index do |obj, i|
-                Neo4j::Core::Cypher::ExprOp.new(obj, expr[i+1], "and") if i < expr.size - 1
-              end
+            next_nodes = case dir
+                           when :outgoing then
+                             n.outgoing(types)
+                           when :incoming then
+                             n.incoming(types)
+                           when :both then
+                             n.both(types)
+                         end
+            if block
+              self.instance_exec(next_nodes, &block)
+            else
+              query_hash.each{|pair|  next_nodes[pair[0]] == pair[1]}.to_a  if query_hash
+              next_nodes
             end
+          end
 
-            this.return_variable = ret.var_name.to_sym
-            ret
-          end.to_s
+          @query = q.to_s
+          self.return_variable=q.return_names.last
         end
 
         def to_s
-          @query
+          @query.to_s
         end
 
         def each
-          Neo4j._query(query).each do |r|
+          Neo4j._query(to_s).each do |r|
             yield r[return_variable]
           end
         end

data/lib/neo4j-core/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module Core
-    VERSION = "2.1.0"
+    VERSION = "2.2.0"
   end
 end

data/lib/neo4j-core/version.rb~

@@ -0,0 +1,5 @@
+module Neo4j
+  module Core
+    VERSION = "2.2.0.rc1"
+  end
+end

data/lib/neo4j/config.rb

@@ -112,9 +112,9 @@ module Neo4j
         to_hash.each_pair do |k, v|
           case v
             when TrueClass
-              map[k.to_s] = "YES"
+              map[k.to_s] = "true"
             when FalseClass
-              map[k.to_s] = "NO"
+              map[k.to_s] = "false"
             when String, Fixnum, Float
               map[k.to_s] = v.to_s
             # skip list and hash values - not accepted by the Java Neo4j API

data/lib/neo4j/config.rb~

@@ -0,0 +1,136 @@
+module Neo4j
+
+
+  # == Keeps configuration for neo4j
+  #
+  # The most important configuration is storage_path which is used to
+  # locate where the neo4j database is stored on the filesystem.
+  # If this directory is empty then a new database will be created, otherwise it will use the
+  # database from that directory.
+  #
+  # == Configurations keys
+  #
+  #   storage_path   where the database is stored
+  #   timestamps     if timestamps should be used when saving the model (Neo4j::Rails::Model)
+  #   lucene         lucene configuration for fulltext and exact indices
+  #   enable_rules   if false the _all relationship to all instances will not be created and custom rules will not be available. (Neo4j::NodeMixin and Neo4j::Rails::Model)
+  #   identity_map   default false, See Neo4j::IdentityMap  (Neo4j::NodeMixin and Neo4j::Rails::Model)
+  #
+  class Config
+
+    class << self
+
+      # @return [Fixnum] The location of the default configuration file.
+      def default_file
+        @default_file ||= File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "config", "neo4j", "config.yml"))
+      end
+
+      # Sets the location of the configuration YAML file and old deletes configurations.
+      #
+      # @param [String] file_path represent the path to the file.
+      def default_file=(file_path)
+        @configuration = nil
+        @defaults = nil
+        @default_file = File.expand_path(file_path)
+      end
+
+      # @return [Hash] the default file loaded by yaml
+      def defaults
+        require 'yaml'
+        @defaults ||= Neo4j::Core::HashWithIndifferentAccess.new(YAML.load_file(default_file))
+      end
+
+      # @return [String] the expanded path of the Config[:storage_path] property
+      def storage_path
+        File.expand_path(self[:storage_path])
+      end
+
+      # Yields the configuration
+      #
+      # @example
+      #   Neo4j::Config.use do |config|
+      #     config[:storage_path] = '/var/neo4j'
+      #   end
+      #
+      # @return nil
+      # @yield config
+      # @yieldparam [Neo4j::Config] config - this configuration class
+      def use
+        @configuration ||= Neo4j::Core::HashWithIndifferentAccess.new
+        yield @configuration
+        nil
+      end
+
+
+      # Sets the value of a config entry.
+      #
+      # @param [Symbol] key the key to set the parameter for
+      # @param val the value of the parameter.
+      def []=(key, val)
+        (@configuration ||= setup)[key.to_s] = val
+      end
+
+
+      # @param [Symbol] key The key of the config entry value we want
+      # @return the the value of a config entry
+      def [](key)
+        (@configuration ||= setup)[key.to_s]
+      end
+
+
+      # Remove the value of a config entry.
+      #
+      # @param [Symbol] key the key of the configuration entry to delete
+      # @return The value of the removed entry.
+      def delete(key)
+        @configuration.delete(key)
+      end
+
+
+      # Remove all configuration. This can be useful for testing purpose.
+      #
+      # @return nil
+      def delete_all
+        @configuration = nil
+      end
+
+
+      # @return [Hash] The config as a hash.
+      def to_hash
+        @configuration ||= setup
+      end
+
+      # @return [String] The config as a YAML
+      def to_yaml
+        @configuration.to_yaml
+      end
+
+      # Converts the defaults hash to a Java HashMap used by the Neo4j API.
+      # @return a Java HashMap used by the Java Neo4j API as configuration for the GraphDatabase
+      def to_java_map
+        map = java.util.HashMap.new
+        to_hash.each_pair do |k, v|
+          case v
+            when TrueClass
+              map[k.to_s] = "YES"
+            when FalseClass
+              map[k.to_s] = "NO"
+            when String, Fixnum, Float
+              map[k.to_s] = v.to_s
+            # skip list and hash values - not accepted by the Java Neo4j API
+          end
+        end
+        map
+      end
+
+      # @return The a new configuration using default values as a hash.
+      def setup()
+        @configuration = Neo4j::Core::HashWithIndifferentAccess.new
+        @configuration.merge!(defaults)
+        @configuration
+      end
+
+    end
+  end
+
+end

data/lib/neo4j/neo4j.rb

@@ -112,9 +112,9 @@ module Neo4j
     # @see http://docs.neo4j.org/chunked/milestone/cypher-query-lang.html The Cypher Query Language Documentation
     # @note Returns a read-once only forward iterable.
     # @param params parameter for the query_dsl block
-    # @return [Neo4j::Core::Cypher::ResultWrapper] a forward read once only Enumerable, containing hash values.
+    # @return [Neo4j::Cypher::ResultWrapper] a forward read once only Enumerable, containing hash values.
     def query(*params, &query_dsl)
-      q = Cypher.new(*params, &query_dsl).to_s
+      q = Neo4j::Cypher.query(*params, &query_dsl).to_s
       _query(q)
     end
 
@@ -124,7 +124,7 @@ module Neo4j
     def _query(q)
       engine = Java::OrgNeo4jCypherJavacompat::ExecutionEngine.new(db)
       result = engine.execute(q)
-      Neo4j::Core::Cypher::ResultWrapper.new(result)
+      Neo4j::Cypher::ResultWrapper.new(result)
     end
 
 

data/neo4j-core.gemspec

@@ -28,4 +28,5 @@ It comes included with the Apache Lucene document database.
   s.rdoc_options = ["--quiet", "--title", "Neo4j::Core", "--line-numbers", "--main", "README.rdoc", "--inline-source"]
 
   s.add_dependency("neo4j-community", '>= 1.8.M05', '< 1.9')
+  s.add_dependency("neo4j-cypher", '~> 1.0.0')
 end

metadata

@@ -2,14 +2,14 @@
 name: neo4j-core
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 2.1.0
+  version: 2.2.0
 platform: java
 authors:
 - Andreas Ronge
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-08-14 00:00:00.000000000 Z
+date: 2012-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neo4j-community
@@ -35,6 +35,22 @@ dependencies:
     none: false
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: neo4j-cypher
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    none: false
+  prerelease: false
+  type: :runtime
 description: ! "You can think of Neo4j as a high-performance graph engine with all\
   \ the features of a mature and robust database.\nThe programmer works with an object-oriented,\
   \ flexible network structure rather than with strict and static tables \nyet enjoys\
@@ -48,12 +64,71 @@ extra_rdoc_files:
 files:
 - !binary |-
   bGliL25lbzRqLWNvcmUucmI=
+- !binary |-
+  bGliL2RiL2FjdGl2ZV90eF9sb2c=
+- !binary |-
+  bGliL2RiL21lc3NhZ2VzLmxvZw==
+- !binary |-
+  bGliL2RiL25lb3N0b3Jl
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLmlk
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLm5vZGVzdG9yZS5kYg==
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLm5vZGVzdG9yZS5kYi5pZA==
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLnByb3BlcnR5c3RvcmUuZGI=
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLnByb3BlcnR5c3RvcmUuZGIuYXJyYXlz
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLnByb3BlcnR5c3RvcmUuZGIuYXJyYXlzLmlk
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLnByb3BlcnR5c3RvcmUuZGIuaWQ=
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLnByb3BlcnR5c3RvcmUuZGIuaW5kZXg=
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLnByb3BlcnR5c3RvcmUuZGIuaW5kZXguaWQ=
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLnByb3BlcnR5c3RvcmUuZGIuaW5kZXgua2V5cw==
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLnByb3BlcnR5c3RvcmUuZGIuaW5kZXgua2V5cy5p
+  ZA==
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLnByb3BlcnR5c3RvcmUuZGIuc3RyaW5ncw==
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLnByb3BlcnR5c3RvcmUuZGIuc3RyaW5ncy5pZA==
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLnJlbGF0aW9uc2hpcHN0b3JlLmRi
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLnJlbGF0aW9uc2hpcHN0b3JlLmRiLmlk
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLnJlbGF0aW9uc2hpcHR5cGVzdG9yZS5kYg==
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLnJlbGF0aW9uc2hpcHR5cGVzdG9yZS5kYi5pZA==
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLnJlbGF0aW9uc2hpcHR5cGVzdG9yZS5kYi5uYW1l
+  cw==
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLnJlbGF0aW9uc2hpcHR5cGVzdG9yZS5kYi5uYW1l
+  cy5pZA==
+- !binary |-
+  bGliL2RiL25pb25lb19sb2dpY2FsLmxvZy5hY3RpdmU=
+- !binary |-
+  bGliL2RiL25pb25lb19sb2dpY2FsLmxvZy52MA==
+- !binary |-
+  bGliL2RiL3RtX3R4X2xvZy4x
+- !binary |-
+  bGliL2RiL2luZGV4L2x1Y2VuZS1zdG9yZS5kYg==
+- !binary |-
+  bGliL2RiL2luZGV4L2x1Y2VuZS5sb2cuYWN0aXZl
+- !binary |-
+  bGliL2RiL2luZGV4L2x1Y2VuZS5sb2cudjA=
 - !binary |-
   bGliL25lbzRqL2FsZ28ucmI=
 - !binary |-
   bGliL25lbzRqL2NvbmZpZy5yYg==
 - !binary |-
-  bGliL25lbzRqL2N5cGhlci5yYg==
+  bGliL25lbzRqL2NvbmZpZy5yYn4=
 - !binary |-
   bGliL25lbzRqL25lbzRqLnJi
 - !binary |-
@@ -78,9 +153,7 @@ files:
 - !binary |-
   bGliL25lbzRqLWNvcmUvdmVyc2lvbi5yYg==
 - !binary |-
-  bGliL25lbzRqLWNvcmUvY3lwaGVyL2N5cGhlci5yYg==
-- !binary |-
-  bGliL25lbzRqLWNvcmUvY3lwaGVyL3Jlc3VsdF93cmFwcGVyLnJi
+  bGliL25lbzRqLWNvcmUvdmVyc2lvbi5yYn4=
 - !binary |-
   bGliL25lbzRqLWNvcmUvZXF1YWwvZXF1YWwucmI=
 - !binary |-
@@ -131,6 +204,8 @@ files:
   bGliL25lbzRqLWNvcmUvd3JhcHBlci93cmFwcGVyLnJi
 - !binary |-
   Y29uZmlnL25lbzRqL2NvbmZpZy55bWw=
+- !binary |-
+  Y29uZmlnL25lbzRqL2NvbmZpZy55bWx+
 - README.rdoc
 - Gemfile
 - neo4j-core.gemspec