neo4j 8.0.18 → 8.1.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d308aa373875c2a15c4252c06d1450d192467fc8
-  data.tar.gz: 29c48905187431fdc1f8363cc061a7ec37edf088
+  metadata.gz: 48710007e99e018577ac5dfd171806ab778f4e14
+  data.tar.gz: 5f36d371ba8289fbf1412cf064330763f97019a8
 SHA512:
-  metadata.gz: 685b2b49d58bdc6d8d63eade6e8f03b88ac18ac4dcc6bb3286258c520dcdc4796cc8d4296e65cbfa08a9eab50b4d74cc74261133c3794bda00b1f306cf2cfb3d
-  data.tar.gz: 024d8b4bb07c397ab8ef356753712430f078bc35db9c4e05cb769e7fde1defdc655fe26266294be2c7410a9ada461fccb6563985cb1f18aa79865777bc1b028f
+  metadata.gz: 2ecbd9e36ba67936bb7106e5d2897d75a2c9acc5f7c0733aaa77f6d8e41d56e2b03dda129010338b2e014c511e118d146d628be03c0877ec3c30c22c27ca7f5a
+  data.tar.gz: 644b80a450e056e0df194d5288e80a87e48052853568c1ef41dfea694f918e5b6d06f67ecd1da9b222dc57fa602619f5c50b48722a74d596736d1d8e612c87ae

data/CHANGELOG.md

@@ -3,11 +3,15 @@ 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/).
 
-## [8.0.18] 2016-06-04
+## [Unreleased]
 
-### Fixed
+### Added
+
+- Created `neo4j:schema:dump` and `neo4j:schema:load` rake tasks to create `schema.yml` files which can be checked into the repository for quick setup of a fresh database
+
+### Changed
 
-- Migration name when generating a model shouldn't be the same as the model (see #1387 / thanks @thefliik and @apotonick)
+- Removed `before` and `after` callback options from associations (model callbacks still exist)
 
 ## [8.0.17] 2016-05-03
 

data/README.md

@@ -1,12 +1,12 @@
 # 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)
+[![Actively Maintained](https://img.shields.io/badge/Maintenance%20Level-Actively%20Maintained-green.svg)](https://gist.github.com/cheerfulstoic/d107229326a01ff0f333a1d3476e068d)
+[![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)
 
 ## Issues
 
@@ -60,26 +60,28 @@ Neo4j.rb v4.1.0 was released in January of 2015. Its changes are outlined [here]
 | 2.2.x             | No   | No    | Yes     | Yes      |
 | 2.3.x             | No   | No    | Yes     | Yes      |
 | 3.0.x             | No   | No    | No      | Yes      |
+| 3.1.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 | >= 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                  |
+| **Neo4j Feature**          |   v2.x | v3.x | >= v4.x | >= 8.x |
+|----------------------------|--------|------|---------|--------|
+| Bolt Protocol              |   No   |  No  | No      | Yes    |
+| 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
+## Documentation
 
 * [Website](http://neo4jrb.io/) (for an introduction)
-* [Wiki](https://github.com/neo4jrb/neo4j/wiki/Neo4j.rb-v4-Introduction)
+* [readthedocs](http://neo4jrb.readthedocs.io/)
+* **Note:** Our GitHub Wiki pages have outdated information.  We are in the process of moving all documentation to [readthedocs](http://neo4jrb.readthedocs.io/)
 
-## Legacy (2.x) Documentation
+## Legacy (<= 2.x) Documentation
 
 * [README](https://github.com/neo4jrb/neo4j/tree/2.x)
 * [Wiki](https://github.com/neo4jrb/neo4j/wiki/Neo4j%3A%3ARails-Introduction)
@@ -95,8 +97,6 @@ Neo4j.rb v4.1.0 was released in January of 2015. Its changes are outlined [here]
 * [Brian Underwood](https://github.com/cheerfulstoic)
 * [Chris Grigg](https://github.com/subvertallchris)
 
-* Consulting support? Contact [Chris](http://subvertallmedia.com/) and/or [Brian](http://www.brian-underwood.codes/)
-
 ## Contributing
 
 Always welcome!  Please review the [guidelines for contributing](CONTRIBUTING.md) to this repository.

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

@@ -103,15 +103,6 @@ module Neo4j
           @target_class = class_const
         end
 
-        def callback(type)
-          @callbacks[type]
-        end
-
-        def perform_callback(caller, other_node, type)
-          return if callback(type).nil?
-          caller.send(callback(type), other_node)
-        end
-
         def relationship_type(create = false)
           case
           when relationship_class
@@ -191,7 +182,6 @@ module Neo4j
           @relationship_type = options[:type] && options[:type].to_sym
 
           @model_class = options[:model_class]
-          @callbacks = {before: options[:before], after: options[:after]}
           @origin = options[:origin] && options[:origin].to_sym
           @dependent = options[:dependent].try(:to_sym)
           @unique = options[:unique]

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

@@ -201,13 +201,9 @@ module Neo4j
             other_nodes.each do |other_node|
               other_node.save unless other_node.neo_id
 
-              return false if @association.perform_callback(@start_object, other_node, :before) == false
-
               @start_object.association_proxy_cache.clear
 
               _create_relationship(other_node, properties)
-
-              @association.perform_callback(@start_object, other_node, :after)
             end
           end
         end

data/lib/neo4j/active_rel/persistence.rb

@@ -40,7 +40,7 @@ module Neo4j::ActiveRel
     # @param [Symbol, String] name of the attribute to increment
     # @param [Integer, Float] amount to increment
     def concurrent_increment!(attribute, by = 1)
-      increment_by_query! query_as(:n), attribute, by
+      increment_by_query! query_as(:n), attribute, by, :r
     end
 
     def create_model

data/lib/neo4j/migrations.rb

@@ -10,6 +10,8 @@ module Neo4j
 
     class << self
       def check_for_pending_migrations!
+        return if Neo4j::Config.configuration['skip_migration_check']
+
         runner = Neo4j::Migrations::Runner.new
         pending = runner.pending_migrations
         fail ::Neo4j::PendingMigrationError, pending if pending.any?

data/lib/neo4j/migrations/runner.rb

@@ -52,6 +52,18 @@ module Neo4j
         all_migrations.select { |migration| !up?(migration) }
       end
 
+      def complete_migration_versions
+        @schema_migrations.map(&:migration_id)
+      end
+
+      def mark_versions_as_complete(versions)
+        Neo4j::ActiveBase.new_query
+                         .with('{versions} AS versions').params(versions: versions).break
+                         .unwind(version: :versions).break
+                         .merge('(:`Neo4j::Migrations::SchemaMigration` {version: version})')
+                         .exec
+      end
+
       def status
         output STATUS_TABLE_FORMAT, *STATUS_TABLE_HEADER
         output SEPARATOR

data/lib/neo4j/migrations/schema.rb

@@ -0,0 +1,44 @@
+module Neo4j
+  module Migrations
+    module Schema
+      class << self
+        def fetch_schema_data(session)
+          {constraints: fetch_constraint_descriptions(session).sort,
+           indexes: fetch_index_descriptions(session).sort}
+        end
+
+        def synchronize_schema_data(session, schema_data, remove_missing)
+          queries = []
+          queries += drop_and_create_queries(fetch_constraint_descriptions(session), schema_data[:constraints], remove_missing)
+          queries += drop_and_create_queries(fetch_index_descriptions(session), schema_data[:indexes], remove_missing)
+          session.queries do
+            queries.each { |query| append query }
+          end
+        end
+
+        private
+
+        def fetch_constraint_descriptions(session)
+          session.query('CALL db.constraints()').map(&:description)
+        end
+
+        def fetch_index_descriptions(session)
+          session.query('CALL db.indexes()').reject do |row|
+            # These indexes are created automagically when the corresponding constraints are created
+            row.type == 'node_unique_property'
+          end.map(&:description)
+        end
+
+        def drop_and_create_queries(existing, specified, remove_missing)
+          [].tap do |queries|
+            if remove_missing
+              (existing - specified).each { |description| queries << "DROP #{description}" }
+            end
+
+            (specified - existing).each { |description| queries << "CREATE #{description}" }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/neo4j/model_schema.rb

@@ -106,7 +106,7 @@ module Neo4j
 
       def validation_error_message(messages)
         <<MSG
-          Some schema elements were defined by the model (which is no longer supported), but they do not exist in the database.  Run the following to create them:
+          Some schema elements were defined by the model (which is no longer supported), but they do not exist in the database.  Run the following to create them if you haven't already:
 
 #{messages[:constraint].join("\n")}
 #{messages[:index].join("\n")}

data/lib/neo4j/railtie.rb

@@ -43,6 +43,8 @@ module Neo4j
     # Starting Neo after :load_config_initializers allows apps to
     # register migrations in config/initializers
     initializer 'neo4j.start', after: :load_config_initializers do |app|
+      app.config.neo4j.skip_migration_check = true if Rails.env.test?
+
       neo4j_config = ActiveSupport::OrderedOptions.new
       app.config.neo4j.each { |k, v| neo4j_config[k] = v } if app.config.neo4j
 

data/lib/neo4j/shared/callbacks.rb

@@ -11,6 +11,7 @@ module Neo4j
         include ActiveModel::Validations::Callbacks
         # after_find is triggered by the `find` method defined in lib/neo4j/active_node/id_property.rb
         define_model_callbacks :initialize, :find, only: :after
+        define_model_callbacks :create_commit, :update_commit, :destroy_commit, only: :after
         define_model_callbacks :save, :create, :update, :destroy, :touch
       end
 
@@ -20,6 +21,7 @@ module Neo4j
 
       def destroy #:nodoc:
         tx = Neo4j::ActiveBase.new_transaction
+        tx.root.after_commit { run_callbacks(:destroy_commit) {} }
         run_callbacks(:destroy) { super }
       rescue
         @_deleted = false
@@ -49,13 +51,15 @@ module Neo4j
       end
 
       def create_model #:nodoc:
-        self.class.run_transaction do
+        self.class.run_transaction do |tx|
+          tx.root.after_commit { run_callbacks(:create_commit) {} }
           run_callbacks(:create) { super }
         end
       end
 
       def update_model(*) #:nodoc:
-        self.class.run_transaction do
+        self.class.run_transaction do |tx|
+          tx.root.after_commit { run_callbacks(:update_commit) {} }
           run_callbacks(:update) { super }
         end
       end

data/lib/neo4j/tasks/migration.rake

@@ -19,7 +19,6 @@ namespace :neo4j do
   task :allow_migrations do
     Neo4j::Migrations.currently_running_migrations = true
   end
-
   desc 'Run a script against the database to perform system-wide changes'
   task :legacy_migrate, [:task_name, :subtask] => :environment do |_, args|
     path = Rake.original_dir
@@ -46,11 +45,63 @@ namespace :neo4j do
     Rake::Task['neo4j:migrate:all'].invoke
   end
 
+  # TODO Make sure these tasks don't run in versions of Neo4j before 3.0
+  namespace :schema do
+    SCHEMA_YAML_PATH = 'db/neo4j/schema.yml'
+
+    def check_neo4j_version_3
+      if Neo4j::ActiveBase.current_session.version > '3.0.0'
+        yield
+      else
+        puts 'WARNING: This task does not work for versions of Neo4j before 3.0.0'
+      end
+    end
+
+    desc 'Creates a db/neo4j/schema.yml file which represents the indexes / constraints in the Neo4j DB'
+    task :dump => :environment do
+      check_neo4j_version_3 do
+        require 'neo4j/migrations/schema'
+
+        schema_data = Neo4j::Migrations::Schema.fetch_schema_data(Neo4j::ActiveBase.current_session)
+
+        runner = Neo4j::Migrations::Runner.new
+        schema_data[:versions] = runner.complete_migration_versions.sort
+
+        FileUtils.mkdir_p(File.dirname(SCHEMA_YAML_PATH))
+        File.open(SCHEMA_YAML_PATH, 'w') { |file| file << schema_data.to_yaml }
+
+        puts "Dumped updated schema file to #{SCHEMA_YAML_PATH}"
+      end
+    end
+
+    desc "Loads a db/neo4j/schema.yml file into the database\nOptionally removes schema elements which aren't in the schema.yml file (defaults to false)"
+    task :load, [:remove_missing] => :environment do |t, args|
+      check_neo4j_version_3 do
+        require 'neo4j/migrations/schema'
+
+        args.with_defaults(remove_missing: false)
+
+        schema_data = YAML.load(File.read(SCHEMA_YAML_PATH))
+
+        Neo4j::Core::CypherSession::Adaptors::Base.subscribe_to_query(&method(:puts))
+
+        Neo4j::ActiveBase.run_transaction do
+          Neo4j::Migrations::Schema.synchronize_schema_data(Neo4j::ActiveBase.current_session, schema_data, args[:remove_missing])
+
+          runner = Neo4j::Migrations::Runner.new
+          runner.mark_versions_as_complete(schema_data[:versions]) # Run in test mode?
+        end
+      end
+    end
+  end
+
   namespace :migrate do
     desc 'Run all pending migrations'
     task all: [:allow_migrations, :environment] do
       runner = Neo4j::Migrations::Runner.new
       runner.all
+
+      Rake::Task['neo4j:schema:dump'].invoke
     end
 
     desc 'Run a migration given its VERSION'
@@ -58,6 +109,8 @@ namespace :neo4j do
       version = ENV['VERSION'] || fail(ArgumentError, 'VERSION is required')
       runner = Neo4j::Migrations::Runner.new
       runner.up version
+
+      Rake::Task['neo4j:schema:dump'].invoke
     end
 
     desc 'Revert a migration given its VERSION'
@@ -65,6 +118,8 @@ namespace :neo4j do
       version = ENV['VERSION'] || fail(ArgumentError, 'VERSION is required')
       runner = Neo4j::Migrations::Runner.new
       runner.down version
+
+      Rake::Task['neo4j:schema:dump'].invoke
     end
 
     desc 'Print a report of migrations status'
@@ -93,6 +148,8 @@ namespace :neo4j do
     steps = (ENV['STEP'] || 1).to_i
     runner = Neo4j::Migrations::Runner.new
     runner.rollback(steps)
+
+    Rake::Task['neo4j:schema:dump'].invoke
   end
 
   # Temporary to help people change to 8.0

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '8.0.18'
+  VERSION = '8.1.0.rc.1'
 end

data/lib/rails/generators/neo4j/model/model_generator.rb

@@ -16,7 +16,7 @@ class Neo4j::Generators::ModelGenerator < Rails::Generators::NamedBase #:nodoc:
 
   def create_model_file
     template 'model.erb', File.join('app/models', class_path, "#{singular_name}.rb")
-    migration_template 'migration.erb', 'create_'
+    migration_template 'migration.erb'
   end
 
   protected

data/lib/rails/generators/neo4j/model/templates/migration.erb

@@ -1,4 +1,4 @@
-class Create<%= @migration_class_name.underscore.camelize %> < Neo4j::Migrations::Base
+class <%= @migration_class_name.underscore.camelize %> < Neo4j::Migrations::Base
   def up
     add_constraint :<%= class_name %>, :uuid
   end

data/lib/rails/generators/neo4j_generator.rb

@@ -9,12 +9,12 @@ end
 module Neo4j::Generators::MigrationHelper
   extend ActiveSupport::Concern
 
-  def migration_file_name(file_name, prefix = '')
-    "#{Time.now.utc.strftime('%Y%m%d%H%M%S')}_#{prefix}#{file_name.parameterize}.rb"
+  def migration_file_name(file_name)
+    "#{Time.now.utc.strftime('%Y%m%d%H%M%S')}_#{file_name.parameterize}.rb"
   end
 
-  def migration_template(template_name, prefix = '')
-    real_file_name = migration_file_name(file_name, prefix)
+  def migration_template(template_name)
+    real_file_name = migration_file_name(file_name)
     @migration_class_name = file_name.camelize
 
     template template_name, File.join('db/neo4j/migrate', real_file_name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 8.0.18
+  version: 8.1.0.rc.1
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-05 00:00:00.000000000 Z
+date: 2017-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter
@@ -275,6 +275,7 @@ files:
 - lib/neo4j/migrations/helpers/schema.rb
 - lib/neo4j/migrations/migration_file.rb
 - lib/neo4j/migrations/runner.rb
+- lib/neo4j/migrations/schema.rb
 - lib/neo4j/migrations/schema_migration.rb
 - lib/neo4j/model_schema.rb
 - lib/neo4j/paginated.rb
@@ -343,9 +344,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.9
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: neo4j
 rubygems_version: 2.6.8