neo4j 4.0.0.rc.3 → 4.0.0.rc.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28fe8a8c4370fbe08721a8ebd9f88665439a71f2
-  data.tar.gz: 802a04febb895b8a561e4c82b9324b159c4eb68a
+  metadata.gz: d79cf5cc18db9fb5569ea5a2c096dcc5f29c7ead
+  data.tar.gz: 4e7b425de4468af56386de2c3f663498835b100c
 SHA512:
-  metadata.gz: 37cbe5595a4991d3f13f44411c71e2c2ec4e3587489cdaec51f639668d94e3819dae84d4fc1213573fb76bac3e6f592ca3919617ea5fa1b9be840b767bf2fd41
-  data.tar.gz: 61781492746a92e307d2bc5769ce7d0db389c06a16864c750cec5981067594fc553d0cd0330984b9fd009b76817380cf9f6cd4224334f4c8b60572472d67b241
+  metadata.gz: cbf9baeb9097961b6e60526ebc9619ee468f5000d64a22c5d0ec278127a50d016c8610ec4a5d5b80ebaebc6afd27b7566fb8dfdf11cf03df3120257e46eaf0d7
+  data.tar.gz: d47ad8ee3c67efd987867335a8a71a73ade28e3fe4e7ce72835d0aba76276d4b25fdb3bfd520a59a669f86b6ac73f07ad125b9f50980a847e9baf252925916c9

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 4.0.0.rc.4
+* _classname property is disabled by default for ActiveRel! It had been disabled for ActiveNode, this just evens the score.
+* Fixes a bug to create better `result` labels in Cypher.
+* Made the `delete_all` and `destroy_all` ActiveNode class methods consistent with their ActiveRecord counterparts. `destroy_all` previously performed its deletes in Cypher but it should have been returning nodes to Ruby and calling `destroy`. `delete_all` didn't exist at all.
+
 == 4.0.0.rc.3
 Released minutes after rc.2 to catch one late addition!
 * Adds serialization support for QueryProxy.

data/lib/neo4j/active_node/has_n.rb

@@ -119,7 +119,7 @@ module HasN
 
         instance_eval(%Q{
           def #{name}(node = nil, rel = nil, proxy_obj = nil)
-            query_proxy = proxy_obj || Neo4j::ActiveNode::Query::QueryProxy.new(#{self.name}, nil, {
+            query_proxy = proxy_obj || Neo4j::ActiveNode::Query::QueryProxy.new(::#{self.name}, nil, {
                   session: self.neo4j_session, query_proxy: nil, context: '#{self.name}' + '##{name}'
                 })
             context = (query_proxy && query_proxy.context ? query_proxy.context : '#{self.name}') + '##{name}'

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

@@ -18,7 +18,17 @@ module Neo4j
         end
 
         def target_class_option(options)
-          options[:model_class].nil? ? @target_class_name_from_name : options[:model_class]
+          if options[:model_class].nil?
+            if @target_class_name_from_name
+              "::#{@target_class_name_from_name}"
+            else
+              @target_class_name_from_name
+            end
+          elsif options[:model_class] == false
+            false
+          else
+            "::#{options[:model_class]}"
+          end
         end
 
         # Return cypher partial query string for the relationship part of a MATCH (arrow / relationship definition)
@@ -78,8 +88,19 @@ module Neo4j
           @relationship_class_name ||= @relationship_class.respond_to?(:constantize) ? @relationship_class : @relationship_class.name
         end
 
+        def relationship_clazz
+          @relationship_clazz ||= if @relationship_class.is_a?(String)
+                                    @relationship_class.constantize
+                                  elsif @relationship_class.is_a?(Symbol)
+                                    @relationship_class.to_s.constantize
+                                  else
+                                    @relationship_class
+                                  end
+        end
+
         def inject_classname(properties)
-          properties[Neo4j::Config.class_name_property] = relationship_class_name if @relationship_class
+          return properties unless @relationship_class
+          properties[Neo4j::Config.class_name_property] = relationship_class_name if relationship_clazz.cached_class?(true)
           properties
         end
 

data/lib/neo4j/active_node/labels.rb

@@ -95,12 +95,18 @@ module Neo4j
           find_by(args) or raise RecordNotFound, "#{self.query_as(:n).where(n: a).limit(1).to_cypher} returned no results"
         end
 
-        # Destroy all nodes and connected relationships
-        def destroy_all
+        # Deletes all nodes and connected relationships from Cypher.
+        def delete_all
           self.neo4j_session._query("MATCH (n:`#{mapped_label_name}`)-[r]-() DELETE n,r")
           self.neo4j_session._query("MATCH (n:`#{mapped_label_name}`) DELETE n")
         end
 
+        # Returns each node to Ruby and calls `destroy`. Be careful, as this can be a very slow operation if you have many nodes. It will generate at least
+        # one database query per node in the database, more if callbacks require them.
+        def destroy_all
+          self.all.each { |n| n.destroy }
+        end
+
         # Creates a Neo4j index on given property
         #
         # This can also be done on the property directly, see Neo4j::ActiveNode::Property::ClassMethods#property.

data/lib/neo4j/active_node/query/query_proxy.rb

@@ -279,8 +279,10 @@ module Neo4j
         def _result_string
           if self.association
             "result_#{self.association.name}".to_sym
-          elsif self.model
-            "result_#{self.model.name.tr!(':', '')}".to_sym
+          elsif self.model && self.model.name
+            label = "result_#{self.model.name}"
+            label.downcase!.tr!(':', '')
+            label.to_sym
           else
             :result
           end

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = "4.0.0.rc.3"
+  VERSION = "4.0.0.rc.4"
 end

data/neo4j.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |s|
   s.version  = Neo4j::VERSION
   s.required_ruby_version = ">= 1.9.1"
 
-  s.authors  = "Andreas Ronge"
-  s.email    = 'andreas.ronge@gmail.com'
+  s.authors  = "Andreas Ronge, Brian Underwood, Chris Grigg"
+  s.email    = 'andreas.ronge@gmail.com, brian@brian-underwood.codes, chris@subvertallmedia.com'
   s.homepage = "https://github.com/neo4jrb/neo4j/"
   s.rubyforge_project = 'neo4j'
   s.summary = "A graph database for Ruby"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc.3
+  version: 4.0.0.rc.4
 platform: ruby
 authors:
-- Andreas Ronge
+- Andreas Ronge, Brian Underwood, Chris Grigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2014-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter
@@ -96,7 +96,7 @@ dependencies:
         version: 3.1.0
 description: |
   A Neo4j OGM (Object-Graph-Mapper) for use in Ruby on Rails and Rack frameworks heavily inspired by ActiveRecord.
-email: andreas.ronge@gmail.com
+email: andreas.ronge@gmail.com, brian@brian-underwood.codes, chris@subvertallmedia.com
 executables:
 - neo4j-jars
 extensions: []