neo4j 8.0.0.alpha.10 → 8.0.0.alpha.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0609e3850992edd31a7802d07473e088bb09556a
-  data.tar.gz: 74ec1af0c63b839f22d545b9073e15092056b16c
+  metadata.gz: 92ded23c28b3eabbb9fa5dbcd51e95e694e0f4bb
+  data.tar.gz: f809277ed6c601b80ae90af8f7634a94e598474d
 SHA512:
-  metadata.gz: dee8942d71e26463e1bd78bfe83bbc597ba38178efaa53faf52eb4121acd53673e8e45d5b0c5c33dfb8439b11010d9d2f261d8db3bc3a511aa102033c99d1948
-  data.tar.gz: 9454917d185fb560c7f9a4d6d50a6a78b4e4e0b64897269b588988c39e838ac777edae1625c458268659e363365800691f99ae4cfd27ed630d06af284fc8a165
+  metadata.gz: e1c123b35850f7d765dda8cb3a9efc995338b3e9c612f452ba6bd1a7522f693460870300fa7e1883a2d0f7811b17c7ea3f6be0c1d46db0dec95f264d829ebc89
+  data.tar.gz: 7a5e8d189ff9a9ec644c3ac197e4c56de00f5552dd41d00c5b9b4c38e0e856b7e68b896733d76a7ee1f1d7bf4857f1549a56aa26be579ce6c325063116606c54

data/CHANGELOG.md

@@ -5,6 +5,19 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+
+## [8.0.0.alpha.11] 2016-09-27
+
+### Fixed
+- Don't fire database when accessing to unpersisted model associations (thanks @klobuczek & @ProGM see #1273)
+- `size` and `length` methods not taking account of `@deferred_objects` (see #1293)
+- `update` was not rolling-back association changes when validations fail
+- Broken Rails `neo4j:migrate_v8` generator
+
+# Changed
+- `count` method in associations, now always fire the database like AR does
+- Neo4j now passes all association validations specs, taken from AR (thanks @klobuczek)
+
 ## [8.0.0.alpha.10] 2016-09-16
 
 ### Fixed
@@ -113,12 +126,30 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 - Made some memory optimizations (thanks ProGM / see #1221)
 
+## [7.2.2] - 09-22-2016
+
+### Fixed
+
+- `where` clause with question mark parameter and array values only using the first element (see #1247 #1290)
+
+## [7.2.1] - 09-19-2016
+
+### Fixed
+
+- During ActiveRel create, node and rel property values formatted like Cypher props (`{val}`) were interpreted as props, causing errors.
+
 ## [7.2.0] - 08-23-2016
 
 ### Added
 
 - Backporting #1245 to 7.x versions. It implements the [`ForbiddenAttributesProtection` API](http://edgeapi.rubyonrails.org/classes/ActionController/StrongParameters.html) from ActiveRecord.
 
+## [7.1.4] - 09-20-2016
+
+### Fixed
+
+- `where` clause with question mark parameter and array values only using the first element (see #1247 #1290)
+
 ## [7.1.3] - 08-18-2016
 
 ### Changed
@@ -144,6 +175,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Gemspec dependency requirements were modified where ActiveModel, ActiveSupport, and Railties are concerned. The gem now requires >= 4.0, < 5.1.
 - `ActiveModel::Serializers::Xml` is only included if supported if available.
 
+## [7.0.16] - 09-20-2016
+
+### Fixed
+
+- `where` clause with question mark parameter and array values only using the first element (see #1247 #1290)
+
 ## [7.0.15] - 08-18-2016
 
 ### Changed

data/lib/neo4j/active_node/has_n.rb

@@ -28,7 +28,7 @@ module Neo4j::ActiveNode
       end
 
       extend Forwardable
-      %w(include? empty? count find first last ==).each do |delegated_method|
+      %w(include? find first last ==).each do |delegated_method|
         def_delegator :@enumerable, delegated_method
       end
 
@@ -38,6 +38,21 @@ module Neo4j::ActiveNode
         result_nodes.each(&block)
       end
 
+      # .count always hits the database
+      def_delegator :@query_proxy, :count
+
+      def length
+        @deferred_objects.length + @enumerable.length
+      end
+
+      def size
+        @deferred_objects.size + @enumerable.size
+      end
+
+      def empty?(*args)
+        @deferred_objects.empty? && @enumerable.empty?(*args)
+      end
+
       def ==(other)
         self.to_a == other.to_a
       end
@@ -59,9 +74,7 @@ module Neo4j::ActiveNode
       def result_nodes
         return result_objects if !@query_proxy.model
 
-        result_objects.map do |object|
-          object.is_a?(Neo4j::ActiveNode) ? object : @query_proxy.model.find(object)
-        end
+        map_results_as_nodes(result_objects)
       end
 
       def result_objects
@@ -101,9 +114,12 @@ module Neo4j::ActiveNode
       end
 
       def replace_with(*args)
-        @cached_result = nil
-
-        @query_proxy.public_send(:replace_with, *args)
+        nodes = @query_proxy.replace_with(*args).to_a
+        if @query_proxy.start_object.try(:new_record?)
+          @cached_result = nil
+        else
+          cache_result(nodes)
+        end
       end
 
       QUERY_PROXY_METHODS = [:<<, :delete, :create, :pluck, :where, :where_not, :rel_where, :rel_order, :order, :skip, :limit]
@@ -132,6 +148,12 @@ module Neo4j::ActiveNode
 
       private
 
+      def map_results_as_nodes(result)
+        result.map do |object|
+          object.is_a?(Neo4j::ActiveNode) ? object : @query_proxy.model.find(object)
+        end
+      end
+
       def target_for_missing_method(method_name)
         case method_name
         when *CACHED_RESULT_METHODS

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

@@ -1,7 +1,9 @@
 module Neo4j
   module ActiveNode
     module Query
+      # rubocop:disable Metrics/ClassLength
       class QueryProxy
+        # rubocop:enable Metrics/ClassLength
         include Neo4j::ActiveNode::Query::QueryProxyEnumerable
         include Neo4j::ActiveNode::Query::QueryProxyMethods
         include Neo4j::ActiveNode::Query::QueryProxyMethodsOfMassUpdating
@@ -165,13 +167,7 @@ module Neo4j
 
         # To add a relationship for the node for the association on this QueryProxy
         def <<(other_node)
-          if @start_object._persisted_obj
-            create(other_node, {})
-          elsif @association
-            @start_object.defer_create(@association.name, other_node)
-          else
-            fail 'Another crazy error!'
-          end
+          _create_relation_or_defer(other_node)
           self
         end
 
@@ -266,8 +262,22 @@ module Neo4j
           end
         end
 
+        def unpersisted_start_object?
+          @start_object && @start_object.new_record?
+        end
+
         protected
 
+        def _create_relation_or_defer(other_node)
+          if @start_object._persisted_obj
+            create(other_node, {})
+          elsif @association
+            @start_object.defer_create(@association.name, other_node)
+          else
+            fail 'Another crazy error!'
+          end
+        end
+
         # Methods are underscored to prevent conflict with user class methods
         def _add_params(params)
           @params = @params.merge(params)

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

@@ -14,6 +14,8 @@ module Neo4j
         end
 
         def result(node = true, rel = nil)
+          return [].freeze if unpersisted_start_object?
+
           @result_cache ||= {}
           return result_cache_for(node, rel) if result_cache?(node, rel)
 

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

@@ -12,7 +12,11 @@ module Neo4j
           end
 
           def args(var, rel_var)
-            @arg.respond_to?(:call) ? @arg.call(var, rel_var) : [@arg, @args].flatten
+            if @arg.respond_to?(:call)
+              @arg.call(var, rel_var)
+            else
+              [@arg] + @args
+            end
           end
 
           class << self

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

@@ -39,6 +39,7 @@ module Neo4j
 
         # @return [Integer] number of nodes of this class
         def count(distinct = nil, target = nil)
+          return 0 if unpersisted_start_object?
           fail(Neo4j::InvalidParameterError, ':count accepts `distinct` or nil as a parameter') unless distinct.nil? || distinct == :distinct
           query_with_target(target) do |var|
             q = distinct.nil? ? var : "DISTINCT #{var}"
@@ -61,6 +62,7 @@ module Neo4j
         end
 
         def empty?(target = nil)
+          return true if unpersisted_start_object?
           query_with_target(target) { |var| !self.exists?(nil, var) }
         end
 

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

@@ -52,7 +52,10 @@ module Neo4j
           nodes = Array(node_or_nodes)
 
           self.delete_all_rels
-          nodes.each { |node| self << node }
+          nodes.map do |node|
+            node if _create_relation_or_defer(node)
+          end.compact
+          # nodes.each { |node| self << node }
         end
 
         # Returns all relationships between a node and its last link in the QueryProxy chain, destroys them in Ruby. Callbacks will be run.

data/lib/neo4j/model_schema.rb

@@ -80,6 +80,7 @@ module Neo4j
       end
 
       def legacy_model_schema_informations
+        ensure_model_data_state!
         data = {index: [], constraint: []}
         each_schema_element do |type, model, label, property_name|
           data[type] << {label: label, property_name: property_name, model: model}

data/lib/neo4j/railtie.rb

@@ -9,7 +9,11 @@ require 'neo4j/core/cypher_session/adaptors/embedded'
 
 module Neo4j
   class Railtie < ::Rails::Railtie
-    config.neo4j = ActiveSupport::OrderedOptions.new
+    def empty_config
+      ActiveSupport::OrderedOptions.new.tap { |cfg| cfg.session = ActiveSupport::OrderedOptions.new }
+    end
+
+    config.neo4j = empty_config
 
     if defined?(ActiveSupport::Reloader)
       ActiveSupport::Reloader.to_prepare do
@@ -57,8 +61,8 @@ module Neo4j
       end
     end
 
-    def setup!(neo4j_config = nil)
-      type, url, path, options, wait_for_connection = final_config!(neo4j_config).values_at(:type, :path, :url, :options, :wait_for_connection)
+    def setup!(neo4j_config = empty_config)
+      type, url, path, options, wait_for_connection = final_config!(neo4j_config).values_at(:type, :url, :path, :options, :wait_for_connection)
       register_neo4j_cypher_logging(type || default_session_type)
 
       Neo4j::SessionManager.open_neo4j_session(type || default_session_type,
@@ -74,8 +78,10 @@ module Neo4j
     end
 
     def support_deprecated_session_configs!(neo4j_config)
-      ActiveSupport::Deprecation.warn('neo4j.config.sessions is deprecated, please use neo4j.config.session (not an array)') if neo4j_config.sessions.present?
-      neo4j_config.session ||= (neo4j_config.sessions && neo4j_config.sessions[0]) || {}
+      if neo4j_config.sessions.present?
+        ActiveSupport::Deprecation.warn('neo4j.config.sessions is deprecated, please use neo4j.config.session (not an array)')
+        neo4j_config.session = neo4j_config.sessions[0] if neo4j_config.session.empty?
+      end
 
       %w(type path url options).each do |key|
         value = neo4j_config.send("session_#{key}")

data/lib/neo4j/shared/persistence.rb

@@ -1,5 +1,7 @@
 module Neo4j::Shared
+  # rubocop:disable Metrics/ModuleLength
   module Persistence
+    # rubocop:enable Metrics/ModuleLength
     extend ActiveSupport::Concern
 
     # @return [Hash] Given a node's state, will call the appropriate `props_for_{action}` method.
@@ -172,15 +174,21 @@ module Neo4j::Shared
     # 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 = process_attributes(attributes)
-      save
+      self.class.run_transaction do |tx|
+        self.attributes = process_attributes(attributes)
+        saved = save
+        tx.mark_failed unless saved
+        saved
+      end
     end
     alias update_attributes update
 
     # Same as {#update_attributes}, but raises an exception if saving fails.
     def update!(attributes)
-      self.attributes = process_attributes(attributes)
-      save!
+      self.class.run_transaction do
+        self.attributes = process_attributes(attributes)
+        save!
+      end
     end
     alias update_attributes! update!
 

data/lib/neo4j/shared/query_factory.rb

@@ -69,7 +69,8 @@ module Neo4j::Shared
 
     def create_query
       return match_query if graph_object.persisted?
-      base_query.create(identifier => {graph_object.labels_for_create => graph_object.props_for_create})
+      labels = graph_object.labels_for_create.map { |l| ":`#{l}`" }.join
+      base_query.create("(#{identifier}#{labels} {#{identifier}_params})").params(identifier_params => graph_object.props_for_create)
     end
   end
 

data/lib/neo4j/tasks/migration.rake

@@ -6,7 +6,7 @@ unless Rake::Task.task_defined?('environment')
   task :environment do
     require 'neo4j/session_manager'
     require 'ostruct'
-    Neo4j::Railtie.setup!(OpenStruct.new)
+    Neo4j::Railtie.setup!
   end
 end
 

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '8.0.0.alpha.10'
+  VERSION = '8.0.0.alpha.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 8.0.0.alpha.10
+  version: 8.0.0.alpha.11
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-16 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter
@@ -370,4 +370,3 @@ signing_key:
 specification_version: 4
 summary: A graph database for Ruby
 test_files: []
-has_rdoc: true