arangorb 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e4afa02169c622aabeddb5937c631d1969fbdb5
-  data.tar.gz: 4aac3c7e39a0e13c73367f2b872af09026f0cb58
+  metadata.gz: db23869df50a9624a7f54598b85fdc08b776fb6c
+  data.tar.gz: e4cd9e680e9f71b40357b7d4bc08f3f397f63982
 SHA512:
-  metadata.gz: 2c11fa83fb5c69e69da67326e45e0d8ea1ab834f001ece451a6f55595d8530dc3506f3bd94eab2869c74d259ffffd11bcbe44efff69f97cde37339be13e47c28
-  data.tar.gz: 1c0548a71d075cfa37ba3504f34841cbce286cbb9ee7a048620e6efd24dd06a789b7a1ba8c323882cedf416e4c3db123ef1a029f4171c1a65c19b515341bc0ce
+  metadata.gz: 4149062e4f5b9a3883769c54b2ba889b672477773ef60fd9364a72648519054aa79ae28ef8ba8a76597a374a07de434175f669084e5d6d68bc56aa091e60ae61
+  data.tar.gz: a2ae7171adcb75443f86d4522940615d3220dd50f08e672b1e5699fe0a700651cf712073ca5a7ac0a7b71fb5a20cd90c4e3c264820edc4aa4a0b3beace5dd25f

data/ArangoRB.gemspec

@@ -4,7 +4,7 @@ require "rake"
 
 Gem::Specification.new do |s|
   s.name        = 'arangorb'
-  s.version	    = '1.0.0'
+  s.version	    = '1.1.0'
   s.authors     = ['Stefano Martin']
   s.email       = ['stefano@seluxit.com']
   s.homepage    = 'https://github.com/StefanoMartin/ArangoRB'

data/README.md

@@ -236,6 +236,15 @@ myDatabase.graphs #  Obtain an Array with the available graphs in the selected D
 myDatabase.functions #  Obtain an Array with the available functions in the selected Database
 ```
 
+It is possible to access its Collections and Graphs by their ids.
+
+``` ruby
+myDatabase["MyCollection"] # where "MyCollection" is the id of the collection
+myDatabase.collection("MyCollection")
+myDatabase.graph("MyGraph")
+```
+
+
 ### Query
 
 ArangoDatabase instances can manage the queries used in their Database.
@@ -337,6 +346,16 @@ Truncate will delete all the Documents inside the selected Collection.
 
 ### Retrieve information
 
+It is possible to access its Documents and its database.
+
+``` ruby
+myCollection["MyDocument"]
+myDatabase.document("MyDocument")
+myDatabase.database
+```
+
+For other information
+
 ``` ruby
 myCollection.retrieve # Retrieve the selected Collection
 myCollection.indexes # Return a list of all used Indexes in the Collection
@@ -348,7 +367,7 @@ myCollection.revision # Return collection revision id
 myCollection.checksum # Return checksum for the Collection
 ```
 
-To retrieve the documents of a Collection you can use:
+To retrieve all the documents of a Collection you can use:
 
 ``` ruby
 myCollection.documents
@@ -544,6 +563,8 @@ myDocument.destroy
 
 ``` ruby
 myDocument.retrieve # Retrieve Document
+myDocument.collection # Retrieve Collection of the Document
+myDocument.database # Retrieve Database of the Document
 myDocument.retrieve_edges collection: myEdgeCollection  # Retrieve all myEdgeCollection edges connected with the Document
 myDocument.any(myEdgeCollection) # Retrieve all myEdgeCollection edges connected with the Document
 myDocument.in(myEdgeCollection)  # Retrieve all myEdgeCollection edges coming in the Document
@@ -601,6 +622,7 @@ myGraph = ArangoGraph.new # By using the defauly Database and Graph
 ``` ruby
 myGraph.create # create a new Graph
 myGraph.retrieve # retrieve the Graph
+myGraph.database # retrieve database of the Graph
 myGraph.destroy # destroy the Graph
 ```
 
@@ -636,6 +658,7 @@ To use ArangoVertex, the Collection of the Vertex needs to be added either to th
 myVertex = ArangoVertex.new key: "newVertex", body: {"value" => 3}, collection: "myCollection", graph: "myGraph", database: "myDatabase" # create a new instance
 myVertex.create # create a new Document in the Graph
 myVertex.retrieve  # retrieve a Document
+myVertex.graph # Retrieve Graph  of the Document
 myVertex.replace body: {"value" => 6} # replace the Document
 myVertex.update body: {"value" => 6} # update the Document
 myVertex.destroy # delete the Document
@@ -650,6 +673,7 @@ To use ArangoEdge, the Collection of the Edge needs to be added to the EdgeColle
 myEdge = ArangoEdge.new key: "newVertex", body: {"value" => 3}, from: myArangoDocument, to: myArangoDocument, collection: "myCollection", graph: "myGraph", database: "myDatabase" # create a new instance
 myEdge.create # create a new Document of type Edge in the Graph
 myEdge.retrieve # retrieve a Document
+myEdge.graph # Retrieve Graph  of the Document
 myEdge.replace body: {"value" => 6} # replace the Document
 myEdge.update body: {"value" => 6} # update the Document
 myEdge.destroy # delete the Document
@@ -733,6 +757,7 @@ myUser = ArangoUser.new user: "MyUser", password: "password"
 
 ``` ruby
 myUser.retrieve # Retrieve User
+myUser["MyDatabase"] # Retrieve database if the user can access it
 myUser.create # Create a new User
 myUser.replace active: false # Replace User
 myUser.update active: false # Update User

data/lib/ArangoRB_AQL.rb

@@ -31,10 +31,16 @@ class ArangoAQL < ArangoServer
   end
 
   attr_accessor :query, :batchSize, :ttl, :cache, :options, :bindVars
-  attr_reader :count, :database, :count, :hasMore, :id, :result
+  attr_reader :count, :count, :hasMore, :id, :result
   alias size batchSize
   alias size= batchSize=
 
+# === RETRIEVE ===
+
+  def database
+    ArangoDatabase.new(database: @database)
+  end
+
 # === EXECUTE QUERY ===
 
   def execute(count: true) # TESTED
@@ -49,29 +55,18 @@ class ArangoAQL < ArangoServer
     }.delete_if{|k,v| v.nil?}
     request = @@request.merge({ :body => body.to_json })
     result = self.class.post("/_db/#{@database}/_api/cursor", request)
-    if @@async == "store"
-      result.headers["x-arango-async-id"]
+    return result.headers["x-arango-async-id"]if @@async == "store"
+    result = result.parsed_response
+    return @@verbose ? result : result["errorMessage"] if result["error"]
+    @count = result["count"]
+    @hasMore = result["hasMore"]
+    @id = result["id"]
+    if(result["result"][0].nil? || !result["result"][0].is_a?(Hash) || !result["result"][0].key?("_key"))
+      @result = result["result"]
     else
-      result = result.parsed_response
-      if result["error"]
-        return @@verbose ? result : result["errorMessage"]
-      else
-        @count = result["count"]
-        @hasMore = result["hasMore"]
-        @id = result["id"]
-        if(result["result"][0].nil? || !result["result"][0].is_a?(Hash) || !result["result"][0].key?("_key"))
-          @result = result["result"]
-        else
-          @result = result["result"].map{|x| ArangoDocument.new(
-            key: x["_key"],
-            collection: x["_id"].split("/")[0],
-            database: @database,
-            body: x
-          )}
-        end
-        return @@verbose ? result : self
-      end
+      @result = result["result"].map{|x| ArangoDocument.new(key: x["_key"], collection: x["_id"].split("/")[0], database: @database, body: x)}
     end
+    return @@verbose ? result : self
   end
 
   def next  # TESTED
@@ -79,29 +74,18 @@ class ArangoAQL < ArangoServer
       print "No other results"
     else
       result = self.class.put("/_db/#{@database}/_api/cursor/#{@id}", @@request)
-      if @@async == "store"
-        result.headers["x-arango-async-id"]
+      return result.headers["x-arango-async-id"]if @@async == "store"
+      result = result.parsed_response
+      return @@verbose ? result : result["errorMessage"] if result["error"]
+      @count = result["count"]
+      @hasMore = result["hasMore"]
+      @id = result["id"]
+      if(result["result"][0].nil? || !result["result"][0].is_a?(Hash) || !result["result"][0].key?("_key"))
+        @result = result["result"]
       else
-        result = result.parsed_response
-        if result["error"]
-          return @@verbose ? result : result["errorMessage"]
-        else
-          @count = result["count"]
-          @hasMore = result["hasMore"]
-          @id = result["id"]
-          if(result["result"][0].nil? || !result["result"][0].is_a?(Hash) || !result["result"][0].key?("_key"))
-            @result = result["result"]
-          else
-            @result = result["result"].map{|x| ArangoDocument.new(
-              key: x["_key"],
-              collection: x["_id"].split("/")[0],
-              database: @database,
-              body: x
-            )}
-          end
-          return @@verbose ? result : self
-        end
+        @result = result["result"].map{|x| ArangoDocument.new(key: x["_key"], collection: x["_id"].split("/")[0], database: @database, body: x)}
       end
+      return @@verbose ? result : self
     end
   end
 
@@ -168,22 +152,8 @@ class ArangoAQL < ArangoServer
 # === UTILITY ===
 
   def return_result(result:, caseTrue: false)
-    if @@async == "store"
-      result.headers["x-arango-async-id"]
-    else
-      result = result.parsed_response
-      if @@verbose
-        result
-      else
-        if result.is_a?(Hash) && result["error"]
-          result["errorMessage"]
-        else
-          return true if caseTrue
-          result.delete("error")
-          result.delete("code")
-          result
-        end
-      end
-    end
+    return result.headers["x-arango-async-id"] if @@async == "store"
+    result = result.parsed_response
+    @@verbose ? result : (result.is_a?(Hash) && result["error"]) ? result["errorMessage"] : caseTrue ? true : result
   end
 end

data/lib/ArangoRB_Col.rb

@@ -36,7 +36,19 @@ class ArangoCollection < ArangoServer
     end
   end
 
-  attr_reader :database, :collection, :body, :type
+  attr_reader :collection, :body, :type
+  alias name collection
+
+  # === RETRIEVE ===
+
+  def [](document_name)
+    ArangoDocument.new(key: document_name, collection: @collection, database: @database)
+  end
+  alias document []
+
+  def database
+    ArangoDatabase.new(database: @database)
+  end
 
   # === GET ===
 
@@ -108,29 +120,11 @@ class ArangoCollection < ArangoServer
   end
 
   def create_document(document: {}, waitForSync: nil, returnNew: nil) # TESTED
-    # if document.is_a? Hash
-    #   body = document
-    # elsif document.is_a? ArangoDocument
-    #   body = document.body
-    # elsif document.is_a? Array
-    #   body = document.map{|x| x.is_a?(Hash) ? x : x.is_a?(ArangoDocument) ? x.body : nil}
-    # else
-    #   raise "document should be Hash, an ArangoDocument instance or an Array of Hashes or ArangoDocument instances"
-    # end
     ArangoDocument.create(body: document, waitForSync: waitForSync, returnNew: returnNew, database: @database, collection: @collection)
   end
   alias create_vertex create_document
 
   def create_edge(document: {}, from:, to:, waitForSync: nil, returnNew: nil) # TESTED
-    # if document.is_a? Hash
-    #   body = document
-    # elsif document.is_a? ArangoDocument
-    #   body = document.body
-    # elsif document.is_a? Array
-    #   body = document.map{|x| x.is_a?(Hash) ? x : x.is_a?(ArangoDocument) ? x.body : nil}
-    # else
-    #   raise "document should be Hash, an ArangoDocument instance or an Array of Hashes or ArangoDocument instances"
-    # end
     ArangoDocument.create_edge(body: document, from: from, to: to, waitForSync: waitForSync, returnNew: returnNew, database: @database, collection: @collection)
   end
 
@@ -191,23 +185,12 @@ class ArangoCollection < ArangoServer
     }.delete_if{|k,v| v.nil?}.to_json
     request = @@request.merge({ :body => body })
     result = self.class.put("/_db/#{@database}/_api/simple/all-keys", request)
-    if @@async == "store"
-      result.headers["x-arango-async-id"]
+    return result.headers["x-arango-async-id"] if @@async == "store"
+    result = result.parsed_response
+    if type.nil?
+      @@verbose ? result : result["error"] ? result["errorMessage"] : result["result"].map{|x| value = self.class.get(x).parsed_response; ArangoDocument.new(key: value["_key"], collection: @collection, body: value)}
     else
-      result = result.parsed_response
-      if type.nil?
-        if @@verbose
-          result
-        else
-          if result["error"]
-            result["errorMessage"]
-          else
-            result["result"].map{|x| value = self.class.get(x).parsed_response; ArangoDocument.new(key: value["_key"], collection: @collection, body: value)}
-          end
-        end
-      else
-        @@verbose ? result : result["error"] ? result["errorMessage"] : result["result"]
-      end
+      @@verbose ? result : result["error"] ? result["errorMessage"] : result["result"]
     end
   end
 
@@ -220,20 +203,9 @@ class ArangoCollection < ArangoServer
     }.delete_if{|k,v| v.nil?}.to_json
     request = @@request.merge({ :body => body })
     result = self.class.put("/_db/#{@database}/_api/simple/all", request)
-    if @@async == "store"
-      result.headers["x-arango-async-id"]
-    else
-      result = result.parsed_response
-      if @@verbose
-        result
-      else
-        if result["error"]
-          result["errorMessage"]
-        else
-          result["result"].map{|x| ArangoDocument.new(key: x["_key"], collection: @collection, body: x)}
-        end
-      end
-    end
+    result.headers["x-arango-async-id"] if @@async == "store"
+    result = result.parsed_response
+    @@verbose ? result : result["error"] ? result["errorMessage"] : result["result"].map{|x| ArangoDocument.new(key: x["_key"], collection: @collection, body: x)}
   end
 
   def documentsMatch(match:, skip: nil, limit: nil, batchSize: nil) # TESTED
@@ -246,20 +218,9 @@ class ArangoCollection < ArangoServer
     }.delete_if{|k,v| v.nil?}.to_json
     request = @@request.merge({ :body => body })
     result = self.class.put("/_db/#{@database}/_api/simple/by-example", request)
-    if @@async == "store"
-      result.headers["x-arango-async-id"]
-    else
-      result = result.parsed_response
-      if @@verbose
-        result
-      else
-        if result["error"]
-          result["errorMessage"]
-        else
-          result["result"].map{|x| ArangoDocument.new(key: x["_key"], collection: @collection, body: x)}
-        end
-      end
-    end
+    return result.headers["x-arango-async-id"] if @@async == "store"
+    result = result.parsed_response
+    @@verbose ? result : result["error"] ? result["errorMessage"] : result["result"].map{|x| ArangoDocument.new(key: x["_key"], collection: @collection, body: x)}
   end
 
   def documentMatch(match:) # TESTED
@@ -269,20 +230,9 @@ class ArangoCollection < ArangoServer
     }.delete_if{|k,v| v.nil?}.to_json
     request = @@request.merge({ :body => body })
     result = self.class.put("/_db/#{@database}/_api/simple/first-example", request)
-    if @@async == "store"
-      result.headers["x-arango-async-id"]
-    else
-      result = result.parsed_response
-      if @@verbose
-        result
-      else
-        if result["error"]
-          result["errorMessage"]
-        else
-          ArangoDocument.new(key: result["document"]["_key"], collection: @collection, body: result["document"])
-        end
-      end
-    end
+    return result.headers["x-arango-async-id"] if @@async == "store"
+    result = result.parsed_response
+    @@verbose ? result : result["error"] ? result["errorMessage"] : ArangoDocument.new(key: result["document"]["_key"], collection: @collection, body: result["document"])
   end
 
   def documentByKeys(keys:) # TESTED
@@ -291,40 +241,18 @@ class ArangoCollection < ArangoServer
     body = { "collection" => @collection, "keys" => keys }
     request = @@request.merge({ :body => body.to_json })
     result = self.class.put("/_db/#{@database}/_api/simple/lookup-by-keys", request)
-    if @@async == "store"
-      result.headers["x-arango-async-id"]
-    else
-      result = result.parsed_response
-      if @@verbose
-        result
-      else
-        if result["error"]
-          result["errorMessage"]
-        else
-          result["documents"].map{|x| ArangoDocument.new(key: x["_key"], collection: @collection, body: x)}
-        end
-      end
-    end
+    return result.headers["x-arango-async-id"] if @@async == "store"
+    result = result.parsed_response
+    @@verbose ? result : result["error"] ? result["errorMessage"] : result["documents"].map{|x| ArangoDocument.new(key: x["_key"], collection: @collection, body: x)}
   end
 
   def random # TESTED
     body = { "collection" => @collection }.to_json
     request = @@request.merge({ :body => body })
     result = self.class.put("/_db/#{@database}/_api/simple/any", request)
-    if @@async == "store"
-      result.headers["x-arango-async-id"]
-    else
-      result = result.parsed_response
-      if @@verbose
-        result
-      else
-        if result["error"]
-          result["errorMessage"]
-        else
-          ArangoDocument.new(key: result["document"]["_key"], collection: @collection, body: result["document"])
-        end
-      end
-    end
+    return result.headers["x-arango-async-id"] if @@async == "store"
+    result = result.parsed_response
+    @@verbose ? result : result["error"] ? result["errorMessage"] : ArangoDocument.new(key: result["document"]["_key"], collection: @collection, body: result["document"])
   end
 
   def removeByKeys(keys:, options: nil) # TESTED
@@ -384,30 +312,12 @@ class ArangoCollection < ArangoServer
       "details": details
     }.delete_if{|k,v| v.nil?}
     body = "#{attributes}\n"
-    if values[0].is_a? Array
-      values.each{|x| body += "#{x}\n"}
-    else
-      body += "#{values}\n"
-    end
-    # print body
+    values[0].is_a?(Array) ? values.each{|x| body += "#{x}\n"} : body += "#{values}\n"
     request = @@request.merge({ :body => body, :query => query })
     result = self.class.post("/_db/#{@database}/_api/import", request)
-    if @@async == "store"
-      result.headers["x-arango-async-id"]
-    else
-      result = result.parsed_response
-      if @@verbose
-        result
-      else
-        if result["error"]
-          result["errorMessage"]
-        else
-          result.delete("error")
-          result.delete("code")
-          result
-        end
-      end
-    end
+    return result.headers["x-arango-async-id"] if @@async == "store"
+    result = result.parsed_response
+    @@verbose ? result : result["error"] ? result["errorMessage"] : result.delete_if{|k,v| k == "error" || k == "code"}
   end
 
   def importJSON(body:, type: "auto", from: nil, to: nil, overwrite: nil, waitForSync: nil, onDuplicate: nil, complete: nil, details: nil)  # TESTED
@@ -424,22 +334,9 @@ class ArangoCollection < ArangoServer
     }.delete_if{|k,v| v.nil?}
     request = @@request.merge({ :body => body.to_json, :query => query })
     result = self.class.post("/_db/#{@database}/_api/import", request)
-    if @@async == "store"
-      result.headers["x-arango-async-id"]
-    else
-      result = result.parsed_response
-      if @@verbose
-        result
-      else
-        if result["error"]
-          result["errorMessage"]
-        else
-          result.delete("error")
-          result.delete("code")
-          result
-        end
-      end
-    end
+    return result.headers["x-arango-async-id"] if @@async == "store"
+    result = result.parsed_response
+    @@verbose ? result : result["error"] ? result["errorMessage"] : result.delete_if{|k,v| k == "error" || k == "code"}
   end
 
 # === EXPORT ===
@@ -456,29 +353,18 @@ class ArangoCollection < ArangoServer
     }.delete_if{|k,v| v.nil?}
     request = @@request.merge({ :body => body.to_json, :query => query })
     result = self.class.post("/_db/#{@database}/_api/export", request)
-    if @@async == "store"
-      result.headers["x-arango-async-id"]
+    return result.headers["x-arango-async-id"] if @@async == "store"
+    result = result.parsed_response
+    return @@verbose ? result : result["errorMessage"] if result["error"]
+    @countExport = result["count"]
+    @hasMoreExport = result["hasMore"]
+    @idExport = result["id"]
+    if(result["result"][0].nil? || !result["result"][0].is_a?(Hash) || !result["result"][0].key?("_key"))
+      result = result["result"]
     else
-      result = result.parsed_response
-      if result["error"]
-        return @@verbose ? result : result["errorMessage"]
-      else
-        @countExport = result["count"]
-        @hasMoreExport = result["hasMore"]
-        @idExport = result["id"]
-        if(result["result"][0].nil? || !result["result"][0].is_a?(Hash) || !result["result"][0].key?("_key"))
-          result = result["result"]
-        else
-          result = result["result"].map{|x| ArangoDocument.new(
-            key: x["_key"],
-            collection: @collection,
-            database: @database,
-            body: x
-          )}
-        end
-        result
-      end
+      result = result["result"].map{|x| ArangoDocument.new(key: x["_key"], collection: @collection, database: @database, body: x)}
     end
+    result
   end
 
   def exportNext  # TESTED
@@ -488,29 +374,18 @@ class ArangoCollection < ArangoServer
       query = { "collection": @collection }
       request = @@request.merge({ :query => query })
       result = self.class.put("/_db/#{@database}/_api/cursor/#{@idExport}", request)
-      if @@async == "store"
-        result.headers["x-arango-async-id"]
+      return result.headers["x-arango-async-id"] if @@async == "store"
+      result = result.parsed_response
+      return @@verbose ? result : result["errorMessage"] if result["error"]
+      @countExport = result["count"]
+      @hasMoreExport = result["hasMore"]
+      @idExport = result["id"]
+      if(result["result"][0].nil? || !result["result"][0].is_a?(Hash) || !result["result"][0].key?("_key"))
+        result = result["result"]
       else
-        result = result.parsed_response
-        if result["error"]
-          return @@verbose ? result : result["errorMessage"]
-        else
-          @countExport = result["count"]
-          @hasMoreExport = result["hasMore"]
-          @idExport = result["id"]
-          if(result["result"][0].nil? || !result["result"][0].is_a?(Hash) || !result["result"][0].key?("_key"))
-            result = result["result"]
-          else
-            result = result["result"].map{|x| ArangoDocument.new(
-              key: x["_key"],
-              collection: @collection,
-              database: @database,
-              body: x
-            )}
-          end
-          result
-        end
+        result = result["result"].map{|x| ArangoDocument.new(key: x["_key"], collection: @collection, database: @database, body: x)}
       end
+      result
     end
   end
 
@@ -538,23 +413,13 @@ class ArangoCollection < ArangoServer
     query = { "collection": @collection }
     request = @@request.merge({ :query => query })
     result = self.class.get("/_db/#{@database}/_api/index", request)
-    if @@async == "store"
-      result.headers["x-arango-async-id"]
-    else
-      result = result.parsed_response
-      if @@verbose
-        result
-      else
-        if result["error"]
-          result["errorMessage"]
-        else
-          result.delete("error")
-          result.delete("code")
-          result["indexes"] = result["indexes"].map{|x| ArangoIndex.new(body: x, id: x["id"], database: @database, collection: @collection, type: x["type"], unique: x["unique"], fields: x["fields"])}
-          result
-        end
-      end
-    end
+    return result.headers["x-arango-async-id"] if @@async == "store"
+    result = result.parsed_response
+    return result if @@verbose
+    return result["errorMessage"] if result["error"]
+    result.delete_if{|k,v| k == "error" || k == "code"}
+    result["indexes"] = result["indexes"].map{|x| ArangoIndex.new(body: x, id: x["id"], database: @database, collection: @collection, type: x["type"], unique: x["unique"], fields: x["fields"])}
+    result
   end
 
   def createIndex(body: {}, unique: nil, type:, fields:, id: nil) # TESTED
@@ -565,20 +430,9 @@ class ArangoCollection < ArangoServer
     query = { "collection": @collection }
     request = @@request.merge({ :body => body.to_json, :query => query })
     result = self.class.post("/_db/#{@database}/_api/index", request)
-    if @@async == "store"
-      result.headers["x-arango-async-id"]
-    else
-      result = result.parsed_response
-      if @@verbose
-        result
-      else
-        if result["error"]
-          result["errorMessage"]
-        else
-          ArangoIndex.new(body: result, id: result["id"], database: @database, collection: @collection, type: result["type"], unique: result["unique"], fields: result["fields"])
-        end
-      end
-    end
+    return result.headers["x-arango-async-id"] if @@async == "store"
+    result = result.parsed_response
+    @@verbose ? result : result["error"] ? result["errorMessage"] : ArangoIndex.new(body: result, id: result["id"], database: @database, collection: @collection, type: result["type"], unique: result["unique"], fields: result["fields"])
   end
   #
   # def deleteIndex(id:) # TESTED
@@ -614,54 +468,31 @@ class ArangoCollection < ArangoServer
     }.delete_if{|k,v| v.nil?}
     request = @@request.merge({ :query => query })
     result = self.class.get("/_db/#{@database}/_api/replication/dump", request)
-    if @@async == "store"
-      result.headers["x-arango-async-id"]
-    else
-      result = result.parsed_response
-      if @@verbose
-        result
-      else
-        if result["error"]
-          result["errorMessage"]
-        else
-          result
-        end
-      end
-    end
+    return result.headers["x-arango-async-id"] if @@async == "store"
+    result = result.parsed_response
+    @@verbose ? result : result["error"] ? result["errorMessage"] : result
   end
 
 # === UTILITY ===
 
   def return_result(result:, caseTrue: false, key: nil, checkType: false)
-    if @@async == "store"
-      result.headers["x-arango-async-id"]
-    else
-      result = result.parsed_response
-      if @@verbose || !result.is_a?(Hash)
-        resultTemp = result
-        unless result["errorMessage"]
-          result.delete("error")
-          result.delete("code")
-          @body = result
-          @type = result["type"] == 2 ? "Document" : "Edge" if(checkType)
-        end
-        resultTemp
-      else
-        if result["error"]
-          result["errorMessage"]
-        else
-          return true if caseTrue
-          result.delete("error")
-          result.delete("code")
-          @body = result
-          @type = result["type"] == 2 ? "Document" : "Edge" if(checkType)
-          if key.nil?
-            self
-          else
-            result[key]
-          end
-        end
+    return result.headers["x-arango-async-id"] if @@async == "store"
+    result = result.parsed_response
+    if @@verbose || !result.is_a?(Hash)
+      resultTemp = result
+      unless result["errorMessage"]
+        result.delete_if{|k,v| k == "error" || k == "code"}
+        @body = result
+        @type = result["type"] == 2 ? "Document" : "Edge" if(checkType)
       end
+      resultTemp
+    else
+      return result["errorMessage"] if result["error"]
+      return true if caseTrue
+      result.delete_if{|k,v| k == "error" || k == "code"}
+      @body = result
+      @type = result["type"] == 2 ? "Document" : "Edge" if(checkType)
+      key.nil? ? self : result[key]
     end
   end
 end