neo4j 6.0.9 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 268f0f4433b4ea5007d954b93734f163fd213fb3
-  data.tar.gz: 292e0d52e9fba8ce3ff115051706ae7d8a26bca7
+  metadata.gz: a3c832dc3c664a9c43d1014226af9d856a9ae5dc
+  data.tar.gz: 2343fc4c93707ee597da241d452da0b912a9f53a
 SHA512:
-  metadata.gz: 83717444682a0591f81d368275069561fe9818b2551841dc9431aa6d521bca6abb132cbe96941f63657e1ce1bfb6717827d17c043e4a06792f80385a9779bbec
-  data.tar.gz: cd5775b891a085b4342cce67f7b9ee5e9f8376e79992a72d676b52636a42fa1c3307e6fdd27de6b6abf2049e1fd66b04fb69ab2598a602be01f00722bbfd0de0
+  metadata.gz: 950118a98e2a592dd0a54550c9e47ed57e243a52e9c879404b0c1a539b1b63a0bfa8726711c107ea7af303aba750ff84846cd3508370b01dc410a282ba3cd731
+  data.tar.gz: d9c55f185d51bf226f98de8eac2fe52db9d1d64b1a79ec1822d7805ee04fd3539f3c13e666ec89961df3a4e3850e69fdb3f89ac40be6ee0285568a7f1fbc7894

data/CHANGELOG.md

@@ -3,29 +3,24 @@ 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/).
 
-## [6.0.9] - 05-27-2016
+## [6.1.0] - 2016-01-01
 
-### Fixed
-
-- Fix to `find_in_batches` (thanks to ProGM / see #1208)
-
-## [6.0.8] - 03-14-2016
-
-### Fixed
-
-- Fixed issue where backticks weren't being added to where clauses for `with_associations`
+### Changed
 
-## [6.0.7] - 03-08-2016
+- When a `model_class` is specified on an association which is not an ActiveNode model, an error is raised
+- The `model_class` option on associations can no longer be a `Class` constant (should be a String, Symbol, nil, false, or an Array of Symbols/Strings)
+- The `rel_class` option on associations can no longer be a `Class` constant (should be a String, Symbol, or nil)
+- The `from_class` and `to_class` arguments can no longer be a `Class` constant (should be a String, Symbol, :any, or false)
+- ActiveNode and ActiveRel models can now be marshaled (thanks to jhoffner for the suggestion in #1093)
 
 ### Fixed
 
-- Issue where creating relationships via `has_one` association created two relationships
-
-## [6.0.6] - 01-20-2016
+- Inheritance of properties in ActiveRel is fixed (see #1080)
 
-### Fixed
+### Added
 
-- Issue where `inspect` failed outside of Rails (Thanks to louspringer, #1111)
+- `config/neo4j.yml` now renders with an ERB step (thanks to mrstif via #1060)
+- `#increment`, `#increment!` and `#concurrent_increment!` methods added to instances of ActiveNode and ActiveRel (thanks to ProGM in #1074)
 
 ## [6.0.5] - 12-29-2015
 

data/Gemfile

@@ -2,8 +2,11 @@ source 'http://rubygems.org'
 
 gemspec
 
-# gem 'neo4j-core', github: 'neo4jrb/neo4j-core', branch: 'master'
-# gem 'neo4j-core', path: '../neo4j-core'
+if ENV['CI']
+  gem 'neo4j-core', github: 'neo4jrb/neo4j-core', branch: 'master'
+else
+  # gem 'neo4j-core', path: '../neo4j-core'
+end
 
 # gem 'active_attr', github: 'neo4jrb/active_attr', branch: 'performance'
 # gem 'active_attr', path: '../active_attr'
@@ -13,7 +16,7 @@ group 'test' do
   gem 'codecov', require: false
   gem 'simplecov', require: false
   gem 'simplecov-html', require: false
-  gem 'rspec', '~> 2.0'
+  gem 'rspec', '~> 3.4'
   gem 'its'
   gem 'test-unit'
   gem 'overcommit'

data/README.md

@@ -18,7 +18,7 @@ All new documentation will be done via our [readthedocs](http://neo4jrb.readthed
 
 ### Contact Us
 
-  [![StackOverflow](https://img.shields.io/badge/StackOverflow-Ask%20a%20question!-blue.svg)](http://stackoverflow.com/questions/ask?tags=neo4j.rb+neo4j+ruby)  [![Gitter](https://img.shields.io/badge/Gitter-Join%20our%20chat!-blue.svg)](https://gitter.im/neo4jrb/neo4j?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)  [![Twitter](https://img.shields.io/badge/Twitter-Tweet%20with%20us!-blue.svg)](https://twitter.com/neo4jrb)  [![Mailing list](https://img.shields.io/badge/Mailing%20list-Mail%20us!-blue.svg)](https://groups.google.com/forum/#!forum/neo4jrb)
+  [![StackOverflow](https://img.shields.io/badge/StackOverflow-Ask%20a%20question!-blue.svg)](http://stackoverflow.com/questions/ask?tags=neo4j.rb+neo4j+ruby)  [![Gitter](https://img.shields.io/badge/Gitter-Join%20our%20chat!-blue.svg)](https://gitter.im/neo4jrb/neo4j?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)  [![Twitter](https://img.shields.io/badge/Twitter-Tweet%20with%20us!-blue.svg)](https://twitter.com/neo4jrb)
 
 
 

data/lib/neo4j.rb

@@ -24,6 +24,7 @@ require 'neo4j/active_rel/rel_wrapper'
 require 'neo4j/active_node/node_wrapper'
 require 'neo4j/shared/type_converters'
 require 'neo4j/shared/rel_type_converters'
+require 'neo4j/shared/marshal'
 require 'neo4j/type_converters'
 require 'neo4j/paginated'
 require 'neo4j/schema/operation'

data/lib/neo4j/active_node.rb

@@ -23,8 +23,11 @@ module Neo4j
   module ActiveNode
     extend ActiveSupport::Concern
 
+    MARSHAL_INSTANCE_VARIABLES = [:@attributes, :@_persisted_obj, :@default_property_value]
+
     include Neo4j::Shared
     include Neo4j::Shared::Identity
+    include Neo4j::Shared::Marshal
     include Neo4j::ActiveNode::Initialize
     include Neo4j::ActiveNode::IdProperty
     include Neo4j::Shared::SerializedProperties

data/lib/neo4j/active_node/has_n.rb

@@ -306,9 +306,9 @@ module Neo4j::ActiveNode
       #
       #         Post.has_one :in, :author, type: :has_author, model_class: 'Person'
       #
-      #     *model_class*: The model class to which the association is referring.  Can be either a
-      #       model object ``include`` ing ``ActiveNode`` or a Symbol/String (or an ``Array`` of same).
-      #       **A Symbol or String is recommended** to avoid load-time issues
+      #     *model_class*: The model class to which the association is referring.  Can be a
+      #       Symbol/String (or an ``Array`` of same) with the name of the `ActiveNode` class,
+      #       `false` to specify any model, or nil to specify that it should be guessed.
       #
       #     *rel_class*: The ``ActiveRel`` class to use for this association.  Can be either a
       #       model object ``include`` ing ``ActiveRel`` or a Symbol/String (or an ``Array`` of same).
@@ -504,6 +504,7 @@ module Neo4j::ActiveNode
       end
 
       def build_association(macro, direction, name, options)
+        options[:model_class] = options[:model_class].name if options[:model_class] == self
         Neo4j::ActiveNode::HasN::Association.new(macro, direction, name, options).tap do |association|
           @associations ||= {}
           @associations[name] = association

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

@@ -1,4 +1,5 @@
 require 'active_support/inflector/inflections'
+require 'neo4j/class_arguments'
 
 module Neo4j
   module ActiveNode
@@ -32,7 +33,7 @@ module Neo4j
           @pending_model_refresh = @target_classes_or_nil = nil
 
           # Using #to_s on purpose here to take care of classes/strings/symbols
-          @model_class = @model_class.to_s.constantize if @model_class
+          @model_class = ClassArguments.constantize_argument(@model_class.to_s) if @model_class
         end
 
         def queue_model_refresh!
@@ -67,7 +68,7 @@ module Neo4j
         end
 
         def target_classes
-          target_class_names.map(&:constantize)
+          ClassArguments.constantize_argument(target_class_names)
         end
 
         def target_classes_or_nil
@@ -78,12 +79,12 @@ module Neo4j
           return if model_class == false
 
           Array.new(target_classes).map do |target_class|
-            "#{name}:`#{target_class.mapped_label_name}`"
+            "#{name}:#{target_class.mapped_label_name}"
           end.join(' OR ')
         end
 
         def discovered_model
-          target_class_names.map(&:constantize).select do |constant|
+          target_classes.select do |constant|
             constant.ancestors.include?(::Neo4j::ActiveNode)
           end
         end
@@ -91,17 +92,11 @@ module Neo4j
         def target_class
           return @target_class if @target_class
 
-          if target_class_names && target_class_names.size == 1
-            class_const = target_class_names[0].constantize
+          return if !(target_class_names && target_class_names.size == 1)
 
-            if !class_const.included_modules.include?(Neo4j::ActiveNode)
-              fail ArgumentError, "Invalid argument to `#{name}` association: `#{class_const.inspect}` is not an ActiveNode model"
-            end
+          class_const = ClassArguments.constantize_argument(target_class_names[0])
 
-            @target_class = class_const
-          end
-        rescue NameError
-          raise ArgumentError, "Invalid argument to `#{name}` association: Could not find class `#{target_class_names[0]}`"
+          @target_class = class_const
         end
 
         def callback(type)
@@ -215,12 +210,12 @@ module Neo4j
         VALID_ASSOCIATION_OPTION_KEYS = [:type, :origin, :model_class, :rel_class, :dependent, :before, :after, :unique]
 
         def validate_association_options!(_association_name, options)
-          type_keys = (options.keys & [:type, :origin, :rel_class])
+          ClassArguments.validate_argument!(options[:model_class], 'model_class')
+          ClassArguments.validate_argument!(options[:rel_class], 'rel_class')
+
           message = case
-                    when type_keys.size > 1
-                      "Only one of 'type', 'origin', or 'rel_class' options are allowed for associations"
-                    when type_keys.empty?
-                      "The 'type' option must be specified( even if it is `nil`) or `origin`/`rel_class` must be specified"
+                    when (message = type_keys_error_message(options.keys))
+                      message
                     when (unknown_keys = options.keys - VALID_ASSOCIATION_OPTION_KEYS).size > 0
                       "Unknown option(s) specified: #{unknown_keys.join(', ')}"
                     end
@@ -228,6 +223,15 @@ module Neo4j
           fail ArgumentError, message if message
         end
 
+        def type_keys_error_message(keys)
+          type_keys = (keys & [:type, :origin, :rel_class])
+          if type_keys.size > 1
+            "Only one of 'type', 'origin', or 'rel_class' options are allowed for associations"
+          elsif type_keys.empty?
+            "The 'type' option must be specified( even if it is `nil`) or `origin`/`rel_class` must be specified"
+          end
+        end
+
         def check_valid_type_and_dir(type, direction)
           fail ArgumentError, "Invalid association type: #{type.inspect} (valid value: :has_many and :has_one)" if ![:has_many, :has_one].include?(type.to_sym)
           fail ArgumentError, "Invalid direction: #{direction.inspect} (valid value: :out, :in, and :both)" if ![:out, :in, :both].include?(direction.to_sym)

data/lib/neo4j/active_node/persistence.rb

@@ -29,6 +29,14 @@ module Neo4j::ActiveNode
       end
     end
 
+    # Increments concurrently a numeric attribute by a centain amount
+    # @param [Symbol, String] name of the attribute to increment
+    # @param [Integer, Float] amount to increment
+    def concurrent_increment!(attribute, by = 1)
+      query_node = Neo4j::Session.query.match_nodes(n: neo_id)
+      increment_by_query! query_node, attribute, by
+    end
+
     # Persist the object to the database.  Validations and Callbacks are included
     # by default but validation can be disabled by passing :validate => false
     # to #save!  Creates a new transaction.

data/lib/neo4j/active_node/property.rb

@@ -51,7 +51,7 @@ module Neo4j::ActiveNode
       id_property_name = self.class.id_property_name.to_s
 
       attribute_pairs = attributes.except(id_property_name).sort.map do |key, value|
-        [key, (value.is_a?(String) && value.size > 100) ? value.dup[0..100] : value]
+        [key, (value.is_a?(String) && value.size > 100) ? value.dup.first(100) : value]
       end
 
       attribute_pairs.unshift([id_property_name, self.send(id_property_name)])

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

@@ -4,7 +4,7 @@ module Neo4j
       module QueryProxyFindInBatches
         def find_in_batches(options = {})
           query.return(identity).find_in_batches(identity, @model.primary_key, options) do |batch|
-            yield batch.map(&identity)
+            yield batch.map(&:identity)
           end
         end
 

data/lib/neo4j/active_rel.rb

@@ -4,9 +4,12 @@ module Neo4j
   module ActiveRel
     extend ActiveSupport::Concern
 
+    MARSHAL_INSTANCE_VARIABLES = [:@attributes, :@rel_type, :@_persisted_obj]
+
     include Neo4j::Shared
     include Neo4j::ActiveRel::Initialize
     include Neo4j::Shared::Identity
+    include Neo4j::Shared::Marshal
     include Neo4j::Shared::SerializedProperties
     include Neo4j::ActiveRel::Property
     include Neo4j::ActiveRel::Persistence
@@ -40,9 +43,6 @@ module Neo4j
       include Neo4j::Timestamps if Neo4j::Config[:record_timestamps]
 
       def self.inherited(other)
-        attributes.each_pair do |k, v|
-          other.inherit_property k.to_sym, v.clone, declared_properties[k].options
-        end
         super
       end
     end

data/lib/neo4j/active_rel/persistence.rb

@@ -36,6 +36,14 @@ module Neo4j::ActiveRel
       save(*args) or fail(RelInvalidError, inspect) # rubocop:disable Style/AndOr
     end
 
+    # Increments concurrently a numeric attribute by a centain amount
+    # @param [Symbol, String] name of the attribute to increment
+    # @param [Integer, Float] amount to increment
+    def concurrent_increment!(attribute, by = 1)
+      query_rel = Neo4j::Session.query.match('()-[n]-()').where(n: {neo_id: neo_id})
+      increment_by_query! query_rel, attribute, by
+    end
+
     def create_model
       validate_node_classes!
       rel = _create_rel

data/lib/neo4j/active_rel/property.rb

@@ -1,3 +1,5 @@
+require 'neo4j/class_arguments'
+
 module Neo4j::ActiveRel
   module Property
     extend ActiveSupport::Concern
@@ -55,13 +57,23 @@ module Neo4j::ActiveRel
 
       %w(to_class from_class).each do |direction|
         define_method("#{direction}") do |argument = nil|
-          return self.instance_variable_get("@#{direction}") if argument.nil?
-          instance_variable_set("@#{direction}", argument)
+          if !argument.nil?
+            Neo4j::ClassArguments.validate_argument!(argument, direction)
+
+            instance_variable_set("@#{direction}", argument)
+          end
+
+          self.instance_variable_get("@#{direction}")
         end
 
         define_method("_#{direction}") { instance_variable_get "@#{direction}" }
       end
 
+      def valid_class_argument?(class_argument)
+        [String, Symbol, FalseClass].include?(class_argument.class) ||
+          (class_argument.is_a?(Array) && class_argument.all? { |c| [String, Symbol].include?(c.class) })
+      end
+
       alias_method :start_class,  :from_class
       alias_method :end_class,    :to_class
 

data/lib/neo4j/active_rel/query.rb

@@ -73,9 +73,7 @@ module Neo4j::ActiveRel
 
       def as_constant(given_class)
         case given_class
-        when String
-          given_class.constantize
-        when Symbol
+        when String, Symbol
           given_class.to_s.constantize
         when Array
           fail "ActiveRel query methods are being deprecated and do not support Array (from|to)_class options. Current value: #{given_class}"

data/lib/neo4j/class_arguments.rb

@@ -0,0 +1,39 @@
+module Neo4j
+  module ClassArguments
+    class << self
+      INVALID_CLASS_ARGUMENT_ERROR = 'option must by String, Symbol, false, nil, or an Array of Symbols/Strings'
+
+      def valid_argument?(class_argument)
+        [NilClass, String, Symbol, FalseClass].include?(class_argument.class) ||
+          (class_argument.is_a?(Array) && class_argument.all? { |c| [Symbol, String].include?(c.class) })
+      end
+
+      def validate_argument!(class_argument, context)
+        return if valid_argument?(class_argument)
+
+        fail ArgumentError, "#{context} #{INVALID_CLASS_ARGUMENT_ERROR} (was #{class_argument.inspect})"
+      end
+
+      def active_node_model?(class_constant)
+        class_constant.included_modules.include?(Neo4j::ActiveNode)
+      end
+
+      def constantize_argument(class_argument)
+        case class_argument
+        when 'any', :any, false, nil
+          nil
+        when Array
+          class_argument.map(&method(:constantize_argument))
+        else
+          class_argument.to_s.constantize.tap do |class_constant|
+            if !active_node_model?(class_constant)
+              fail ArgumentError, "#{class_constant} is not an ActiveNode model"
+            end
+          end
+        end
+      rescue NameError
+        raise ArgumentError, "Could not find class: #{class_argument}"
+      end
+    end
+  end
+end

data/lib/neo4j/railtie.rb

@@ -30,7 +30,7 @@ module Neo4j
 
         return if !cfg.sessions.empty?
 
-        cfg.sessions << {type: cfg.session_type, path: cfg.session_path, options: cfg.session_options}
+        cfg.sessions << {type: cfg.session_type, path: cfg.session_path, options: cfg.session_options.merge(default: true)}
       end
 
       def setup_config_defaults!(cfg)
@@ -42,7 +42,7 @@ module Neo4j
 
       def config_data
         @config_data ||= if yaml_path
-                           HashWithIndifferentAccess.new(YAML.load(yaml_path.read)[Rails.env])
+                           HashWithIndifferentAccess.new(YAML.load(ERB.new(yaml_path.read).result)[Rails.env])
                          else
                            {}
                          end

data/lib/neo4j/shared.rb

@@ -33,13 +33,6 @@ module Neo4j
       def self.i18n_scope
         :neo4j
       end
-
-      def self.inherited(other)
-        attributes.each_pair do |k, v|
-          other.inherit_property k.to_sym, v.clone, declared_properties[k].options
-        end
-        super
-      end
     end
 
     def declared_properties

data/lib/neo4j/shared/marshal.rb

@@ -0,0 +1,23 @@
+module Neo4j
+  module Shared
+    module Marshal
+      extend ActiveSupport::Concern
+
+      def marshal_dump
+        marshal_instance_variables.map(&method(:instance_variable_get))
+      end
+
+      def marshal_load(array)
+        marshal_instance_variables.zip(array).each do |var, value|
+          instance_variable_set(var, value)
+        end
+      end
+
+      private
+
+      def marshal_instance_variables
+        self.class::MARSHAL_INSTANCE_VARIABLES
+      end
+    end
+  end
+end

data/lib/neo4j/shared/persistence.rb

@@ -37,6 +37,29 @@ module Neo4j::Shared
       props_for_db(changed_props)
     end
 
+    # Increments a numeric attribute by a centain amount
+    # @param [Symbol, String] name of the attribute to increment
+    # @param [Integer, Float] amount to increment
+    def increment(attribute, by = 1)
+      self[attribute] ||= 0
+      self[attribute] += by
+      self
+    end
+
+    # Convenience method to increment numeric attribute and #save at the same time
+    # @param [Symbol, String] name of the attribute to increment
+    # @param [Integer, Float] amount to increment
+    def increment!(attribute, by = 1)
+      increment(attribute, by).update_attribute(attribute, self[attribute])
+    end
+
+    # Increments concurrently a numeric attribute by a centain amount
+    # @param [Symbol, String] name of the attribute to increment
+    # @param [Integer, Float] amount to increment
+    def concurrent_increment!(_attribute, _by = 1)
+      fail 'not_implemented'
+    end
+
     # Convenience method to set attribute and #save at the same time
     # @param [Symbol, String] attribute of the attribute to update
     # @param [Object] value to set
@@ -166,6 +189,19 @@ module Neo4j::Shared
       end
     end
 
+    protected
+
+    def increment_by_query!(match_query, attribute, by, element_name = :n)
+      new_attribute = match_query.with(element_name)
+                      .set("#{element_name}.`#{attribute}` = COALESCE(#{element_name}.`#{attribute}`, 0) + {by}")
+                      .params(by: by).limit(1)
+                      .pluck("#{element_name}.`#{attribute}`").first
+      return false unless new_attribute
+      self[attribute] = new_attribute
+      changed_attributes.delete(attribute)
+      true
+    end
+
     private
 
     def props_for_db(props_hash)

data/lib/neo4j/shared/property.rb

@@ -27,7 +27,7 @@ module Neo4j::Shared
     # It calls an init method in active_attr that has a very negative impact on performance.
     def initialize(attributes = nil)
       attributes = process_attributes(attributes)
-      @relationship_props = {} # self.class.extract_association_attributes!(attributes)
+      @relationship_props = self.class.extract_association_attributes!(attributes)
       modded_attributes = inject_defaults!(attributes)
       validate_attributes!(modded_attributes)
       writer_method_props = extract_writer_methods!(modded_attributes)
@@ -132,6 +132,13 @@ module Neo4j::Shared
 
       def_delegators :declared_properties, :serialized_properties, :serialized_properties=, :serialize, :declared_property_defaults
 
+      def inherited(other)
+        self.declared_properties.registered_properties.each_pair do |prop_key, prop_def|
+          other.property(prop_key, prop_def.options)
+        end
+        super
+      end
+
       # Defines a property on the class
       #
       # See active_attr gem for allowed options, e.g which type

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '6.0.9'
+  VERSION = '6.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 6.0.9
+  version: 6.1.0
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2016-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter
@@ -268,6 +268,7 @@ files:
 - lib/neo4j/active_rel/related_node.rb
 - lib/neo4j/active_rel/types.rb
 - lib/neo4j/active_rel/validations.rb
+- lib/neo4j/class_arguments.rb
 - lib/neo4j/config.rb
 - lib/neo4j/core/query.rb
 - lib/neo4j/errors.rb
@@ -284,6 +285,7 @@ files:
 - lib/neo4j/shared/filtered_hash.rb
 - lib/neo4j/shared/identity.rb
 - lib/neo4j/shared/initialize.rb
+- lib/neo4j/shared/marshal.rb
 - lib/neo4j/shared/persistence.rb
 - lib/neo4j/shared/property.rb
 - lib/neo4j/shared/property/default_property.rb