neo4j-core 3.0.0.alpha.17 → 3.0.0.alpha.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8be042272113088b89f98c812d097faf22861cf
-  data.tar.gz: 2e9a52899e194e0270a80dc09e01295b63277af4
+  metadata.gz: 189f7b0b7187d44d8f5825e6747c033bdba18380
+  data.tar.gz: d6748e42f17f0cd18d20009378e2101164df7d5b
 SHA512:
-  metadata.gz: bd6fbbf822ad6aed46487b5059aa8d37a2802d38f349ad896fdd02c8330489f212b6bdda28df31ca5876f0115f9e95f8251c96705bcaea0936ee4520561f8b0f
-  data.tar.gz: 4e5479f9e6d9dbb980add9ab44f381e17c125780424d9272e93629d4591ad4aa9af5ee1c026d00a9a04ce03b3cf6a0d8bfcd4bb6c840acc09c913676c5d26877
+  metadata.gz: b35a530b4637e5732589a0689a4125f5727b7ece75e4d2ba4c5efe45b1f4526a824bd3578a5510745c748b6a20a17dd563a96fbec2f3cfc6d49ad9bf0e4b8135
+  data.tar.gz: 5127606c4d29c68fe05ad77f79f0614dd16aa3e4faad3c025c7c821a96c8e2f2e643dd6faf9301cf5515362f96619d56b969a639c78dc42e539996556e6476dc

data/lib/neo4j-core/query.rb

@@ -17,7 +17,7 @@ module Neo4j::Core
 
       @options = options
       @clauses = []
-      @params = {}
+      @_params = {}
     end
 
     # @method start *args
@@ -136,13 +136,13 @@ module Neo4j::Core
     #   Query.new.match('(q: Person {id: {id}})').params(id: 12)
     #
     def params(args)
-      @params = @params.merge(args)
+      @_params = @_params.merge(args)
 
       self
     end
 
     def response
-      response = @session._query(self.to_cypher, @params)
+      response = @session._query(self.to_cypher, @_params)
       if !response.respond_to?(:error?) || !response.error?
         response
       else
@@ -252,7 +252,17 @@ module Neo4j::Core
       "#{self.to_cypher} UNION#{options[:all] ? ' ALL' : ''} #{other_query.to_cypher}"
     end
 
+    def &(other_query)
+      raise "Sessions don't match!" if @session != other_query.session
+
+      self.class.new(session: @session).tap do |new_query|
+        new_query.options = self.options.merge(other_query.options)
+        new_query.clauses = self.clauses + other_query.clauses
+      end.params(other_query._params)
+    end
+
     protected
+    attr_accessor :session, :options, :clauses, :_params
 
     def add_clauses(clauses)
       @clauses += clauses

data/lib/neo4j-core/query_clauses.rb

@@ -81,7 +81,7 @@ module Neo4j::Core
           else
             attributes_string = attributes_string(value)
           end
-        when Class
+        when Class, Module
           var = key
           label_string = defined?(value::CYPHER_LABEL) ? value::CYPHER_LABEL : value.name
         else
@@ -171,6 +171,8 @@ module Neo4j::Core
         when Regexp
           pattern = (value.casefold? ? "(?i)" : "") + value.source
           "#{key} =~ #{escape_value(pattern.gsub(/\\/, '\\\\\\'))}"
+        when /^\{[^\{\}]+\}$/
+          "#{key} = #{value}"
         else
           "#{key} = #{value.inspect}"
         end

data/lib/neo4j-core/version.rb

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

data/lib/neo4j-embedded/property.rb

@@ -11,19 +11,33 @@ module Neo4j::Embedded::Property
 
   def [](key)
     return nil unless has_property?(key.to_s)
-    get_property(key.to_s)
+    val = to_ruby_property(key.to_s)
   end
   tx_methods :[]
 
+  # Sets the property of this node.
+  # Property keys are always strings. Valid property value types are the primitives(<tt>String</tt>, <tt>Fixnum</tt>, <tt>Float</tt>, <tt>FalseClass</tt>, <tt>TrueClass</tt>) or array of those primitives.
+  #
+  # ==== Gotchas
+  # * Values in the array must be of the same type.
+  # * You can *not* delete or add one item in the array (e.g. person.phones.delete('123')) but instead you must create a new array instead.
+  #
+  # @param [String, Symbol] key of the property to set
+  # @param [String,Fixnum,Float,true,false, Array] value to set
+  def []=(k, v)
+    to_java_property(k, v)
+  end
+  tx_methods :[]=
+
   def props
     property_keys.inject({}) do |ret, key|
-      ret[key.to_sym] = get_property(key)
+      val = to_ruby_property(key)
+      ret[key.to_sym] = val
       ret
     end
   end
   tx_methods :props
 
-
   def props=(hash)
     property_keys.each do |key|
       remove_property(key)
@@ -34,13 +48,7 @@ module Neo4j::Embedded::Property
   tx_methods :props=
 
   def _update_props(hash)
-    hash.each_pair do |k,v|
-      if v.nil?
-        remove_property(k)
-      else
-        set_property(k,v)
-      end
-    end
+    hash.each_pair { |k,v| to_java_property(k, v) }
     hash
   end
 
@@ -52,4 +60,38 @@ module Neo4j::Embedded::Property
   def neo_id
     get_id
   end
+
+  private
+
+  def to_ruby_property(key)
+    val = get_property(key)
+    val.class.superclass == ArrayJavaProxy ? val.to_a : val
+  end
+
+  def to_java_property(k, v)
+    validate_property(v)
+
+    k = k.to_s
+    if v.nil?
+      remove_property(k)
+    elsif (Array === v)
+      case v[0]
+        when NilClass
+          set_property(k, [].to_java(:string))
+        when String
+          set_property(k, v.to_java(:string))
+        when Float
+          set_property(k, v.to_java(:double))
+        when FalseClass, TrueClass
+          set_property(k, v.to_java(:boolean))
+        when Fixnum
+          set_property(k, v.to_java(:long))
+        else
+          raise "Not allowed to store array with value #{v[0]} type #{v[0].class}"
+      end
+    else
+      set_property(k, v)
+    end
+  end
+
 end

data/lib/neo4j-server/cypher_response.rb

@@ -71,7 +71,7 @@ module Neo4j::Server
     end
 
     attr_reader :struct
-
+    
     def initialize(response, uncommited = false)
       @response = response
       @uncommited = uncommited

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-core
 version: !ruby/object:Gem::Version
-  version: 3.0.0.alpha.17
+  version: 3.0.0.alpha.18
 platform: ruby
 authors:
 - Andreas Ronge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -79,47 +79,6 @@ extra_rdoc_files:
 files:
 - Gemfile
 - README.md
-- lib/mydb/active_tx_log
-- lib/mydb/index/lucene-store.db
-- lib/mydb/index/lucene.log.active
-- lib/mydb/index/lucene.log.v0
-- lib/mydb/messages.log
-- lib/mydb/neostore
-- lib/mydb/neostore.id
-- lib/mydb/neostore.labeltokenstore.db
-- lib/mydb/neostore.labeltokenstore.db.id
-- lib/mydb/neostore.labeltokenstore.db.names
-- lib/mydb/neostore.labeltokenstore.db.names.id
-- lib/mydb/neostore.nodestore.db
-- lib/mydb/neostore.nodestore.db.id
-- lib/mydb/neostore.nodestore.db.labels
-- lib/mydb/neostore.nodestore.db.labels.id
-- lib/mydb/neostore.propertystore.db
-- lib/mydb/neostore.propertystore.db.arrays
-- lib/mydb/neostore.propertystore.db.arrays.id
-- lib/mydb/neostore.propertystore.db.id
-- lib/mydb/neostore.propertystore.db.index
-- lib/mydb/neostore.propertystore.db.index.id
-- lib/mydb/neostore.propertystore.db.index.keys
-- lib/mydb/neostore.propertystore.db.index.keys.id
-- lib/mydb/neostore.propertystore.db.strings
-- lib/mydb/neostore.propertystore.db.strings.id
-- lib/mydb/neostore.relationshipgroupstore.db
-- lib/mydb/neostore.relationshipgroupstore.db.id
-- lib/mydb/neostore.relationshipstore.db
-- lib/mydb/neostore.relationshipstore.db.id
-- lib/mydb/neostore.relationshiptypestore.db
-- lib/mydb/neostore.relationshiptypestore.db.id
-- lib/mydb/neostore.relationshiptypestore.db.names
-- lib/mydb/neostore.relationshiptypestore.db.names.id
-- lib/mydb/neostore.schemastore.db
-- lib/mydb/neostore.schemastore.db.id
-- lib/mydb/nioneo_logical.log.active
-- lib/mydb/nioneo_logical.log.v0
-- lib/mydb/schema/label/lucene/segments.gen
-- lib/mydb/schema/label/lucene/segments_1
-- lib/mydb/store_lock
-- lib/mydb/tm_tx_log.1
 - lib/neo4j-core.rb
 - lib/neo4j-core/cypher_translator.rb
 - lib/neo4j-core/hash_with_indifferent_access.rb
@@ -128,19 +87,14 @@ files:
 - lib/neo4j-core/query.rb
 - lib/neo4j-core/query_clauses.rb
 - lib/neo4j-core/version.rb
-- lib/neo4j-core/version.rb~
 - lib/neo4j-embedded.rb
 - lib/neo4j-embedded/cypher_response.rb
-- lib/neo4j-embedded/cypher_response.rb~
 - lib/neo4j-embedded/embedded_database.rb
 - lib/neo4j-embedded/embedded_impermanent_session.rb
 - lib/neo4j-embedded/embedded_label.rb
 - lib/neo4j-embedded/embedded_node.rb
-- lib/neo4j-embedded/embedded_node.rb~
 - lib/neo4j-embedded/embedded_relationship.rb
-- lib/neo4j-embedded/embedded_relationship.rb~
 - lib/neo4j-embedded/embedded_session.rb
-- lib/neo4j-embedded/embedded_session.rb~
 - lib/neo4j-embedded/property.rb
 - lib/neo4j-embedded/to_java.rb
 - lib/neo4j-server.rb
@@ -149,7 +103,6 @@ files:
 - lib/neo4j-server/cypher_node_uncommited.rb
 - lib/neo4j-server/cypher_relationship.rb
 - lib/neo4j-server/cypher_response.rb
-- lib/neo4j-server/cypher_response.rb~
 - lib/neo4j-server/cypher_session.rb
 - lib/neo4j-server/cypher_transaction.rb
 - lib/neo4j-server/neo4j_server_endpoint.rb
@@ -161,7 +114,6 @@ files:
 - lib/neo4j/property_validator.rb
 - lib/neo4j/relationship.rb
 - lib/neo4j/session.rb
-- lib/neo4j/session.rb~
 - lib/neo4j/tasks/neo4j_server.rb
 - lib/neo4j/transaction.rb
 - neo4j-core.gemspec

data/lib/mydb/active_tx_log

@@ -1 +0,0 @@
-tm_tx_log.1