neo4j-core 5.0.0.rc.3 → 5.0.0.rc.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efd3a180ba80337ada8311b1ca7dbf2c9d3a1d5b
-  data.tar.gz: feaef1009aca073d05b6ac7e54b22a746c76d552
+  metadata.gz: af03b69f505c6ef9e583acb0e392daa6550c30c5
+  data.tar.gz: d6d91dec745200ebb3877f3bd76b597408fa66ab
 SHA512:
-  metadata.gz: a141d208d880c0aa0ef8ac89c9264dffc382b84ce7c9703f376bb9fb8cf87fa8d19d28e25128c9312d9174d04cf24c3d6bb00482d8cd74d168d0478a98f7bc72
-  data.tar.gz: 8bfa569810bcacd5d96246864570ff642d50cfa7832bff07e4f14b4bb84b1bf01d4880ed496ce3539f87df834a17856836821e36dbe63593c1096e891ab5187d
+  metadata.gz: e6a95cc4aa65f54ea657b87225c9a9bd50e27653d658f56f468594eb03df9f7118b75063e618597197a3d77cd1e8c90489061b18e181bcf0a014ef7ca6f416e5
+  data.tar.gz: f5a5a49f5880f493567b1e9cffded59b7666d2e81046e13fc58fc9e9ae7a9a46669dcd4cf7281d5a097fb2c39bf6929250a0c2e807849f38a1795d25d2def5de

data/lib/neo4j-core/query_clauses.rb

@@ -143,15 +143,15 @@ module Neo4j
 
         private
 
-        def key_value_string(key, value, previous_keys = [], force_equals = false)
+        def key_value_string(key, value, previous_keys = [], is_set = false)
           param = (previous_keys << key).join(UNDERSCORE)
           param.tr_s!('^a-zA-Z0-9', UNDERSCORE)
           param.gsub!(/^_+|_+$/, '')
 
-          value = value.first if value.is_a?(Array) && value.size == 1
+          value = value.first if !is_set && value.is_a?(Array) && value.size == 1
           @params[param.to_sym] = value
 
-          if !value.is_a?(Array) || force_equals
+          if !value.is_a?(Array) || is_set
             "#{key} = {#{param}}"
           else
             "#{key} IN {#{param}}"
@@ -399,7 +399,7 @@ module Neo4j
             "#{key}.#{value}"
           when Array
             value.map do |v|
-              v.is_a?(Hash) ?  from_key_and_value(key, v) : "#{key}.#{v}"
+              v.is_a?(Hash) ? from_key_and_value(key, v) : "#{key}.#{v}"
             end
           when Hash
             value.map { |k, v| "#{key}.#{k} #{v.upcase}" }

data/lib/neo4j-core/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module Core
-    VERSION = '5.0.0.rc.3'
+    VERSION = '5.0.0.rc.4'
   end
 end

data/lib/neo4j-embedded/embedded_ha_session.rb

@@ -13,8 +13,15 @@ module Neo4j
         factory    = Java::OrgNeo4jGraphdbFactory::HighlyAvailableGraphDatabaseFactory.new
         db_service = factory.newHighlyAvailableDatabaseBuilder(db_location)
 
-        fail Error, 'Need properties file for HA configuration' unless properties_file
-        db_service.loadPropertiesFromFile(properties_file)
+        case
+        when properties_file
+          db_service.loadPropertiesFromFile(properties_file)
+        when properties_map
+          db_service.setConfig(properties_map)
+        else
+          fail Error, 'Need properties for HA configuration'
+        end
+
         @graph_db = db_service.newGraphDatabase
         Neo4j::Session._notify_listeners(:session_available, self)
       end

data/lib/neo4j-embedded/embedded_impermanent_session.rb

@@ -9,7 +9,7 @@ module Neo4j
     class EmbeddedImpermanentSession < EmbeddedSession
       def start
         fail Error, 'Embedded Neo4j db is already running' if running?
-        # puts "Start test impermanent embedded Neo4j db at #{db_location}"
+        puts 'Start test impermanent embedded Neo4j db'
         @graph_db = Java::OrgNeo4jTest::TestGraphDatabaseFactory.new.newImpermanentDatabase
         Neo4j::Session._notify_listeners(:session_available, self)
       end

data/lib/neo4j-embedded/embedded_session.rb

@@ -11,7 +11,7 @@ module Neo4j
       class Error < StandardError
       end
 
-      attr_reader :graph_db, :db_location, :properties_file
+      attr_reader :graph_db, :db_location, :properties_file, :properties_map
       extend Forwardable
       extend Neo4j::Core::TxMethods
       def_delegator :@graph_db, :begin_tx
@@ -20,6 +20,10 @@ module Neo4j
         @db_location     = db_location
         @auto_commit     = !!config[:auto_commit]
         @properties_file = config[:properties_file]
+        if config[:properties_map]
+          props = config[:properties_map].each_with_object({}) { |(k, v), m| m[k.to_s.to_java] = v.to_s.to_java }
+          @properties_map = java.util.HashMap.new(props)
+        end
         Neo4j::Session.register(self)
       end
 
@@ -43,6 +47,8 @@ module Neo4j
         factory    = Java::OrgNeo4jGraphdbFactory::GraphDatabaseFactory.new
         db_service = factory.newEmbeddedDatabaseBuilder(db_location)
         db_service.loadPropertiesFromFile(properties_file) if properties_file
+        db_service.setConfig(properties_map)               if properties_map
+
         @graph_db = db_service.newGraphDatabase
         Neo4j::Session._notify_listeners(:session_available, self)
         @engine = Java::OrgNeo4jCypherJavacompat::ExecutionEngine.new(@graph_db)

data/lib/neo4j-server/cypher_node.rb

@@ -31,7 +31,7 @@ module Neo4j
       # (see Neo4j::Node#create_rel)
       def create_rel(type, other_node, props = nil)
         q = @session.query.match(:a, :b).where(a: {neo_id: neo_id}, b: {neo_id: other_node.neo_id})
-            .create("(a)-[r:`#{type}`]->(b)").break.set_props(r: props).return(r: :neo_id)
+            .create("(a)-[r:`#{type}`]->(b)").break.set(r: props).return(r: :neo_id)
 
         id = @session._query_or_fail(q, true)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-core
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc.3
+  version: 5.0.0.rc.4
 platform: ruby
 authors:
 - Andreas Ronge, Chris Grigg, Brian Underwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-23 00:00:00.000000000 Z
+date: 2015-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty