neo4j 8.0.0.alpha.7 → 8.0.0.alpha.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e27235ebda95170bf3b1be86184d65f52c6ce62
-  data.tar.gz: fd49a4500e63667ecf2073c47dc56bb28f9bafe2
+  metadata.gz: 3a4dced9d6e5bc8185bc712bc60dce1e7f7cce74
+  data.tar.gz: 3c9284c3a08fa0968bd86ce1593e768c64fd818b
 SHA512:
-  metadata.gz: c2c5b918e977389e50ba89ba7bd95391846a47e2357987e2691b79e57526324a4aba4cfaee5ec03e3f35359c2c29e10a9fa3233ce606009062d27a822a2fd48c
-  data.tar.gz: 67e94db613943bf239a2db082b44f6baa6a1ca98abe274ac66d5536c293e5348f9cd3361d098d8a9e2d5b9c6bf1be1383af28c1e4d1944be366568f4ff2a268a
+  metadata.gz: b62366ac431d4d32a7f5923beb873c6a628efb84701c9cfd777a28c75eda783e1b342854c878d15afedf257432b181d1080a0209df2bb947d40773d08a2e5c3a
+  data.tar.gz: 237623a12317e0ba70ae6964f0a2f8c441ce864b82652516d495050b5bca83652b9a633c7bb969426ab52dc2948444f83ea7c0f0ef0b58864a3e93ea6419e8da

data/CHANGELOG.md

@@ -5,6 +5,35 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+
+## [8.0.0.alpha.7] 2016-09-13
+
+### Changed
+
+- Multiple sessions in Rails config no longer supported
+
+## [8.0.0.alpha.6] 2016-09-14
+
+### Fixed
+
+- Issues with railtie
+
+## [8.0.0.alpha.6] 2016-09-12
+
+### Fixed
+
+- Instead of using `session_type`, `session_url`, `session_path`, and `session_options` in config `session.type`, `session.url`, `session.path`, and `session.options` should now be used.
+- Issue where `session_url` (now `session.url`) was not working
+- Broken sessions when threading
+
+## [8.0.0.alpha.5] 2016-09-08
+
+### Fixed
+
+- Various issues with not be able to run migrations when migration were pending (see 22b7e6aaadd46c11d421b4dac8d3fb15f663a4c4)
+
+## [8.0.0.alpha.4] 2016-09-08
+
 ### Added
 
 - A `Neo4j::Migrations.maintain_test_schema!` method, to keep the test database up to date with schema changes. (see #1277)
@@ -14,15 +43,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 
 - `ActiveNode#destroy` and `ActiveRel#destroy` now return the object in question rather than `true` to be compatible with `ActiveRecord` (see #1254)
-- Multiple sessions in Rails config no longer supported
-- Instead of using `session_type`, `session_url`, `session_path`, and `session_options` in config `session.type`, `session.url`, `session.path`, and `session.options` should now be used.
 
 ### Fixed
 
 - Bugs with using `neo_id` as `ActiveNode` `id_property` (thanks klobuczek / see #1274)
-- Issue where `session_url` (now `session.url`) was not working
-- Various issues with not be able to run migrations when migration were pending
-- Broken sessions when threading
+
+## [8.0.0.alpha.3]
+
+### Skipped
 
 ## [8.0.0.alpha.2] 2016-08-05
 

data/lib/neo4j/railtie.rb

@@ -60,7 +60,8 @@ module Neo4j
     def setup!(neo4j_config = nil)
       support_deprecated_session_configs!(neo4j_config)
 
-      type, url, path, options, wait_for_connection = neo4j_config.session.values_at(:type, :path, :url, :options, :wait_for_connection)
+      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)
       register_neo4j_cypher_logging(type || default_session_type)
 
       Neo4j::SessionManager.open_neo4j_session(type || default_session_type,
@@ -96,6 +97,20 @@ module Neo4j
       ENV['NEO4J_URL'] || ENV['NEO4J_PATH'] || 'http://localhost:7474'
     end
 
+    def yaml_config_data
+      @yaml_config_data ||= if yaml_path
+                         HashWithIndifferentAccess.new(YAML.load(ERB.new(yaml_path.read).result)[Rails.env])
+                       else
+                         {}
+                       end
+    end
+
+    def yaml_path
+      return unless defined?(Rails)
+      @yaml_path ||= %w(config/neo4j.yml config/neo4j.yaml).map do |path|
+        Rails.root.join(path)
+      end.detect(&:exist?)
+    end
 
     TYPE_SUBSCRIBERS = {
       http: Neo4j::Core::CypherSession::Adaptors::HTTP.method(:subscribe_to_request),

data/lib/neo4j/session_manager.rb

@@ -31,21 +31,6 @@ module Neo4j
         restricted_field.set nil, false
       end
 
-      def config_data
-        @config_data ||= if yaml_path
-                           HashWithIndifferentAccess.new(YAML.load(ERB.new(yaml_path.read).result)[Rails.env])
-                         else
-                           {}
-                         end
-      end
-
-      def yaml_path
-        return unless defined?(Rails)
-        @yaml_path ||= %w(config/neo4j.yml config/neo4j.yaml).map do |path|
-          Rails.root.join(path)
-        end.detect(&:exist?)
-      end
-
       # TODO: Deprecate embedded_db and http in favor of embedded and http
       #
       def cypher_session_adaptor(type, path_or_url, options = {})

data/lib/neo4j/tasks/migration.rake

@@ -5,7 +5,8 @@ unless Rake::Task.task_defined?('environment')
   desc 'Run a script against the database to perform system-wide changes'
   task :environment do
     require 'neo4j/session_manager'
-    Neo4j::SessionManager.setup!
+    require 'ostruct'
+    Neo4j::Railtie.setup!(OpenStruct.new)
   end
 end
 

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '8.0.0.alpha.7'
+  VERSION = '8.0.0.alpha.8'
 end

metadata

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