neo4j 8.0.0.rc.3 → 8.0.0.rc.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31ce9e5bebd684174609471aad17082021face51
-  data.tar.gz: d54842495024cd8df255e9b9a2abcb061ffa03e5
+  metadata.gz: 1b6f28cae082dd5d5a620b0457212c98dd62e6b9
+  data.tar.gz: c48ce9f1276d4508edab08259ca059d742eba72c
 SHA512:
-  metadata.gz: bdaf705709a16d870e42f31dcebd664c33bcd4810341975eaa2ea3d1d1e6ab4b0ec05cba3d9716d54dde200b3400a3a34312d9dc26067ad1d353b0e0e56a240d
-  data.tar.gz: 0bdee81e2b4e35f3abc1087d778ee01bffed4be0495dd0fda0f3fb23ca4090bdb2d908d514b904c2016002161d286d302fd3f1e83a28fae389cf789ef30d498f
+  metadata.gz: 626708e743a96d88e228aee34ce2de20b826cc1b867f4fa13ddf64f3e7b6d767261c319e0b53effd1aa9a038257aa7e9d98e327510b2a3ee21e844147f6a6b4e
+  data.tar.gz: 10533ee448ed072bb458b8a15e6373656bdd3235c4b263f02e559a4f504a89f2c6d9a495794872b33a479227e4eddb3e6cb4144db33227f67b1a5d5e4fb7455b

data/CHANGELOG.md

@@ -7,6 +7,20 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [8.0.0.rc.3] 2016-10-12
 
+### Changed
+
+- `find_or_create_by` on an association does not look for nodes which aren't related to the node in question (thanks for the report @efatsi / see #1240)
+
+### Fixed
+
+- Inconsistent `drop_constraint` and `drop_index` behavior: they were accepting `force` option (like `add_*` methods)
+- `PendingMigrationError` not showing pending migrations versions
+- Fixed `silenced: true` for `Neo4j::Migration::Runner` option, not working properly
+- Removed "strange" inheritance between Neo4j::Migrations::Base and the legacy Neo4j::Migration class
+- Avoid creating the `SchemaMigration` model constraint when it already exists
+
+## [8.0.0.rc.3] 2016-10-12
+
 # Added
 
 - `distinct` method for QueryProxy (thanks @ProGM / see #1305)

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

@@ -148,7 +148,7 @@ module Neo4j
           result = self.where(params).first
           return result unless result.nil?
           Neo4j::ActiveBase.run_transaction do
-            node = model.find_or_create_by(params)
+            node = model.create(params)
             self << node
             return node
           end

data/lib/neo4j/errors.rb

@@ -34,11 +34,12 @@ module Neo4j
 
   # Inspired/taken from active_record/migration.rb
   class PendingMigrationError < MigrationError
-    def initialize
+    def initialize(migrations)
+      pending_migrations = migrations.join("\n")
       if rails? && defined?(Rails.env)
-        super("Migrations are pending. To resolve this issue, run:\n\n        #{command_name} neo4j:migrate RAILS_ENV=#{::Rails.env}")
+        super("Migrations are pending:\n#{pending_migrations}\n To resolve this issue, run:\n\n        #{command_name} neo4j:migrate RAILS_ENV=#{::Rails.env}")
       else
-        super("Migrations are pending. To resolve this issue, run:\n\n        #{command_name} neo4j:migrate")
+        super("Migrations are pending:\n#{pending_migrations}\n To resolve this issue, run:\n\n        #{command_name} neo4j:migrate")
       end
     end
 

data/lib/neo4j/migrations.rb

@@ -11,7 +11,8 @@ module Neo4j
     class << self
       def check_for_pending_migrations!
         runner = Neo4j::Migrations::Runner.new
-        fail ::Neo4j::PendingMigrationError if runner.pending_migrations?
+        pending = runner.pending_migrations
+        fail ::Neo4j::PendingMigrationError, pending if pending.any?
       end
 
       attr_accessor :currently_running_migrations

data/lib/neo4j/migrations/base.rb

@@ -1,13 +1,14 @@
 module Neo4j
   module Migrations
-    class Base < ::Neo4j::Migration
+    class Base
       include Neo4j::Migrations::Helpers
       include Neo4j::Migrations::Helpers::Schema
       include Neo4j::Migrations::Helpers::IdProperty
       include Neo4j::Migrations::Helpers::Relationships
 
-      def initialize(migration_id)
+      def initialize(migration_id, options = {})
         @migration_id = migration_id
+        @silenced = options[:silenced]
       end
 
       def migrate(method)

data/lib/neo4j/migrations/helpers.rb

@@ -72,6 +72,10 @@ module Neo4j
 
       protected
 
+      def output(*string_format)
+        puts format(*string_format) unless @silenced
+      end
+
       def transactions?
         self.class.transaction?
       end

data/lib/neo4j/migrations/helpers/schema.rb

@@ -24,13 +24,13 @@ module Neo4j
         def drop_constraint(label, property, options = {})
           type = options[:type] || :uniqueness
           label_object = ActiveBase.label_object(label)
-          fail_missing_constraint_or_index!(:constraint, label, property) if !label_object.constraint?(property)
+          fail_missing_constraint_or_index!(:constraint, label, property) if !options[:force] && !label_object.constraint?(property)
           label_object.drop_constraint(property, type: type)
         end
 
-        def drop_index(label, property)
+        def drop_index(label, property, options = {})
           label_object = ActiveBase.label_object(label)
-          fail_missing_constraint_or_index!(:index, label, property) if !label_object.index?(property)
+          fail_missing_constraint_or_index!(:index, label, property) if !options[:force] && !label_object.index?(property)
           label_object.drop_index(property)
         end
 

data/lib/neo4j/migrations/migration_file.rb

@@ -8,9 +8,9 @@ module Neo4j
         extract_data!
       end
 
-      def create
+      def create(options = {})
         require @file_name
-        class_name.constantize.new(@version)
+        class_name.constantize.new(@version, options)
       end
 
       private

data/lib/neo4j/migrations/runner.rb

@@ -13,7 +13,8 @@ module Neo4j
 
       def initialize(options = {})
         @silenced = options[:silenced] || !!ENV['MIGRATIONS_SILENCED']
-        SchemaMigration.mapped_label.create_constraint(:migration_id, type: :unique)
+        label = SchemaMigration.mapped_label
+        label.create_constraint(:migration_id, type: :unique) unless label.constraint?(:migration_id)
         @schema_migrations = SchemaMigration.all.to_a
         @up_versions = SortedSet.new(@schema_migrations.map(&:migration_id))
       end
@@ -47,8 +48,8 @@ module Neo4j
         end
       end
 
-      def pending_migrations?
-        all_migrations.any? { |migration| !up?(migration) }
+      def pending_migrations
+        all_migrations.select { |migration| !up?(migration) }
       end
 
       def status
@@ -110,7 +111,7 @@ MSG
 
       def migrate(direction, migration_file)
         migration_message(direction, migration_file) do
-          migration = migration_file.create
+          migration = migration_file.create(silenced: @silenced)
           migration.migrate(direction)
         end
       end

data/lib/neo4j/shared/callbacks.rb

@@ -24,7 +24,7 @@ module Neo4j
       rescue
         @_deleted = false
         @attributes = @attributes.dup
-        tx.mark_failed
+        tx.mark_failed if tx
         raise
       ensure
         tx.close if tx

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '8.0.0.rc.3'
+  VERSION = '8.0.0.rc.4'
 end

data/neo4j.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ((RUBY_PLATFORM == 'java') ? '>= 1.9.3' : '>= 2.1.9')
 
   s.authors  = 'Andreas Ronge, Brian Underwood, Chris Grigg'
-  s.email    = 'andreas.ronge@gmail.com, brian@brian-underwood.codes, chris@subvertallmedia.com'
+  s.email    = 'andreas.ronge@gmail.com, public@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: 8.0.0.rc.3
+  version: 8.0.0.rc.4
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-12 00:00:00.000000000 Z
+date: 2016-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter
@@ -214,7 +214,7 @@ description: 'A Neo4j OGM (Object-Graph-Mapper) for use in Ruby on Rails and Rac
   frameworks heavily inspired by ActiveRecord.
 
 '
-email: andreas.ronge@gmail.com, brian@brian-underwood.codes, chris@subvertallmedia.com
+email: andreas.ronge@gmail.com, public@brian-underwood.codes, chris@subvertallmedia.com
 executables:
 - neo4j-jars
 extensions: []