neo4j 8.0.0.alpha.12 → 8.0.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e910e891ebaa4b95b7b70e638b57facd5ab0abe
-  data.tar.gz: a9570dd8812d110e508dd1b86c2b72e6c4c8385a
+  metadata.gz: e2f958f5ab64ca55f0c33a3bcd9680773a604c54
+  data.tar.gz: 6d61a3310ec123a99703b1958072d97a57c279be
 SHA512:
-  metadata.gz: 8252603ec9eb5d9cca34ca4c8b35882eeeeeff8c2a9f48fce7e00eebd0b0b3a22291cb401234deb95a0680be7c02f4c93b03c838be84bca39a03366772e22f90
-  data.tar.gz: cb0505ab1461d56b0dc33258c7a7723ea43992f39c625f1f7db43b1efd8596767be5d701a1c64624d9adf5bc4740b9ea0b6a924c52f8445a65a3bfd0d0cbd175
+  metadata.gz: 946355cd23bf4c589dbaa651d73896ebc7a87fb9717d8827a4f3f4c0e801fb67ba2299875f2f3c5edc970bd3f1183e52c8573cce5eb2405d73c2b8d87760625c
+  data.tar.gz: f9e7e33a203f1f32e85f4ff3eab979e216b2a8b09b8901c7be9378e8f2d5cadc2f8385abe7d648f90dd898e52870305047083d65378ad5d73c00b07c4a95c218

data/CHANGELOG.md

@@ -3,7 +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/).
 
-## [Unreleased]
+## [8.0.0.rc.1] 2016-10-04
+
+### Changed
+
+- Pending migrations check, now using a Rack Middleware instead of failing on startup (thanks @ProGM / see #1300)
+
+### Added
+
+- Add support for undeclared properties on specific models (see #1294 / thanks @klobuczek)
 
 ## [8.0.0.alpha.12] 2016-09-29
 
@@ -22,7 +30,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - `update` was not rolling-back association changes when validations fail
 - Broken Rails `neo4j:migrate_v8` generator
 
-# Changed
+### 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)
 

data/lib/neo4j.rb

@@ -26,6 +26,7 @@ require 'neo4j/paginated'
 require 'neo4j/schema/operation'
 
 require 'neo4j/timestamps'
+require 'neo4j/undeclared_properties'
 
 require 'neo4j/shared/callbacks'
 require 'neo4j/shared/filtered_hash'

data/lib/neo4j/migrations.rb

@@ -6,6 +6,7 @@ module Neo4j
     autoload :Base
     autoload :Runner
     autoload :SchemaMigration
+    autoload :CheckPending
 
     class << self
       def check_for_pending_migrations!

data/lib/neo4j/migrations/check_pending.rb

@@ -0,0 +1,19 @@
+module Neo4j
+  module Migrations
+    class CheckPending
+      def initialize(app)
+        @app = app
+        @last_check = 0
+      end
+
+      def call(env)
+        mtime = Neo4j::Migrations::Runner.latest_migration.version.to_i
+        if @last_check < mtime
+          Neo4j::Migrations.check_for_pending_migrations!
+          @last_check = mtime
+        end
+        @app.call(env)
+      end
+    end
+  end
+end

data/lib/neo4j/migrations/runner.rb

@@ -141,31 +141,41 @@ MSG
       end
 
       def all_migrations
-        @up_versions + files_versions
-      end
-
-      def files_versions
-        migration_files.map(&:version)
-      end
-
-      def migration_files
-        files.map { |file_path| MigrationFile.new(file_path) }
+        @up_versions + migration_files_versions
       end
 
       def incomplete_states
         @incomplete_states ||= SortedSet.new(@schema_migrations.select(&:incomplete?))
       end
 
-      def files
-        Dir[files_path].sort
-      end
+      delegate :migration_files, :migration_files_versions, to: :class
 
-      def files_path
-        app_root.join('db', 'neo4j', 'migrate', '*.rb')
-      end
+      class <<self
+        def migration_files_versions
+          migration_files.map!(&:version)
+        end
+
+        def migration_files
+          files.map! { |file_path| MigrationFile.new(file_path) }
+        end
 
-      def app_root
-        defined?(Rails) ? Rails.root : Pathname.new('.')
+        def latest_migration
+          migration_files.last
+        end
+
+        def files
+          Dir[files_path].sort
+        end
+
+        private
+
+        def files_path
+          app_root.join('db', 'neo4j', 'migrate', '*.rb')
+        end
+
+        def app_root
+          defined?(Rails) ? Rails.root : Pathname.new('.')
+        end
       end
     end
   end

data/lib/neo4j/railtie.rb

@@ -56,8 +56,8 @@ module Neo4j
 
       Neo4j::Config[:logger] ||= Rails.logger
 
-      if Rails.env.development? && !Neo4j::Migrations.currently_running_migrations && Neo4j::Config.fail_on_pending_migrations
-        Neo4j::Migrations.check_for_pending_migrations!
+      if Neo4j::Config.fail_on_pending_migrations
+        config.app_middleware.insert_after ::ActionDispatch::Callbacks, Neo4j::Migrations::CheckPending
       end
     end
 

data/lib/neo4j/shared/mass_assignment.rb

@@ -26,10 +26,16 @@ module Neo4j::Shared
       return unless new_attributes.present?
       new_attributes.each do |name, value|
         writer = :"#{name}="
-        send(writer, value) if respond_to?(writer)
+        if respond_to?(writer)
+          send(writer, value)
+        else
+          add_undeclared_property(name, value)
+        end
       end
     end
 
+    def add_undeclared_property(_, _); end
+
     # Mass update a model's attributes
     #
     # @example Assigning a hash

data/lib/neo4j/shared/persistence.rb

@@ -10,11 +10,17 @@ module Neo4j::Shared
     end
 
     def update_model
-      return if !changed_attributes || changed_attributes.empty?
-      neo4j_query(query_as(:n).set(n: props_for_update))
+      return if skip_update?
+      props = props_for_update
+      neo4j_query(query_as(:n).set(n: props))
+      _persisted_obj.props.merge!(props)
       changed_attributes.clear
     end
 
+    def skip_update?
+      changed_attributes.blank?
+    end
+
     # Returns a hash containing:
     # * All properties and values for insertion in the database
     # * A `uuid` (or equivalent) key and value
@@ -66,7 +72,7 @@ module Neo4j::Shared
     # @param [Symbol, String] attribute of the attribute to update
     # @param [Object] value to set
     def update_attribute(attribute, value)
-      send("#{attribute}=", value)
+      write_attribute(attribute, value)
       self.save
     end
 
@@ -74,7 +80,7 @@ module Neo4j::Shared
     # @param [Symbol, String] attribute of the attribute to update
     # @param [Object] value to set
     def update_attribute!(attribute, value)
-      send("#{attribute}=", value)
+      write_attribute(attribute, value)
       self.save!
     end
 

data/lib/neo4j/shared/property.rb

@@ -26,9 +26,12 @@ module Neo4j::Shared
       validate_attributes!(modded_attributes)
       writer_method_props = extract_writer_methods!(modded_attributes)
       send_props(writer_method_props)
+      self.undeclared_properties = attributes
       @_persisted_obj = nil
     end
 
+    def undeclared_properties=(_); end
+
     def inject_defaults!(starting_props)
       return starting_props if self.class.declared_properties.declared_property_defaults.empty?
       self.class.declared_properties.inject_defaults!(self, starting_props || {})

data/lib/neo4j/tasks/migration.rake

@@ -1,7 +1,7 @@
 require 'active_support/concern'
 require 'neo4j/migration'
 
-unless Rake::Task.task_defined?('environment')
+if !defined?(Rails) && !Rake::Task.task_defined?('environment')
   desc 'Run a script against the database to perform system-wide changes'
   task :environment do
     require 'neo4j/session_manager'
@@ -84,7 +84,7 @@ namespace :neo4j do
   end
 
   desc 'Rollbacks migrations given a STEP number'
-  task :rollback, [:allow_migrations, :environment] do
+  task rollback: [:allow_migrations, :environment] do
     steps = (ENV['STEP'] || 1).to_i
     runner = Neo4j::Migrations::Runner.new
     runner.rollback(steps)

data/lib/neo4j/undeclared_properties.rb

@@ -0,0 +1,53 @@
+module Neo4j
+  # This mixin allows storage and update of undeclared properties in the included class
+  module UndeclaredProperties
+    extend ActiveSupport::Concern
+
+    included do
+      attr_accessor :undeclared_properties
+    end
+
+    def validate_attributes!(_)
+    end
+
+    def read_attribute(name)
+      respond_to?(name) ? super(name) : read_undeclared_property(name.to_sym)
+    end
+    alias [] read_attribute
+
+    def read_undeclared_property(name)
+      _persisted_obj ? _persisted_obj.props[name] : (undeclared_properties && undeclared_properties[name])
+    end
+
+    def write_attribute(name, value)
+      if respond_to? "#{name}="
+        super(name, value)
+      else
+        add_undeclared_property(name, value)
+      end
+    end
+    alias []= write_attribute
+
+    def skip_update?
+      super && undeclared_properties.blank?
+    end
+
+    def props_for_create
+      super.merge(undeclared_properties!)
+    end
+
+    def props_for_update
+      super.merge(undeclared_properties!)
+    end
+
+    def undeclared_properties!
+      undeclared_properties || {}
+    ensure
+      self.undeclared_properties = nil
+    end
+
+    def add_undeclared_property(name, value)
+      (self.undeclared_properties ||= {})[name] = value
+    end
+  end
+end

data/lib/neo4j/version.rb

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

data/neo4j.gemspec

@@ -30,7 +30,7 @@ A Neo4j OGM (Object-Graph-Mapper) for use in Ruby on Rails and Rack frameworks h
   s.add_dependency('orm_adapter', '~> 0.5.0')
   s.add_dependency('activemodel', '>= 4.0', '< 5.1')
   s.add_dependency('activesupport', '>= 4.0', '< 5.1')
-  s.add_dependency('neo4j-core', '>= 7.0.0.alpha.1')
+  s.add_dependency('neo4j-core', '>= 7.0.0.rc.1')
   s.add_dependency('neo4j-community', '~> 2.0') if RUBY_PLATFORM =~ /java/
   s.add_development_dependency('railties', '>= 4.0', '< 5.1')
   s.add_development_dependency('pry')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 8.0.0.alpha.12
+  version: 8.0.0.rc.1
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-29 00:00:00.000000000 Z
+date: 2016-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter
@@ -70,14 +70,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0.alpha.1
+        version: 7.0.0.rc.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0.alpha.1
+        version: 7.0.0.rc.1
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -287,6 +287,7 @@ files:
 - lib/neo4j/migration.rb
 - lib/neo4j/migrations.rb
 - lib/neo4j/migrations/base.rb
+- lib/neo4j/migrations/check_pending.rb
 - lib/neo4j/migrations/helpers.rb
 - lib/neo4j/migrations/helpers/id_property.rb
 - lib/neo4j/migrations/helpers/relationships.rb
@@ -327,6 +328,7 @@ files:
 - lib/neo4j/timestamps/created.rb
 - lib/neo4j/timestamps/updated.rb
 - lib/neo4j/type_converters.rb
+- lib/neo4j/undeclared_properties.rb
 - lib/neo4j/version.rb
 - lib/neo4j/wrapper.rb
 - lib/rails/generators/neo4j/migration/migration_generator.rb