neo4j 8.0.0.alpha.9 → 8.0.0.alpha.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5af55246f618ffc643e86c81b6a58af2bb638f7f
-  data.tar.gz: 2f28ba5df62bb6024ba0fde53c60471e0e99e6ad
+  metadata.gz: 0609e3850992edd31a7802d07473e088bb09556a
+  data.tar.gz: 74ec1af0c63b839f22d545b9073e15092056b16c
 SHA512:
-  metadata.gz: dc665609547173f3a61b54de4d6016bdf50582c5a2d0ed001652fe09b23abadfe2d652870da506f815a44d0e5d347d4bfa23e94efd967ecffe2444454ba524e5
-  data.tar.gz: 7a2ecbe2347f1dcfaddf3fd2d85d55caad8112c20feb8465787f6bb1458175a1fdf55af0dc22740f1ccea7e4776a4bc927baa4a83444666588a113824b061179
+  metadata.gz: dee8942d71e26463e1bd78bfe83bbc597ba38178efaa53faf52eb4121acd53673e8e45d5b0c5c33dfb8439b11010d9d2f261d8db3bc3a511aa102033c99d1948
+  data.tar.gz: 9454917d185fb560c7f9a4d6d50a6a78b4e4e0b64897269b588988c39e838ac777edae1625c458268659e363365800691f99ae4cfd27ed630d06af284fc8a165

data/CHANGELOG.md

@@ -5,6 +5,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [8.0.0.alpha.10] 2016-09-16
+
+### Fixed
+- Remove blank objects from association results to be compatible with `ActiveRecord` (see #1276 / thanks klobuczek)
+- Allow https scheme in the NEO4J_URL (see #1287 / thanks jacob-ewald)
+
 ## [8.0.0.alpha.9] 2016-09-14
 
 ### Fixed

data/lib/neo4j/active_node/has_n.rb

@@ -386,7 +386,7 @@ module Neo4j::ActiveNode
 
         define_method_unless_defined("#{name.to_s.singularize}_ids=") do |ids|
           clear_deferred_nodes_for_association(name)
-          association_proxy(name).replace_with(ids)
+          association_proxy(name).replace_with(Array(ids).reject(&:blank?))
         end
 
         define_method_unless_defined("#{name.to_s.singularize}_neo_ids") do

data/lib/neo4j/active_node/labels/reloading.rb

@@ -5,8 +5,17 @@ module Neo4j::ActiveNode::Labels
     MODELS_TO_RELOAD = []
 
     def self.reload_models!
-      Neo4j::ActiveNode::Labels::WRAPPED_CLASSES.clear
-      Neo4j::ActiveNode::Labels.clear_wrapped_models
+      MODELS_TO_RELOAD.each(&:constantize)
+      MODELS_TO_RELOAD.clear
+    end
+
+    module ClassMethods
+      def before_remove_const
+        associations.each_value(&:queue_model_refresh!)
+        MODELS_FOR_LABELS_CACHE.clear
+        WRAPPED_CLASSES.each { |c| MODELS_TO_RELOAD << c.name }
+        WRAPPED_CLASSES.clear
+      end
     end
   end
 end

data/lib/neo4j/railtie.rb

@@ -58,10 +58,7 @@ module Neo4j
     end
 
     def setup!(neo4j_config = nil)
-      support_deprecated_session_configs!(neo4j_config)
-
-      session_data = neo4j_config.session.empty? ? yaml_config_data : neo4j_config.session
-      type, url, path, options, wait_for_connection = session_data.values_at(:type, :path, :url, :options, :wait_for_connection)
+      type, url, path, options, wait_for_connection = final_config!(neo4j_config).values_at(:type, :path, :url, :options, :wait_for_connection)
       register_neo4j_cypher_logging(type || default_session_type)
 
       Neo4j::SessionManager.open_neo4j_session(type || default_session_type,
@@ -70,6 +67,12 @@ module Neo4j
                                                options || {})
     end
 
+    def final_config!(neo4j_config)
+      support_deprecated_session_configs!(neo4j_config)
+
+      neo4j_config.session.empty? ? yaml_config_data : neo4j_config.session
+    end
+
     def support_deprecated_session_configs!(neo4j_config)
       ActiveSupport::Deprecation.warn('neo4j.config.sessions is deprecated, please use neo4j.config.session (not an array)') if neo4j_config.sessions.present?
       neo4j_config.session ||= (neo4j_config.sessions && neo4j_config.sessions[0]) || {}
@@ -85,9 +88,9 @@ module Neo4j
 
     def default_session_type
       if ENV['NEO4J_URL']
-        URI(ENV['NEO4J_URL']).scheme.tap do |scheme|
-          fail "Invalid scheme for NEO4J_URL: #{scheme}" if !%w(http bolt).include?(scheme)
-        end
+        scheme = URI(ENV['NEO4J_URL']).scheme
+        fail "Invalid scheme for NEO4J_URL: #{scheme}" if !%w(http https bolt).include?(scheme)
+        scheme == 'https' ? 'http' : scheme
       else
         ENV['NEO4J_TYPE'] || :http
       end.to_sym
@@ -99,10 +102,10 @@ module Neo4j
 
     def yaml_config_data
       @yaml_config_data ||= if yaml_path
-                         HashWithIndifferentAccess.new(YAML.load(ERB.new(yaml_path.read).result)[Rails.env])
-                       else
-                         {}
-                       end
+                              HashWithIndifferentAccess.new(YAML.load(ERB.new(yaml_path.read).result)[Rails.env])
+                            else
+                              {}
+                            end
     end
 
     def yaml_path

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '8.0.0.alpha.9'
+  VERSION = '8.0.0.alpha.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 8.0.0.alpha.9
+  version: 8.0.0.alpha.10
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-14 00:00:00.000000000 Z
+date: 2016-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter