neo4j-core 6.1.1 → 6.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da06dc452a9115555f4c41864175e341829e75f9
-  data.tar.gz: 046393f931563d7bb4722b2ec7b9827a4d7c870a
+  metadata.gz: ca37281eae5c190ad058ab504fb1e6ffb5fc682c
+  data.tar.gz: 9541360552ce0e0f26651fb7c0d1a6d3ff8e732c
 SHA512:
-  metadata.gz: 18947051963ebfb10dfc13eb149587f4a36059c40b4838597d0b230c83eb7e9228d719e5deba355de9c23a3704f9740bbe55adc462c0250c455a7302d6f57c6a
-  data.tar.gz: 0a8ab8ec56c8843f2b91e1d0a0f670146a76b64632d3f2fa66003a550ba9f75d232e2497abe73d78f51094d097eb19c208894a80d43e841054d12f099643957d
+  metadata.gz: 1d66bb9bb42948ffce0f3de794afef2001ffbe9500d5c4bcc78de01865ae47d390db99140f7ef01dc62b11c69bf27b27cb73857f130dcd8abcca48a053680694
+  data.tar.gz: 6553b27e42bea15397c6cb061c2e89dcda9805b45c5b99005e9707eb0b76123d71cfc407cd28ea90db18ee33b8fbeeb749674a129c065471fc42237da29c0a0a

data/lib/neo4j-core/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module Core
-    VERSION = '6.1.1'
+    VERSION = '6.1.2'
   end
 end

data/lib/neo4j-server/cypher_response.rb

@@ -55,11 +55,8 @@ module Neo4j
 
       def to_node_enumeration(cypher = EMPTY_STRING, session = Neo4j::Session.current)
         Enumerator.new do |yielder|
-          @result_index = 0
           to_struct_enumeration(cypher).each do |row|
-            @row_index = 0
             yielder << row_pair_in_struct(row, session)
-            @result_index += 1
           end
         end
       end
@@ -68,7 +65,6 @@ module Neo4j
         @struct.new.tap do |result|
           row.each_pair do |column, value|
             result[column] = map_row_value(value, session)
-            @row_index += 1
           end
         end
       end
@@ -84,17 +80,10 @@ module Neo4j
       end
 
       def hash_value_as_object(value, session)
-        if transaction_response?
-          add_transaction_entity_id
-          data = mapped_rest_data
-        elsif [:node, :relationship].include?(identify_entity(value))
-          add_entity_id(value)
-          data = value
-        else
-          return value
-        end
+        return value unless [:node, :relationship].include?(identify_entity(value))
+        add_entity_id(value)
 
-        basic_obj = (node?(value) ? CypherNode : CypherRelationship).new(session, data)
+        basic_obj = (node?(value) ? CypherNode : CypherRelationship).new(session, value)
         unwrapped? ? basic_obj : basic_obj.wrapper
       end
 
@@ -112,11 +101,7 @@ module Neo4j
       end
 
       def looks_like_an_object?(value)
-        if transaction_response?
-          mapped_rest_data[:outgoing_relationships] || (mapped_rest_data[:start] && mapped_rest_data[:properties])
-        else
-          value[:labels] || value[:type]
-        end
+        value[:labels] || value[:type]
       end
 
       def unwrapped!
@@ -128,7 +113,7 @@ module Neo4j
       end
 
       def node?(value)
-        transaction_response? ? !mapped_rest_data[:start] : value[:labels]
+        value[:labels]
       end
 
       attr_reader :struct
@@ -151,7 +136,6 @@ module Neo4j
       def first_data
         if @uncommited
           @data.first[:row].first
-          # data.is_a?(Hash) ? {'data' => data, 'id' => id} : data
         else
           data = @data[0][0]
           data.is_a?(Hash) ? add_entity_id(data) : data
@@ -167,11 +151,6 @@ module Neo4j
         data
       end
 
-      def add_transaction_entity_id
-        mapped_rest_data[:id] = mapped_rest_data[:self].split('/').last.to_i
-        mapped_rest_data
-      end
-
       def error?
         !!@error
       end
@@ -191,7 +170,18 @@ module Neo4j
       end
 
       def each_data_row
-        data.each { |r| yield (@uncommited ? r[:row] : r) }
+        data.each do |r|
+          yieldable = if @uncommitted
+                        r[:row]
+                      else
+                        transaction_row?(r) ? r[:rest] : r
+                      end
+          yield yieldable
+        end
+      end
+
+      def transaction_response?
+        response.respond_to?(:body) && !response.body[:commit].nil?
       end
 
       def set_data(response)
@@ -244,27 +234,10 @@ module Neo4j
         end
       end
 
-      def transaction_response?
-        response.respond_to?(:body) && !response.body[:commit].nil?
-      end
-
-      def rest_data
-        @result_index = @row_index = 0
-        mapped_rest_data
-      end
-
-      def rest_data_with_id
-        rest_data[:id] = mapped_rest_data[:self].split('/').last.to_i
-        rest_data
-      end
-
       private
 
-      attr_reader :row_index, :result_index
-
-      def mapped_rest_data
-        data = response.body[:results][0][:data][result_index][:rest][row_index]
-        data.is_a?(Array) ? data.first : data
+      def transaction_row?(row)
+        row.is_a?(Hash) && row[:rest] && row[:row]
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-core
 version: !ruby/object:Gem::Version
-  version: 6.1.1
+  version: 6.1.2
 platform: ruby
 authors:
 - Andreas Ronge, Chris Grigg, Brian Underwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -285,7 +285,6 @@ files:
 - lib/neo4j/core/cypher_session/responses/http.rb
 - lib/neo4j/core/cypher_session/result.rb
 - lib/neo4j/core/instrumentable.rb
-- lib/neo4j/core/label.rb
 - lib/neo4j/core/node.rb
 - lib/neo4j/core/path.rb
 - lib/neo4j/core/relationship.rb

data/lib/neo4j/core/label.rb

@@ -1,127 +0,0 @@
-module Neo4j
-  module Core
-    class Label
-      attr_reader :name
-
-      def initialize(name, session)
-        @name = name
-        @session = session
-        schema_threads = []
-      end
-
-      def create_index(property, options = {})
-        puts "create_index(#{property.inspect}, #{options.inspect})"
-        validate_index_options!(options)
-        properties = property.is_a?(Array) ? property.join(',') : property
-        schema_query("CREATE INDEX ON :`#{@name}`(#{properties})")
-      end
-
-      def drop_index(property, options = {})
-        puts "drop_index(#{property.inspect}, #{options.inspect})"
-        validate_index_options!(options)
-        schema_query("DROP INDEX ON :`#{@name}`(#{property})")
-      end
-
-      # Creates a neo4j constraint on a property
-      # See http://docs.neo4j.org/chunked/stable/query-constraints.html
-      # @example
-      #   label = Neo4j::Label.create(:person, session)
-      #   label.create_constraint(:name, {type: :unique}, session)
-      #
-      def create_constraint(property, constraints)
-        puts "create_constraint(#{property.inspect}, #{constraints.inspect})"
-        cypher = case constraints[:type]
-                 when :unique
-                   "CREATE CONSTRAINT ON (n:`#{name}`) ASSERT n.`#{property}` IS UNIQUE"
-                 else
-                   fail "Not supported constrain #{constraints.inspect} for property #{property} (expected :type => :unique)"
-                 end
-        schema_query(cypher)
-      end
-
-      # Drops a neo4j constraint on a property
-      # See http://docs.neo4j.org/chunked/stable/query-constraints.html
-      # @example
-      #   label = Neo4j::Label.create(:person, session)
-      #   label.create_constraint(:name, {type: :unique}, session)
-      #   label.drop_constraint(:name, {type: :unique}, session)
-      #
-      def drop_constraint(property, constraint)
-        puts "drop_constraint(#{property.inspect}, #{constraint.inspect})"
-        cypher = case constraint[:type]
-                 when :unique
-                   "DROP CONSTRAINT ON (n:`#{name}`) ASSERT n.`#{property}` IS UNIQUE"
-                 else
-                   fail "Not supported constrain #{constraint.inspect}"
-                 end
-        schema_query(cypher)
-      end
-
-      def indexes
-        @session.indexes_for_label(@name)
-      end
-
-      def index?(property)
-        indexes.include?(property)
-      end
-
-      def uniqueness_constraints
-        @session.uniqueness_constraints_for_label(@name)
-      end
-
-      def uniqueness_constraint?(property)
-        uniqueness_constraints.include?(property)
-      end
-
-      def self.wait_for_schema_changes(session)
-        schema_threads(session).map(&:join)
-        set_schema_threads(session, [])
-      end
-
-      private
-
-      # Store schema threads on the session so that we can easily wait for all
-      # threads on a session regardless of label
-      def schema_threads
-        self.class.schema_threads(@session)
-      end
-
-      def schema_threads=(array)
-        self.class.set_schema_threads(@session, array)
-      end
-
-      def self.schema_threads(session)
-        session.instance_variable_get('@_schema_threads') || []
-      end
-
-      def self.set_schema_threads(session, array)
-        session.instance_variable_set('@_schema_threads', array)
-      end
-
-      # If there is a transaction going on, this could block
-      # So we run in a thread and it will go through at the next opportunity
-      def schema_query(cypher)
-        Thread.new do
-          begin
-            puts 'Starting transaction for schema query...'
-            @session.transaction do |tx|
-              puts 'Executing schema query...'
-              tx.query(cypher)
-              puts 'Executed schema query...'
-            end
-          rescue Exception => e
-            puts e.message
-            puts e.backtrace
-          end
-        end.tap do |thread|
-          schema_threads << thread
-        end
-      end
-
-      def validate_index_options!(options)
-        return unless options[:type] && options[:type] != :exact
-        fail "Type #{options[:type]} is not supported"
-      end
-    end
-  end
-end