neo4j-wrapper 0.0.5-java → 0.0.6-java

data/lib/neo4j-wrapper/has_n/class_methods.rb

@@ -53,14 +53,21 @@ module Neo4j
         #      has_one(:folder).from(FolderNode, :files)
         #   end
         #
+        # @example Using Cypher
+        #   # from FolderNode example above
+        #   folder.files.query{ cypher query DSL, see neo4j-core}
+        #   folder.files{ } # same as above
+        #   folder.files.query(:name => 'file.txt') # a cypher query with WHERE and statements
+        #   folder.files(:name => 'file.txt') # same as above
+        #   folder.files.query.to_s # the cypher query explained as a String
         #
-        # @return [Neo4j::Wrapper::HasN::DeclRel] a DSL object where the has_n relationship can be futher specified
+        # @return [Neo4j::Wrapper::HasN::DeclRel] a DSL object where the has_n relationship can be further specified
         def has_n(rel_type)
           clazz = self
           module_eval(%Q{
-                def #{rel_type}
+                def #{rel_type}(cypher_hash_query = nil, &cypher_block)
                     dsl = _decl_rels_for('#{rel_type}'.to_sym)
-                    Neo4j::Wrapper::HasN::Nodes.new(self, dsl)
+                    Neo4j::Wrapper::HasN::Nodes.new(self, dsl, cypher_hash_query, &cypher_block)
                 end}, __FILE__, __LINE__)
 
 
@@ -107,7 +114,7 @@ module Neo4j
               end}, __FILE__, __LINE__)
 
           module_eval(%Q{def #{rel_type}
-                  dsl = _decl_rels_for(:#{rel_type})
+                  dsl = _decl_rels_for('#{rel_type}'.to_sym)
                   dsl.single_node(self)
               end}, __FILE__, __LINE__)
 

data/lib/neo4j-wrapper/has_n/nodes.rb

@@ -9,13 +9,45 @@ module Neo4j
         include Enumerable
         include Neo4j::Core::ToJava
 
-        def initialize(node, decl_rel) # :nodoc:
+        def initialize(node, decl_rel, cypher_query_hash = nil, &cypher_block) # :nodoc:
           @node = node
           @decl_rel = decl_rel
+          @cypher_block = cypher_block
+          @cypher_query_hash = cypher_query_hash
+          self.class.define_rule_methods_on(self, decl_rel)
+        end
+
+        def self.define_rule_methods_on(instance, decl_rel )
+          rule_node = Neo4j::Wrapper::Rule::Rule.rule_node_for(decl_rel.target_class)
+
+          singelton = class << instance;
+            self;
+          end
+
+          rule_node && rule_node.rules.each do |rule|
+            next if rule.rule_name == :all
+            singelton.send(:define_method, rule.rule_name) do |*cypher_query_hash, &cypher_block|
+              proc = Proc.new do |m|
+                m.incoming(rule.rule_name)
+                if cypher_block
+                  self.instance_exec(m, &cypher_block)
+                end
+              end
+              query(cypher_query_hash.first, &proc)
+            end
+          end
         end
 
         def to_s
-          "HasN::Nodes [#{@decl_rel.dir}, id: #{@node.neo_id} type: #{@decl_rel && @decl_rel.rel_type} decl_rel:#{@decl_rel}]"
+          if @cypher_block || @cypher_query_hash
+            query(@cypher_query_hash, &@cypher_block).to_s
+          else
+            "HasN::Nodes [#{@decl_rel.dir}, id: #{@node.neo_id} type: #{@decl_rel && @decl_rel.rel_type} decl_rel:#{@decl_rel}]"
+          end
+        end
+
+        def query(cypher_query_hash = nil, &block)
+          Neo4j::Core::Traversal::CypherQuery.new(@node.neo_id, @decl_rel.dir, [@decl_rel.rel_type], cypher_query_hash, &block)
         end
 
         # Traverse the relationship till the index position
@@ -35,7 +67,11 @@ module Neo4j
 
         # Required by the Enumerable mixin.
         def each
-          @decl_rel.each_node(@node) { |n| yield n } # Should use yield here as passing &block through doesn't always work (why?)
+          if @cypher_block || @cypher_query_hash
+            query(@cypher_query_hash, &@cypher_block).each { |i| yield i }
+          else
+            @decl_rel.each_node(@node) { |n| yield n } # Should use yield here as passing &block through doesn't always work (why?)
+          end
         end
 
         # returns none wrapped nodes, you may get better performance using this method

data/lib/neo4j-wrapper/node_mixin/delegates.rb

@@ -134,6 +134,9 @@ module Neo4j
 
         # @macro  node.delegate
         delegate :getId
+
+        # @macro  node.delegate
+        delegate :getRelationships
       end
     end
   end

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

@@ -102,9 +102,9 @@ module Neo4j
           end
 
           # define class methods
-          singleton.send(:define_method, rule_name) do
+          singleton.send(:define_method, rule_name) do |*args, &cypher_block|
             rule_node = Rule.rule_node_for(self)
-            rule_node.traversal(rule_name)
+            rule_node.traversal(rule_name, args.first, &cypher_block)
           end unless respond_to?(rule_name)
 
           # define instance methods
@@ -129,7 +129,7 @@ module Neo4j
         end
 
         # Assigns the reference node for a class via a supplied block.
-        # Example of usage:
+        # @example usage:
         #   class Person
         #     include Neo4j::NodeMixin
         #     ref_node { Neo4j.default_ref_node }

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

@@ -12,6 +12,7 @@ module Neo4j
           self
         end
 
+
         def functions_method(func, rule_node, rule_name)
           singelton = class << self;
             self;

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

@@ -122,6 +122,7 @@ module Neo4j
 
           def bulk_trigger_rules(classname, class_change, map)
             rule_node = rule_node_for(classname)
+            return if rule_node.rules.size > 1 # this optimization is not allowed when using more then one rule
             rule_node.classes_changed(class_change)
             if (clazz = rule_node.model_class.superclass) && clazz.include?(Neo4j::NodeMixin)
               bulk_trigger_rules(clazz.name, class_change, map) if clazz.to_s != "Neo4j::Rails::Model"

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

@@ -97,17 +97,21 @@ module Neo4j
 
         # Return a traversal object with methods for each rule and function.
         # E.g. Person.all.old or Person.all.sum(:age)
-        def traversal(rule_name)
+        def traversal(rule_name, cypher_query_hash = nil, &cypher_block)
           traversal = rule_node.outgoing(rule_name)
-          @rules.each do |rule|
-            traversal.filter_method(rule.rule_name) do |path|
-              path.end_node.rel?(:incoming, rule.rule_name)
-            end
-            rule.functions && rule.functions.each do |func|
-              traversal.functions_method(func, self, rule_name)
+          if cypher_query_hash || cypher_block
+            traversal.query(cypher_query_hash, &cypher_block)
+          else
+            @rules.each do |rule|
+              traversal.filter_method(rule.rule_name) do |path|
+                path.end_node.rel?(:incoming, rule.rule_name)
+              end
+              rule.functions && rule.functions.each do |func|
+                traversal.functions_method(func, self, rule_name)
+              end
             end
+            traversal
           end
-          traversal
         end
 
         def find_function(rule_name, function_name, function_id)

data/lib/neo4j-wrapper/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module Wrapper
-    VERSION = '0.0.5'
+    VERSION = '0.0.6'
   end
 end

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.9")
+  s.add_dependency("neo4j-core", "0.0.10")
 end

metadata

@@ -2,7 +2,7 @@
 name: neo4j-wrapper
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.5
+  version: 0.0.6
 platform: java
 authors: 
   - Andreas Ronge
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-15 00:00:00 Z
+date: 2012-04-18 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.9
+            version: 0.0.10
     type: :runtime
     version_requirements: *id001
 description: |