neo4j 3.0.0.alpha.6 → 3.0.0.alpha.7

data/lib/neo4j.rb

@@ -30,9 +30,7 @@ require 'neo4j/active_node/has_n/decl_rel'
 require 'neo4j/active_node/has_n/nodes'
 require 'neo4j/active_node'
 
-if defined? Rails::Generators # defined in 'rails/generators.rb'
-  # TODO, not sure this is the correct way of adding rails generators
-  # See https://github.com/andreasronge/neo4j/blob/gh-pages/neo4j.rb
-  # It is required from the rails config/application file
-  require 'rails/generators/neo4j_generator'
-end
+require 'neo4j/active_node/orm_adapter'
+require 'rails/generators'
+require 'rails/generators/neo4j_generator'
+

data/lib/neo4j.rb~

@@ -0,0 +1,40 @@
+require 'neo4j/version'
+
+#require "delegate"
+#require "time"
+#require "set"
+#
+#require "active_support/core_ext"
+#require "active_support/json"
+#require "active_support/inflector"
+#require "active_support/time_with_zone"
+
+require "neo4j-core"
+require "active_model"
+require 'active_support/concern'
+require 'active_support/core_ext/class/attribute.rb'
+
+require 'active_attr'
+require 'neo4j/wrapper'
+require 'neo4j/type_converters'
+require "neo4j/active_node/labels"
+require 'neo4j/active_node/identity'
+require 'neo4j/active_node/callbacks'
+require 'neo4j/active_node/initialize'
+require 'neo4j/active_node/property'
+require 'neo4j/active_node/persistence'
+require 'neo4j/active_node/validations'
+require 'neo4j/active_node/rels'
+require 'neo4j/active_node/has_n'
+require 'neo4j/active_node/has_n/decl_rel'
+require 'neo4j/active_node/has_n/nodes'
+require 'neo4j/active_node'
+
+require 'neo4j/active_node/orm_adapter'
+
+if defined? Rails::Generators # defined in 'rails/generators.rb'
+  # TODO, not sure this is the correct way of adding rails generators
+  # See https://github.com/andreasronge/neo4j/blob/gh-pages/neo4j.rb
+  # It is required from the rails config/application file
+  require 'rails/generators/neo4j_generator'
+end

data/lib/neo4j/active_node.rb

@@ -28,13 +28,14 @@ module Neo4j
     include ActiveModel::Conversion
     include ActiveModel::Serializers::Xml
     include ActiveModel::Serializers::JSON
+
     include Neo4j::ActiveNode::Initialize
     include Neo4j::ActiveNode::Identity
     include Neo4j::ActiveNode::Persistence
     include Neo4j::ActiveNode::Property
     include Neo4j::ActiveNode::Labels
-    include Neo4j::ActiveNode::Callbacks
     include Neo4j::ActiveNode::Validations
+    include Neo4j::ActiveNode::Callbacks
     include Neo4j::ActiveNode::Rels
     include Neo4j::ActiveNode::HasN
 
@@ -43,7 +44,7 @@ module Neo4j
     end
 
     def neo4j_obj
-      _persisted_node || raise("Tried to access native neo4j object on a none persisted object")
+      _persisted_node || raise("Tried to access native neo4j object on a non persisted object")
     end
 
     module ClassMethods
@@ -61,6 +62,13 @@ module Neo4j
     end
 
     included do
+      self.include_root_in_json = true
+
+
+      def self.i18n_scope
+        :neo4j
+      end
+
       def self.inherited(other)
         attributes.each_pair do |k,v|
           other.attributes[k] = v

data/lib/neo4j/active_node/has_n.rb

@@ -8,6 +8,19 @@ module Neo4j::ActiveNode
 
     module ClassMethods
 
+
+      def has_relationship?(rel_type)
+        !!_decl_rels[rel_type]
+      end
+
+      def has_one_relationship?(rel_type)
+        has_relationship?(rel_type) && _decl_rels[rel_type].has_one?
+      end
+
+      def relationship_dir(rel_type)
+        has_relationship?(rel_type) && _decl_rels[rel_type].dir
+      end
+
       def _decl_rels
         @_decl_rels ||= {}
       end
@@ -50,7 +63,7 @@ module Neo4j::ActiveNode
       #
       #   FolderNode.files #=> 'File#files' the name of the relationship
       #
-      # @example has_n(x).from(class, has_n_name)
+      # @example has_one(x).from(class, has_one_name)
       #
       #   # generate accessor method for traversing and adding relationship on incoming nodes.
       #   class FileNode
@@ -64,19 +77,28 @@ module Neo4j::ActiveNode
       # @return [Neo4j::ActiveNode::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}=(values)
+                  #{rel_type}_rels.each {|rel| rel.del }
+
+                  dsl = _decl_rels_for('#{rel_type}'.to_sym)
+                  values.each do |value|
+                    dsl.create_relationship_to(self, value)
+                  end
+              end}, __FILE__, __LINE__)
+
         module_eval(%Q{
                 def #{rel_type}()
                     dsl = _decl_rels_for('#{rel_type}'.to_sym)
                     Neo4j::ActiveNode::HasN::Nodes.new(self, dsl)
                 end}, __FILE__, __LINE__)
 
-
         module_eval(%Q{
                 def #{rel_type}_rels
                     dsl = _decl_rels_for('#{rel_type}'.to_sym)
                     dsl.all_relationships(self)
                 end}, __FILE__, __LINE__)
 
+
         instance_eval(%Q{
           def #{rel_type}
             _decl_rels[:#{rel_type}].rel_type
@@ -135,4 +157,4 @@ module Neo4j::ActiveNode
     end
   end
 
-end
+end

data/lib/neo4j/active_node/has_n/decl_rel.rb

@@ -54,7 +54,11 @@ module Neo4j
         end
 
         def to_s
-          "DeclRel #{object_id} dir: #{@dir} rel_id: #{@method_id}, rel_type: #{@rel_type}, target_class:#{@target_name}"
+          "DeclRel one #{has_one?}, dir: #{@dir}, rel_id: #{@method_id}, rel_type: #{@rel_type}, target_class:#{@target_name}"
+        end
+
+        def inspect
+          to_s
         end
 
         # @return [true, false]
@@ -197,7 +201,7 @@ module Neo4j
 
         # @private
         def each_node(node, &block)
-          node.nodes(dir: dir, type: rel_type).each { |n| block.call(n)}
+          node.nodes(dir: dir, type: rel_type).each { |n| block.call(n) }
         end
 
         def all_relationships(node)

data/lib/neo4j/active_node/has_n/nodes.rb

@@ -14,7 +14,11 @@ module Neo4j
         end
 
         def to_s
-          "HasN::Nodes [#{@decl_rel.dir}, id: #{@node.neo_id} type: #{@decl_rel.rel_type} decl_rel:#{@decl_rel}]"
+          "[#{@decl_rel.dir}, from: #{@node.neo_id} type: #{@decl_rel.rel_type} has_one #{@decl_rel.has_one?}]"
+        end
+
+        def inspect
+          to_s
         end
 
         # Traverse the relationship till the index position
@@ -32,6 +36,11 @@ module Neo4j
           super
         end
 
+        def ==(other)
+          self.to_a == other.to_a
+        end
+        alias_method :eql?, :==
+
         # 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?)
@@ -79,4 +88,4 @@ module Neo4j
 
     end
   end
-end
+end

data/lib/neo4j/active_node/identity.rb

@@ -19,10 +19,11 @@ module Neo4j::ActiveNode
 
     # @return [String, nil] same as #neo_id
     def id
-      persisted? ? neo_id.to_s : nil
+      id = neo_id
+      id.is_a?(Integer) ? id : nil
     end
 
 
   end
 
-end
+end

data/lib/neo4j/active_node/initialize.rb

@@ -9,7 +9,7 @@ module Neo4j::ActiveNode::Initialize
   # @param [Hash] properties of the persisted node.
   def init_on_load(persisted_node, properties)
     @_persisted_node = persisted_node
-    @changed_attributes && @changed_attributes.clear
+    changed_attributes && changed_attributes.clear
     @attributes = attributes.merge(properties.stringify_keys)
     @attributes = convert_properties_to :ruby, @attributes
   end

data/lib/neo4j/active_node/labels.rb

@@ -7,11 +7,27 @@ module Neo4j
       extend ActiveSupport::Concern
 
       WRAPPED_CLASSES = []
+      class InvalidQueryError < StandardError; end
 
+      # @return the labels
+      # @see Neo4j-core
       def labels
         @_persisted_node.labels
       end
 
+      # adds one or more labels
+      # @see Neo4j-core
+      def add_label(*label)
+        @_persisted_node.add_label(*label)
+      end
+
+      # Removes one or more labels
+      # Be careful, don't remove the label representing the Ruby class.
+      # @see Neo4j-core
+      def remove_label(*label)
+        @_persisted_node.remove_label(*label)
+      end
+
       def self.included(klass)
         add_wrapped_class(klass)
       end
@@ -21,7 +37,6 @@ module Neo4j
         @_wrapped_labels = nil
       end
 
-
       def self._wrapped_classes
         Neo4j::ActiveNode::Labels::WRAPPED_CLASSES
       end
@@ -48,7 +63,7 @@ module Neo4j
         # @param [Hash, nil] args the search critera or nil if finding all
         # @param [Neo4j::Session] session defaults to the model's session
         def all(args = nil, session = self.neo4j_session)
-          if (args)
+          if args
             find_by_hash(args, session)
           else
             Neo4j::Label.find_all_nodes(mapped_label_name, session)
@@ -57,8 +72,8 @@ module Neo4j
 
         # @return [Fixnum] number of nodes of this class
         def count(session = self.neo4j_session)
-          q = session.query("MATCH (n:`#{mapped_label_name}`) RETURN count(n) AS count")
-          q.to_a[0][:count]
+          q = session.query(label: mapped_label_name, return: "count(n) AS count", map_return: :value)
+          q.to_a[0]
         end
 
         # Same as #all but return only one object
@@ -69,7 +84,7 @@ module Neo4j
             when Hash
               find_by_hash(args, session).first
             when String, Fixnum
-              Neo4j::Node.load(args)
+              Neo4j::Node.load(args.to_i)
             else
               raise "Unknown argument #{args.class} in find method"
           end
@@ -94,6 +109,9 @@ module Neo4j
           end
         end
 
+        def index?(index_def)
+          mapped_label.indexes[:property_keys].include?(index_def)
+        end
 
         # @return [Array{Symbol}] all the labels that this class has
         def mapped_label_names
@@ -111,8 +129,52 @@ module Neo4j
 
         protected
 
-        def find_by_hash(hash, session)
-          Neo4j::Label.query(mapped_label_name, {conditions: hash}, session)
+        def find_by_hash(query, session)
+          validate_query!(query)
+
+          extract_relationship_conditions!(query)
+
+          session.query(query.merge(label: mapped_label_name))
+        end
+
+        # Raises an error if query is malformed
+        def validate_query!(query)
+          invalid_query_keys = query.keys.map(&:to_sym) - [:conditions, :order, :limit, :skip]
+
+          raise InvalidQueryError, "Invalid query keys: #{invalid_query_keys.join(', ')}" if not invalid_query_keys.empty?
+        end
+
+        # Takes out :conditions query keys for associations and creates corresponding :conditions and :match keys  
+        # example:
+        # class Person
+        #   property :name
+        #   has_n :friend
+        # end
+        #
+        #   :conditions => {name: 'Fred', friend: person}
+        # should result in:
+        #   :conditions => {name => 'Fred', 'id(n1)' => person.id}, :match => 'n--n1'
+        #
+        def extract_relationship_conditions!(query)
+          node_num = 1
+          if query[:conditions]
+            query[:conditions].dup.each do |key, value|
+              if has_one_relationship?(key)
+                neo_id = value.try(:neo_id) || value
+                raise InvalidQueryError, "Invalid value for '#{key}' condition" if not neo_id.is_a?(Integer)
+
+                query[:match] ||= []
+                n_string = "n#{node_num}"
+                dir = relationship_dir(key)
+
+                match = dir == :outgoing ? "n-->(#{n_string})" : "n<--(#{n_string})"
+                query[:match] << match
+                query[:conditions]["id(#{n_string})"] = neo_id.to_i
+                query[:conditions].delete(key)
+                node_num += 1
+              end
+            end
+          end
         end
 
         def _index(property)