neo4j-core 3.0.0.alpha.6 → 3.0.0.alpha.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0169ab5b121c40e20ed52eef9788cf4f18f46c2a
-  data.tar.gz: 3d193639061208fe216802c04d420faa20b9e0a9
+  metadata.gz: 8d1f4739d5310c9630aa978a30139764ca721ba8
+  data.tar.gz: 288f2ce9b48122d99c4edbce147e5278f933bd6b
 SHA512:
-  metadata.gz: a1d763665cbe45cfff3765e46d9346e21c379ea0f65930a3405a90632bdd59e8139318fd4a4e15dd3b41795c9d57e87f751ea81dfef365fe7dce3a449bb61d8b
-  data.tar.gz: 85e2bf6b4819f47556b5a33e137bc9980226f75a5c95aa0375e24734f231c1c49af269fcd0962556a1d58100a3b2aa356f91b7384db322a3622701a70ee14e8e
+  metadata.gz: fd729be854e8df8c59e4f2e96f8720f0a09d5bc66aed7b2a13c5abfa1ef7146a1997f6042302139968180b6a8a6a59aae08908ef79fab5d7d5a005a4585d3fff
+  data.tar.gz: 394e87ad9bfb563d1d27d61bc5e4bcb884b23cb319d8d78a4489b457398e37ebbb44bd0b45f27b2d98640653a5e9b8e2d34507148aa1ace1ce7c8a511719fa7a

data/README.md

@@ -73,10 +73,23 @@ The default session is used by all operation unless specified as the last argume
 For example create a node with a different session:
 
 ```ruby
-my_session = Neo4j::Session.open(:server_db, "http://localhost:7474")
+my_session = Neo4j::Session.create_session(:server_db, "http://localhost:7474")
 Neo4j::Node.create(name: 'kalle', my_session)
 ```
 
+When using the Neo4j Server: `:server_db`, mutliple sessions are supported. They
+can be created using the open_named method. This method takes two extra parameters,
+the second prameter is the session name, and the third parameter is whether the new session should over-ride
+the default session (becoming the session returned by calling `Neo4j::Session.current`).
+Valid options are true (always become current), false (never become current) and nil (become current if no
+existing current session).
+
+```ruby
+Neo4j::Session.open_named(:server_db, :test, true, "https://localhost:7474")
+session = Neo4j::Session.named :test # Returns the session named :test.
+session = Neo4j::Session.current # Returns the session named :test, because the 'default' flag was set to true.
+```
+
 
 ### Label and Index Support
 
@@ -125,6 +138,7 @@ Setting properties
   node[:name] # => 'changed name'
   node.props # => {name: 'changed name'}
   node.props={ foo: 42}  # replace all properties
+  node.update_props( bar: 42) # keeps old properties (unlike #props=) update with given hash
 ```
 
 Notice properties are never stored in ruby objects, instead they are always fetched from the database.
@@ -192,8 +206,13 @@ How to create a relationship between node n1 and node n2 with one property
 n1 = Neo4j::Node.create
 n2 = Neo4j::Node.create
 rel = n1.create_rel(:knows, n2, since: 1994)
+
+# Alternative
+Neo4j::Relationship.create(:knows, n1, n2, since: 1994)
 ```
 
+Setting properties on relationships works like setting properties on nodes.
+
 Finding relationships
 
 ```ruby
@@ -234,15 +253,22 @@ Delete relationship
 rel = n1.rel(:outgoing, :know) # expects only one relationship
 rel.del
 ```
-### Identity
 
-NOT WORKING YET, TODO.
-By default the identity for a node is the same as the native Neo4j id.
-You can specify your own identity of nodes.
+
+### Cypher
+
+Example
 
 ```ruby
-session = Neo4j::CypherDatabase.connect('URL')
-session.config.node_identity = '_my_id'
+session = Neo4j::Session.current
+
+session.query("CREATE (n {mydata: 'Hello'}) RETURN ID(n) AS id")
+
+# Parameters
+session.query("START n=node({a_parameter}) RETURN ID(n)", a_parameter: 0)
+
+# DSL
+session.query(a_parameter: 0) { node("{a_parameter}").neo_id.as(:foo) }
 ```
 
 ## Implementation:
@@ -282,7 +308,7 @@ The testing will be using much more mocking.
 
 * The `unit` rspec folder only contains testing for one Ruby module. All other modules should be mocked.
 * The `integration` rspec folder contains testing for two or more modules but mocks the neo4j database access.
-* The `e2e` rspec folder for use the real database (or Neo4j's ImpermanentDatabase (todo))
+* The `e2e` rspec folder for use the real database (or Neo4j's ImpermanentDatabase)
 * The `shared_examples` common specs for different types of databases
 
 

data/lib/neo4j-core/cypher_translator.rb

@@ -4,7 +4,7 @@ module Neo4j::Core
     def escape_value(value)
       case value
         when String
-          "'#{value}'" # TODO escape ' and "
+          "'#{value.gsub("'", %q(\\\'))}'"
         else
           value
       end

data/lib/neo4j-core/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module Core
-    VERSION = "3.0.0.alpha.6"
+    VERSION = "3.0.0.alpha.7"
   end
 end

data/lib/neo4j-embedded/property.rb

@@ -28,14 +28,22 @@ module Neo4j::Embedded::Property
     property_keys.each do |key|
       remove_property(key)
     end
+    _update_props(hash)
+    hash
+  end
+  tx_methods :props=
 
+  def _update_props(hash)
     hash.each_pair do |k,v|
       set_property(k,v)
     end
     hash
   end
-  tx_methods :props=
 
+  def update_props(hash)
+    _update_props(hash)
+  end
+  tx_methods :update_props
 
   def neo_id
     get_id

data/lib/neo4j-server/cypher_node.rb

@@ -51,6 +51,16 @@ module Neo4j::Server
       properties
     end
 
+    # (see Neo4j::Node#update_props)
+    def update_props(properties)
+      return if properties.empty?
+      q = "START n=node(#{neo_id}) SET " + properties.keys.map do |k|
+        "n.`#{k}`= #{escape_value(properties[k])}"
+      end.join(',')
+      @session._query_or_fail(q)
+      properties
+    end
+
     # (see Neo4j::Node#get_property)
     def get_property(key)
       @session._query_or_fail("START n=node(#{neo_id}) RETURN n.`#{key}`", true)

data/lib/neo4j-server/cypher_relationship.rb

@@ -2,6 +2,7 @@ module Neo4j::Server
 
   class CypherRelationship < Neo4j::Relationship
     include Neo4j::Server::Resource
+    include Neo4j::Core::CypherTranslator
 
     def initialize(session, id)
       @session = session
@@ -60,6 +61,29 @@ module Neo4j::Server
       expect_response_code(r.response, 200)
     end
 
+    # (see Neo4j::Relationship#props)
+    def props
+      props = @session._query_or_fail("START n=relationship(#{neo_id}) RETURN n", true)['data']
+      props.keys.inject({}){|hash,key| hash[key.to_sym] = props[key]; hash}
+    end
+
+    # (see Neo4j::Relationship#props=)
+    def props=(properties)
+      @session._query_or_fail("START n=relationship(#{neo_id}) SET n = { props }", false, {props: properties})
+      properties
+    end
+
+    # (see Neo4j::Relationship#update_props)
+    def update_props(properties)
+      return if properties.empty?
+      q = "START n=relationship(#{neo_id}) SET " + properties.keys.map do |k|
+        "n.`#{k}`= #{escape_value(properties[k])}"
+      end.join(',')
+      @session._query_or_fail(q)
+      properties
+    end
+
+
     def del
       id = neo_id
       @session._query_internal{rel(id).del}.raise_unless_response_code(200)

data/lib/neo4j/node.rb

@@ -26,11 +26,17 @@ module Neo4j
     end
 
     # replace all properties with new properties
-    # @param hash a hash of properties the node should have
+    # @param [Hash] hash a hash of properties the node should have
     def props=(hash)
       raise 'not implemented'
     end
 
+    # Updates the properties, keeps old properties
+    # @param [Hash] hash hash of properties that should be updated on the node
+    def update_props(hash)
+      raise 'not implemented'
+    end
+
     # Directly remove the property on the node (low level method, may need transaction)
     def remove_property(key)
       raise 'not implemented'

data/lib/neo4j/relationship.rb

@@ -16,12 +16,53 @@ module Neo4j
       def wrapper
         self
       end
+
+      def neo4j_obj
+        self
+      end
+
     end
 
     include PropertyContainer
     include EntityEquality
     include Wrapper
 
+    # @return [Hash] all properties of the relationship
+    def props()
+      raise 'not implemented'
+    end
+
+    # replace all properties with new properties
+    # @param [Hash] hash a hash of properties the relationship should have
+    def props=(hash)
+      raise 'not implemented'
+    end
+
+    # Updates the properties, keeps old properties
+    # @param [Hash] hash hash of properties that should be updated on the relationship
+    def update_props(hash)
+      raise 'not implemented'
+    end
+
+    # Directly remove the property on the relationship (low level method, may need transaction)
+    def remove_property(key)
+      raise 'not implemented'
+    end
+
+    # Directly set the property on the relationship (low level method, may need transaction)
+    # @param [Hash, String] key
+    # @param value see Neo4j::PropertyValidator::VALID_PROPERTY_VALUE_CLASSES for valid values
+    def set_property(key, value)
+      raise 'not implemented'
+    end
+
+    # Directly get the property on the relationship (low level method, may need transaction)
+    # @param [Hash, String] key
+    # @return the value of the key
+    def get_property(key, value)
+      raise 'not implemented'
+    end
+
     # Returns the start node of this relationship.
     # @return [Neo4j::Node,Object] the node or wrapped node
     def start_node
@@ -106,6 +147,10 @@ module Neo4j
 
 
     class << self
+      def create(rel_type, from_node, other_node, props = {})
+        from_node.neo4j_obj.create_rel(rel_type, other_node, props)
+      end
+
       def load(neo_id, session = Neo4j::Session.current)
         session.load_relationship(neo_id)
       end

data/lib/neo4j/session.rb

@@ -2,6 +2,7 @@ module Neo4j
   class Session
 
     @@current_session = nil
+    @@all_sessions = {}
     @@factories = {}
 
     # @abstract
@@ -91,17 +92,29 @@ module Neo4j
       # Creates a new session
       # @param db_type the type of database, e.g. :embedded_db, or :server_db
       def open(db_type, *params)
+        register(create_session(db_type, params))
+      end
+
+      def open_named(db_type, name, default = nil, *params)
+        raise "Multiple sessions is currently only supported for Neo4j Server connections." unless db_type == :server_db
+        register(create_session(db_type, params), name, default)
+      end
+
+      def create_session(db_type, params)
         unless (@@factories[db_type])
           raise "Can't connect to database '#{db_type}', available #{@@factories.keys.join(',')}"
         end
-        session = @@factories[db_type].call(*params)
-        register(session)
+        @@factories[db_type].call(*params)
       end
 
       def current
         @@current_session
       end
 
+      def named(name)
+        @@all_sessions[name] || raise("No session named #{name}.")
+      end
+
       def set_current(session)
         @@current_session = session
       end
@@ -119,8 +132,13 @@ module Neo4j
         _listeners.each {|li| li.call(event, data)}
       end
 
-      def register(session)
-        set_current(session) unless @@current_session
+      def register(session, name = nil, default = nil)
+        if default == true
+          set_current(session)
+        elsif default.nil?
+          set_current(session) unless @@current_session
+        end
+        @@all_sessions[name] = session if name
         @@current_session
       end
 
@@ -134,4 +152,4 @@ module Neo4j
       end
     end
   end
-end
+end

data/lib/test.rb

@@ -0,0 +1,11 @@
+class Hej
+  attr_accessor :values
+
+  def []=(key, v)
+    self.values = *v
+  end
+end
+
+h = Hej.new
+h[:koo] = 1
+puts "h: #{h.values.inspect}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-core
 version: !ruby/object:Gem::Version
-  version: 3.0.0.alpha.6
+  version: 3.0.0.alpha.7
 platform: ruby
 authors:
 - Andreas Ronge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2014-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -96,6 +96,7 @@ files:
 - lib/neo4j-server/cypher_transaction.rb
 - lib/neo4j-server/resource.rb
 - lib/neo4j-server.rb
+- lib/test.rb
 - README.md
 - Gemfile
 - neo4j-core.gemspec