neo4j 3.0.0.alpha.9 → 3.0.0.alpha.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1f7216c885708e2f7b3f094a4ab4266e83c37a0
-  data.tar.gz: 7350f7cd2f95de57873b607bda7a7a6357b29643
+  metadata.gz: f3ed632e184847cf87dace2146181d1fbde5bc7c
+  data.tar.gz: 3c4314c17410475fad46f4b5eed730186e800458
 SHA512:
-  metadata.gz: cf800fb8a523e06f163e837985600bfa84109f74b2b548e18bd99961adb28e3ee5703963fe34e8939688af842eb2dc3b4d7ae3d529412ef2ce3791fa924bb922
-  data.tar.gz: 3f0e91124dbe00b6f102d82c9f69117ecd9f4268c87d3f30600e145078ae28e155f69927415d8e106f93015ed4c694a4df9da540330d7cf929e5abd4ff23b6a2
+  metadata.gz: f8732369f9890161646404ccbdc2f3aca3d6facc4119c775a5dac45ae0b130997039dfc0a6134f7004801969c333b2dd3d191de1adcd5603e4bd2c88904830b4
+  data.tar.gz: edfdf0fc367e93e5d72e4255aec79216f80834aab3d40bbc9f5447762883412521b273980c0d15ff7bbc6d90a4969248a2bea632fe03d9a034cc9d6278ee9066

data/CHANGELOG

@@ -1,3 +1,6 @@
+== 3.0.0.alpha.10
+* ActiveRel support, see Wiki pages (chris #393)
+
 == 3.0.0.alpha.9
 * Complete rewrite of the query api, see wiki page (#406, chris, brian)
 * Performance improvements (#382,#400, #402, chris)

data/Gemfile

@@ -2,7 +2,8 @@ source 'http://rubygems.org'
 
 gemspec
 
-#gem 'neo4j-core', :path => '../neo4j-core'
+
+gem 'neo4j-core' #, path: '../neo4j-core'
 #gem 'neo4j-core', :git => 'https://github.com/andreasronge/neo4j-core.git'
 #gem 'orm_adapter', :path => '../orm_adapter'
 

data/lib/neo4j.rb

@@ -17,9 +17,28 @@ require 'active_support/core_ext/class/attribute.rb'
 require 'active_attr'
 require 'neo4j/config'
 require 'neo4j/wrapper'
+require 'neo4j/active_rel/rel_wrapper'
+require 'neo4j/active_node/node_wrapper'
 require 'neo4j/type_converters'
-require "neo4j/active_node/labels"
-require 'neo4j/active_node/identity'
+require 'neo4j/paginated'
+
+require 'neo4j/shared/callbacks'
+require 'neo4j/shared/property'
+require 'neo4j/shared/persistence'
+require 'neo4j/shared/validations'
+require 'neo4j/shared/identity'
+require 'neo4j/shared'
+
+require 'neo4j/active_rel/callbacks'
+require 'neo4j/active_rel/initialize'
+require 'neo4j/active_rel/property'
+require 'neo4j/active_rel/persistence'
+require 'neo4j/active_rel/validations'
+require 'neo4j/active_rel/query'
+require 'neo4j/active_rel/related_node'
+require 'neo4j/active_rel'
+
+require 'neo4j/active_node/labels'
 require 'neo4j/active_node/id_property'
 require 'neo4j/active_node/callbacks'
 require 'neo4j/active_node/initialize'
@@ -29,11 +48,9 @@ require 'neo4j/active_node/validations'
 require 'neo4j/active_node/rels'
 require 'neo4j/active_node/has_n'
 require 'neo4j/active_node/has_n/association'
-require 'neo4j/active_node/has_n/nodes'
 require 'neo4j/active_node/query/query_proxy'
 require 'neo4j/active_node/query'
 require 'neo4j/active_node/serialized_properties'
-require 'neo4j/paginated'
 require 'neo4j/active_node'
 
 require 'neo4j/active_node/orm_adapter'

data/lib/neo4j/active_node.rb

@@ -23,55 +23,25 @@ module Neo4j
   #
   module ActiveNode
     extend ActiveSupport::Concern
-    extend ActiveModel::Naming
-
-    include ActiveModel::Conversion
-    include ActiveModel::Serializers::Xml
-    include ActiveModel::Serializers::JSON
 
+    include Neo4j::Shared
     include Neo4j::ActiveNode::Initialize
-    include Neo4j::ActiveNode::Identity
     include Neo4j::ActiveNode::IdProperty
-    include Neo4j::ActiveNode::Persistence
     include Neo4j::ActiveNode::SerializedProperties
     include Neo4j::ActiveNode::Property
-    include Neo4j::ActiveNode::Query
-    include Neo4j::ActiveNode::Labels
+    include Neo4j::ActiveNode::Persistence
     include Neo4j::ActiveNode::Validations
     include Neo4j::ActiveNode::Callbacks
+    include Neo4j::ActiveNode::Query
+    include Neo4j::ActiveNode::Labels
     include Neo4j::ActiveNode::Rels
     include Neo4j::ActiveNode::HasN
 
-    def wrapper
-      self
-    end
-
     def neo4j_obj
-      _persisted_node || raise("Tried to access native neo4j object on a non persisted object")
-    end
-
-    module ClassMethods
-      def neo4j_session_name (name)
-        @neo4j_session_name = name
-      end
-
-      def neo4j_session
-        if @neo4j_session_name
-          Neo4j::Session.named(@neo4j_session_name) || raise("#{self.name} is configured to use a neo4j session named #{@neo4j_session_name}, but no such session is registered with Neo4j::Session")
-        else
-          Neo4j::Session.current
-        end
-      end
+      _persisted_obj || raise("Tried to access native neo4j object on a non persisted object")
     end
 
     included do
-      self.include_root_in_json = true
-
-
-      def self.i18n_scope
-        :neo4j
-      end
-
       def self.inherited(other)
         inherited_indexes(other) if self.respond_to?(:indexed_properties)
         attributes.each_pair do |k,v|

data/lib/neo4j/active_node/callbacks.rb

@@ -2,40 +2,7 @@ module Neo4j
   module ActiveNode
     module Callbacks #:nodoc:
       extend ActiveSupport::Concern
-
-      module ClassMethods
-        include ActiveModel::Callbacks
-      end
-
-      included do
-        include ActiveModel::Validations::Callbacks
-
-        define_model_callbacks :initialize, :find, :only => :after
-        define_model_callbacks :save, :create, :update, :destroy
-      end
-
-      def destroy #:nodoc:
-        run_callbacks(:destroy) { super }
-      end
-
-      def touch(*) #:nodoc:
-        run_callbacks(:touch) { super }
-      end
-
-      private
-
-      def create_or_update #:nodoc:
-        run_callbacks(:save) { super }
-      end
-
-      def create_model #:nodoc:
-        run_callbacks(:create) { super }
-      end
-
-      def update_model(*) #:nodoc:
-        run_callbacks(:update) { super }
-      end
+      include Neo4j::Shared::Callbacks
     end
-
   end
 end

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

@@ -7,26 +7,16 @@ module Neo4j
         attr_reader :type, :name, :relationship, :direction
 
         def initialize(type, direction, name, options = {})
-          raise ArgumentError, "Invalid association type: #{type.inspect}" if not [:has_many, :has_one].include?(type.to_sym)
-          raise ArgumentError, "Invalid direction: #{direction.inspect}" if not [:out, :in, :both].include?(direction.to_sym)
+          check_valid_type_and_dir(type, direction)
           @type = type.to_sym
           @name = name
           @direction = direction.to_sym
-          raise ArgumentError, "Cannot specify both :type and :origin (#{base_declaration})" if options[:type] && options[:origin]
-
           @target_class_name_from_name = name.to_s.classify
-          @target_class_option = target_class_option(options)
-          @callbacks = {before: options[:before], after: options[:after]}
-          @relationship_type = options[:type] && options[:type].to_sym
-          @origin = options[:origin] && options[:origin].to_sym
+          set_vars_from_options(options)
         end
 
         def target_class_option(options)
-          if options[:model_class].nil?
-            @target_class_name_from_name
-          elsif options[:model_class]
-            options[:model_class]
-          end
+          options[:model_class].nil? ? @target_class_name_from_name : options[:model_class]
         end
 
         # Return cypher partial query string for the relationship part of a MATCH (arrow / relationship definition)
@@ -35,7 +25,6 @@ module Neo4j
 
           relationship_type = relationship_type(create)
           relationship_name_cypher = ":`#{relationship_type}`" if relationship_type
-
           properties_string = get_properties_string(properties)
           relationship_cypher = get_relationship_cypher(var, relationship_name_cypher, properties_string)
           get_direction(relationship_cypher, create) 
@@ -63,9 +52,12 @@ module Neo4j
         end
 
         def relationship_type(create = false)
-          if @relationship_type
+          case
+          when @relationship_class
+            @relationship_class._type
+          when @relationship_type
             @relationship_type
-          elsif @origin
+          when @origin
             origin_type
           else
             (create || exceptional_target_class?) && "##{@name}"
@@ -91,7 +83,9 @@ module Neo4j
         end
 
         def get_properties_string(properties)
+          properties[Neo4j::Config.class_name_property] = @relationship_class.name if @relationship_class
           p = properties.map do |key, value|
+            next if key == :_classname
             "#{key}: #{value.inspect}"
           end.join(', ')
           p.size == 0 ? '' : " {#{p}}"
@@ -101,6 +95,21 @@ module Neo4j
           target_class.associations[@origin].relationship_type
         end
 
+        def relationship_class
+          @relationship_class
+        end
+
+        private
+
+        def set_vars_from_options(options)
+          validate_option_combinations(options)
+          @target_class_option = target_class_option(options)
+          @callbacks = {before: options[:before], after: options[:after]}
+          @origin = options[:origin] && options[:origin].to_sym
+          @relationship_class = options[:rel_class]
+          @relationship_type  = options[:type] && options[:type].to_sym
+        end
+        
         # Return basic details about association as declared in the model
         # @example
         #   has_many :in, :bands
@@ -108,6 +117,16 @@ module Neo4j
           "#{type} #{direction.inspect}, #{name.inspect}"
         end
 
+        def check_valid_type_and_dir(type, direction)
+          raise ArgumentError, "Invalid association type: #{type.inspect}" if not [:has_many, :has_one].include?(type.to_sym)
+          raise ArgumentError, "Invalid direction: #{direction.inspect}" if not [:out, :in, :both].include?(direction.to_sym)
+        end
+
+        def validate_option_combinations(options)
+          raise ArgumentError, "Cannot specify both :type and :origin (#{base_declaration})" if options[:type] && options[:origin]
+          raise ArgumentError, "Cannot specify both :type and :rel_class (#{base_declaration})" if options[:type] && options[:rel_class]
+          raise ArgumentError, "Cannot specify both :origin and :rel_class (#{base_declaration}" if options[:origin] && options[:rel_class]
+        end
 
         # Determine if model class as derived from the association name would be different than the one specified via the model_class key
         # @example

data/lib/neo4j/active_node/id_property.rb

@@ -116,4 +116,4 @@ module Neo4j::ActiveNode
 
   end
 
-end
+end

data/lib/neo4j/active_node/initialize.rb

@@ -2,13 +2,13 @@ module Neo4j::ActiveNode::Initialize
   extend ActiveSupport::Concern
   include Neo4j::TypeConverters
 
-  attr_reader :_persisted_node
+  attr_reader :_persisted_obj
 
   # called when loading the node from the database
   # @param [Neo4j::Node] persisted_node the node this class wraps
   # @param [Hash] properties of the persisted node.
   def init_on_load(persisted_node, properties)
-    @_persisted_node = persisted_node
+    @_persisted_obj = persisted_node
     changed_attributes && changed_attributes.clear
     @attributes = attributes.merge(properties.stringify_keys)
     self.default_properties=properties

data/lib/neo4j/active_node/labels.rb

@@ -13,20 +13,20 @@ module Neo4j
       # @return the labels
       # @see Neo4j-core
       def labels
-        @_persisted_node.labels
+        @_persisted_obj.labels
       end
 
       # adds one or more labels
       # @see Neo4j-core
       def add_label(*label)
-        @_persisted_node.add_label(*label)
+        @_persisted_obj.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)
+        @_persisted_obj.remove_label(*label)
       end
 
       def self.included(klass)

data/lib/neo4j/active_node/node_wrapper.rb

@@ -0,0 +1,50 @@
+class Neo4j::Node
+  module Wrapper
+
+    # this is a plugin in the neo4j-core so that the Ruby wrapper will be wrapped around the Neo4j::Node objects
+    def wrapper
+      most_concrete_class = sorted_wrapper_classes
+      wrapped_node = most_concrete_class.new
+      wrapped_node.init_on_load(self, self.props)
+      wrapped_node
+    end
+
+    def checked_labels_set
+      @@_checked_labels_set ||= Set.new
+    end
+
+    def check_label(label_name)
+      unless checked_labels_set.include?(label_name)
+        load_class_from_label(label_name)
+        # do this only once
+        checked_labels_set.add(label_name)
+      end
+    end
+
+    def sorted_wrapper_classes
+      if self.props.is_a?(Hash) && self.props.has_key?(Neo4j::Config.class_name_property)
+        self.props[Neo4j::Config.class_name_property].constantize
+      else
+        wrappers = _class_wrappers
+        return self if wrappers.nil?
+        wrapper_classes = wrappers.map{|w| Neo4j::ActiveNode::Labels._wrapped_labels[w]}
+        wrapper_classes.sort.first
+      end
+    end
+
+    def load_class_from_label(label_name)
+      begin
+        label_name.to_s.split("::").inject(Kernel) {|container, name| container.const_get(name.to_s) }
+      rescue NameError
+        nil
+      end
+    end
+
+    def _class_wrappers
+      labels.find_all do |label_name|
+        check_label(label_name)
+        Neo4j::ActiveNode::Labels._wrapped_labels[label_name].class == Class
+      end
+    end
+  end
+end

data/lib/neo4j/active_node/persistence.rb

@@ -1,32 +1,13 @@
 module Neo4j::ActiveNode
   module Persistence
-    class RecordInvalidError < RuntimeError
-      attr_reader :record
-
-      def initialize(record)
-        @record = record
-        super(@record.errors.full_messages.join(", "))
-      end
-    end
-
     extend ActiveSupport::Concern
-    include Neo4j::TypeConverters
-
-    # Saves the model.
-    #
-    # If the model is new a record gets created in the database, otherwise the existing record gets updated.
-    # If perform_validation is true validations run.
-    # If any of them fail the action is cancelled and save returns false. If the flag is false validations are bypassed altogether. See ActiveRecord::Validations for more information.
-    # There’s a series of callbacks associated with save. If any of the before_* callbacks return false the action is cancelled and save returns false.
-    def save(*)
-      update_magic_properties
-      create_or_update
-    end
+    include Neo4j::Shared::Persistence
 
     # Creates a model with values matching those of the instance attributes and returns its id.
     # @private
     # @return true
     def create_model(*)
+      create_magic_properties
       set_timestamps
       create_magic_properties
       properties = convert_properties_to :db, props
@@ -37,97 +18,6 @@ module Neo4j::ActiveNode
       true
     end
 
-    # Persist the object to the database.  Validations and Callbacks are included
-    # by default but validation can be disabled by passing :validate => false
-    # to #save!  Creates a new transaction.
-    #
-    # @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
-
-    # Convenience method to set attribute and #save at the same time
-    # @param [Symbol, String] attribute of the attribute to update
-    # @param [Object] value to set
-    def update_attribute(attribute, value)
-      send("#{attribute}=", value)
-      self.save
-    end
-
-    # Convenience method to set attribute and #save! at the same time
-    # @param [Symbol, String] attribute of the attribute to update
-    # @param [Object] value to set
-    def update_attribute!(attribute, value)
-      send("#{attribute}=", value)
-      self.save!
-    end
-
-    # Convenience method to set multiple attributes and #save at the same time
-    # @param [Hash] attributes of names and values of attributes to set
-    def update_attributes(attributes)
-      assign_attributes(attributes)
-      self.save
-    end
-
-    def create_or_update
-      # since the same model can be created or updated twice from a relationship we have to have this guard
-      @_create_or_updating = true
-      result = persisted? ? update_model : create_model
-      unless result != false
-        Neo4j::Transaction.current.fail if Neo4j::Transaction.current
-        false
-      else
-        true
-      end
-    rescue => e
-      Neo4j::Transaction.current.fail if Neo4j::Transaction.current
-      raise e
-    ensure
-      @_create_or_updating = nil
-    end
-
-    def exist?
-      _persisted_node && _persisted_node.exist?
-    end
-
-    # Returns +true+ if the object was destroyed.
-    def destroyed?
-      @_deleted || (!new_record? && !exist?)
-    end
-
-    # 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.
-    def new_record?
-      ! _persisted_node
-    end
-
-    alias :new? :new_record?
-
-    def destroy
-      _persisted_node && _persisted_node.del
-      @_deleted = true
-    end
-
-    def update_model
-      if changed_attributes && !changed_attributes.empty?
-        changed_props = attributes.select{|k,v| changed_attributes.include?(k)}
-        changed_props = convert_properties_to :db, changed_props
-        _persisted_node.update_props(changed_props)
-        changed_attributes.clear
-      end
-    end
-
     def _create_node(*args)
       session = self.class.neo4j_session
       props = self.class.default_property_values(self)
@@ -137,75 +27,6 @@ module Neo4j::ActiveNode
       session.create_node(props, labels)
     end
 
-    # @return [Hash] all defined and none nil properties
-    def props
-      attributes.reject{|k,v| v.nil?}.symbolize_keys
-    end
-
-    # @return true if the attributes hash has been frozen
-    def frozen?
-      freeze_if_deleted
-      @attributes.frozen?
-    end
-
-    def freeze
-      @attributes.freeze
-      self
-    end
-
-    def freeze_if_deleted
-      unless new_record?
-        # TODO - Neo4j::IdentityMap.remove_node_by_id(neo_id)
-        unless self.class.load_entity(neo_id)
-          @_deleted = true
-          freeze
-        end
-      end
-    end
-
-    def reload
-      return self if new_record?
-      changed_attributes && changed_attributes.clear
-      unless reload_from_database
-        @_deleted = true
-        freeze
-      end
-      self
-    end
-
-    def reload_from_database
-      # TODO - Neo4j::IdentityMap.remove_node_by_id(neo_id)
-      if reloaded = self.class.load_entity(neo_id)
-        send(:attributes=, reloaded.attributes)
-      end
-      reloaded
-    end
-
-    # Updates this resource with all the attributes from the passed-in Hash and requests that the record be saved.
-    # If saving fails because the resource is invalid then false will be returned.
-    def update(attributes)
-      self.attributes = attributes
-      save
-    end
-    alias_method :update_attributes, :update
-
-    # Same as {#update_attributes}, but raises an exception if saving fails.
-    def update!(attributes)
-      self.attributes = attributes
-      save!
-    end
-    alias_method :update_attributes!, :update!
-
-    def cache_key
-      if self.new_record?
-        "#{self.class.model_name.cache_key}/new"
-      elsif self.respond_to?(:updated_at) && !self.updated_at.blank?
-        "#{self.class.model_name.cache_key}/#{neo_id}-#{self.updated_at.utc.to_s(:number)}" 
-      else
-        "#{self.class.model_name.cache_key}/#{neo_id}"
-      end
-    end
-
     module ClassMethods
       # Creates a saves a new node
       # @param [Hash] props the properties the new node should have
@@ -237,33 +58,9 @@ module Neo4j::ActiveNode
       def load_entity(id)
         Neo4j::Node.load(id)
       end
-
     end
 
     private
 
-    def create_magic_properties
-
-    end
-
-    def update_magic_properties
-      self.updated_at = DateTime.now if respond_to?(:updated_at=) && changed?
-    end
-
-    def set_classname(props)
-      props[Neo4j::Config.class_name_property] = self.class.name if self.class.cached_class?
-    end
-
-    def assign_attributes(attributes)
-      attributes.each do |attribute, value|
-        send("#{attribute}=", value)
-      end
-    end
-
-    def set_timestamps
-      self.created_at = DateTime.now if respond_to?(:created_at=)
-      self.updated_at = self.created_at if respond_to?(:updated_at=)
-    end
   end
-
 end