neo4j 9.5.3 → 9.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 822965793898b0cdde8a1e6410520b411478b84e849ee4130a53e6391858f8c4
-  data.tar.gz: c92710ffdbca32f588378bf11ea0466fc69233f571656e499b0287fa685f1578
+  metadata.gz: 43e2766ba1ce0e8a8f3a87d750f2b162b5dbf3428cf1be8f564323a499e1701a
+  data.tar.gz: 05cf66caefa84395b4e5a1c24b81b65aa9a1cd1f519a681ee6b43cd18dfc7005
 SHA512:
-  metadata.gz: ff8a3d6a6122ad2f9fee70dcafbb10a2c30de757c0d98b755547334d56b5df020ae66eebaa12750dbdb2ab418a57ee071fd736960225426e0d55bef178e104bf
-  data.tar.gz: 19a8e93b5dd488c8d119d48230a02127b2622842de1adda468fe57f996ad00ec128f927e2b05e5ddea2cf4fd298cde324a5c7f3c90a16473614ea48ca838563f
+  metadata.gz: a1d7a3986d18fb877ccd4defc85cd2b98d1b5bf2f3907cc8098825209226c3417610c7fe7d4f9a0df5725d1fbf844ac5d3e275047650e8ddb7ff93762260f79d
+  data.tar.gz: 233023315b80577975f7239fe5ac1e69b2b0506786ed062f027f13fdb5f376873ccca86d0f4b10e9e6da8b1142c1a1f0f7c4a5f2fc32a7836197e044351930e0

data/CHANGELOG.md

@@ -3,6 +3,17 @@ 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/).
 
+## [9.6.0] 2019-09-3
+
+## Added
+
+- support for activemodel and activesupport version 6 (thanks @mrhardikjoshi)
+
+## Fixed
+
+- fixed cypher generation for `remove_property` (thanks @lshimokawa)
+- cleaned up deprecations, unused files and badges (thanks @olleolleolle)
+
 ## [9.5.3] 2019-08-16
 
 ## Fixed

data/README.md

@@ -3,16 +3,9 @@
 ## Code Status
 
 [![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
-
-[![Next Release](https://badge.waffle.io/neo4jrb/neo4j.png?label=Next%20Release&title=Next%20Release) ![In Progress](https://badge.waffle.io/neo4jrb/neo4j.png?label=In%20Progress&title=In%20Progress) ![In Master](https://badge.waffle.io/neo4jrb/neo4j.png?label=In%20Master&title=In%20Master)](https://waffle.io/neo4jrb/neo4j)
-
-[![Post an issue](https://img.shields.io/badge/Bug%3F-Post%20an%20issue!-blue.svg)](https://waffle.io/neo4jrb/neo4j)
+[![Build Status](https://secure.travis-ci.org/neo4jrb/neo4j.svg?branch=master)](http://travis-ci.org/neo4jrb/neo4j)
+[![Coverage Status](https://coveralls.io/repos/neo4jrb/neo4j/badge.svg?branch=master)](https://coveralls.io/r/neo4jrb/neo4j?branch=master)
+[![Code Climate](https://codeclimate.com/github/neo4jrb/neo4j.svg)](https://codeclimate.com/github/neo4jrb/neo4j)
 
 ## Get Support
 

data/lib/neo4j/migrations/helpers.rb

@@ -14,7 +14,7 @@ module Neo4j
                                  'To overwrite, call `remove_property(:%{label}, :%{new_property})` before this method.'.freeze
 
       def remove_property(label, property)
-        by_label(label).remove(n: property).exec
+        by_label(label).remove("n.#{property}").exec
       end
 
       def rename_property(label, old_property, new_property)

data/lib/neo4j/shared/initialize.rb

@@ -27,9 +27,14 @@ module Neo4j::Shared
 
     # We should be using #clear_changes_information
     # but right now we don't use `ActiveModel` attributes correctly and so it doesn't work
+    # Once we set @attribute correctly from using class ActiveModel::Attribute
+    # we will no longer need to explicitly call following method and can safely remove it
     def changed_attributes_clear!
       return if changed_attributes.nil?
 
+      # with ActiveModel 6.0.0 we have to clear attribute changes with clear_attribute_changes
+      clear_attribute_changes(self.attributes.keys)
+
       # changed_attributes is frozen starting with ActiveModel 5.2.0
       # Not a good long term solution
       if changed_attributes.frozen?
@@ -39,7 +44,12 @@ module Neo4j::Shared
       end
     end
 
+    # Once we set @attribute correctly from using class ActiveModel::Attribute
+    # we will no longer need to explicitly call following method and can safely remove it
     def changed_attributes_selective_clear!(hash_to_clear)
+      # with ActiveModel 6.0.0 we have to clear attribute changes with clear_attribute_change
+      hash_to_clear.each_key { |k| clear_attribute_change(k) } if defined?(ActiveModel::ForcedMutationTracker)
+
       # changed_attributes is frozen starting with ActiveModel 5.2.0
       # Not a good long term solution
       if changed_attributes.frozen?

data/lib/neo4j/shared/persistence.rb

@@ -242,7 +242,14 @@ module Neo4j::Shared
                                  .pluck("#{element_name}.`#{attribute}`").first
       return false unless new_attribute
       self[attribute] = new_attribute
-      set_attribute_was(attribute, new_attribute)
+
+      if defined? ActiveModel::ForcedMutationTracker
+        # with ActiveModel 6.0.0 set_attribute_was is removed
+        # so we mark attribute's previous value using attr_will_change method
+        clear_attribute_change(attribute)
+      else
+        set_attribute_was(attribute, new_attribute)
+      end
       true
     end
 

data/lib/neo4j/shared/property.rb

@@ -11,8 +11,11 @@ module Neo4j::Shared
 
     attr_reader :_persisted_obj
 
+    # TODO: Set @attribute correctly using class ActiveModel::Attribute, and after that
+    # remove mutations_from_database and other ActiveModel::Dirty overrided methods
     def mutations_from_database
-      ActiveModel::NullMutationTracker.instance
+      @mutations_from_database ||=
+        defined?(ActiveModel::ForcedMutationTracker) ? ActiveModel::ForcedMutationTracker.new(self) : ActiveModel::NullMutationTracker.instance
     end
 
     def inspect

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '9.5.3'
+  VERSION = '9.6.0'
 end

data/neo4j.gemspec

@@ -23,7 +23,6 @@ DESCRIPTION
   s.require_path = 'lib'
   s.files = Dir.glob('{bin,lib,config}/**/*') + %w(README.md CHANGELOG.md CONTRIBUTORS Gemfile neo4j.gemspec)
   s.executables = ['neo4j-jars']
-  s.has_rdoc = true
   s.extra_rdoc_files = %w( README.md )
   s.rdoc_options = ['--quiet', '--title', 'Neo4j.rb', '--line-numbers', '--main', 'README.rdoc', '--inline-source']
   s.metadata = {
@@ -33,8 +32,8 @@ DESCRIPTION
     'bug_tracker_uri' => 'https://github.com/neo4jrb/neo4j/issues'
   }
 
-  s.add_dependency('activemodel', ['>= 4.0', '< 6'])
-  s.add_dependency('activesupport', ['>= 4.0', '< 6'])
+  s.add_dependency('activemodel', '>= 4.0')
+  s.add_dependency('activesupport', '>= 4.0')
   s.add_dependency('i18n', '!= 1.3.0') # version 1.3.0 introduced a bug with `symbolize_key`
   s.add_dependency('neo4j-core', '>= 9.0.0')
   s.add_dependency('orm_adapter', '~> 0.5.0')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 9.5.3
+  version: 9.6.0
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-23 00:00:00.000000000 Z
+date: 2019-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -37,9 +31,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -47,9 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -234,7 +222,7 @@ dependencies:
         version: '0'
 description: 'A Neo4j OGM (Object-Graph-Mapper) for Ruby heavily inspired by ActiveRecord.
 
-'
+  '
 email: andreas.ronge@gmail.com, public@brian-underwood.codes, chris@subvertallmedia.com
 executables:
 - neo4j-jars
@@ -394,7 +382,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: neo4j
-rubygems_version: 2.7.6
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: A graph database for Ruby