neo4j-core 0.0.15-java → 2.0.0.alpha.1-java

data/Gemfile

@@ -2,8 +2,8 @@ source :gemcutter
 
 gemspec
 
-gem 'neo4j-advanced', "1.7.0",  :require => false
-gem 'neo4j-enterprise', "1.7.0", :require => false
+gem 'neo4j-advanced', "1.6.1.alpha.1",  :require => false
+gem 'neo4j-enterprise', "1.6.1.alpha.1", :require => false
 
 group 'development' do
   gem 'guard'

data/README.rdoc

@@ -1,16 +1,16 @@
-== Neo4j-core {<img src="https://secure.travis-ci.org/andreasronge/neo4j-core.png" />}[http://travis-ci.org/andreasronge/neo4j-core]
-
 This gem only contains the JRuby mapping of the Neo4j graph database.
-The neo4j.rb gem will be split up into three gems, neo4j-core, {neo4j-wrapper}[http://github.com/andreasronge/neo4j-wrapper] and {neo4j}[http://github.com/andreasronge/neo4j].
-This gem will be included by neo4j 2.0.0 gem.
-
-This gem contains two modules: Neo4j and Neo4j::Core
-The Neo4j module is public and the Neo4j::Core(::*) are internal modules.
+The neo4j.rb gem will be split up into two gems, neo4j-core and neo4j.
+This gem will be included by neo4j 2.0.0 gem (if successful).
 
-== Documentation
+Changes from the neo4j.rb
+* Use of YARD instead of RDoc
+* Some tidy up of the API and code (e.g. Neo4j::Node#rels methods)
+* Change of Ruby module structure.
+* More RSpecs and more use of mocking combined with real testing of the Java layer
+* Make sure that we retrieve relationships and nodes lazy if possible.
 
-* {YARD}[http://rdoc.info/github/andreasronge/neo4j-core/file/README.rdoc]
-* {Neo4j.rb Wiki}[https://github.com/andreasronge/neo4j/wiki/]
+This gem contains two modules: Neo4j and Neo4j::Core
+The Neo4j modules are public and the Neo4j::Core(::*) are private modules
 
 == The public API
 
@@ -20,186 +20,6 @@ The Neo4j module is public and the Neo4j::Core(::*) are internal modules.
 
 {Neo4j} The Database
 
-{Neo4j::Cypher} Cypher Query DSL, see {Neo4j Wiki}[https://github.com/andreasronge/neo4j/wiki/Neo4j%3A%3ACore-Cypher]
-
-{Neo4j::Algo} Included algorithms, like shortest path
-
-== Custom Index
-
-You can create your own indexer.
-
-  class MyIndex
-    extend Neo4j::Core::Index::ClassMethods
-    include Neo4j::Core::Index
-
-    node_indexer do
-      index_names :exact => 'myindex_exact', :fulltext => 'myindex_fulltext'
-      trigger_on :myindex => true, :things => ['a', 'b']
-    end
-
-    index :name
-  end
-
-All nodes with the property <tt>myindex == true</tt> or property <tt>things</tt> <tt>'a'</tt> or <tt>'b'</tt>
-will be indexed using this index.
-
-Exampel:
-  n = Neo4j::Node.new(:myindex = true, :name => 'foo')
-  MyIndex.find('name: foo').first #=> n
-
-
-
-== Cypher
-
-Example:
-  Neo4j.query { node(3) }
-
-Example with parameters:
-  Neo4j.query(Neo4j.ref_node} do |ref|
-     ref <=> :x
-     :x
-  end
-
-Notice
-* The last statement in the expression will be the return value.
-* You can skip the start, match, where and ret (they are just empty methods).
-
-=== Cypher Examples
-
-"START n0=node(3) RETURN n0"
-  Neo4j.query do
-    start n = node(3)
-    ret n
-  end
-  # the above is same as:
-  Neo4j.query { node(3) }
-
-"START n0=node(42) RETURN n0"
-  node(Neo4j::Node.new)
-
-"START r0=relationship(3,4) RETURN r0"
-  rel(3,4)
-
-"START n0=node(3) MATCH (n0)--(x) RETURN x"
-  start n = node(3)
-  match n <=> :x
-  ret :x
-
-"START n0=node(3) MATCH (n0)--(v0) RETURN v0"
-  x = node
-  n = node(3)
-  match n <=> x
-  ret x
-
-"START n0=node(3) MATCH (n0)--(v0) RETURN v0.name"
-  x = node
-  n = node(3)
-  match n <=> x
-  ret x[:name]
-
-"START n0=node(1) RETURN n0.name AS SomethingTotallyDifferent"
-  x = node(1)
-  x[:name].as('SomethingTotallyDifferent')
-
-"START n0=node:fooindex_exact(name:A) RETURN n0"
-  query(FooIndex, "name:A")
-
-"START n0=node:fooindex_fulltext(desc="A") RETURN n0"
-  lookup(FooIndex, "desc", "A")
-
-"START n0=node(1),n1=node(2) RETURN n0,n1"
-  [node(1), node(2)]
-
-"START n0=node(3) MATCH (n0)-->(c)-->(d) RETURN c"
-  node(3) >> node(:c) >> :d
-  :c
-
-"START n0=node(3) MATCH (n0)-[r]->(x) RETURN r"
-  node(3) > :r > :x
-  :r
-
-"START n0=node(3) MATCH (n0)-[r:friends]->(x) RETURN r"
-  r = rel('r:friends').as(:r)
-  node(3) > r > :x
-  r
-
-"START n0=node(3,1) WHERE n0.age < 30 RETURN n0"
-  n=node(3, 1)
-  where n[:age] < 30
-  ret n
-
-"START n0=node(3,4) WHERE n0.desc = "hej" RETURN n0"
-  n=node(3, 4)
-  n[:desc] == "hej"
-  n
-
-"START n0=node(3) MATCH (n0)<-[:knows]-(c) RETURN c"
-  a=node(3)
-  a < ':knows' < :c
-  :c
-
-"START n0=node(3) MATCH (n0)-[r]->(v1) WHERE type(r) =~ /K.*/ RETURN r"
-  n=node(3)
-  n > (r=rel('r')) > node
-  r.rel_type =~ /K.*/
-  r
-
-"START n0=node(3) MATCH m2 = (n0)-->(b) RETURN b,length(m2)"
-  p = node(3) >> :b; [:b, p.length]
-
-"START n0=node(1) MATCH (n0)-->(b) RETURN distinct n0"
-  n=node(1); n>>:b; n.distinct
-
-"START n0=node(2) MATCH (n0)-->(x) RETURN n0,count(*)"
-  n = node(2))>>:x
-  [n, count]
-
-"START n0=node(2,3,4) RETURN sum(n0.property)"
-  n=node(2, 3, 4)
-  n[:property].sum
-
-"START n0=node(2) MATCH (n0)-->(b) RETURN count(distinct n0.eyes)"
-  n=node(2); n>>:b
-  n[:eyes].distinct.count
-
-"START n0=node(3,4,5) RETURN ID(n0)"
-  node(3, 4, 5).neo_id
-
-"START n0=node(2) WHERE any(x in n0.array WHERE x = "one") RETURN n0"
-  a = node(2)
-  a[:array].any? { |x| x == 'one' }
-  a
-
-"START n0=node(3),n1=node(4),n2=node(1) MATCH m4 = (n0)-->(n1)-->(n2) RETURN extract(x in nodes(m4) : x.age)"
-  a=node(3)
-  b=node(4)
-  c=node(1)
-  p=a>>b>>c
-  p.nodes.extract { |x| x[:age] }
-
-"START n0=node(3) WHERE abs(n0.x) = 3 RETURN n0"
-  a=node(3); a[:x].abs==3
-  a
-
-"START n0=node(3,4,5,1,2) RETURN n0 ORDER BY n0.name SKIP 1 LIMIT 2"
-  a=node(3,4,5,1,2); ret(a).asc(a[:name]).skip(1).limit(2)
-  # o same as
-  a=node(3,4,5,1,2); ret a, :asc => a[:name], :skip => 1, :limit => 2
-
-For more examples, see the RSpecs
-
-== Creates Your Own Wrapper
-
-Todo, see {Neo4j::Core::Wrapper}
-
-
-== Changes
-
-Changes from the neo4j.rb
-* Use of YARD instead of RDoc
-* Some tidy up of the API and code (e.g. Neo4j::Node#rels methods)
-* Change of Ruby module structure.
-* More RSpecs and more use of mocking combined with real testing of the Java layer
-* Make sure that we retrieve relationships and nodes lazy if possible.
-* Cypher Query DSL
+== Not Impemented Yet
 
+Neo4j::Node#outgoing, #incoming, #both methods

data/lib/neo4j-core.rb

@@ -1,11 +1,4 @@
 require 'java'
-include Java
-
-module Neo4j
-  # Enumerator has been moved to top level in Ruby 1.9.2, make it compatible with Ruby 1.8.7
-  Enumerator = Enumerable::Enumerator unless defined? Enumerator
-end
-
 require 'neo4j/config'
 
 require 'neo4j-community'
@@ -19,7 +12,6 @@ require 'neo4j-core/database'
 require 'neo4j-core/to_java'
 
 require 'neo4j-core/property/property'
-require 'neo4j-core/property/java'
 
 require 'neo4j-core/rels/rels'
 require 'neo4j-core/rels/traverser'
@@ -37,13 +29,9 @@ require 'neo4j-core/index/indexer_registry'
 require 'neo4j-core/index/index_config'
 require 'neo4j-core/index/indexer'
 require 'neo4j-core/index/lucene_query'
-require 'neo4j-core/index/unique_factory'
 
 require 'neo4j-core/equal/equal'
 
-require 'neo4j-core/wrapper/class_methods'
-require 'neo4j-core/wrapper/wrapper'
-
 require 'neo4j-core/relationship/relationship'
 require 'neo4j-core/relationship/class_methods'
 
@@ -52,6 +40,8 @@ require 'neo4j-core/node/class_methods'
 
 require 'neo4j/transaction'
 
+require 'neo4j-core/type_converters/type_converters'
+
 require 'neo4j-core/traversal/evaluator'
 require 'neo4j-core/traversal/filter_predicate'
 require 'neo4j-core/traversal/prune_evaluator'
@@ -59,11 +49,5 @@ 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'
+require 'neo4j/relationship'

data/lib/neo4j-core/database.rb

@@ -53,10 +53,10 @@ module Neo4j
             start_readonly_graph_db
           elsif Neo4j::Config['ha.db']
             start_ha_graph_db
-            Neo4j.migrate! if Neo4j.respond_to?(:migrate!)
+            Neo4j.migrate!
           else
             start_local_graph_db
-            Neo4j.migrate! if Neo4j.respond_to?(:migrate!)
+            Neo4j.migrate!
           end
         rescue
           @running = false
@@ -67,8 +67,7 @@ module Neo4j
       end
 
 
-      # true if the database has started
-      def running?
+      def running? #:nodoc:
         @running
       end
 
@@ -164,6 +163,8 @@ module Neo4j
         Neo4j.logger.info "starting Neo4j in HA mode, machine id: #{Neo4j.config['ha.server_id']} at #{Neo4j.config['ha.server']} db #{@storage_path}"
         # Modify the public base classes for the HA Node and Relationships
         # (instead of private Java::OrgNeo4jKernel::HighlyAvailableGraphDatabase::LookupNode)
+        Neo4j::Node.extend_java_class(Java::OrgNeo4jToolingWrap::WrappedNode)
+        Neo4j::Relationship.extend_java_class(Java::OrgNeo4jToolingWrap::WrappedRelationship)
         @graph = Java::OrgNeo4jKernel::HighlyAvailableGraphDatabase.new(@storage_path, Neo4j.config.to_java_map)
         @graph.register_transaction_event_handler(@event_handler)
         @lucene = @graph.index

data/lib/neo4j-core/event_handler.rb

@@ -88,7 +88,7 @@ module Neo4j
     # You only need to implement the methods that you need.
     #
     class EventHandler
-      include Java::OrgNeo4jGraphdbEvent::TransactionEventHandler
+      include org.neo4j.graphdb.event.TransactionEventHandler
 
       def initialize
         @listeners = []

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

@@ -7,6 +7,7 @@ module Neo4j
         attr_reader :_indexer
 
 
+        # TODO fix YARD docs update using DSL
         # Sets which indexer should be used for the given node class.
         # You can share an indexer between several different classes.
         #
@@ -19,18 +20,49 @@ module Neo4j
         #      node_indexer do
         #        index_names :exact => 'myindex_exact', :fulltext => 'myindex_fulltext'
         #        trigger_on :ntype => 'foo', :name => ['bar', 'foobar']
-        #
+        #        # TODO multitenancy support
         #        prefix_index_name do
-        #          "Foo"  # this is used for example in multitenancy to let each domain have there own index files
+        #          return "" unless Neo4j.running?
+        #          return "" unless @indexer_for.respond_to?(:ref_node_for_class)
+        #          ref_node = @indexer_for.ref_node_for_class.wrapper
+        #          prefix = ref_node.send(:_index_prefix) if ref_node.respond_to?(:_index_prefix)
+        #          prefix ||= ref_node[:name] # To maintain backward compatiblity
+        #          prefix.blank? ? "" : prefix + "_"
+        #         end
+        #
+        #
+        #        TODO ...
+        #        numeric do
+        #           type = decl_props && decl_props[field.to_sym] && decl_props[field.to_sym][:type]
+        #           type && !type.is_a?(String)
         #        end
         #      end
         #   end
         #
-        # @param [Neo4j::Core::Index::IndexConfig] config the configuration used as context for the config_dsl
+        # @example Using Neo4j::NodeMixin
+        #
+        #   class Contact
+        #      include Neo4j::NodeMixin
+        #      index :name
+        #      has_one :phone
+        #   end
+        #
+        #   class Phone
+        #      include Neo4j::NodeMixin
+        #      property :phone
+        #      node_indexer Contact  # put index on the Contact class instead
+        #      index :phone
+        #   end
+        #
+        #   # Find an contact with a phone number, this works since they share the same index
+        #   Contact.find('phone: 12345').first #=> a phone object !
+        #
         # @return [Neo4j::Core::Index::Indexer] The indexer that should be used to index the given class
         # @see Neo4j::Core::Index::IndexConfig for possible configuration values in the +config_dsl+ block
         # @yield evaluated in the a Neo4j::Core::Index::IndexConfig object to configure it.
-        def node_indexer(config = _config || IndexConfig.new(:node), &config_dsl)
+        def node_indexer(&config_dsl)
+          # TODO reuse an existing index config
+          config = IndexConfig.new(:node)
           config.instance_eval(&config_dsl)
           indexer(config)
         end
@@ -38,32 +70,17 @@ module Neo4j
         # Sets which indexer should be used for the given relationship class
         # Same as #node_indexer except that it indexes relationships instead of nodes.
         #
-        # @param (see #node_indexer)
-        # @return (see #node_indexer)
-        def rel_indexer(config = _config || IndexConfig.new(:rel), &config_dsl)
-          config.instance_eval(&config_dsl)
-          indexer(config)
+        # @see #node_indexer
+        # @return [Neo4j::Core::Index::Indexer] The indexer that should be used to index the given class
+        def rel_indexer(clazz)
+          indexer(clazz, :rel)
         end
 
-        def _config
-          @_indexer && @_indexer.config
-        end
 
         def indexer(index_config)
           @_indexer ||= IndexerRegistry.instance.register(Indexer.new(index_config))
         end
 
-        # You can specify which nodes should be triggered.
-        # The index can be triggered by one or more properties having one or more values.
-        # This can also be done using the #node_indexer or #rel_indexer methods.
-        #
-        # @example trigger on property :type being 'MyType1'
-        #   Neo4j::NodeIndex.trigger_on(:type => 'MyType1')
-        #
-        def trigger_on(hash)
-          _config.trigger_on(hash)
-        end
-
 
         class << self
           private
@@ -76,7 +93,7 @@ module Neo4j
           def delegate(method_name)
             class_eval(<<-EOM, __FILE__, __LINE__)
               def #{method_name}(*args, &block)
-                _indexer.send(:#{method_name}, *args, &block)
+                @_indexer.send(:#{method_name}, *args, &block)
               end
             EOM
           end
@@ -92,9 +109,6 @@ module Neo4j
         delegate :add_index
         delegate :rm_index
         delegate :index_type
-        delegate :index_name_for_type
-        delegate :index_for_type
-        delegate :put_if_absent
       end
 
 

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

@@ -2,7 +2,7 @@ module Neo4j
   module Core
 
     # A mixin which adds indexing behaviour to your own Ruby class
-    # You are expected to implement the method `_java_entity` returning the underlying Neo4j Node or Relationship.
+    # You are expected to implement the method `wrapped_entity` returning the underlying Neo4j Node or Relationship
     module Index
 
       # Adds an index on the given property
@@ -16,7 +16,8 @@ module Neo4j
       # @see Neo4j::Core::Index::ClassMethods#add_index
       #
       def add_index(field, value=self[field])
-        self.class.add_index(_java_entity, field.to_s, value)
+        converted_value = Neo4j::TypeConverters.convert(value, field, self.class)
+        self.class.add_index(wrapped_entity, field.to_s, converted_value)
       end
 
       # Removes an index on the given property.
@@ -26,7 +27,7 @@ module Neo4j
       # @see Neo4j::Core::Index::ClassMethods#rm_index
       #
       def rm_index(field, value=self[field])
-        self.class.rm_index(_java_entity, field.to_s, value)
+        self.class.rm_index(wrapped_entity, field.to_s, value)
       end
 
     end