neo4j-wrapper 0.0.2-java → 0.0.3-java

data/lib/neo4j/node_mixin.rb

@@ -41,33 +41,14 @@ module Neo4j
       klass.extend Neo4j::Core::Index::ClassMethods
       klass.extend Neo4j::Wrapper::Find
       klass.extend Neo4j::Wrapper::Rule::ClassMethods
-
       klass.send(:include, Neo4j::Wrapper::Rule::Functions)
-
-
-      klass.node_indexer do
-        index_names :exact => "#{klass._index_name}_exact", :fulltext => "#{klass._index_name}_fulltext"
-        trigger_on :_classname => klass.to_s
-        prefix_index_name &klass.method(:index_prefix)
-      end
+      klass.setup_node_index
 
       def klass.inherited(sub_klass)
-        return super if sub_klass.to_s == self.to_s
-        base_class = self
-
-        # make the base class trigger on the sub class nodes
-        base_class._indexer.config.trigger_on :_classname => sub_klass.to_s
-
-        sub_klass.inherit_rules_from self
-
-        sub_klass.node_indexer do
-          inherit_from base_class
-          index_names :exact => "#{sub_klass._index_name}_exact", :fulltext => "#{sub_klass._index_name}_fulltext"
-          trigger_on :_classname => sub_klass.to_s
-          prefix_index_name &sub_klass.method(:index_prefix)
-        end
+        setup_neo4j_subclass(sub_klass)
         super
       end
+
       super
     end
 

data/lib/neo4j/relationship_mixin.rb

@@ -31,27 +31,10 @@ module Neo4j
       klass.extend Neo4j::Wrapper::Property::ClassMethods
       klass.extend Neo4j::Core::Index::ClassMethods
       klass.extend Neo4j::Wrapper::Find
-
-      index_name = klass.to_s.gsub("::", '_')
-
-      klass.rel_indexer do
-        index_names :exact => "#{index_name}_exact", :fulltext => "#{index_name}_fulltext"
-        trigger_on :_classname => klass.to_s
-      end
+      klass.setup_rel_index
 
       def klass.inherited(sub_klass)
-        return super if sub_klass.to_s == self.to_s
-        index_name = sub_klass.to_s.gsub("::", '_')
-        base_class = self
-
-        # make the base class trigger on the sub class nodes
-        base_class._indexer.config.trigger_on :_classname => sub_klass.to_s
-
-        sub_klass.rel_indexer do
-          inherit_from base_class
-          index_names :exact => "#{index_name}_exact", :fulltext => "#{index_name}_fulltext"
-          trigger_on :_classname => sub_klass.to_s
-        end
+        setup_neo4j_subclass(sub_klass)
         super
       end
 

data/lib/neo4j-wrapper/class_methods.rb

@@ -10,6 +10,42 @@ module Neo4j
         wrapped_node
       end
 
+      def setup_neo4j_subclass(sub_klass)
+        return if self.to_s == sub_klass.to_s
+        # make the base class trigger on the sub class nodes
+        _indexer.config.trigger_on :_classname => sub_klass.to_s
+
+        sub_klass.inherit_rules_from(self) if sub_klass.respond_to?(:inherit_rules_from)
+
+        if sub_klass.ancestors.include?(Neo4j::NodeMixin)
+          setup_node_index(sub_klass)
+        else
+          setup_rel_index(sub_klass)
+        end
+
+        superclass.setup_neo4j_subclass(sub_klass) if superclass.respond_to?(:setup_neo4j_subclass)
+      end
+
+      def setup_node_index(sub_klass=self)
+        base_class = self
+        sub_klass.node_indexer do
+          inherit_from base_class unless base_class == sub_klass
+          index_names :exact => "#{sub_klass._index_name}_exact", :fulltext => "#{sub_klass._index_name}_fulltext"
+          trigger_on :_classname => sub_klass.to_s
+          prefix_index_name &sub_klass.method(:index_prefix)
+        end
+      end
+
+      def setup_rel_index(sub_klass=self)
+        base_class = self
+        sub_klass.rel_indexer do
+          inherit_from base_class unless base_class == sub_klass
+          index_names :exact => "#{sub_klass}_exact", :fulltext => "#{sub_klass}_fulltext"
+          trigger_on :_classname => sub_klass.to_s
+          prefix_index_name &sub_klass.method(:index_prefix)
+        end
+      end
+
       # Creates an alias to the original new method:  <tt>orig_new</tt>
       # @private
       def self.extended(klass)

data/lib/neo4j-wrapper/rule/functions/{count.rb → size.rb}

@@ -4,7 +4,7 @@ module Neo4j
       module Functions
 
         # A function for counting number of nodes of a given class.
-        class Count < Function
+        class Size < Function
           def initialize
             @property = '_classname'
             @@lock ||= Java::java.lang.Object.new
@@ -39,7 +39,7 @@ module Neo4j
           end
 
           def self.function_name
-            :count
+            :size
           end
         end
       end

data/lib/neo4j-wrapper/rule/rule.rb

@@ -17,7 +17,15 @@ module Neo4j
           @triggers = [@triggers] if @triggers && !@triggers.respond_to?(:each)
           @functions = [@functions] if @functions && !@functions.respond_to?(:each)
           @filter = block
-          @bulk_update = !@functions.nil? && @functions.size == 1 && @functions.first.class.function_name == :count && @filter.nil?
+          @bulk_update = bulk_update
+        end
+
+        def bulk_update
+          return false if @filter
+          return true if @functions.nil?
+          # only one function allowed for bulk update
+          return false if @functions.size != 1
+          @functions.first.class.function_name == :size
         end
 
         def to_s

data/lib/neo4j-wrapper/rule/rule_node.rb

@@ -193,7 +193,7 @@ module Neo4j
         def classes_changed(total)
           @rules.each do |rule|
             if rule.bulk_update?
-              rule.functions.first.classes_changed(rule.rule_name, rule_node, total)
+              rule.functions && rule.functions.first.classes_changed(rule.rule_name, rule_node, total)
               total.added.each { |node| connect(rule.rule_name, node) }
               total.deleted.each { |node| break_connection(rule.rule_name, node) }
             end

data/lib/neo4j-wrapper/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module Wrapper
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
   end
 end

data/lib/neo4j-wrapper.rb

@@ -28,7 +28,7 @@ require 'neo4j-wrapper/rule/event_listener'
 require 'neo4j-wrapper/rule/rule'
 require 'neo4j-wrapper/rule/rule_node'
 require 'neo4j-wrapper/rule/functions/function'
-require 'neo4j-wrapper/rule/functions/count'
+require 'neo4j-wrapper/rule/functions/size'
 require 'neo4j-wrapper/rule/functions/sum'
 
 require 'neo4j/type_converters/type_converters'

data/neo4j-wrapper.gemspec

@@ -27,5 +27,5 @@ It comes included with the Apache Lucene document database.
   s.extra_rdoc_files = %w( README.rdoc )
   s.rdoc_options = ["--quiet", "--title", "Neo4j.rb", "--line-numbers", "--main", "README.rdoc", "--inline-source"]
 
-  s.add_dependency("neo4j-core", "0.0.6")
+  s.add_dependency("neo4j-core", "0.0.7")
 end

metadata

@@ -2,7 +2,7 @@
 name: neo4j-wrapper
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: java
 authors: 
   - Andreas Ronge
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-04 00:00:00 Z
+date: 2012-04-08 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: neo4j-core
@@ -20,7 +20,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 0.0.6
+            version: 0.0.7
     type: :runtime
     version_requirements: *id001
 description: |
@@ -60,66 +60,13 @@ files:
   - lib/neo4j-wrapper/rule/class_methods.rb
   - lib/neo4j-wrapper/rule/event_listener.rb
   - lib/neo4j-wrapper/rule/functions/function.rb
-  - lib/neo4j-wrapper/rule/functions/count.rb
+  - lib/neo4j-wrapper/rule/functions/size.rb
   - lib/neo4j-wrapper/rule/functions/sum.rb
   - lib/neo4j-wrapper/rule/neo4j_core_ext/traverser.rb
   - lib/neo4j/identity_map.rb
   - lib/neo4j/node_mixin.rb
   - lib/neo4j/relationship_mixin.rb
   - lib/neo4j/type_converters/type_converters.rb
-  - lib/db/neostore.relationshiptypestore.db.names
-  - lib/db/neostore.id
-  - lib/db/neostore.relationshiptypestore.db.names.id
-  - lib/db/neostore.nodestore.db.id
-  - lib/db/neostore.propertystore.db.index
-  - lib/db/neostore.propertystore.db.strings.id
-  - lib/db/nioneo_logical.log.active
-  - lib/db/neostore.propertystore.db.strings
-  - lib/db/neostore.relationshiptypestore.db.id
-  - lib/db/neostore
-  - lib/db/neostore.nodestore.db
-  - lib/db/neostore.propertystore.db.index.keys.id
-  - lib/db/neostore.propertystore.db.arrays.id
-  - lib/db/messages.log
-  - lib/db/neostore.relationshipstore.db.id
-  - lib/db/neostore.propertystore.db.arrays
-  - lib/db/neostore.relationshipstore.db
-  - lib/db/neostore.propertystore.db.index.id
-  - lib/db/neostore.propertystore.db.id
-  - lib/db/index.db
-  - lib/db/neostore.propertystore.db
-  - lib/db/tm_tx_log.1
-  - lib/db/neostore.relationshiptypestore.db
-  - lib/db/active_tx_log
-  - lib/db/neostore.propertystore.db.index.keys
-  - lib/db/index/lucene-store.db
-  - lib/db/index/lucene.log.active
-  - lib/db/index/lucene/node/Person_exact/_1.prx
-  - lib/db/index/lucene/node/Person_exact/_1.tii
-  - lib/db/index/lucene/node/Person_exact/_0.fdx
-  - lib/db/index/lucene/node/Person_exact/segments.gen
-  - lib/db/index/lucene/node/Person_exact/_0.frq
-  - lib/db/index/lucene/node/Person_exact/_2.tii
-  - lib/db/index/lucene/node/Person_exact/_1.nrm
-  - lib/db/index/lucene/node/Person_exact/_0.nrm
-  - lib/db/index/lucene/node/Person_exact/_1.tis
-  - lib/db/index/lucene/node/Person_exact/_2.frq
-  - lib/db/index/lucene/node/Person_exact/_2.nrm
-  - lib/db/index/lucene/node/Person_exact/_2.fdt
-  - lib/db/index/lucene/node/Person_exact/_0.fdt
-  - lib/db/index/lucene/node/Person_exact/_0.tis
-  - lib/db/index/lucene/node/Person_exact/_1.fnm
-  - lib/db/index/lucene/node/Person_exact/_1.frq
-  - lib/db/index/lucene/node/Person_exact/_0.tii
-  - lib/db/index/lucene/node/Person_exact/_2.tis
-  - lib/db/index/lucene/node/Person_exact/_2.prx
-  - lib/db/index/lucene/node/Person_exact/_2.fdx
-  - lib/db/index/lucene/node/Person_exact/_0.prx
-  - lib/db/index/lucene/node/Person_exact/_2.fnm
-  - lib/db/index/lucene/node/Person_exact/_1.fdt
-  - lib/db/index/lucene/node/Person_exact/_0.fnm
-  - lib/db/index/lucene/node/Person_exact/_1.fdx
-  - lib/db/index/lucene/node/Person_exact/segments_3
   - README.rdoc
   - Gemfile
   - neo4j-wrapper.gemspec

data/lib/db/active_tx_log

@@ -1 +0,0 @@
-tm_tx_log.1

data/lib/db/index/lucene/node/Person_exact/_0.fnm

@@ -1 +0,0 @@
-����_id_
ageQ

data/lib/db/index/lucene/node/Person_exact/_0.nrm

@@ -1 +0,0 @@
-NRM�|

data/lib/db/index/lucene/node/Person_exact/_1.fnm

@@ -1 +0,0 @@
-����_id_
ageQ

data/lib/db/index/lucene/node/Person_exact/_1.nrm

@@ -1 +0,0 @@
-NRM�|

data/lib/db/index/lucene/node/Person_exact/_2.fnm

@@ -1 +0,0 @@
-����_id_
ageQ

data/lib/db/index/lucene/node/Person_exact/_2.nrm

@@ -1 +0,0 @@
-NRM�|