neo4j 1.0.0.beta.1 → 1.0.0.beta.2

data/lib/neo4j/event_handler.rb

@@ -20,6 +20,8 @@ module Neo4j
       data.assigned_node_properties.each { |tx_data| property_changed(tx_data.entity, tx_data.key, tx_data.previously_commited_value, tx_data.value) }
       data.removed_node_properties.each { |tx_data| property_changed(tx_data.entity, tx_data.key, tx_data.previously_commited_value, nil) unless data.deleted_nodes.include?(tx_data.entity) }
       data.deleted_nodes.each { |node| node_deleted(node, deleted_properties_for(node,data))}
+      data.created_relationships.each {|rel| relationship_created(rel)}
+      data.deleted_relationships.each {|rel| relationship_deleted(rel)}
       # TODO Add relationship properties callbacks
     end
 

data/lib/neo4j/index.rb

@@ -31,6 +31,36 @@ module Neo4j
       end
     end
 
+    class WrappedQuery
+      include Enumerable
+
+      def initialize(index, query)
+        @index = index
+        @query = query
+      end
+
+      def each
+        hits.each{|n| yield n.wrapper}
+      end
+
+      def close
+        @hits.close if @hits
+      end
+
+      def empty?
+        hits.size == 0
+      end
+
+      def size
+        hits.size
+      end
+
+      def hits
+        @hits ||= @index.query(@query)
+      end
+
+    end
+
     class Indexer
       attr_reader :index_name
 
@@ -65,18 +95,20 @@ module Neo4j
         index_for_field(field).remove(entity, field, value)
       end
 
-      def find(query, type = :exact)
+      def find(query, params = {})
+        type = params[:type] || :exact
         index = index_for_type(type)
-        hits = index.query(query)
+        query = (params[:wrapped].nil? || params[:wrapped]) ? WrappedQuery.new(index, query) : index.query(query)
+
         if block_given?
           begin
-            ret = yield hits
+            ret = yield query
           ensure
-            hits.close if hits
+            query.close
           end
           ret
         else
-          hits
+          query
         end
       end
 

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

@@ -2,8 +2,7 @@ module Neo4j::Mapping
   module ClassMethods
 
     module Relationship
-      def decl_relationships
-        # :nodoc:
+      def decl_relationships # :nodoc:
         self::DECL_RELATIONSHIPS
       end
 

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

@@ -2,12 +2,24 @@ module Neo4j::Mapping
   module ClassMethods
     class Rules
       class << self
-        def add(clazz, field, &block)
+        def add(clazz, field, props, &block)
           clazz = clazz.to_s
           @rules ||= {}
           @rules[clazz] ||= {}
-          filter = block.nil? ? Proc.new{|*| true} : block
+          filter = block.nil? ? Proc.new { |*| true } : block
           @rules[clazz][field] = filter
+          @triggers ||= {}
+          @triggers[clazz] ||= {}
+          trigger = props[:trigger].nil? ? [] : props[:trigger]
+          @triggers[clazz][field] = trigger.respond_to?(:each) ? trigger : [trigger]
+        end
+
+        def trigger_other_rules(node, field)
+          clazz = node[:_classname]
+          rel_types = @triggers[clazz][field]
+          rel_types.each do |rel_type|
+            node.incoming(rel_type).each { |n| n.trigger_rules }
+          end
         end
 
         def fields_for(clazz)
@@ -31,7 +43,7 @@ module Neo4j::Mapping
 
         def create_rules
           @rules.each_key do |clazz|
-            # check if rule nodes exist, if note create them
+            # check if rule nodes exist, if not create them
             if !Neo4j.ref_node.rel?(clazz)
               Neo4j::Transaction.run do
                 node = Neo4j::Node.new
@@ -52,28 +64,52 @@ module Neo4j::Mapping
         end
 
 
-        def on_property_changed(node, key, old_value, new_value)
-          return unless trigger?(node)
+        def on_relationship_created(rel)
+          trigger_start_node = trigger?(rel.start_node)
+          trigger_end_node   = trigger?(rel.end_node)
+          # end or start node must be triggered by this event
+          return unless trigger_start_node || trigger_end_node
+          on_property_changed(trigger_start_node ? rel.start_node : rel.end_node)
+        end
+
+
+        def on_property_changed(node, *)
+          trigger_rules(node) if trigger?(node)
+        end
+
+        def trigger_rules(node)
           clazz = node[:_classname]
           return if @rules[clazz].nil?
+
           agg_node = rule_for(node[:_classname])
-          @rules[clazz].each_pair do |field, filter|
-            if filter.call(node)
+          @rules[clazz].each_pair do |field, rule|
+            if run_rule(rule, node)
               # is this node already included ?
               if !node.rel?(field)
                 agg_node.outgoing(field) << node
+                trigger_other_rules(node, field)
               end
             else
               # remove old ?
               node.rels(field).incoming.each { |x| x.del }
+              trigger_other_rules(node, field)
             end
           end
         end
+
+        def run_rule(rule, node)
+          if rule.arity != 1
+            wrapper = Neo4j::Node.load_wrapper(node)
+            wrapper.instance_eval(&rule)
+          else
+            rule.call(node)
+          end
+        end
       end
     end
 
 
-    module Aggregate
+    module Rule
 
       # Creates an rule node attached to the Neo4j.ref_node
       # Can be used to rule all instances of a specific Ruby class.
@@ -93,7 +129,7 @@ module Neo4j::Mapping
       #   Person.young  # =>  [p1,p2]
       #   p1.young?    # => true
       #
-      def rule(name, &block)
+      def rule(name, props = {}, &block)
         singelton = class << self;
           self;
         end
@@ -116,18 +152,25 @@ module Neo4j::Mapping
           instance_eval &block
         end
 
-        Rules.add(self, name, &block)
+        Rules.add(self, name, props, &block)
       end
 
       # This is typically used for RSpecs to clean up rule nodes created by the #rule method.
       # It also remove the given class method.
       def delete_rules
-        singelton = class << self; self;  end
+        singelton = class << self;
+          self;
+        end
         Rules.fields_for(self).each do |name|
           singelton.send(:remove_method, name)
         end
         Rules.delete(self)
       end
+
+      def trigger_rules(node)
+        Rules.trigger_rules(node)
+      end
+
     end
 
     Neo4j.unstarted_db.event_handler.add(Rules)

data/lib/neo4j/mapping/node_mixin.rb

@@ -6,7 +6,7 @@ module Neo4j::Mapping
 
     def_delegators :@_java_node, :[]=, :[], :property?, :props, :attributes, :update, :neo_id, :id, :rels, :rel?, :to_param, :getId,
                    :rel, :del, :list?, :print, :print_sub, :outgoing, :incoming, :both,
-                   :equal?, :eql?, :==, :exist?
+                   :equal?, :eql?, :==, :exist?, :getRelationships
 
 
     # --------------------------------------------------------------------------
@@ -35,10 +35,11 @@ module Neo4j::Mapping
       @_java_node
     end
 
-    def id
-      @_java_node.id
+    def trigger_rules
+      self.class.trigger_rules(self)
     end
 
+
     def self.included(c) # :nodoc:
       c.instance_eval do
         # these constants are used in the Neo4j::RelClassMethods and Neo4j::PropertyClassMethods
@@ -49,13 +50,14 @@ module Neo4j::Mapping
           const_set(:DECL_RELATIONSHIPS, {})
           const_set(:PROPERTIES_INFO, {})
         end
+
         class << self
           alias_method :orig_new, :new
         end
       end
       c.extend ClassMethods::Property
       c.extend ClassMethods::Relationship
-      c.extend ClassMethods::Aggregate
+      c.extend ClassMethods::Rule
       c.extend Neo4j::Index::ClassMethods
       def c.inherited(subclass)
         subclass.indexer subclass

data/lib/neo4j/node.rb

@@ -23,6 +23,13 @@ module Neo4j
     def wrapped_entity
       self
     end
+    
+    # Loads the Ruby wrapper for this node 
+    # If there is no _classname property for this node then it will simply return itself.
+    # Same as Neo4j::Node.load_wrapper(node)
+    def wrapper
+      self.class.load_wrapper(self)
+    end
 
     def class
       Neo4j::Node

data/lib/neo4j/version.rb

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

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
     - 0
     - 0
     - beta
-    - 1
-  version: 1.0.0.beta.1
+    - 2
+  version: 1.0.0.beta.2
 platform: ruby
 authors: 
   - Andreas Ronge
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-21 00:00:00 +02:00
+date: 2010-09-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency