neo4j 1.0.0.beta.7 → 1.0.0.beta.8

data/lib/neo4j.rb

@@ -24,6 +24,7 @@ require 'neo4j/relationship'
 require 'neo4j/node'
 require 'neo4j/config'
 require 'neo4j/neo4j'
+require 'neo4j/mapping/class_methods/root'
 require 'neo4j/mapping/class_methods/property'
 require 'neo4j/mapping/class_methods/index'
 require 'neo4j/mapping/class_methods/relationship'

data/lib/neo4j/index.rb

@@ -12,7 +12,7 @@ module Neo4j
     module ClassMethods
       extend Forwardable
 
-      def_delegators :@indexer, :index, :find, :index?, :index_type?, :clear_index_type, :rm_index_type, :add_index, :rm_index, :index_type_for
+      def_delegators :@indexer, :index, :find, :index?, :index_type?, :clear_index_type, :rm_index_type, :add_index, :rm_index, :index_type_for, :index_name
 
       # Sets which indexer should be used for the given class.
       # Returns the old one if there was an old indexer.

data/lib/neo4j/mapping/class_methods/index.rb

@@ -12,10 +12,6 @@ module Neo4j::Mapping
       def rm_index(field, config = {})
         Neo4j::Node.rm_index(field, config, index_name)
       end
-
-      def index_name
-        root_class
-      end
     end
   end
 end

data/lib/neo4j/mapping/class_methods/property.rb

@@ -2,25 +2,6 @@ module Neo4j::Mapping
   module ClassMethods
     module Property
 
-      #
-      # Access to class constants.
-      # These properties are shared by the class and its siblings.
-      # For example that means that we can specify properties for a parent
-      # class and the child classes will 'inherit' those properties.
-      #
-
-      def root_class # :nodoc:
-        self::ROOT_CLASS
-      end
-
-      def properties_info # :nodoc:
-        self::PROPERTIES_INFO
-      end
-
-
-      # ------------------------------------------------------------------------
-
-
       # Generates accessor method and sets configuration for Neo4j node properties.
       # The generated accessor is a simple wrapper around the #[] and
       # #[]= operators.
@@ -43,16 +24,16 @@ module Neo4j::Mapping
         if props.size == 2 and props[1].kind_of?(Hash)
           props[1].each_pair do |key, value|
             pname = props[0].to_sym
-            properties_info[pname] ||= {}
-            properties_info[pname][key] = value
+            _decl_props[pname] ||= {}
+            _decl_props[pname][key] = value
           end
           props = props[0..0]
         end
 
         props.each do |prop|
           pname = prop.to_sym
-          properties_info[pname] ||= {}
-          properties_info[pname][:defined] = true
+          _decl_props[pname] ||= {}
+          _decl_props[pname][:defined] = true
 
           define_method(pname) do
             self[pname]
@@ -76,8 +57,8 @@ module Neo4j::Mapping
       # true or false
       #
       def property?(prop_name)
-        return false if properties_info[prop_name.to_sym].nil?
-        properties_info[prop_name.to_sym][:defined] == true
+        return false if _decl_props[prop_name.to_sym].nil?
+        _decl_props[prop_name.to_sym][:defined] == true
       end
 
 
@@ -89,7 +70,8 @@ module Neo4j::Mapping
       end
 
       def load_wrapper(node, db = Neo4j.started_db)
-        wrapped_node = self.orig_new # avoid creating a new node, only a Ruby Object
+        wrapped_node = self.orig_new # avo
+        #id creating a new node, only a Ruby Object
         wrapped_node.init_on_load(node)
         wrapped_node
       end

data/lib/neo4j/mapping/class_methods/relationship.rb

@@ -2,9 +2,6 @@ module Neo4j::Mapping
   module ClassMethods
 
     module Relationship
-      def decl_relationships # :nodoc:
-        self::DECL_RELATIONSHIPS
-      end
 
       # Specifies a relationship between two node classes.
       # Generates assignment and accessor methods for the given relationship.
@@ -28,17 +25,17 @@ module Neo4j::Mapping
         clazz = self
         module_eval(%Q{
                 def #{rel_type}(&block)
-                    dsl = #{clazz}.decl_relationships[:'#{rel_type.to_s}']
+                    dsl = #{clazz}._decl_rels[:'#{rel_type.to_s}']
                     Neo4j::Mapping::HasN.new(self, dsl, &block)
                 end}, __FILE__, __LINE__)
 
         module_eval(%Q{
                 def #{rel_type}_rels
-                    dsl = #{clazz}.decl_relationships[:'#{rel_type.to_s}']
+                    dsl = #{clazz}._decl_rels[:'#{rel_type.to_s}']
                     Neo4j::Mapping::HasN.new(self, dsl).rels
       end}, __FILE__, __LINE__)
 
-        decl_relationships[rel_type.to_sym] = Neo4j::Mapping::DeclRelationshipDsl.new(rel_type, params)
+        _decl_rels[rel_type.to_sym] = Neo4j::Mapping::DeclRelationshipDsl.new(rel_type, params)
       end
 
 
@@ -67,7 +64,7 @@ module Neo4j::Mapping
 
 
         module_eval(%Q{def #{rel_type}=(value)
-                    dsl = #{clazz}.decl_relationships[:'#{rel_type.to_s}']
+                    dsl = #{clazz}._decl_rels[:'#{rel_type.to_s}']
                     r = Neo4j::Mapping::HasN.new(self, dsl)
                     r.rels.each {|n| n.del} # delete previous relationships, only one can exist
                     r << value
@@ -75,19 +72,19 @@ module Neo4j::Mapping
                 end}, __FILE__, __LINE__)
 
         module_eval(%Q{def #{rel_type}
-                    dsl = #{clazz}.decl_relationships[:'#{rel_type.to_s}']
+                    dsl = #{clazz}._decl_rels[:'#{rel_type.to_s}']
                     r = Neo4j::Mapping::HasN.new(self, dsl)
                     [*r][0]
                 end}, __FILE__, __LINE__)
 
         module_eval(%Q{
                 def #{rel_type}_rel
-                    dsl = #{clazz}.decl_relationships[:'#{rel_type.to_s}']
+                    dsl = #{clazz}._decl_rels[:'#{rel_type.to_s}']
                     r = Neo4j::Mapping::HasN.new(self, dsl).rels
                     [*r][0]
       end}, __FILE__, __LINE__)
 
-        decl_relationships[rel_type.to_sym] = Neo4j::Mapping::DeclRelationshipDsl.new(rel_type, params)
+        _decl_rels[rel_type.to_sym] = Neo4j::Mapping::DeclRelationshipDsl.new(rel_type, params)
       end
 
     end

data/lib/neo4j/mapping/class_methods/root.rb

@@ -0,0 +1,28 @@
+module Neo4j::Mapping
+  module ClassMethods
+    module Root
+      #attr_reader :_decl_rels, :_decl_props
+
+      def root_class(clazz)
+        @@_all_decl_rels  ||= {}
+        @@_all_decl_props ||= {}
+        @@_all_decl_rels[clazz] ||= {}
+        @@_all_decl_props[clazz] ||= {}
+        @_decl_rels  = @@_all_decl_rels[clazz]
+        @_decl_props = @@_all_decl_props[clazz]
+      end
+
+
+      def _decl_rels
+        @@_all_decl_rels[self] ||= {}
+        @_decl_props = @@_all_decl_rels[self]
+      end
+
+      def _decl_props
+        @@_all_decl_props[self] ||= {}
+        @_decl_props = @@_all_decl_props[self]
+      end
+
+    end
+  end
+end

data/lib/neo4j/mapping/has_n.rb

@@ -16,7 +16,7 @@ module Neo4j
         else
           # which class specifies the incoming DSL ?
           clazz = dsl.to_class || node.class
-          @dsl = clazz.decl_relationships[dsl.to_type]
+          @dsl = clazz._decl_rels[dsl.to_type]
           raise "Unspecified outgoing relationship '#{dsl.to_type}' for incoming relationship '#{dsl.rel_id}' on class #{clazz}" if @dsl.nil?
         end
 

data/lib/neo4j/mapping/node_mixin.rb

@@ -42,28 +42,22 @@ module Neo4j::Mapping
 
     def self.included(c) # :nodoc:
       c.instance_eval do
-        # these constants are used in the Neo4j::RelClassMethods and Neo4j::PropertyClassMethods
-        # they are defined here since they should only be defined once -
-        # all subclasses share the same index and declared properties
-        unless c.const_defined?(:DECL_RELATIONSHIPS)
-          const_set(:ROOT_CLASS, self)
-          const_set(:DECL_RELATIONSHIPS, {})
-          const_set(:PROPERTIES_INFO, {})
-        end
-
         class << self
           alias_method :orig_new, :new
         end
       end
+      c.extend ClassMethods::Root
       c.extend ClassMethods::Property
       c.extend ClassMethods::Relationship
       c.extend ClassMethods::Rule
       c.extend Neo4j::Index::ClassMethods
       def c.inherited(subclass)
         subclass.indexer subclass
+        subclass.root_class subclass
         super
       end
       c.indexer c
+      c.root_class c
     end
   end
 end

data/lib/neo4j/rails/model.rb

@@ -56,7 +56,7 @@ class Neo4j::Model
   # enables ActiveModel::Dirty and Validation
   def method_missing(method_id, *args, &block)
     if !self.class.attribute_methods_generated?
-      self.class.define_attribute_methods(self.class.properties_info.keys)
+      self.class.define_attribute_methods(self.class._decl_props.keys)
       # try again
       send(method_id, *args, &block)
     end

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = "1.0.0.beta.7"
+  VERSION = "1.0.0.beta.8"
 end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
     - 0
     - 0
     - beta
-    - 7
-  version: 1.0.0.beta.7
+    - 8
+  version: 1.0.0.beta.8
 platform: ruby
 authors: 
   - Andreas Ronge
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-03 00:00:00 +02:00
+date: 2010-10-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -189,6 +189,7 @@ files:
   - lib/neo4j/mapping/class_methods/rule.rb
   - lib/neo4j/mapping/class_methods/property.rb
   - lib/neo4j/mapping/class_methods/index.rb
+  - lib/neo4j/mapping/class_methods/root.rb
   - lib/neo4j/mapping/class_methods/relationship.rb
   - README.rdoc
   - CHANGELOG