neo4j 6.0.0.alpha.5 → 6.0.0.alpha.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51e7f7f2111156aec6a405435bfb1d54ba872b21
-  data.tar.gz: 25ff673e9f3baf99812fdf9a9cf090e7071004b7
+  metadata.gz: b0ca6a12d1708b86d03c1c5932a4f251e365c005
+  data.tar.gz: 26bc7938b51f0c998ab7065df9db84cccf60a9dc
 SHA512:
-  metadata.gz: 510aa9f0861552d70b27a5e15c765ed24c7ee47d6a74a80d11daf402a616da286fb69d4456159c34e3d9c52f8928ae6ad8de85e168592fa1ded6ea8b28340da4
-  data.tar.gz: b5a78ff50ce7b9815687f7e9dcc619dae0f21dbf68668f0190c7b1b83328948db39bd3eeccb64d0aaefe219e9d3e2af997fff8a8934b81e98518eb659d50a45c
+  metadata.gz: 75f1ec8c3a3c26a6047d0257da2652f0e51c4b198cffeff15bd847797cd5a94928788e5010f9c57a3a81693628b5ec7ac0e4fa16190b9d8b58b39b2b61e2e6c5
+  data.tar.gz: ba64cd70f047f933e47a0aed2d9daa4b1b39876589fe432537c20c85bdf6f13fdd74e14794d53a9304aaf5a44df573dac7e9933455ccccb28204f9fae4b73330

data/CHANGELOG.md

@@ -3,12 +3,29 @@ 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.alpha.7] - 10-19-2015
+
+- Remove uniqueness validation for `id_property` because we already have Neo4j constraints
+- Support `config/neo4j.ya?ml`
+
+## [6.0.0.alpha.6] - 10-18-2015
+
+### Changed
+
+- Improved eager loading when no with_associations is specified (see #905)
+
 ## [6.0.0.alpha.5] - 10-18-2015
 
 ### Changed
 
 - Change size and length so that they match expected Ruby / ActiveRecord behavior (see http://stackoverflow.com/questions/6083219/activerecord-size-vs-count and #875)
 
+## [6.0.0.alpha.4] - 10-17-2015
+
+### Fixed
+
+- `QueryProxy` was not converting Boolean properties correctly
+
 ## [6.0.0.alpha.3] - 10-14-2015
 
 ### Removed
@@ -46,6 +63,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - 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
 
+## [5.2.11] - 10-18-2015
+
+### Fixed
+- Unable to give additional options as first argument to chained QueryProxy method
+
 ## [5.2.10] - 10-14-2015
 
 ### Fixed

data/lib/neo4j/active_node/has_n.rb

@@ -158,7 +158,7 @@ module Neo4j::ActiveNode
       name = name.to_sym
       hash = association_proxy_hash(name, options)
       association_proxy_cache_fetch(hash) do
-        if result_cache = self.instance_variable_get('@source_query_proxy_result_cache')
+        if result_cache = self.instance_variable_get('@source_proxy_result_cache')
           result_by_previous_id = previous_proxy_results_by_previous_id(result_cache, name)
 
           result_cache.inject(nil) do |proxy_to_return, object|
@@ -184,7 +184,11 @@ module Neo4j::ActiveNode
       query_proxy = self.class.as(:previous).where(neo_id: result_cache.map(&:neo_id))
       query_proxy = self.class.send(:association_query_proxy, association_name, previous_query_proxy: query_proxy, node: :next, optional: true)
 
-      Hash[*query_proxy.pluck('ID(previous)', 'collect(next)').flatten(1)]
+      Hash[*query_proxy.pluck('ID(previous)', 'collect(next)').flatten(1)].each do |_, records|
+        records.each do |record|
+          record.instance_variable_set('@source_proxy_result_cache', records)
+        end
+      end
     end
 
     module ClassMethods
@@ -332,10 +336,7 @@ module Neo4j::ActiveNode
         define_method(name) do |node = nil, rel = nil, options = {}|
           # return [].freeze unless self._persisted_obj
 
-          if node.is_a?(Hash)
-            options = node
-            node = nil
-          end
+          options, node = node, nil if node.is_a?(Hash)
 
           association_proxy(name, {node: node, rel: rel, source_object: self, labels: options[:labels]}.merge!(options))
         end
@@ -345,6 +346,8 @@ module Neo4j::ActiveNode
         define_has_many_id_methods(name)
 
         define_class_method(name) do |node = nil, rel = nil, options = {}|
+          options, node = node, nil if node.is_a?(Hash)
+
           association_proxy(name, {node: node, rel: rel, labels: options[:labels]}.merge!(options))
         end
       end
@@ -383,6 +386,8 @@ module Neo4j::ActiveNode
         define_has_one_id_methods(name)
 
         define_class_method(name) do |node = nil, rel = nil, options = {}|
+          options, node = node, nil if node.is_a?(Hash)
+
           association_proxy(name, {node: node, rel: rel, labels: options[:labels]}.merge!(options))
         end
       end
@@ -403,10 +408,7 @@ module Neo4j::ActiveNode
 
       def define_has_one_getter(name)
         define_method(name) do |node = nil, rel = nil, options = {}|
-          if node.is_a?(Hash)
-            options = node
-            node = nil
-          end
+          options, node = node, nil if node.is_a?(Hash)
 
           # Return all results if a variable-length relationship length was given
           association_proxy = association_proxy(name, {node: node, rel: rel}.merge!(options))

data/lib/neo4j/active_node/id_property.rb

@@ -74,8 +74,6 @@ module Neo4j::ActiveNode
             _persisted_obj ? #{name.to_sym == :id ? 'attribute(\'id\')' : name} : nil
           end
 
-          validates_uniqueness_of :#{name}
-
           property :#{name}
                 ), __FILE__, __LINE__)
       end

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

@@ -14,9 +14,8 @@ module Neo4j
         end
 
         def result(node = true, rel = nil)
-          puts '@result_cache', @result_cache.inspect
           @result_cache ||= {}
-          return result_cache_for(node, rel) if has_result_cache?(node, rel)
+          return result_cache_for(node, rel) if result_cache?(node, rel)
 
           pluck_vars = []
           pluck_vars << identity if node
@@ -26,13 +25,13 @@ module Neo4j
 
           result.each do |object|
             object.instance_variable_set('@source_query_proxy', self)
-            object.instance_variable_set('@source_query_proxy_result_cache', result)
+            object.instance_variable_set('@source_proxy_result_cache', result)
           end
 
           @result_cache[[node, rel]] ||= result
         end
 
-        def has_result_cache?(node = true, rel = nil)
+        def result_cache?(node = true, rel = nil)
           !!result_cache_for(node, rel)
         end
 

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

@@ -64,17 +64,10 @@ module Neo4j
         end
 
         def size
-          puts 'size'
-          if has_result_cache?
-            result_cache_for.length
-          else
-            count
-          end
+          result_cache? ? result_cache_for.length : count
         end
 
-        def length
-          to_a.length
-        end
+        delegate :length, to: :to_a
 
         # TODO: update this with public API methods if/when they are exposed
         def limit_value
@@ -250,10 +243,8 @@ module Neo4j
 
         def exists_query_start(condition, target)
           case condition
-          when Integer
-            self.where("ID(#{target}) = {exists_condition}").params(exists_condition: condition)
-          when Hash
-            self.where(condition.keys.first => condition.values.first)
+          when Integer then self.where("ID(#{target}) = {exists_condition}").params(exists_condition: condition)
+          when Hash then self.where(condition.keys.first => condition.values.first)
           else
             self
           end

data/lib/neo4j/railtie.rb

@@ -40,12 +40,32 @@ module Neo4j
         cfg.sessions ||= []
       end
 
+      def config_data
+        @config_data ||= if yaml_path
+                           HashWithIndifferentAccess.new(YAML.load(yaml_path.read)[Rails.env])
+                         else
+                           {}
+                         end
+      end
+
+      def yaml_path
+        @yaml_path ||= %w(config/neo4j.yml config/neo4j.yaml).map do |path|
+          Rails.root.join(path)
+        end.detect(&:exist?)
+      end
+
       def default_session_type
-        ENV['NEO4J_PATH'] ? :embedded_db : :server_db
+        if ENV['NEO4J_PATH']
+          :embedded_db
+        else
+          config_data[:type] || :server_db
+        end.to_sym
       end
 
       def default_session_path
-        ENV['NEO4J_URL'] || ENV['NEO4J_PATH'] || 'http://localhost:7474'
+        ENV['NEO4J_URL'] || ENV['NEO4J_PATH'] ||
+          config_data[:url] || config_data[:path] ||
+          'http://localhost:7474'
       end
 
       def start_embedded_session(session)

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '6.0.0.alpha.5'
+  VERSION = '6.0.0.alpha.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 6.0.0.alpha.5
+  version: 6.0.0.alpha.7
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-18 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter