neo4j 7.2.3 → 8.0.0.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10c4a3071672ec1cbeeaf8c16a827491adf838ce
-  data.tar.gz: e372ea171b766c38f20ce48919e7c38f77e58a26
+  metadata.gz: ae62feb1503e7f65d35cbc182034a65a28c9361b
+  data.tar.gz: 5ddeb82fa562a1868c1a6b5d8898c5b0dca80276
 SHA512:
-  metadata.gz: 4d1037a455e81fe4791f0c6ee1427eb1949a2b689ebf6a536046c0536bc2ecb62690ee0ac615e12bc099a60460372782bb558d2c378c5eb65d50f0550467d54d
-  data.tar.gz: 1b86a45979724c810b9dfdc137aa66f77b3705697dd9d0e6d6dabfdb5e934f02ac1e5c508f17a9be09e9588642edddbbb7e4059da3ce06e25daf5d1885d0a79e
+  metadata.gz: 8acc45e1a6fa2cc4c314558f12b737ab2ffa0c30b914244672839da5f7ab9a64ea4194f39d9e4b90cb6f85e7a32b10b2f73c52eedd28c5d4bf072828881d4acc
+  data.tar.gz: 47c95259853558c3637073ef6150d3f53c6af8bf54c9866cee1fcff543561482e48e38bdc723916ba41c6125fa073dfb53f26689a15f497cd211b57deb8109af

data/CHANGELOG.md

@@ -3,47 +3,41 @@ All notable changes to this project will be documented in this file.
 This file should follow the standards specified on [http://keepachangelog.com/]
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [7.2.3] - 09-28-2016
+## [Unreleased] Unreleased
 
-### Fixed
-
-- `as` resetting scope of the current query chain (see #1298)
-
-## [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.
+### Changed
 
-## [7.2.0] - 08-23-2016
+- Improved `QueryProxy` and `AssociationProxy` `#inspect` method to show a result preview (thanks ProGM / see #1228 #1232)
+- Renamed the old migration task to `neo4j:legacy_migrate`
+- Renamed the ENV variable to silence migrations output from `silenced` to `MIGRATIONS_SILENCED`
+- Changed the behavior with transactions when a validation fails. This is a potentially breaking change, since now calling `save` would not fail the current transaction, as expected. (thanks ProGM / see #1156)
+- Invalid options to the `property` method now raise an exception (see #1169)
+- Label #indexes/#constraints return array without needing to access [:property_keys]
+- `server_db` server type is no longer supported.  Use `http` instead to connect to Neo4j via the HTTP JSON API
 
 ### 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
+- Allow to pass a Proc for a default property value (thanks @knapo / see #1250)
+- Adding a new ActiveRecord-like migration framework (thanks ProGM / see #1197)
+- Adding a set of rake tasks to manage migrations (thanks ProGM / see #1197)
+- Implemented autoloading for new and legacy migration modules (there's no need to `require` them anymore)
+- Adding explicit identity method for use in Query strings (thanks brucek / see #1159)
+- New adaptor-based API has been created for connecting to Neo4j (See the [upgrade guide](TODO!!!!)).  Changes include:
+- The old APIs are deprecated and will be removed later.
+- In the new API, there is no such thing as a "current" session.  Users of `neo4j-core` must create and maintain references themselves to their sessions
+- New `Neo4j::Core::Node` and `Neo4j::Core::Relationshp` classes have been created to provide consistent results between adaptors.  `Neo4j::Core::Path` has also been added
+- New API is centered around Cypher.  No special methods are defined to, for example, load/create/etc... nodes/relationships
+- There is now a new API for making multiple queries in the same HTTP request
+- It is now possible to subscribe separately to events for querying in different adaptors and for HTTP requests (see [the docs](TODO!!!!))
+- Schema queries (changes to indexes/constraints) happen in a separate thread for performance and reduce the complexity of the code
+- New session API does not include replacement for on_next_session_available
+- Adding a migration helper to mass relabel migrations (thanks @JustinAiken / see #1166 #1239)
+- Added support for `find_or_initialize_by` and `first_or_initialize` methods from ActiveRecord (thanks ProGM / see #1164)
+- Support for using Neo4j-provided IDs (`neo_id`) instead of UUID or another Ruby-provided ID. (Huge thanks to @klobuczek, see #1174)
 
 ### 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
-
-- Default value for `enum` is `nil` instead of the first value.  This is a **BREAKING** change but is being released as a patch because the original behavior was considered a bug.  See [this pull request](https://github.com/neo4jrb/neo4j/pull/1270) (thanks to ProGM and andyweiss1982)
-
-## [7.1.2] - 08-01-2016
-
-### Fixed
-
-- Fixed issue where the label wrapping cache would get stuck
+- Made some memory optimizations (thanks ProGM / see #1221)
 
 ## [7.1.1] - 07-22-2016
 
@@ -58,18 +52,6 @@ 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
-
-- Default value for `enum` is `nil` instead of the first value.  This is a **BREAKING** change but is being released as a patch because the original behavior was considered a bug.  See [this pull request](https://github.com/neo4jrb/neo4j/pull/1270) (thanks to ProGM and andyweiss1982)
-
 ## [7.0.14] - 07-10-2016
 
 ### Fixed
@@ -87,6 +69,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 
 - Fix dipendence from JSON when using outside of rails (thanks ProGM)
+>>>>>>> 7.1.x
 
 ## [7.0.10] - 06-07-2016
 
@@ -154,7 +137,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 No changes from `rc.7`
 
 ## [7.0.0.rc.7] - 03-16-2016
-/
+
 ### Changed
 
 - `with_associations` now generates separate `OPTIONAL MATCH` clauses, separated by `WITH` clauses and is preceeded by a `WITH` clause.
@@ -211,6 +194,7 @@ No changes from `rc.7`
 - Rails will now rescue all `Neo4j::RecordNotFound` errors with a 404 status code by default
 - A clone of [ActiveRecord::Enum](http://edgeapi.rubyonrails.org/classes/ActiveRecord/Enum.html) API. See docs for details. (thanks ProGM / #1129)
 - Added #branch method to `QueryProxy` to allow for easy branching of matches in association chains (thanks ProGM / #1147 / #1143)
+- The `.match` method on ActiveNode model class has changed to allow a second argument which takes `on_create`, `on_match`, and `set` keys.  These allow you to define attribute values for the Cypher `MERGE` in the different cases (thanks leviwilson / see #1123)
 
 ### Removed
 

data/Gemfile

@@ -2,10 +2,14 @@ source 'http://rubygems.org'
 
 gemspec
 
-# if ENV['CI']
-#   gem 'neo4j-core', github: 'neo4jrb/neo4j-core', branch: 'master'
-#   gem 'neo4j-rake_tasks', github: 'neo4jrb/neo4j-rake_tasks', branch: 'master'
-# end
+# gem 'neo4j-core', github: 'neo4jrb/neo4j-core', branch: 'master' if ENV['CI']
+
+if branch = ENV['TRAVIS_BRANCH']
+  same_branch_exists = `curl --head https://github.com/neo4jrb/neo4j-core/tree/#{branch} | head -1`.match(/200 OK/)
+  gem 'neo4j-core', github: 'neo4jrb/neo4j-core', branch: same_branch_exists ? branch : 'master'
+else
+  gem 'neo4j-core', github: 'neo4jrb/neo4j-core'
+end
 
 # gem 'active_attr', github: 'neo4jrb/active_attr', branch: 'performance'
 # gem 'active_attr', path: '../active_attr'
@@ -13,26 +17,23 @@ gemspec
 gem 'listen', '< 3.1'
 
 if RUBY_VERSION.to_f < 2.2
-  gem 'activemodel', '~> 4.2'
-  gem 'activesupport', '~> 4.2'
-  gem 'railties', '~> 4.2'
+  gem 'activemodel', '~> 4'
+  gem 'activesupport', '~> 4'
+  gem 'railties', '~> 4'
 end
 
+gem 'tins', '< 1.7' if RUBY_VERSION.to_f < 2.0
+
 group 'test' do
   gem 'coveralls', require: false
-  if RUBY_VERSION.to_f < 2.0
-    gem 'term-ansicolor', '< 1.4'
-    gem 'tins', '< 1.7'
-    gem 'overcommit', '< 0.35.0'
-  else
-    gem 'overcommit'
-  end
+  gem 'tins', '< 1.7' if RUBY_VERSION.to_f < 2.0
   gem 'codecov', require: false
   gem 'simplecov', require: false
   gem 'simplecov-html', require: false
   gem 'rspec', '~> 3.4'
   gem 'its'
   gem 'test-unit'
+  gem 'overcommit'
   gem 'colored'
   gem 'dotenv'
   gem 'timecop'

data/README.md

@@ -1,5 +1,9 @@
 # Welcome to Neo4j.rb
 
+**FOR INFORMATION ABOUT NEO4J 3.0 SUPPORT, SEE [VERSION SUPPORT](https://github.com/neo4jrb/neo4j#neo4j-version-support) and [FEATURE SUPPORT](https://github.com/neo4jrb/neo4j#neo4j-feature-support) sections**
+
+**ALSO NOTE THAT MASTER IS CURRENT IN FLUX IN PREPARATION FOR AN ALPHA OF 8.0 AND IT IS NOT RECOMMENDED TO BE USED**
+
 ## Code Status
 
 [![Build Status](https://secure.travis-ci.org/neo4jrb/neo4j.png?branch=master)](http://travis-ci.org/neo4jrb/neo4j) [![Coverage Status](https://coveralls.io/repos/neo4jrb/neo4j/badge.png?branch=master)](https://coveralls.io/r/neo4jrb/neo4j?branch=master) [![Code Climate](https://codeclimate.com/github/neo4jrb/neo4j.png)](https://codeclimate.com/github/neo4jrb/neo4j) [![PullReview stats](https://www.pullreview.com/github/neo4jrb/neo4j/badges/master.svg?)](https://www.pullreview.com/github/neo4jrb/neo4j/reviews/master)
@@ -48,25 +52,27 @@ Neo4j.rb v4.1.0 was released in January of 2015. Its changes are outlined [here]
 
 ## Neo4j version support
 
-| **Neo4j Version** | v2.x | v3.x  | >= v4.x |
-|-------------------|------|-------|---------|
-| 1.9.x             | Yes  | No    | No      |
-| 2.0.x             | No   | Yes   | No      |
-| 2.1.x             | No   | Yes   | Yes *   |
-| 2.2.x             | No   | No    | Yes     |
-| 2.3.x             | No   | No    | Yes     |
+| **Neo4j Version** | v2.x | v3.x  | >= v4.x | >= 7.0.3 |
+|-------------------|------|-------|---------|----------|
+| 1.9.x             | Yes  | No    | No      | No       |
+| 2.0.x             | No   | Yes   | No      | No       |
+| 2.1.x             | No   | Yes   | Yes *   | Yes      |
+| 2.2.x             | No   | No    | Yes     | Yes      |
+| 2.3.x             | No   | No    | Yes     | Yes      |
+| 3.0.x             | No   | No    | No      | Yes      |
 
 `*` Neo4j.rb >= 4.x doesn't support Neo4j versions before 2.1.5.  To use 2.1.x you should upgrade to a version >= 2.1.5
 
 ## Neo4j feature support
 
-| **Neo4j Feature**          |   v2.x | v3.x | >= v4.x |
-|----------------------------|--------|------|---------|
-| Auth                       |   No   |  No  | Yes     |
-| Remote Cypher              |   Yes  |  Yes | Yes     |
-| Transactions               |   Yes  |  Yes | Yes     |
-| High Availability          |   No   |  Yes | Yes     |
-| Embedded JVM support       |   Yes  |  Yes | Yes     |
+| **Neo4j Feature**          |   v2.x | v3.x | >= v4.x | >= 8.x (coming soon) |
+|----------------------------|--------|------|---------|----------------------|
+| Bolt Protocol              |   No   |  No  | No      | Yes (coming soon)    |
+| Auth                       |   No   |  No  | Yes     | Yes                  |
+| Remote Cypher              |   Yes  |  Yes | Yes     | Yes                  |
+| Transactions               |   Yes  |  Yes | Yes     | Yes                  |
+| High Availability          |   No   |  Yes | Yes     | Yes                  |
+| Embedded JVM support       |   Yes  |  Yes | Yes     | Yes                  |
 
 ## Modern (3.x/4.X) Documentation
 
@@ -101,3 +107,4 @@ Always welcome!  Please review the [guidelines for contributing](CONTRIBUTING.md
 * Neo4j - Dual free software/commercial license, see [Licensing Guide](http://www.neo4j.org/learn/licensing).
 
 **Notice:** There are different licenses for the `neo4j-community`, `neo4j-advanced`, and `neo4j-enterprise` jar gems. Only the `neo4j-community` gem is required by default.
+

data/bin/neo4j-jars

@@ -2,7 +2,7 @@
 
 require 'neo4j'
 
-if ARGV.length == 0
+if ARGV.empty?
   puts <<TEXT
 A tool for copying jar files needed by the application server, like trinidad
 It copies all jar files which has been required (neo4j-community, neo4j-advanced or neo4j-enterprise) to the lib folder of the current directory

data/lib/neo4j.rb

@@ -3,6 +3,11 @@ require 'neo4j/version'
 require 'neo4j-core'
 require 'neo4j/core/cypher_session'
 require 'neo4j/core/query'
+
+require 'neo4j/active_base'
+require 'neo4j/model_schema'
+require 'neo4j/active_base/session_registry'
+
 require 'active_model'
 require 'active_support/concern'
 require 'active_support/core_ext/class/attribute.rb'
@@ -40,7 +45,6 @@ require 'neo4j/shared/typecaster'
 require 'neo4j/shared/initialize'
 require 'neo4j/shared/query_factory'
 require 'neo4j/shared/cypher'
-require 'neo4j/shared/permitted_attributes'
 require 'neo4j/shared'
 
 require 'neo4j/active_rel/callbacks'
@@ -54,6 +58,7 @@ require 'neo4j/active_rel/related_node'
 require 'neo4j/active_rel/types'
 require 'neo4j/active_rel'
 
+require 'neo4j/active_node/node_list_formatter'
 require 'neo4j/active_node/dependent'
 require 'neo4j/active_node/dependent/query_proxy_methods'
 require 'neo4j/active_node/dependent/association_methods'
@@ -88,6 +93,12 @@ require 'neo4j/active_node/query'
 require 'neo4j/active_node/scope'
 require 'neo4j/active_node'
 
+module Neo4j
+  extend ActiveSupport::Autoload
+  autoload :Migrations
+  autoload :Migration
+end
+
 require 'neo4j/active_node/orm_adapter'
 if defined?(Rails)
   require 'rails/generators'

data/lib/neo4j/active_base.rb

@@ -0,0 +1,68 @@
+module Neo4j
+  # To contain any base login for ActiveNode/ActiveRel which
+  # is external to the main classes
+  module ActiveBase
+    class << self
+      # private?
+      def current_session
+        SessionRegistry.current_session.tap do |session|
+          fail 'No session defined!' if session.nil?
+        end
+      end
+
+      def current_transaction_or_session
+        current_transaction || current_session
+      end
+
+      def query(*args)
+        current_transaction_or_session.query(*args)
+      end
+
+      # Should support setting session via config options
+      def current_session=(session)
+        SessionRegistry.current_session = session
+      end
+
+      def current_adaptor=(adaptor)
+        self.current_session = Neo4j::Core::CypherSession.new(adaptor)
+      end
+
+      def run_transaction(run_in_tx = true)
+        Neo4j::Transaction.run(current_session, run_in_tx) do |tx|
+          yield tx
+        end
+      end
+
+      def new_transaction
+        Neo4j::ModelSchema.validate_model_schema!
+        Neo4j::Transaction.new(current_session)
+      end
+
+      def new_query(options = {})
+        Neo4j::ModelSchema.validate_model_schema!
+        Neo4j::Core::Query.new({session: current_session}.merge(options))
+      end
+
+      def magic_query(*args)
+        if args.empty? || args.map(&:class) == [Hash]
+          ActiveBase.new_query(*args)
+        else
+          ActiveBase.current_session.query(*args)
+        end
+      end
+
+      def current_transaction
+        Neo4j::ModelSchema.validate_model_schema!
+        Neo4j::Transaction.current_for(current_session)
+      end
+
+      def label_object(label_name)
+        Neo4j::Core::Label.new(label_name, current_session)
+      end
+
+      def logger
+        @logger ||= (Neo4j::Config[:logger] || Logger.new(STDOUT))
+      end
+    end
+  end
+end

data/lib/neo4j/active_base/session_registry.rb

@@ -0,0 +1,12 @@
+require 'active_support/per_thread_registry'
+
+module Neo4j
+  module ActiveBase
+    # Provides a simple API to manage sessions in a thread-safe manner
+    class SessionRegistry
+      extend ActiveSupport::PerThreadRegistry
+
+      attr_accessor :current_session
+    end
+  end
+end

data/lib/neo4j/active_node.rb

@@ -44,11 +44,12 @@ module Neo4j
     include Neo4j::ActiveNode::Scope
     include Neo4j::ActiveNode::Dependent
     include Neo4j::ActiveNode::Enum
-    include Neo4j::Shared::PermittedAttributes
 
     def initialize(args = nil)
-      args = sanitize_input_parameters(args)
-      super(args)
+      self.class.ensure_id_property_info! # So that we make sure all objects have an id_property
+
+      symbol_args = args.is_a?(Hash) ? args.symbolize_keys : args
+      super(symbol_args)
     end
 
     def neo4j_obj
@@ -68,9 +69,12 @@ module Neo4j
     included do
       include Neo4j::Timestamps if Neo4j::Config[:record_timestamps]
 
-      def self.inherited(other)
-        Neo4j::ActiveNode::Labels.clear_wrapped_models
+      def self.inherited?
+        !!@inherited
+      end
 
+      def self.inherited(other)
+        other.instance_variable_set('@inherited', true)
         inherit_id_property(other)
         attributes.each_pair do |k, v|
           other.inherit_property k.to_sym, v.clone, declared_properties[k].options
@@ -81,22 +85,10 @@ module Neo4j
       end
 
       def self.inherit_id_property(other)
-        Neo4j::Session.on_next_session_available do |_|
-          next if other.manual_id_property? || !self.id_property?
-          id_prop = self.id_property_info
-          conf = id_prop[:type].empty? ? {auto: :uuid} : id_prop[:type]
-          other.id_property id_prop[:name], conf
-        end
-      end
-
-      Neo4j::Session.on_next_session_available do |_|
-        next if manual_id_property?
-        id_property :uuid, auto: :uuid unless self.id_property?
-
-        name = Neo4j::Config[:id_property]
-        type = Neo4j::Config[:id_property_type]
-        value = Neo4j::Config[:id_property_type_value]
-        id_property(name, type => value) if name && type && value
+        return if other.manual_id_property? || !self.id_property?
+        id_prop = self.id_property_info
+        conf = id_prop[:type].empty? && id_prop[:name] != :neo_id ? {auto: :uuid} : id_prop[:type]
+        other.id_property id_prop[:name], conf, true
       end
     end
 

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

@@ -37,12 +37,12 @@ module Neo4j
 
         def unique_nodes_query(association, self_identifer, other_node, other_rel)
           query.with(identity).proxy_as_optional(source_object.class, self_identifer)
-            .send(association.name, other_node, other_rel)
-            .query
-            .with(other_node)
-            .match("()#{association.arrow_cypher(:orphan_rel)}(#{other_node})")
-            .with(other_node, count: 'count(*)')
-            .where('count = {one}', one: 1)
+               .send(association.name, other_node, other_rel)
+               .query
+               .with(other_node)
+               .match("()#{association.arrow_cypher(:orphan_rel)}(#{other_node})")
+               .with(other_node, count: 'count(*)')
+               .where('count = {one}', one: 1)
         end
       end
     end