neo4j-wrapper 0.0.1-java → 0.0.2-java

data/lib/neo4j/node_mixin.rb

@@ -15,11 +15,11 @@ module Neo4j
   #
   # = Class Method Modules
   # * {Neo4j::Wrapper::ClassMethods}
-  # * {Neo4j::Wrapper::NodeMixin::ClassMethods}
-  # * {Neo4j::Wrapper::Property::ClassMethods}
-  # * {Neo4j::Wrapper::HasN::ClassMethods}
-  # * {Neo4j::Wrapper::Find}
-  # * {Neo4j::Wrapper::Rule::ClassMethods}
+  # * {Neo4j::Wrapper::NodeMixin::ClassMethods} - redefines the <tt>new</tt> method
+  # * {Neo4j::Wrapper::Property::ClassMethods} - defines <tt>property</tt> method
+  # * {Neo4j::Wrapper::HasN::ClassMethods} - defines <tt>has_n</tt>  and <tt>has_one</tt> method
+  # * {Neo4j::Wrapper::Find} - defines <tt>find</tt> method
+  # * {Neo4j::Wrapper::Rule::ClassMethods} - defines <tt>rule</tt> method
   # * {http://rdoc.info/github/andreasronge/neo4j-core/master/Neo4j/Core/Index/ClassMethods Neo4j::Core::Index::ClassMethods}
   #
   # = Instance Method Modules
@@ -29,6 +29,7 @@ module Neo4j
     include Neo4j::Wrapper::NodeMixin::Initialize
     include Neo4j::Wrapper::HasN::InstanceMethods
     include Neo4j::Wrapper::Rule::InstanceMethods
+    include Neo4j::Wrapper::Property::InstanceMethods
     include Neo4j::Core::Index
 
     # @private

data/lib/neo4j/relationship_mixin.rb

@@ -22,6 +22,7 @@ module Neo4j
 
     include Neo4j::Wrapper::RelationshipMixin::Initialize
     include Neo4j::Wrapper::RelationshipMixin::Delegates
+    include Neo4j::Wrapper::Property::InstanceMethods
 
     # @private
     def self.included(klass)

data/lib/neo4j-wrapper/class_methods.rb

@@ -10,7 +10,7 @@ module Neo4j
         wrapped_node
       end
 
-      # Creates an alias to the original new method:  <tt>orig_new</t>
+      # Creates an alias to the original new method:  <tt>orig_new</tt>
       # @private
       def self.extended(klass)
         klass.instance_eval do

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

@@ -47,6 +47,19 @@ module Neo4j
         end
 
         alias_method :create, :new
+
+        # Loads a wrapped node from the database given a neo id.
+        # @param [#to_i, nil] neo_id
+        # @raise an exception if the loaded node/relationship is not of the same kind as this class.
+        # @return [Object, nil] If the node does not exist it will return nil otherwise the loaded node or wrapped node.
+        def load_entity(neo_id)
+          node = Neo4j::Node.load(neo_id)
+          return nil if node.nil?
+          return node if node.class == Neo4j::Node
+          raise "Expected loaded node #{neo_id} to be of type #{self} but it was #{node.class}" unless node.kind_of?(self)
+          node
+        end
+
       end
     end
   end

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

@@ -129,8 +129,7 @@ module Neo4j
         # @see Neo4j::TypeConverters::DefaultConverter
         def _converter(prop_name)
           prop_conf = _decl_props[prop_name.to_sym]
-          Neo4j::TypeConverters::DefaultConverter unless prop_conf
-          prop_conf[:converter]
+          (prop_conf && prop_conf[:converter]) || Neo4j::TypeConverters::DefaultConverter
         end
 
         # Returns true if the given property name has been defined with the class

data/lib/neo4j-wrapper/properties/instance_methods.rb

@@ -0,0 +1,19 @@
+module Neo4j
+  module Wrapper
+    module Property
+      module InstanceMethods
+        # Return a hash of 'public' properties.
+        # If there is an accessor method available it will use that.
+        # That means you can override the returned value of the property by implementing a method of the same name
+        # as the property. All properteis not starting with <tt>_</tt> are considered public.
+        # @return [Hash] hash of properties with keys not starting with <tt>_</tt>
+        def attributes
+          attr = props
+          ret = {}
+          attr.each_pair { |k, v| ret[k] = respond_to?(k) ? send(k) : v unless k.to_s[0] == ?_ }
+          ret
+        end
+      end
+    end
+  end
+end

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

@@ -24,6 +24,19 @@ module Neo4j
         end
 
         alias_method :create, :new
+
+        # Loads a wrapped relationship from the database given a neo id.
+        # @param [#to_i, nil] neo_id
+        # @raise an exception if the loaded node/relationship is not of the same kind as this class.
+        # @return [Object, nil] If the node does not exist it will return nil otherwise the loaded relationship or wrapped relationship.
+        def load_entity(neo_id)
+          node = Neo4j::Relationship.load(neo_id)
+          return nil if node.nil?
+          return node if node.class == Neo4j::Relationship
+          raise "Expected loaded node #{neo_id} to be of type #{self} but it was #{node.class}" unless node.kind_of?(self)
+          node
+        end
+
       end
     end
   end

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

@@ -7,6 +7,7 @@ module Neo4j
         class Count < Function
           def initialize
             @property = '_classname'
+            @@lock ||= Java::java.lang.Object.new
           end
 
           def calculate?(changed_property)
@@ -31,8 +32,10 @@ module Neo4j
 
           def classes_changed(rule_name, rule_node, class_change)
             key = rule_node_property(rule_name)
-            rule_node[key] ||= 0
-            rule_node[key] += class_change.net_change
+            @@lock.synchronized do
+              rule_node[key] ||= 0
+              rule_node[key] += class_change.net_change
+            end
           end
 
           def self.function_name

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

@@ -62,6 +62,8 @@ module Neo4j
 
         @rule_nodes = {}
 
+        @lock = Java::java.lang.Object.new
+
         class << self
 
           def add(clazz, rule_name, props, &block)
@@ -79,7 +81,9 @@ module Neo4j
 
           def rule_node_for(clazz)
             return nil if clazz.nil?
-            @rule_nodes[clazz.to_s] ||= RuleNode.new(clazz)
+            @lock.synchronized do
+              @rule_nodes[clazz.to_s] ||= RuleNode.new(clazz)
+            end
           end
 
           def find_rule_node(node)

data/lib/neo4j-wrapper/version.rb

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

data/lib/neo4j-wrapper.rb

@@ -8,6 +8,8 @@ require 'neo4j-wrapper/node_mixin/class_methods'
 require 'neo4j-wrapper/node_mixin/initialize'
 
 require 'neo4j-wrapper/properties/class_methods'
+require 'neo4j-wrapper/properties/instance_methods'
+
 
 require 'neo4j-wrapper/has_n/class_methods'
 require 'neo4j-wrapper/has_n/decl_rel'

metadata

@@ -2,7 +2,7 @@
 name: neo4j-wrapper
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: java
 authors: 
   - Andreas Ronge
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-03 00:00:00 Z
+date: 2012-04-04 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: neo4j-core
@@ -37,9 +37,7 @@ extensions: []
 extra_rdoc_files: 
   - README.rdoc
 files: 
-  - lib/test.rb
   - lib/neo4j-wrapper.rb
-  - lib/example.rb
   - lib/neo4j-wrapper/find.rb
   - lib/neo4j-wrapper/wrapper.rb
   - lib/neo4j-wrapper/class_methods.rb
@@ -47,6 +45,7 @@ files:
   - lib/neo4j-wrapper/relationship_mixin/initialize.rb
   - lib/neo4j-wrapper/relationship_mixin/delegates.rb
   - lib/neo4j-wrapper/relationship_mixin/class_methods.rb
+  - lib/neo4j-wrapper/properties/instance_methods.rb
   - lib/neo4j-wrapper/properties/class_methods.rb
   - lib/neo4j-wrapper/has_n/nodes.rb
   - lib/neo4j-wrapper/has_n/instance_methods.rb

data/lib/example.rb

@@ -1,34 +0,0 @@
-require 'rubygems'
-require 'neo4j-wrapper'
-
-class Company
-  include Neo4j::NodeMixin
-  has_n(:employees)
-end
-
-class Person
-  include Neo4j::NodeMixin
-  property :name
-  property :age, :size, :type => Fixnum, :index => :exact
-  property :description, :index => :fulltext
-
-  has_one(:best_friend)
-  has_n(:employed_by).from(:employees)
-end
-
-Neo4j::Transaction.run do
-  Person.new(:name => 'jimmy', :age => 35)
-end
-
-person = Person.find(:age => (10..42)).first
-
-Neo4j::Transaction.run do
-  person.best_friend = Person.new
-  person.employed_by << Company.new(:name => "Foo ab")
-end
-
-company = person.employed_by.find { |p| p[:name] == 'Foo ab' }
-puts "Person #{person.name} employed by #{company[:name]}"
-
-company.employees.each {|x| puts x.name}
-

data/lib/test.rb

@@ -1,61 +0,0 @@
-def calc(x)
-  x + 1
-end
-
-p = method(:calc)
-t = Time.now
-(0..10000).each { |x| calc(x) }
-total = Time.now - t
-puts "1. total = #{total}"
-
-#p = Proc.new {|x| x + 1}
-t = Time.now
-(0..10000).each { |x| p.call(x) }
-total = Time.now - t
-puts "2. total = #{total}"
-
-puts "================="
-t = Time.now
-(0..10000).each { |x| calc(x) }
-total = Time.now - t
-puts "1. total = #{total}"
-
-t = Time.now
-(0..10000).each { |x| p.call(x) }
-total = Time.now - t
-puts "2. total = #{total}"
-
-puts "================="
-t = Time.now
-(0..10000).each { |x| calc(x) }
-total = Time.now - t
-puts "1. total = #{total}"
-
-t = Time.now
-(0..10000).each { |x| p.call(x) }
-total = Time.now - t
-puts "2. total = #{total}"
-
-p = method(:calc).to_proc
-
-puts "================= TO PROC"
-t = Time.now
-(0..10000).each { |x| calc(x) }
-total = Time.now - t
-puts "1. total = #{total}"
-
-t = Time.now
-(0..10000).each { |x| p.call(x) }
-total = Time.now - t
-puts "2. total = #{total}"
-
-puts "================= TO PROC"
-t = Time.now
-(0..10000).each { |x| calc(x) }
-total = Time.now - t
-puts "1. total = #{total}"
-
-t = Time.now
-(0..10000).each { |x| p.call(x) }
-total = Time.now - t
-puts "2. total = #{total}"