neo4j 6.0.0.alpha.12 → 6.0.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88d57fe8f616166912b89e008686fea6190fee43
-  data.tar.gz: 83cbc8c78c8ae3a8571ed0870699f0537b018a84
+  metadata.gz: 79fee58d2b88d542f1af73c6240762f5484fe820
+  data.tar.gz: bc525e2a2f3ec67b346a09a89f62dc1ac39f85fc
 SHA512:
-  metadata.gz: c13bb99309098ea662883902a7491cec10d32c9beb475a96825622e0a3b9e2f032b6d92eed15524613a796ab00da7407516241f5d655c1fc770ee1e0a321f70e
-  data.tar.gz: db933033b16e28f6282dd3e6b46f772587bfa670d125c26e2289f32bba771d93c66c5da3933fe1beb0fab1783495af1604c82ba616179f78179b4f2889a1a55e
+  metadata.gz: e536923b9a12aee831cefb2bf323c52c616868f1404d1c3e34edb68833c4365ae65afea87872174bd5b227dc857775c0e03bf0577a194df8da01e1e3176da1f5
+  data.tar.gz: 33a078d405f0eb7afaa34f079d458920211a2844c743d32faca3ba5f2a2e1fe10d41f4acc89b529177dae8c19ba62c746d6843478162296d3be13fd7236fe7c9

data/CHANGELOG.md

@@ -3,10 +3,59 @@ 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.0.rc.1] - 11-13-2015
+
+This release contains no changes since the last alpha. Below are all modifications introduced in alpha releases.
+
+### Changed
+
+- `_classname` property has been completely removed, officially dropping support for Neo4j < 2.1.5.
+- `ActiveRel#creates_unique` and the `:unique` Association option take arguments to control how the query is built. See https://github.com/neo4jrb/neo4j/pull/1038.
+- `#<<` and `#create` methods on associations now create with the `rel_class` when available so that validations/callbacks/defaults are all used as expected
+- Allow calling of `#method=` methods via model `new` method `Hash` argument
+- Remove uniqueness validation for `id_property` because we already have Neo4j constraints
+- Improved eager loading when no with_associations is specified (see #905)
+- Change size and length so that they match expected Ruby / ActiveRecord behavior (see http://stackoverflow.com/questions/6083219/activerecord-size-vs-count and #875)
+- Refactoring around indexing and constraints in `Neo4j::ActiveNode`. The public interfaces are unchanged.
+- `Neo4j::Shared::DeclaredPropertyManager` was renamed `Neo4j::Shared::DeclaredProperties`. All methods referencing the old name were updated to reflect this.
+- Methods that were using `Neo4j::Session#on_session_available` were updated to reflect the upstream change to `on_next_session_available`.
+- `rel_where` will now use ActiveRel classes for type conversion, when possible.
+- Converters will look for a `converted?` method to determine whether an object is of the appropriate type for the database. This allows converters to be responsible for multiple types, if required.
+- Removed the ability to set both an exact index and unique constraint on the same property in a model. Unique constraints also provide exact indexes.
+- Deprecated all methods in ActiveRel's Query module except for those that allow finding by id.
+- Return `true` on successful `#save!` calls (Thanks to jmdeldin)
+
+### Added
+
+- Optional three-argument signature for `ActiveRel#create` and `#create!`, just like `initialize`.
+- Alternate `ActiveRel` init syntax: `RelClass.new(from_node, to_node, args)`. This is optional, so giving a single hash with props with or without nodes is still possible.
+- `ActiveRel` `create` actions can now handle unpersisted nodes.
+- `rel_order` method for association chaining
+- Support `config/neo4j.yaml`
+- Look for ENV variables for Neo4j URL / path for Rails apps
+- New classes for schema operations, predictably called `Neo4j::Schema::Operation` and subclasses `UniqueConstraintOperation` and `ExactIndexOperation`. These provide methods to aid in the additional, removal, and presence checking of indexes and constraints.
+- A few methods were added to `Neo4j::Shared::DeclaredProperties` to make it easier to work with. In particular, `[key]` acts as a shortcut for `DeclaredProperties#registered_properties`.
+- Type Converters were added for String, Integer, Fixnum, BigDecimal, and Boolean to provide type conversion for these objects in QueryProxy.
+- Support for Array arguments to ActiveRel's `from_class` and `to_class`.
+
+### Fixed
+
+- Regression RE: properties being overwritten with their defaults on save in alpha.10.
+- Long properties in `ActiveNode`/`ActiveRel` `#inspect` are truncated
+- Property defaults are set initially when an instance of a model is loaded, then checked again before save to ensure `valid?` works.
+- `QueryProxy` was not converting Boolean properties correctly
+- Certain actions that were intended as once-in-the-app's-lifetime events, notably schema operations, will only occur immediately upon the first session's establishment.
+- Context now set for Model.all QueryProxy so that logs can reflect that it wasn't just a raw Cypher query
+
+### Removed
+
+- Railtie was removing username/password and putting them into the session options.  This has been unneccessary in `neo4j-core` for a while now
+
 ## [6.0.0.alpha.12] - 11-5-2015
 
 ### Changed
 - `_classname` property has been completely removed, officially dropping support for Neo4j < 2.1.5.
+- `ActiveRel#creates_unique` and the `:unique` Association option take arguments to control how the query is built. See https://github.com/neo4jrb/neo4j/pull/1038. 
 
 ### Added
 - Optional three-argument signature for `ActiveRel#create` and `#create!`, just like `initialize`.
@@ -51,7 +100,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 
-- Support `config/neo4j.ya?ml`
+- Support `config/neo4j.yaml`
 
 ## [6.0.0.alpha.6] - 10-18-2015
 

data/lib/neo4j.rb

@@ -31,6 +31,7 @@ require 'neo4j/schema/operation'
 require 'neo4j/timestamps'
 
 require 'neo4j/shared/callbacks'
+require 'neo4j/shared/filtered_hash'
 require 'neo4j/shared/declared_property/index'
 require 'neo4j/shared/declared_property'
 require 'neo4j/shared/declared_properties'
@@ -42,6 +43,7 @@ require 'neo4j/shared/serialized_properties'
 require 'neo4j/shared/typecaster'
 require 'neo4j/shared/initialize'
 require 'neo4j/shared/query_factory'
+require 'neo4j/shared/cypher'
 require 'neo4j/shared'
 
 require 'neo4j/active_rel/callbacks'
@@ -80,6 +82,8 @@ require 'neo4j/active_node/reflection'
 require 'neo4j/active_node/unpersisted'
 require 'neo4j/active_node/has_n'
 require 'neo4j/active_node/has_n/association_cypher_methods'
+require 'neo4j/active_node/has_n/association/rel_wrapper'
+require 'neo4j/active_node/has_n/association/rel_factory'
 require 'neo4j/active_node/has_n/association'
 require 'neo4j/active_node/query/query_proxy'
 require 'neo4j/active_node/query'

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

@@ -133,10 +133,18 @@ module Neo4j
           @origin ? origin_association.unique? : !!@unique
         end
 
+        def creates_unique_option
+          @unique || :none
+        end
+
         def create_method
           unique? ? :create_unique : :create
         end
 
+        def _create_relationship(start_object, node_or_nodes, properties)
+          RelFactory.create(start_object, node_or_nodes, properties, self)
+        end
+
         def relationship_class?
           !!relationship_class
         end

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

@@ -0,0 +1,61 @@
+module Neo4j::ActiveNode::HasN
+  class Association
+    class RelFactory
+      [:start_object, :other_node_or_nodes, :properties, :association].tap do |accessors|
+        attr_reader(*accessors)
+        private(*accessors)
+      end
+
+      def self.create(start_object, other_node_or_nodes, properties, association)
+        factory = new(start_object, other_node_or_nodes, properties, association)
+        factory._create_relationship
+      end
+
+      def _create_relationship
+        creator = association.relationship_class ? :rel_class : :factory
+        send(:"_create_relationship_with_#{creator}")
+      end
+
+      private
+
+      def initialize(start_object, other_node_or_nodes, properties, association)
+        @start_object = start_object
+        @other_node_or_nodes = other_node_or_nodes
+        @properties = properties
+        @association = association
+      end
+
+      def _create_relationship_with_rel_class
+        Array(other_node_or_nodes).each do |other_node|
+          node_props = _nodes_for_create(other_node, :from_node, :to_node)
+          association.relationship_class.create(properties.merge(node_props))
+        end
+      end
+
+      def _create_relationship_with_factory
+        Array(other_node_or_nodes).each do |other_node|
+          wrapper = _rel_wrapper(properties)
+          base = _match_query(other_node, wrapper)
+          factory = Neo4j::Shared::RelQueryFactory.new(wrapper, wrapper.rel_identifier)
+          factory.base_query = base
+          factory.query.exec
+        end
+      end
+
+      def _match_query(other_node, wrapper)
+        nodes = _nodes_for_create(other_node, wrapper.from_node_identifier, wrapper.to_node_identifier)
+        Neo4j::Session.current.query.match_nodes(nodes)
+      end
+
+      def _nodes_for_create(other_node, from_node_id, to_node_id)
+        nodes = [@start_object, other_node]
+        nodes.reverse! if association.direction == :in
+        {from_node_id => nodes[0], to_node_id => nodes[1]}
+      end
+
+      def _rel_wrapper(properties)
+        Neo4j::ActiveNode::HasN::Association::RelWrapper.new(association, properties)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+class Neo4j::ActiveNode::HasN::Association
+  # Provides the interface needed to interact with the ActiveRel query factory.
+  class RelWrapper
+    include Neo4j::Shared::Cypher::RelIdentifiers
+    include Neo4j::Shared::Cypher::CreateMethod
+
+    attr_reader :type, :association
+    attr_accessor :properties
+    private :association
+    alias_method :props_for_create, :properties
+
+    def initialize(association, properties = {})
+      @association = association
+      @properties = properties
+      @type = association.relationship_type(true)
+      creates_unique(association.creates_unique_option) if association.unique?
+    end
+
+    def persisted?
+      false
+    end
+  end
+end

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

@@ -206,21 +206,7 @@ module Neo4j
         end
 
         def _create_relationship(other_node_or_nodes, properties)
-          if association.relationship_class
-            _create_relationship_with_rel_class(other_node_or_nodes, properties)
-          else
-            _session.query(context: @options[:context])
-              .match(:start, :end).match_nodes(start: @start_object, end: other_node_or_nodes)
-              .send(association.create_method, "start#{_association_arrow(properties, true)}end").exec
-          end
-        end
-
-        def _create_relationship_with_rel_class(other_node_or_nodes, properties)
-          Array(other_node_or_nodes).each do |other_node|
-            node_props = (association.direction == :in) ? {from_node: other_node, to_node: @start_object} : {from_node: @start_object, to_node: other_node}
-
-            association.relationship_class.create(properties.merge(node_props))
-          end
+          association._create_relationship(@start_object, other_node_or_nodes, properties)
         end
 
         def read_attribute_for_serialization(*args)

data/lib/neo4j/active_rel/persistence.rb

@@ -1,10 +1,9 @@
 module Neo4j::ActiveRel
   module Persistence
     extend ActiveSupport::Concern
+    include Neo4j::Shared::Cypher::RelIdentifiers
     include Neo4j::Shared::Persistence
 
-    attr_writer :from_node_identifier, :to_node_identifier
-
     class RelInvalidError < RuntimeError; end
     class ModelClassInvalidError < RuntimeError; end
     class RelCreateFailedError < RuntimeError; end
@@ -17,6 +16,14 @@ module Neo4j::ActiveRel
       @to_node_identifier || :to_node
     end
 
+    def from_node_identifier=(id)
+      @from_node_identifier = id.to_sym
+    end
+
+    def to_node_identifier=(id)
+      @to_node_identifier = id.to_sym
+    end
+
     def cypher_identifier
       @cypher_identifier || :rel
     end

data/lib/neo4j/active_rel/persistence/query_factory.rb

@@ -29,7 +29,7 @@ module Neo4j::ActiveRel::Persistence
     private
 
     def rel_id
-      @rel_id ||= rel.cypher_identifier
+      @rel_id ||= rel.rel_identifier
     end
 
     # Node callbacks only need to be executed if the node is not persisted. We let the `conditional_callback` method do the work,

data/lib/neo4j/active_rel/property.rb

@@ -31,7 +31,13 @@ module Neo4j::ActiveRel
       send_props(@relationship_props) unless @relationship_props.nil?
     end
 
+    def creates_unique_option
+      self.class.creates_unique_option
+    end
+
     module ClassMethods
+      include Neo4j::Shared::Cypher::CreateMethod
+
       # Extracts keys from attributes hash which are relationships of the model
       # TODO: Validate separately that relationships are getting the right values?  Perhaps also store the values and persist relationships on save?
       def extract_association_attributes!(attributes)
@@ -62,26 +68,6 @@ module Neo4j::ActiveRel
       def load_entity(id)
         Neo4j::Node.load(id)
       end
-
-      def creates_unique
-        @creates_unique = true
-      end
-
-      def creates_unique_rel
-        warning = <<-WARNING
-creates_unique_rel() is deprecated and will be removed from future releases,
-use creates_unique() instead.
-WARNING
-
-        ActiveSupport::Deprecation.warn(warning, caller)
-
-        creates_unique
-      end
-
-      def creates_unique?
-        !!@creates_unique
-      end
-      alias_method :unique?, :creates_unique?
     end
 
     private

data/lib/neo4j/shared/cypher.rb

@@ -0,0 +1,37 @@
+module Neo4j::Shared
+  module Cypher
+    module CreateMethod
+      def create_method
+        creates_unique? ? :create_unique : :create
+      end
+
+      def creates_unique(option = :none)
+        option = :none if option == true
+        @creates_unique = option
+      end
+
+      def creates_unique_option
+        @creates_unique || :none
+      end
+
+      def creates_unique?
+        !!@creates_unique
+      end
+      alias_method :unique?, :creates_unique?
+    end
+
+    module RelIdentifiers
+      extend ActiveSupport::Concern
+
+      [:from_node, :to_node, :rel].each do |element|
+        define_method("#{element}_identifier") do
+          instance_variable_get(:"@#{element}_identifier") || element
+        end
+
+        define_method("#{element}_identifier=") do |id|
+          instance_variable_set(:"@#{element}_identifier", id.to_sym)
+        end
+      end
+    end
+  end
+end

data/lib/neo4j/shared/filtered_hash.rb

@@ -0,0 +1,79 @@
+module Neo4j::Shared
+  class FilteredHash
+    class InvalidHashFilterType < Neo4j::Neo4jrbError; end
+    VALID_SYMBOL_INSTRUCTIONS = [:all, :none]
+    VALID_HASH_INSTRUCTIONS = [:on]
+    VALID_INSTRUCTIONS_TYPES = [Hash, Symbol]
+
+    attr_reader :base, :instructions, :instructions_type
+
+    def initialize(base, instructions)
+      @base = base
+      @instructions = instructions
+      @instructions_type = instructions.class
+      validate_instructions!(instructions)
+    end
+
+    def filtered_base
+      case instructions
+      when Symbol
+        filtered_base_by_symbol
+      when Hash
+        filtered_base_by_hash
+      end
+    end
+
+    private
+
+    def filtered_base_by_symbol
+      case instructions
+      when :all
+        [base, {}]
+      when :none
+        [{}, base]
+      end
+    end
+
+    def filtered_base_by_hash
+      behavior_key = instructions.keys.first
+      filter_keys = keys_array(behavior_key)
+      [filter(filter_keys, :with), filter(filter_keys, :without)]
+    end
+
+    def key?(filter_keys, key)
+      filter_keys.include?(key)
+    end
+
+    def filter(filter_keys, key)
+      filtering = key == :with
+      base.select { |k, _v| key?(filter_keys, k) == filtering }
+    end
+
+    def keys_array(key)
+      instructions[key].is_a?(Array) ? instructions[key] : [instructions[key]]
+    end
+
+    def validate_instructions!(instructions)
+      fail InvalidHashFilterType, "Filtering instructions #{instructions} are invalid" unless VALID_INSTRUCTIONS_TYPES.include?(instructions.class)
+      clazz = instructions_type.name.downcase
+      return if send(:"valid_#{clazz}_instructions?", instructions)
+      fail InvalidHashFilterType, "Invalid instructions #{instructions}, valid options for #{clazz}: #{send(:"valid_#{clazz}_instructions")}"
+    end
+
+    def valid_symbol_instructions?(instructions)
+      valid_symbol_instructions.include?(instructions)
+    end
+
+    def valid_hash_instructions?(instructions)
+      valid_hash_instructions.include?(instructions.keys.first)
+    end
+
+    def valid_symbol_instructions
+      VALID_SYMBOL_INSTRUCTIONS
+    end
+
+    def valid_hash_instructions
+      VALID_HASH_INSTRUCTIONS
+    end
+  end
+end

data/lib/neo4j/shared/query_factory.rb

@@ -79,13 +79,20 @@ module Neo4j::Shared
 
     def create_query
       return match_query if graph_object.persisted?
-      base_query.send(graph_object.create_method, query_string).params(identifier_params.to_sym => graph_object.props_for_create)
+      create_props, set_props = filtered_props
+      base_query.send(graph_object.create_method, query_string).break
+        .set(identifier => set_props)
+        .params(:"#{identifier}_create_props" => create_props)
     end
 
     private
 
+    def filtered_props
+      Neo4j::Shared::FilteredHash.new(graph_object.props_for_create, graph_object.creates_unique_option).filtered_base
+    end
+
     def query_string
-      "#{graph_object.from_node_identifier}-[#{identifier}:#{graph_object.type} {#{identifier_params}}]->#{graph_object.to_node_identifier}"
+      "#{graph_object.from_node_identifier}-[#{identifier}:#{graph_object.type} {#{identifier}_create_props}]->#{graph_object.to_node_identifier}"
     end
   end
 end

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '6.0.0.alpha.12'
+  VERSION = '6.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('activemodel', '~> 4')
   s.add_dependency('activesupport', '~> 4')
   s.add_dependency('active_attr', '~> 0.8')
-  s.add_dependency('neo4j-core', '~> 6.0.0.alpha.6')
+  s.add_dependency('neo4j-core', '~> 6.0.0.rc.1')
   s.add_dependency('neo4j-community', '~> 2.0') if RUBY_PLATFORM =~ /java/
   s.add_development_dependency('railties', '~> 4')
   s.add_development_dependency('pry')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 6.0.0.alpha.12
+  version: 6.0.0.rc.1
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0.alpha.6
+        version: 6.0.0.rc.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0.alpha.6
+        version: 6.0.0.rc.1
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -231,6 +231,8 @@ files:
 - lib/neo4j/active_node/dependent/query_proxy_methods.rb
 - lib/neo4j/active_node/has_n.rb
 - lib/neo4j/active_node/has_n/association.rb
+- lib/neo4j/active_node/has_n/association/rel_factory.rb
+- lib/neo4j/active_node/has_n/association/rel_wrapper.rb
 - lib/neo4j/active_node/has_n/association_cypher_methods.rb
 - lib/neo4j/active_node/id_property.rb
 - lib/neo4j/active_node/id_property/accessor.rb
@@ -276,9 +278,11 @@ files:
 - lib/neo4j/schema/operation.rb
 - lib/neo4j/shared.rb
 - lib/neo4j/shared/callbacks.rb
+- lib/neo4j/shared/cypher.rb
 - lib/neo4j/shared/declared_properties.rb
 - lib/neo4j/shared/declared_property.rb
 - lib/neo4j/shared/declared_property/index.rb
+- lib/neo4j/shared/filtered_hash.rb
 - lib/neo4j/shared/identity.rb
 - lib/neo4j/shared/initialize.rb
 - lib/neo4j/shared/persistence.rb