.idea/inspectionProfiles/Project_Default.xml .idea/inspectionProfiles/profiles_settings.xml lib/neo4j/index_node.rb @@ -30,7 +30,7 @@ require 'neo4j/config' require 'neo4j/indexer' # this will replace neo4j/events require 'neo4j/neo' require 'neo4j/event_handler' -require 'neo4j/container_node' +require 'neo4j/index_node' require 'neo4j/reference_node' require 'neo4j/transaction' require 'neo4j/search_result' lib/neo4j.rb @@ -599,7 +599,7 @@ module Neo4j # # :api: public def all - ref = Neo4j.container_node + ref = Neo4j.instance.index_node ref.relations.outgoing(root_class) end lib/neo4j/mixins/node.rb @@ -78,11 +78,6 @@ module Neo4j self.instance.ref_node end - def self.container_node - self.instance.container_node - end - - # # Allows run and stop the Neo4j service # Contains global ćonstants such as location of the neo storage and index files @@ -95,7 +90,7 @@ module Neo4j # # ref_node : the reference, ReferenceNode, node, wraps a org.neo4j.api.core.NeoService#getReferenceNode # - attr_reader :ref_node, :container_node, :event_handler + attr_reader :ref_node, :index_node, :event_handler def start @neo = org.neo4j.api.core.EmbeddedNeo.new(Neo4j::Config[:storage_path]) @@ -103,10 +98,10 @@ module Neo4j Transaction.run do @ref_node = ReferenceNode.new(@neo.getReferenceNode()) - if @ref_node.container_node.nil? - @ref_node.container_node = ContainerNode.new + if @ref_node.index_node.nil? + @ref_node.index_node = IndexNode.new end - @container_node = @ref_node.container_node # to speed things up + @index_node = @ref_node.index_node # to speed things up end $NEO_LOGGER.info{ "Started neo. Database storage located at '#{@db_storage}'"} lib/neo4j/neo.rb @@ -8,7 +8,7 @@ module Neo4j class ReferenceNode include Neo4j::NodeMixin - has_one :container_node + has_one :index_node end end \ No newline at end of file lib/neo4j/reference_node.rb @@ -77,14 +77,14 @@ describe 'NodeMixin' do include Neo4j::NodeMixin end - container_node = Neo4j.instance.container_node - container_node.relations.outgoing(TestNode).should be_empty + index_node = Neo4j.instance.index_node + index_node.relations.outgoing(TestNode).should be_empty # when t = TestNode.new # then - nodes = container_node.relations.outgoing(TestNode).nodes + nodes = index_node.relations.outgoing(TestNode).nodes nodes.to_a.size.should == 1 nodes.should include(t) end @@ -97,14 +97,14 @@ describe 'NodeMixin' do class SubNode < TestNode end - container_node = Neo4j.instance.container_node - container_node.relations.outgoing(TestNode).should be_empty + index_node = Neo4j.instance.index_node + index_node.relations.outgoing(TestNode).should be_empty # when t = SubNode.new # then - nodes = container_node.relations.outgoing(TestNode).nodes + nodes = index_node.relations.outgoing(TestNode).nodes nodes.to_a.size.should == 1 nodes.should include(t) SubNode.root_class.should == TestNode @@ -198,7 +198,7 @@ describe 'NodeMixin' do # describe 'Neo4j::Node#all' do before(:each) do - Neo4j.container_node.relations.each {|r| r.delete unless r.start_node == Neo4j.ref_node} + Neo4j.instance.index_node.relations.each {|r| r.delete unless r.start_node == Neo4j.ref_node} undefine_class :TestNode # must undefine this since each spec defines it end test/neo4j/node_mixin_spec.rb @@ -29,27 +29,27 @@ describe 'ReferenceNode' do it "has a reference to a created node" do #should only have a reference to the reference node - Neo4j.container_node.relations.to_a.size.should == 1 + Neo4j.instance.index_node.relations.to_a.size.should == 1 n = MyNode.new n.name = 'hoj' # then - Neo4j.container_node.relations.nodes.should include(n) - Neo4j.container_node.relations.to_a.size.should == 2 + Neo4j.instance.index_node.relations.nodes.should include(n) + Neo4j.instance.index_node.relations.to_a.size.should == 2 end it "has a reference to all created nodes" do #should only have a reference to the reference node - Neo4j.container_node.relations.to_a.size.should == 1 + Neo4j.instance.index_node.relations.to_a.size.should == 1 node1 = MyNode.new node2 = MyNode2.new node3 = MyNode2.new # then - Neo4j.container_node.relations.outgoing(:MyNode).nodes.should include(node1) - Neo4j.container_node.relations.outgoing(:MyNode2).nodes.should include(node2, node3) - Neo4j.container_node.relations.outgoing(:MyNode).nodes.to_a.size.should == 1 - Neo4j.container_node.relations.outgoing(:MyNode2).nodes.to_a.size.should == 2 + Neo4j.instance.index_node.relations.outgoing(:MyNode).nodes.should include(node1) + Neo4j.instance.index_node.relations.outgoing(:MyNode2).nodes.should include(node2, node3) + Neo4j.instance.index_node.relations.outgoing(:MyNode).nodes.to_a.size.should == 1 + Neo4j.instance.index_node.relations.outgoing(:MyNode2).nodes.to_a.size.should == 2 MyNode.all.nodes.to_a.size.should == 1 MyNode2.all.nodes.to_a.size.should == 2 test/neo4j/ref_node_spec.rb lib/neo4j/container_node.rb 53ac8722a731259cef3592e26fccd605c3c02847 Andreas Ronge andreas.ronge@gmail.com http://github.com/andreasronge/neo4j/commit/8b20616d2e5a85e69b0526d202abc4959812d591 8b20616d2e5a85e69b0526d202abc4959812d591 2009-06-07T13:41:18-07:00 2009-06-07T13:41:18-07:00 Refactoring: renamed container_node to index_node d8e3e6c9696c4b96fe78f3dfaf9d5323049282cf Andreas Ronge andreas.ronge@gmail.com