neo4j 5.0.0.rc.3 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc96b4d5b3007bf7da4b1894ad52a9a203171e44
-  data.tar.gz: ee8e0b05b7df72c85a4d5f6d661a668fa350dbb9
+  metadata.gz: df42076f21c3f31cf2cde7b6d226af5c3f27ffd4
+  data.tar.gz: 284cff951e6666fe88f49147c05d89f59be231fd
 SHA512:
-  metadata.gz: b5733ba5a5137b072f5e9dc0eded1bb0642a5361f0dffde0f6c257068b7f83db796967a6767b7683be8e454bfdfcd3e517f99ae9218357e853ea63472c319297
-  data.tar.gz: 8b287427507618a06e4e3f27fa58d4c7ceb6298a2042400dc77591657046680ceacd404accbf20afff71fe545f3dcbfb71736f336d45854d27541ab7b5cb3afd
+  metadata.gz: dd03334a23759e25ecf0aa6a3586ad8b08b8650312505254e84e06e43502fab6e1ae775f9b86218db686baefdfec11e8078dfd7de378bcffe0ac1055682bc2bc
+  data.tar.gz: 408d0968f7796141d8f04f81fd91b08e859141001285eba1a7f4d79f30ad2be8a2f3f7ed46964b853743e497f9726c8d8b615f3ad3f3508fac132e9f0a946db5

data/CHANGELOG.md

@@ -6,7 +6,18 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased][unreleased]
 - Nothing yet, placeholder
 
-## [5.0.0.rc.3] - 2015-05-20
+## [5.0.0] - 2015-06-18
+
+### Fixed
+- Prevented `to_key` from requiring an extra DB query. (See https://github.com/neo4jrb/neo4j/pull/827)
+
+### Added
+- QueryProxy associations accept `labels: false` option to prevent generated Cypher from using labels.
+
+### Changed
+- Properties explicitly set to type `Time` will no longer be converted to `DateTime`.
+
+## [5.0.0.rc.3] - 2015-06-07
 
 ### Fixed
 - Associations now allow `unique` option.  Error handling is generalized to make this testable (Thanks to @olance, see #824)

data/lib/neo4j/active_node.rb

@@ -44,6 +44,15 @@ module Neo4j
       _persisted_obj || fail('Tried to access native neo4j object on a non persisted object')
     end
 
+    def inspect
+      id_property_name = self.class.id_property_name.to_s
+      attribute_pairs = attributes.except(id_property_name).sort.map { |key, value| "#{key}: #{value.inspect}" }
+      attribute_pairs.unshift("#{id_property_name}: #{self.send(id_property_name).inspect}")
+      attribute_descriptions = attribute_pairs.join(', ')
+      separator = ' ' unless attribute_descriptions.empty?
+      "#<#{self.class.name}#{separator}#{attribute_descriptions}>"
+    end
+
     included do
       def self.inherited(other)
         inherit_id_property(other)

data/lib/neo4j/active_node/has_n.rb

@@ -138,22 +138,13 @@ module Neo4j::ActiveNode
       end
     end
 
-    # Uses the cypher generated by a QueryProxy object, complete with params, to generate a basic non-cryptographic hash
-    # for use in @association_cache.
-    # @param [String] the cypher used in the query
-    # @return [String] A basic hash of the query
-    def cypher_hash(cypher_string)
-      cypher_string.hash.abs
-    end
-
     def association_query_proxy(name, options = {})
-      self.class.send(:association_query_proxy, name, {start_object: self}.merge(options))
+      self.class.send(:association_query_proxy, name, {start_object: self}.merge!(options))
     end
 
     def association_proxy(name, options = {})
       name = name.to_sym
-      hash = [name, options.values_at(:node, :rel)].hash
-
+      hash = [name, options.values_at(:node, :rel, :labels)].hash
       association_proxy_cache_fetch(hash) do
         if previous_association_proxy = self.instance_variable_get('@association_proxy')
           result_by_previous_id = previous_association_proxy_results_by_previous_id(previous_association_proxy, name)
@@ -321,13 +312,13 @@ module Neo4j::ActiveNode
         define_method(name) do |node = nil, rel = nil, options = {}|
           return [].freeze unless self._persisted_obj
 
-          association_proxy(name, {node: node, rel: rel, source_object: self}.merge(options))
+          association_proxy(name, {node: node, rel: rel, source_object: self, labels: options[:labels]}.merge!(options))
         end
 
         define_has_many_setter(name)
 
         define_class_method(name) do |node = nil, rel = nil, options = {}|
-          association_proxy(name, {node: node, rel: rel}.merge(options))
+          association_proxy(name, {node: node, rel: rel, labels: options[:labels]}.merge!(options))
         end
       end
 
@@ -349,7 +340,7 @@ module Neo4j::ActiveNode
         define_has_one_setter(name)
 
         define_class_method(name) do |node = nil, rel = nil, options = {}|
-          association_proxy(name, {node: node, rel: rel}.merge(options))
+          association_proxy(name, {node: node, rel: rel, labels: options[:labels]}.merge!(options))
         end
       end
 
@@ -373,14 +364,14 @@ module Neo4j::ActiveNode
       def association_query_proxy(name, options = {})
         previous_query_proxy = options[:previous_query_proxy] || current_scope
         query_proxy = previous_query_proxy || default_association_query_proxy(name)
-
         Neo4j::ActiveNode::Query::QueryProxy.new(association_target_class(name),
                                                  associations[name],
                                                  {session: neo4j_session,
                                                   query_proxy: query_proxy,
                                                   context: "#{query_proxy.context || self.name}##{name}",
                                                   optional: query_proxy.optional?,
-                                                  source_object: query_proxy.source_object}.merge(options)).tap do |query_proxy_result|
+                                                  association_labels: options[:labels],
+                                                  source_object: query_proxy.source_object}.merge!(options)).tap do |query_proxy_result|
                                                     target_classes = association_target_classes(name)
                                                     return query_proxy_result.as_models(target_classes) if target_classes
                                                   end
@@ -388,7 +379,6 @@ module Neo4j::ActiveNode
 
       def association_proxy(name, options = {})
         query_proxy = association_query_proxy(name, options)
-
         AssociationProxy.new(query_proxy)
       end
 

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

@@ -38,8 +38,7 @@ module Neo4j
           @context = options.delete(:context)
           @options = options
 
-          @node_var, @session, @source_object, @starting_query, @optional, @start_object, @query_proxy, @chain_level =
-            options.values_at(:node, :session, :source_object, :starting_query, :optional, :start_object, :query_proxy, :chain_level)
+          instance_vars_from_options!(options)
 
           @match_type = @optional ? :optional_match : :match
 
@@ -86,8 +85,8 @@ module Neo4j
         # and work with it from the more powerful (but less friendly) Neo4j::Core::Query.
         # @param [String,Symbol] var The identifier to use for node at this link of the QueryProxy chain.
         #   student.lessons.query_as(:l).with('your cypher here...')
-        def query_as(var, with_label = true)
-          result_query = @chain.inject(base_query(var, with_label).params(@params)) do |query, link|
+        def query_as(var, with_labels = true)
+          result_query = @chain.inject(base_query(var, with_labels).params(@params)) do |query, link|
             args = link.args(var, rel_var)
 
             args.is_a?(Array) ? query.send(link.clause, *args) : query.send(link.clause, args)
@@ -106,8 +105,11 @@ module Neo4j
           end
         end
 
-        def _model_label_string
-          return if !@model
+        # param [TrueClass, FalseClass] with_labels This param is used by certain QueryProxy methods that already have the neo_id and
+        # therefore do not need labels.
+        # The @association_labels instance var is set during init and used during association chaining to keep labels out of Cypher queries.
+        def _model_label_string(with_labels = true)
+          return if !@model || (!with_labels || @association_labels == false)
           @model.mapped_label_names.map { |label_name| ":`#{label_name}`" }.join
         end
 
@@ -185,16 +187,6 @@ module Neo4j
           end
         end
 
-        def rels
-          fail 'Cannot get rels without a relationship variable.' if !@rel_var
-
-          pluck(@rel_var)
-        end
-
-        def rel
-          rels.first
-        end
-
         def _nodeify!(*args)
           other_nodes = [args].flatten!.map! do |arg|
             (arg.is_a?(Integer) || arg.is_a?(String)) ? @model.find_by(@model.id_property_name => arg) : arg
@@ -232,12 +224,6 @@ module Neo4j
           (@model && @model.respond_to?(method_name, include_all)) || super
         end
 
-        # Give ability to call `#find` on associations to get a scoped find
-        # Doesn't pass through via `method_missing` because Enumerable has a `#find` method
-        def find(*args)
-          scoping { @model.find(*args) }
-        end
-
         def optional?
           @optional == true
         end
@@ -325,6 +311,11 @@ module Neo4j
 
         private
 
+        def instance_vars_from_options!(options)
+          @node_var, @session, @source_object, @starting_query, @optional, @start_object, @query_proxy, @chain_level, @association_labels =
+              options.values_at(:node, :session, :source_object, :starting_query, :optional, :start_object, :query_proxy, :chain_level, :association_labels)
+        end
+
         def build_deeper_query_proxy(method, args)
           new_link.tap do |new_query|
             Link.for_args(@model, method, args).each { |link| new_query._add_links(link) }

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

@@ -6,6 +6,22 @@ module Neo4j
         FIRST = 'HEAD'
         LAST = 'LAST'
 
+        def rels
+          fail 'Cannot get rels without a relationship variable.' if !@rel_var
+
+          pluck(@rel_var)
+        end
+
+        def rel
+          rels.first
+        end
+
+        # Give ability to call `#find` on associations to get a scoped find
+        # Doesn't pass through via `method_missing` because Enumerable has a `#find` method
+        def find(*args)
+          scoping { @model.find(*args) }
+        end
+
         def first(target = nil)
           first_and_last(FIRST, target)
         end

data/lib/neo4j/shared/declared_property.rb

@@ -34,10 +34,6 @@ module Neo4j::Shared
     # Tweaks properties
     def register_magic_properties
       options[:type] ||= DateTime if name.to_sym == :created_at || name.to_sym == :updated_at
-      # TODO: Custom typecaster to fix the stuff below
-      # ActiveAttr does not handle "Time", Rails and Neo4j.rb 2.3 did
-      # Convert it to DateTime in the interest of consistency
-      options[:type] = DateTime if options[:type] == Time
 
       register_magic_typecaster
       register_type_converter

data/lib/neo4j/shared/identity.rb

@@ -8,7 +8,7 @@ module Neo4j::Shared
     # Returns an Enumerable of all (primary) key attributes
     # or nil if model.persisted? is false
     def to_key
-      persisted? ? [id] : nil
+      _persisted_obj ? [id] : nil
     end
 
     # @return [Integer, nil] the neo4j id of the node if persisted or nil

data/lib/neo4j/shared/type_converters.rb

@@ -57,6 +57,9 @@ module Neo4j::Shared
           Time
         end
 
+        def primitive_type
+          Integer
+        end
         # Converts the given DateTime (UTC) value to an Integer.
         # Only utc times are supported !
         def to_db(value)
@@ -70,6 +73,7 @@ module Neo4j::Shared
         def to_ruby(value)
           Time.at(value).utc
         end
+        alias_method :call, :to_ruby
       end
     end
 

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '5.0.0.rc.3'
+  VERSION = '5.0.0'
 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', '>= 5.0.0.rc.1')
+  s.add_dependency('neo4j-core', '~> 5.0.0')
   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: 5.0.0.rc.3
+  version: 5.0.0
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-08 00:00:00.000000000 Z
+date: 2015-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter
@@ -70,16 +70,16 @@ dependencies:
   name: neo4j-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0.rc.1
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0.rc.1
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -307,12 +307,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: neo4j
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A graph database for Ruby