arangorb 0.1.0 → 1.0.0

data/lib/ArangoRB_AQL.rb

@@ -1,7 +1,7 @@
 # === AQL ===
 
-class ArangoAQL < ArangoS
-  def initialize(query: nil, batchSize: nil, ttl: nil, cache: nil, options: nil, bindVars: nil, database: @@database)
+class ArangoAQL < ArangoServer
+  def initialize(query: nil, batchSize: nil, ttl: nil, cache: nil, options: nil, bindVars: nil, database: @@database)  # TESTED
     if query.is_a?(String)
       @query = query
     elsif query.is_a?(ArangoAQL)
@@ -9,7 +9,15 @@ class ArangoAQL < ArangoS
     else
       raise "query should be String or ArangoAQL instance, not a #{query.class}"
     end
-    @database = database
+
+    if database.is_a?(String)
+      @database = database
+    elsif database.is_a?(ArangoDatabase)
+      @database = database.database
+    else
+      raise "databaseshould be String or ArangoDatabase instance, not a #{database.class}"
+    end
+
     @batchSize = batchSize
     @ttl = ttl
     @cache = cache
@@ -29,7 +37,7 @@ class ArangoAQL < ArangoS
 
 # === EXECUTE QUERY ===
 
-  def execute(count: true)
+  def execute(count: true) # TESTED
     body = {
       "query" => @query,
       "count" => count,
@@ -39,33 +47,12 @@ class ArangoAQL < ArangoS
       "options" => @options,
       "bindVars" => @bindVars
     }.delete_if{|k,v| v.nil?}
-    new_Document = { :body => body.to_json }
-    result = self.class.post("/_db/#{@database}/_api/cursor", new_Document).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| ArangoDoc.new(
-          key: x["_key"],
-          collection: x["_id"].split("/")[0],
-          database: @database,
-          body: x
-        )}
-      end
-      return @@verbose ? result : self
-    end
-  end
-
-  def next
-    unless @hasMore
-      print "No other results"
+    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"]
     else
-      result = self.class.put("/_db/#{@database}/_api/cursor/#{@id}")
+      result = result.parsed_response
       if result["error"]
         return @@verbose ? result : result["errorMessage"]
       else
@@ -75,7 +62,7 @@ class ArangoAQL < ArangoS
         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| ArangoDoc.new(
+          @result = result["result"].map{|x| ArangoDocument.new(
             key: x["_key"],
             collection: x["_id"].split("/")[0],
             database: @database,
@@ -87,52 +74,85 @@ class ArangoAQL < ArangoS
     end
   end
 
+  def next  # TESTED
+    unless @hasMore
+      print "No other results"
+    else
+      result = self.class.put("/_db/#{@database}/_api/cursor/#{@id}", @@request)
+      if @@async == "store"
+        result.headers["x-arango-async-id"]
+      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
+      end
+    end
+  end
+
   # === PROPERTY QUERY ===
 
-  def explain
+  def explain  # TESTED
     body = {
       "query" => @query,
       "options" => @options,
       "bindVars" => @bindVars
     }.delete_if{|k,v| v.nil?}
-    new_Document = { :body => body.to_json }
-    result = self.class.post("/_db/#{@database}/_api/explain", new_Document).parsed_response
-    return_result(result)
+    request = @@request.merge({ :body => body.to_json })
+    result = self.class.post("/_db/#{@database}/_api/explain", request)
+    return_result result: result
   end
 
-  def parse
+  def parse # TESTED
     body = { "query" => @query }
-    new_Document = { :body => body.to_json }
-    result = self.class.post("/_db/#{@database}/_api/query", new_Document).parsed_response
-    return_result(result)
+    request = @@request.merge({ :body => body.to_json })
+    result = self.class.post("/_db/#{@database}/_api/query", request)
+    return_result result: result
   end
 
-  def properties
-    result = self.class.get("/_db/#{@database}/_api/query/properties").parsed_response
-    return_result(result)
+  def properties # TESTED
+    result = self.class.get("/_db/#{@database}/_api/query/properties", @@request)
+    return_result result: result
   end
 
-  def current
-    self.class.get("/_db/#{@database}/_api/query/current").parsed_response
+  def current # TESTED
+    result = self.class.get("/_db/#{@database}/_api/query/current", @@request)
+    return_result result: result
   end
 
-  def slow
-    self.class.get("/_db/#{@database}/_api/query/slow").parsed_response
+  def slow # TESTED
+    result = self.class.get("/_db/#{@database}/_api/query/slow", @@request)
+    return_result result: result
   end
 
 # === DELETE ===
 
-  def stopSlow
-    result = self.class.delete("/_db/#{@database}/_api/query/slow").parsed_response
-    @@verbose ? result : result["error"] ? result["errorMessage"] : true
+  def stopSlow # TESTED
+    result = self.class.delete("/_db/#{@database}/_api/query/slow", @@request)
+    return_result result: result, caseTrue: true
   end
 
-  def kill(id: @id)
-    result = self.class.delete("/_db/#{@database}/_api/query/#{id}").parsed_response
-    @@verbose ? result : result["error"] ? result["errorMessage"] : true
+  def kill(id: @id) # TESTED
+    result = self.class.delete("/_db/#{@database}/_api/query/#{id}", @@request)
+    return_result result: result, caseTrue: true
   end
 
-  def changeProperties(slowQueryThreshold: nil, enabled: nil, maxSlowQueries: nil, trackSlowQueries: nil, maxQueryStringLength: nil)
+  def changeProperties(slowQueryThreshold: nil, enabled: nil, maxSlowQueries: nil, trackSlowQueries: nil, maxQueryStringLength: nil) # TESTED
     body = {
       "slowQueryThreshold" => slowQueryThreshold,
       "enabled" => enabled,
@@ -140,62 +160,29 @@ class ArangoAQL < ArangoS
       "trackSlowQueries" => trackSlowQueries,
       "maxQueryStringLength" => maxQueryStringLength
     }.delete_if{|k,v| v.nil?}
-    new_Document = { :body => body.to_json }
-    result = self.class.put("/_db/#{@database}/_api/query/properties", new_Document).parsed_response
-    return_result(result)
-  end
-
-# === CACHE ===
-
-  def clearCache
-    result = self.class.delete("/_db/#{@database}/_api/query-cache").parsed_response
-    @@verbose ? result : result["error"] ? result["errorMessage"] : true
-  end
-
-  def propertyCache
-    self.class.get("/_db/#{@database}/_api/query-cache/properties").parsed_response
-  end
-
-  def changePropertyCache(mode: nil, maxResults: nil)
-    body = { "mode" => mode, "maxResults" => maxResults }.delete_if{|k,v| v.nil?}
-    new_Document = { :body => body.to_json }
-    self.class.put("/_db/#{@database}/_api/query-cache/properties", new_Document).parsed_response
-  end
-
-# === AQL FUNCTION ===
-
-  def createFunction(code:, name:, isDeterministic: nil)
-    body = {
-      "code" => code,
-      "name" => name,
-      "isDeterministic" => isDeterministic
-    }.delete_if{|k,v| v.nil?}
-    new_Document = { :body => body.to_json }
-    result = self.class.post("/_db/#{@database}/_api/aqlfunction", new_Document).parsed_response
-    return_result(result)
-  end
-
-  def deleteFunction(name:)
-    result = self.class.delete("/_db/#{@database}/_api/aqlfunction/#{name}").parsed_response
-    @@verbose ? result : result["error"] ? result["errorMessage"] : true
-  end
-
-  def functions
-    self.class.get("/_db/#{@database}/_api/aqlfunction").parsed_response
+    request = @@request.merge({ :body => body.to_json })
+    result = self.class.put("/_db/#{@database}/_api/query/properties", request)
+    return_result result: result
   end
 
 # === UTILITY ===
 
-  def return_result(result)
-    if @@verbose
-      result
+  def return_result(result:, caseTrue: false)
+    if @@async == "store"
+      result.headers["x-arango-async-id"]
     else
-      if result["error"]
-        result["errorMessage"]
-      else
-        result.delete("error")
-        result.delete("code")
+      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
   end