neo4j 2.0.0.alpha.6-java → 2.0.0.alpha.7-java

data/CHANGELOG

@@ -1,3 +1,10 @@
+== 2.0.0.alpha.7 / 2012-04-19
+* fix for Neo4j::Config bug - did not work from rails to set the db location, closes #191
+* has_n and has_one method generate class method returning the name of the relationship as a Symbol, closes #170
+* Raise exception if trying to index boolean property, closes #180
+* Made start_node= and end_node= protected closes 186
+* Support for things like @dungeon.monsters.dangerous { |m| m[:weapon?] == 'sword' } closes #181
+
 == 2.0.0.alpha.6 / 2012-04-15
 * Complete rewrite and smaller change of API + lots of refactoring and better RSpecs
 * Moved code to the neo4j-core and neo4j-wrapper gems

data/lib/neo4j/rails/attributes.rb

@@ -4,10 +4,13 @@ module Neo4j
     # in a Railsy way.  This typically means not writing anything to the DB until the
     # object is saved (after validation).
     #
-    # Externally, when we talk about properties (e.g. #property?, #property_names, #properties),
+    # Externally, when we talk about properties (e.g. {#property?}, {#property_names}),
     # we mean all of the stored properties for this object include the 'hidden' props
     # with underscores at the beginning such as _neo_id and _classname.  When we talk
     # about attributes, we mean all the properties apart from those hidden ones.
+    #
+    # This mixin defines a number of class methods, see #{ClassMethods}.
+    #
     module Attributes
       extend ActiveSupport::Concern
       extend TxMethods
@@ -47,6 +50,8 @@ module Neo4j
         end
       end
 
+      # Is called when a node neo4j entity is created and we need to save attributes
+      # @private
       def init_on_create(*)
         self._classname = self.class.to_s
         write_default_attributes
@@ -54,6 +59,8 @@ module Neo4j
         clear_changes
       end
 
+      # Setup this mixins instance variables
+      # @private
       def initialize_attributes(attributes)
         @_properties = {}
         @_properties_before_type_cast={}
@@ -88,13 +95,14 @@ module Neo4j
       end
       tx_methods :update_attributes
 
-      # Same as #update_attributes, but raises an exception if saving fails.
+      # Same as {#update_attributes}, but raises an exception if saving fails.
       def update_attributes!(attributes)
         self.attributes = attributes
         save!
       end
       tx_methods :update_attributes!
 
+      # @private
       def reset_attributes
         @_properties = {}
       end
@@ -309,6 +317,8 @@ module Neo4j
           _decl_props[property][:converter] = converter
 
           if options.include?(:index)
+            _decl_props[property][:index] = options[:index]
+            raise "Indexing boolean property is not allowed" if options[:type] && options[:type] == :boolean
             index(property, :type => options[:index], :field_type => converter.index_as)
           end
 

data/lib/neo4j/rails/finders.rb

@@ -3,10 +3,12 @@ module Neo4j
     class RecordNotFoundError < StandardError
     end
 
+    # Defines {ClassMethods}
     module Finders
       extend ActiveSupport::Concern
 
 
+      # @private
       def reachable_from_ref_node?
         # All relationships are reachable
         respond_to?(:_java_rel) || Neo4j::Algo.all_path(self.class.ref_node_for_class, self).outgoing(self.class).outgoing(:_all).first != nil
@@ -16,8 +18,29 @@ module Neo4j
         rule(:_all, :functions => Neo4j::Wrapper::Rule::Functions::Size.new) if respond_to?(:rule)
       end
 
+      # Defines the #{#find} method. When declaring properties with index a number of finder methods will be generated,
+      # similar to active record, example +find_by_<property_name>+, +find_or_create_by_<property_name>. +all_by_<property_name>+
+      #
+      # @example find_or_create_by
+      #   class Person < Neo4j::Rails::Model
+      #     property :age, :type => Fixnum
+      #   end
+      #
+      #   Person.find_by_age(42)
+      #   Person.find_or_create_by
+      #   Person.find_or_create_by!(:age => 'bla')
+      #
+      # @example find all
+      #   Person.all_by_age
+      #   Person.all(:name => 'bla')
+      #   Person.all('name: "bla"')  # lucene query syntax
+      #
+      # @see Neo4j::Rails::Attributes::ClassMethods#property
+      # @see #find
+      #
       module ClassMethods
 
+        # @private
         def index_prefix
           return "" unless Neo4j.running?
           return "" unless respond_to?(:ref_node_for_class)
@@ -26,6 +49,7 @@ module Neo4j
           prefix ? prefix + "_" : ""
         end
 
+        # @private
         # overwrite the index method to add find_by_xxx class methods
         def index(*args)
           field = args.first

data/lib/neo4j/rails/has_n.rb

@@ -1,14 +1,15 @@
 module Neo4j
   module Rails
+    # Defines class methods, see {ClassMethods}
     module HasN
       extend ActiveSupport::Concern
 
       module ClassMethods
 
         # Create a number of methods similar to active record has_many.
-        # The first one returns an Neo4j::Rails::Relationships::NodesDSL
+        # The first one returns an {Neo4j::Rails::Relationships::NodesDSL}
         # the second generate method (with the _rels postfix) returns a
-        # Neo4j::Rails::Relationships::RelsDSL
+        # {Neo4j::Rails::Relationships::RelsDSL}
         #
         # See also Neo4j::NodeMixin#has_n which only work with persisted relationships.
         #
@@ -101,7 +102,7 @@ module Neo4j
             RUBY
           end
 
-          unless method_defined?("#{rel_type}=".to_sym)
+          unless method_defined?("#{rel_type}=")
             class_eval <<-RUBY, __FILE__, __LINE__
                 def #{rel_type}=(other)
                     dsl = _decl_rels_for(:'#{rel_type}')
@@ -142,16 +143,29 @@ module Neo4j
             RUBY
           end
 
+          instance_eval <<-RUBY, __FILE__, __LINE__
+              def #{rel_type}
+                _decl_rels[:'#{rel_type}'].rel_type.to_sym
+              end
+          RUBY
+
           _decl_rels[rel_type.to_sym] = Neo4j::Wrapper::HasN::DeclRel.new(rel_type, true, self)
         end
 
         def define_has_n_methods_for(rel_type, options) #:nodoc:
           unless method_defined?(rel_type)
             class_eval <<-RUBY, __FILE__, __LINE__
-                def #{rel_type}
+                def #{rel_type}(cypher_hash_query = nil, &cypher_block)
                     dsl = _decl_rels_for(:'#{rel_type}')
-                    storage = _create_or_get_storage_for_decl_rels(dsl)
-                    NodesDSL.new(storage, dsl.dir)
+                    if cypher_hash_query || cypher_block
+                      raise "Expected a hash, can't translated to cypher where statements" if cypher_hash_query && !cypher_hash_query.is_a?(Hash)
+                      Neo4j::Wrapper::HasN::Nodes.new(self, dsl, cypher_hash_query, &cypher_block)
+                    else
+                      storage = _create_or_get_storage_for_decl_rels(dsl)
+                      NodesDSL.new(storage, dsl.dir).tap do |n|
+                        Neo4j::Wrapper::HasN::Nodes.define_rule_methods_on(n, dsl)
+                      end
+                    end
                 end
             RUBY
           end
@@ -190,7 +204,7 @@ module Neo4j
 
           instance_eval <<-RUBY, __FILE__, __LINE__
               def #{rel_type}
-                _decl_rels[:'#{rel_type}'].rel_type.to_s
+                _decl_rels[:'#{rel_type}'].rel_type.to_sym
               end
           RUBY
 

data/lib/neo4j/rails/model.rb

@@ -1,20 +1,39 @@
 module Neo4j
   module Rails
     # Makes Neo4j nodes and relationships behave like active record objects.
-    # That means for example that you don't have to care about transactions since they will be
-    # automatically be created when needed. Validation, Callbacks etc. are also supported.
+    # That means for example that you don't (normally) have to care about transactions since they will be
+    # automatically be created when needed. {Neo4j::Rails::Validation}, {Neo4j::Rails::Callbacks} etc. are also supported.
     #
-    # @example Traverse
+    # @example Create a node (learn more - see {Neo4j::Rails::Persistence})
+    #   class Company < Neo4j::Rails::Model
+    #   end
+    #   Company.new.save
+    #   Company.save
+    #   Company.save(:name => 'Foo Ab')
+    #
+    # @example Declare properties (learn more - see {Neo4j::Rails::Attributes})
+    #
+    #   class Company < Neo4j::Rails::Model
+    #     property :data
+    #     property :revenue, :type => :Float
+    #   end
+    #
+    #   c = Company.new(:data => false, :type => '2123123.23')
+    #   c.data = "changed type"
+    #   c.revenue = 123124 # will always be converted
+    #
+    # @example Creating and Navigating Relationships (learn more - see {Neo4j::Rails::Relationships})
     #   class Person < Neo4j::Rails::Model
     #   end
     #
-    #   person = Person.find(...)
-    #   person.outgoing(:foo) << Person.create
+    #   person = Person.new
+    #   person.outgoing(:foo) << Person.new
     #   person.save!
     #   person.outgoing(:foo).depth(:all)...
     #   person.outgoing(:friends).map{|f| f.outgoing(:knows).to_a}.flatten
+    #   person.rels(:outgoing, :foo).first.end_node #=> the other node
     #
-    # @example Declared Relationships: has_n and has_one
+    # @example Declared Relationships (learn more - see {Neo4j::Rails::HasN::ClassMethods})
     #
     #   class Person < Neo4j::Rails::Model
     #   end
@@ -25,9 +44,9 @@ module Neo4j
     #   end
     #
     #   Person.new.foo << other_node
-    #   Person.friends.build(:name => 'kalle')
+    #   Person.friends.build(:name => 'kalle').save
     #
-    # @example Declared Properties and Index
+    # @example Searching with Lucene Index (learn more - see {Neo4j::Rails::Finders::ClassMethods})
     #
     #   class Person < Neo4j::Rails::Model
     #     property :name
@@ -37,7 +56,32 @@ module Neo4j
     #   Person.create(:name => 'kalle', :age => 42, :undeclared_prop => 3.14)
     #   Person.find_by_age(42)
     #
-    # @example Callbacks
+    # @example Searching with Cypher (learn more - {Neo4j-core}[http://rdoc.info/github/andreasronge/neo4j-core/file/README.rdoc])
+    #
+    #   Monster.all.query(:strength => 17).first #=> a node/Neo4j::Rails::Model
+    #   Monster.all.query(:strength => 17).to_s  #=> "START n0=node(42) MATCH ..."
+    #   Neo4j.query{Neo4j.rb cypher DSL}
+    #   dungeon.monsters.query(:name => 'Ghost', :strength => 10) # all monsters with those properties
+    #   dungeon.monsters(:name => 'Ghost', :strength => 10) # same as above
+    #   dungeon.monsters { |m| m[:name] == 'Ghost'] & m[:strength] == 16} # same as above
+    #
+    # @example Rules and Cypher (learn more {Neoj::Wrapper::Rule::ClassMethods}[http://rdoc.info/github/andreasronge/neo4j-wrapper/Neo4j/Wrapper/Rule/ClassMethods] )
+    #   class Dungeon < Neo4j::Rails::Model
+    #     has_n(:monsters).to(Monster)
+    #   end
+    #
+    #   class Monster < Neo4j::Rails::Model
+    #     rule(:dangerous) { |m| m[:strength] > 15 }
+    #   end
+    #
+    #   class Room < Neo4j::Rails::Model
+    #     has_n(:monsters).to(Monster)
+    #   end
+    #
+    #   @dungeon.monsters.dangerous { |m| rooms = m.incoming(Room.monsters); rooms }  # returns rooms we should avoid
+    #   @dungeon.monsters{|m| ret(m).asc(m[:strength])} # return the monsters nodes sorted by strength
+    #
+    # @example Callbacks (learn more - see #{Neo4j::Rails::Callbacks})
     #
     #   class Person < Neo4j::Rails::Model
     #     before_save :do_something

data/lib/neo4j/rails/persistence.rb

@@ -1,13 +1,19 @@
 module Neo4j
   module Rails
+    # Defines the create, delete and update methods.
+    # @see ClassMethods class methods when including this module
     module Persistence
       extend ActiveSupport::Concern
       extend TxMethods
 
 
       # Persist the object to the database.  Validations and Callbacks are included
-      # by default but validation can be disabled by passing :validate => false
-      # to #save.
+      # by default but validation can be disabled by passing <tt>:validate => false</tt>
+      # to <tt>save</tt>. Creates a new transaction.
+      # @param (see Neo4j::Rails::Validations#save)
+      # @return [Boolean] true if it was persisted
+      # @see Neo4j::Rails::Validations Neo4j::Rails::Validations - for the :validate parameter
+      # @see Neo4j::Rails::Callbacks Neo4j::Rails::Callbacks - for callbacks
       def save(*)
         create_or_update
       end
@@ -15,23 +21,20 @@ module Neo4j
 
       # Persist the object to the database.  Validations and Callbacks are included
       # by default but validation can be disabled by passing :validate => false
-      # to #save!.
+      # to #save!  Creates a new transaction.
       #
-      # Raises a RecordInvalidError if there is a problem during save.
+      # @raise a RecordInvalidError if there is a problem during save.
+      # @param (see Neo4j::Rails::Validations#save)
+      # @return nil
+      # @see #save
+      # @see Neo4j::Rails::Validations Neo4j::Rails::Validations - for the :validate parameter
+      # @see Neo4j::Rails::Callbacks Neo4j::Rails::Callbacks - for callbacks
       def save!(*args)
         unless save(*args)
           raise RecordInvalidError.new(self)
         end
       end
 
-      def update
-        write_changed_attributes
-        clear_changes
-        true
-      end
-
-
-
       # Removes the node from Neo4j and freezes the object.
       def destroy
         delete
@@ -39,24 +42,24 @@ module Neo4j
       end
 
       # Same as #destroy but doesn't run destroy callbacks and doesn't freeze
-      # the object
+      # the object. Creates a new transaction
       def delete
         del unless new_record? || destroyed?
         set_deleted_properties
       end
       tx_methods :delete
 
-      # Returns true if the object was destroyed.
+      # Returns +true+ if the object was destroyed.
       def destroyed?
         @_deleted || (!new_record? && !self.class.load_entity(neo_id))
       end
 
-      # Returns if the record is persisted, i.e. it’s not a new record and it was not destroyed
+      # Returns +true+ if the record is persisted, i.e. it’s not a new record and it was not destroyed
       def persisted?
         !new_record? && !destroyed?
       end
 
-      # Returns true if the record hasn't been saved to Neo4j yet.
+      # Returns +true+ if the record hasn't been saved to Neo4j yet.
       def new_record?
         _java_entity.nil?
       end
@@ -117,6 +120,13 @@ module Neo4j
       end
 
       protected
+
+      def update
+        write_changed_attributes
+        clear_changes
+        true
+      end
+
       def create_or_update
         result = persisted? ? update : create
         unless result != false

data/lib/neo4j/rails/relationship_persistence.rb

@@ -34,10 +34,12 @@ module Neo4j
         true
       end
 
+      # @return [Symbol] the relationship type
       def rel_type
         new_record? ? @_rel_type : _java_entity.rel_type.to_sym
       end
 
+      # @see http://rdoc.info/github/andreasronge/neo4j-core/Neo4j/Core/Relationship#other_node-instance_method
       def other_node(node)
         if persisted?
           _java_rel._other_node(node._java_node)
@@ -46,40 +48,18 @@ module Neo4j
         end
       end
 
-
+      # Returns the start node which can be unpersisted
+      # @see http://rdoc.info/github/andreasronge/neo4j-core/Neo4j/Core/Relationship#start_node-instance_method
       def start_node
         @_start_node ||= _java_rel && _java_rel.start_node.wrapper
       end
 
-      def start_node=(node)
-        old = @_start_node
-        @_start_node = node
-        # TODO should raise exception if not persisted and changed
-        if old != @_start_node
-          old && old.rm_outgoing_rel(rel_type, self)
-          @_start_node.class != Neo4j::Node && @_start_node.add_outgoing_rel(rel_type, self)
-        end
-      end
-
+      # Returns the end node which can be unpersisted
+      # @see http://rdoc.info/github/andreasronge/neo4j-core/Neo4j/Core/Relationship#end_node-instance_method
       def end_node
         @_end_node ||= _java_rel && _java_rel.end_node.wrapper
       end
 
-      def end_node=(node)
-        old = @_end_node
-        @_end_node = node
-        # TODO should raise exception if not persisted and changed
-        if old != @_end_node
-          old && old.rm_incoming_rel(rel_type, self)
-          @_end_node.class != Neo4j::Node && @_end_node.add_incoming_rel(rel_type, self)
-        end
-      end
-
-
-      def _persist_node(start_or_end_node)
-        (start_or_end_node.new_record? || start_or_end_node.relationships_changed?) ? start_or_end_node.save : true
-      end
-
       # Reload the object from the DB
       def reload(options = nil)
         raise "Can't reload a none persisted node" if new_record?
@@ -100,6 +80,33 @@ module Neo4j
         end
         reloaded
       end
+
+      protected
+
+      def start_node=(node)
+        old = @_start_node
+        @_start_node = node
+        # TODO should raise exception if not persisted and changed
+        if old != @_start_node
+          old && old.rm_outgoing_rel(rel_type, self)
+          @_start_node.class != Neo4j::Node && @_start_node.add_outgoing_rel(rel_type, self)
+        end
+      end
+
+      def end_node=(node)
+        old = @_end_node
+        @_end_node = node
+        # TODO should raise exception if not persisted and changed
+        if old != @_end_node
+          old && old.rm_incoming_rel(rel_type, self)
+          @_end_node.class != Neo4j::Node && @_end_node.add_incoming_rel(rel_type, self)
+        end
+      end
+
+      def _persist_node(start_or_end_node)
+        (start_or_end_node.new_record? || start_or_end_node.relationships_changed?) ? start_or_end_node.save : true
+      end
+
     end
 
   end

data/lib/neo4j/rails/relationships/node_dsl.rb

@@ -142,6 +142,7 @@ module Neo4j
         #
         def all(*args)
           unless args.empty?
+            raise "Illegal argument, expected a node" unless args.first.kind_of?(Neo4j::NodeMixin)
             enum = Enumerator.new(@storage, :each_node, @dir).find { |n| n == args.first }
           else
             enum = Enumerator.new(@storage, :each_node, @dir)
@@ -208,7 +209,7 @@ module Neo4j
 
         # These methods are using the Neo4j::Core::Traversal::Traverser which means that only persisted relationship will be seen
         # but more advanced traversal can be performed.
-        CORE_TRAVERSAL_METHODS = [:depth, :outgoing, :incoming, :both, :expand, :depth_first, :breadth_first, :eval_paths, :unique, :expander, :prune, :filter, :include_start_node, :rels, :eval_paths]
+        CORE_TRAVERSAL_METHODS = [:depth, :outgoing, :incoming, :both, :expand, :depth_first, :breadth_first, :eval_paths, :unique, :expander, :prune, :filter, :include_start_node, :rels, :eval_paths, :query]
 
 
         protected

data/lib/neo4j/rails/relationships/relationships.rb

@@ -1,7 +1,8 @@
 module Neo4j
   module Rails
 
-    # This module overrides the Neo4j::Core::Rels module so that it can handle unpersisted relationships.
+    # This module overrides the {Neo4j::Core::Rels}[http://rdoc.info/github/andreasronge/neo4j-core/Neo4j/Core/Rels] and {Neo4j::Core::Traversal}[http://rdoc.info/github/andreasronge/neo4j-core/Neo4j/Core/Traversal]
+    # modules so that it can handle unpersisted relationships of depth one.
     #
     module Relationships
       extend ActiveSupport::Concern

data/lib/neo4j/rails/validations.rb

@@ -1,14 +1,20 @@
 module Neo4j
   module Rails
+    # This mixin replace the original save method and performs validation before the save.
     module Validations
       include ActiveModel::Validations
 
+      # Implements the ActiveModel::Validation hook method.
+      # @see http://rubydoc.info/docs/rails/ActiveModel/Validations:read_attribute_for_validation
       def read_attribute_for_validation(key)
         respond_to?(key) ? send(key) : self[key]
       end
 
       # The validation process on save can be skipped by passing false. The regular Model#save method is
       # replaced with this when the validations module is mixed in, which it is by default.
+      # @param [Hash] options the options to create a message with.
+      # @option options [true, false] :validate if false no validation will take place
+      # @return [Boolean] true if it saved it successfully
       def save(options={})
         result = perform_validations(options) ? super : false
         if !result
@@ -17,6 +23,7 @@ module Neo4j
         result
       end
 
+      # @return [Boolean] true if valid
       def valid?(context = nil)
         context     ||= (new_record? ? :create : :update)
         super(context)

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = "2.0.0.alpha.6"
+  VERSION = "2.0.0.alpha.7"
 end

data/neo4j.gemspec

@@ -32,5 +32,5 @@ It comes included with the Apache Lucene document database.
   s.add_dependency('orm_adapter', ">= 0.0.3")
   s.add_dependency("activemodel", ">= 3.0.0", "< 3.3")
   s.add_dependency("railties", ">= 3.0.0", "< 3.3")
-  s.add_dependency("neo4j-wrapper", '0.0.5')
+  s.add_dependency("neo4j-wrapper", '0.0.8')
 end

metadata

@@ -2,7 +2,7 @@
 name: neo4j
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 2.0.0.alpha.6
+  version: 2.0.0.alpha.7
 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-19 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: orm_adapter
@@ -59,7 +59,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 0.0.5
+            version: 0.0.8
     type: :runtime
     version_requirements: *id004
 description: |
@@ -93,7 +93,6 @@ files:
   - lib/tasks/upgrade_v2/upgrade_v2.rake
   - lib/tasks/upgrade_v2/lib/upgrade_v2.rb
   - lib/orm_adapter/adapters/neo4j.rb
-  - lib/neo4j/performance.rb
   - lib/neo4j/version.rb
   - lib/neo4j/rails/attributes.rb
   - lib/neo4j/rails/rack_middleware.rb

data/lib/neo4j/performance.rb

@@ -1,43 +0,0 @@
-require 'rubygems'
-require 'neo4j'
-
-class MyIndex
-  include Neo4j::NodeMixin
-  index(:name) # default :exact
-  index(:things)
-  index(:age, :field_type => Fixnum) # default :exact
-  index(:wheels, :field_type => Fixnum)
-  index(:description, :type => :fulltext)
-end
-
-def rm_db_storage
-  FileUtils.rm_rf Neo4j::Config[:storage_path]
-  raise "Can't delete db" if File.exist?(Neo4j::Config[:storage_path])
-end
-
-def finish_tx
-  return unless @tx
-  @tx.success
-  @tx.finish
-  @tx = nil
-end
-
-def new_tx
-  finish_tx if @tx
-  @tx = Neo4j::Transaction.new
-end
-
-rm_db_storage
-
-10.times do
-  t = Time.now
-  new_tx
-  (0..1000).each do
-    MyIndex.new :things => 'bla', :name => 'foo', :age => 42, :wheels => 53, :description => "Bla bla"
-  end
-  d1 = Time.now - t
-  t = Time.now
-  finish_tx
-  d2 = Time.now - t
-  puts "Index #{d2}, create #{d1} tot #{d1 + d2} - #{d2/(d1 + d2).round(2)}"
-end