arangorb 1.0.0 → 1.1.0

data/lib/ArangoRB_Index.rb

@@ -41,31 +41,31 @@ class ArangoIndex < ArangoServer
     end
   end
 
-  attr_reader :database, :collection, :body, :type, :id, :unique, :fields, :key, :sparse
+  attr_reader :body, :type, :id, :unique, :fields, :key, :sparse
+
+  ### RETRIEVE ###
+
+  def database
+    ArangoDatabase.new(database: @database)
+  end
+
+  def collection
+    ArangoCollection.new(collection: @collection, database: @database)
+  end
 
   def retrieve # TESTED
     result = self.class.get("/_db/#{@database}/_api/index/#{@id}", @@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")
-          @body = result
-          @type = result["type"]
-          @unique = result["unique"]
-          @fields = result["fields"]
-          @sparse = result["sparse"]
-          self
-        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"}
+    @body = result
+    @type = result["type"]
+    @unique = result["unique"]
+    @fields = result["fields"]
+    @sparse = result["sparse"]
+    self
   end
 
   def self.indexes(database: @@database, collection: @@collection) # TESTED
@@ -74,23 +74,13 @@ class ArangoIndex < ArangoServer
     query = { "collection": collection }
     request = @@request.merge({ :query => query })
     result = 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"], sparse: x["sparse"])}
-          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"], sparse: x["sparse"])}
+    result
   end
 
   def create # TESTED
@@ -103,42 +93,21 @@ class ArangoIndex < 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
-          result.delete("error")
-          result.delete("code")
-          @body = result
-          @id = result["id"]
-          @key = @id.split("/")[1]
-          self
-        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"}
+    @body = result
+    @id = result["id"]
+    @key = @id.split("/")[1]
+    self
   end
 
   def destroy # TESTED
     result = self.class.delete("/_db/#{@database}/_api/index/#{id}", @@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
-          true
-        end
-      end
-    end
+    return result.headers["x-arango-async-id"] if @@async == "store"
+    result = result.parsed_response
+    @@verbose ? result : result["error"] ? result["errorMessage"] : true
   end
 end

data/lib/ArangoRB_Ser.rb

@@ -64,10 +64,11 @@ class ArangoServer
     else
       raise "database should be a String or an ArangoDatabase instance, not a #{database.class}"
     end
+    ArangoDatabase.new(database: @@database)
   end
 
   def self.database  # TESTED
-    @@database
+    ArangoDatabase.new(database: @@database)
   end
 
   def self.graph=(graph)  # TESTED
@@ -78,10 +79,11 @@ class ArangoServer
     else
       raise "graph should be a String or an ArangoGraph instance, not a #{graph.class}"
     end
+    ArangoGraph.new(database: @@database, graph: @@graph)
   end
 
   def self.graph  # TESTED
-    @@graph
+    ArangoGraph.new(database: @@database, graph: @@graph)
   end
 
   def self.collection=(collection)  # TESTED
@@ -92,10 +94,11 @@ class ArangoServer
     else
       raise "graph should be a String or an ArangoCollection instance, not a #{collection.class}"
     end
+    ArangoCollection.new(database: @@database, collection: @@collection)
   end
 
   def self.collection  # TESTED
-    @@collection
+    ArangoCollection.new(database: @@database, collection: @@collection)
   end
 
   def self.user=(user)
@@ -106,10 +109,11 @@ class ArangoServer
     else
       raise "graph should be a String or an ArangoUser instance, not a #{user.class}"
     end
+    ArangoUser.new(user: @@user)
   end
 
   def self.user # TESTED
-    @@user
+    ArangoUser.new(user: @@user)
   end
 
   def self.request # TESTED
@@ -171,20 +175,9 @@ class ArangoServer
 
   def self.users # TESTED
     result = get("/_api/user", @@request)
-    if @@async == "store"
-      result.headers["x-arango-async-id"]
-    else
-      result = result.parsed_response
-      if @@verbose
-        return result
-      else
-        if result["error"]
-          return result["errorMessage"]
-        else
-          return result["result"].map{|x| ArangoUser.new(user: x["user"], active: x["active"], extra: x["extra"])}
-        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| ArangoUser.new(user: x["user"], active: x["active"], extra: x["extra"])}
   end
 
   def self.databases(user: nil) # TESTED
@@ -194,20 +187,9 @@ class ArangoServer
 
   def self.tasks # TESTED
     result = get("/_api/tasks", @@request)
-    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
-          result.map{|x| ArangoTask.new(id: x["id"], name: x["name"], type: x["type"], period: x["period"], created: x["created"], command: x["command"], database: x["database"])}
-        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"] : result.map{|x| ArangoTask.new(id: x["id"], name: x["name"], type: x["type"], period: x["period"], created: x["created"], command: x["command"], database: x["database"])}
   end
 
   # === ASYNC ===
@@ -444,42 +426,16 @@ class ArangoServer
 # === UTILITY ===
 
   def self.return_result(result:, caseTrue: false, key: nil)
-    if @@async == "store"
-      result.headers["x-arango-async-id"]
-    else
-      result = result.parsed_response
-      if @@verbose || !result.is_a?(Hash)
-        result
-      else
-        if result["error"]
-          result["errorMessage"]
-        else
-          if caseTrue
-            true
-          elsif key.nil?
-            result.delete_if{|k,v| k == "error" || k == "code"}
-          else
-            result[key]
-          end
-        end
-      end
-    end
+    return result.headers["x-arango-async-id"] if @@async == "store"
+    result = result.parsed_response
+    return result if @@verbose || !result.is_a?(Hash)
+    return result["errorMessage"] if result["error"]
+    return true if caseTrue
+    return key.nil? ? result.delete_if{|k,v| k == "error" || k == "code"} : result[key]
   end
 
   def self.return_result_async(result:, caseTrue: false)
     result = result.parsed_response
-    if @@verbose || !result.is_a?(Hash)
-      result
-    else
-      if result["error"]
-        result["errorMessage"]
-      else
-        if caseTrue
-          true
-        else
-          result.delete_if{|k,v| k == "error" || k == "code"}
-        end
-      end
-    end
+    (@@verbose || !result.is_a?(Hash)) ? result : result["error"] ? result["errorMessage"] : caseTrue ? true : result.delete_if{|k,v| k == "error" || k == "code"}
   end
 end

data/lib/ArangoRB_Task.rb

@@ -18,7 +18,11 @@ class ArangoTask < ArangoServer
     @created = created
   end
 
-  attr_reader :id, :name, :type, :period, :created, :command, :database, :params
+  attr_reader :id, :name, :type, :period, :created, :command, :params
+
+  def database
+    ArangoDatabase.new(database: @database)
+  end
 
   def retrieve # TESTED
     result = self.class.get("/_db/#{@database}/_api/tasks/#{@id}")
@@ -54,20 +58,9 @@ class ArangoTask < ArangoServer
 
   def self.tasks # TESTED
     result = get("/_db/#{@@database}/_api/tasks", @@request)
-    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
-          result.map{|x| ArangoTask.new(id: x["id"], name: x["name"], type: x["type"], period: x["period"], created: x["created"], command: x["command"], database: x["database"])}
-        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"] : result.map{|x| ArangoTask.new(id: x["id"], name: x["name"], type: x["type"], period: x["period"], created: x["created"], command: x["command"], database: x["database"])}
   end
 
   def create offset: nil # TESTED
@@ -84,53 +77,36 @@ class ArangoTask < ArangoServer
     else
       result = self.class.put("/_db/#{@database}/_api/tasks/#{@id}", request)
     end
-    if @@async == "store"
-      result.headers["x-arango-async-id"]
-    else
-      result = result.parsed_response
-      if @@verbose
-        unless result.is_a?(Hash) && result["error"]
-          @id = result["id"]
-          @name = result["name"]
-          @type = result["type"]
-          @period = result["period"]
-          @created = result["created"]
-          @command = result["command"]
-          @database = result["database"]
-        end
-        result
-      else
-        if result.is_a?(Hash) && result["error"]
-          result["errorMessage"]
-        else
-          @id = result["id"]
-          @name = result["name"]
-          @type = result["type"]
-          @period = result["period"]
-          @created = result["created"]
-          @command = result["command"]
-          @database = result["database"]
-          self
-        end
+    return result.headers["x-arango-async-id"] if @@async == "store"
+    result = result.parsed_response
+    if @@verbose
+      unless result.is_a?(Hash) && result["error"]
+        @id = result["id"]
+        @name = result["name"]
+        @type = result["type"]
+        @period = result["period"]
+        @created = result["created"]
+        @command = result["command"]
+        @database = result["database"]
       end
+      result
+    else
+      return result["errorMessage"] if result.is_a?(Hash) && result["error"]
+      @id = result["id"]
+      @name = result["name"]
+      @type = result["type"]
+      @period = result["period"]
+      @created = result["created"]
+      @command = result["command"]
+      @database = result["database"]
+      self
     end
   end
 
   def destroy # TESTED
     result = self.class.delete("/_db/#{@database}/_api/tasks/#{@id}", @@request)
-    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
-          true
-        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"] : true
   end
 end

data/lib/ArangoRB_Tra.rb

@@ -23,8 +23,26 @@ class ArangoTraversal < ArangoServer
     @paths = nil
   end
 
-  attr_accessor :sort, :direction, :maxDepth, :minDepth, :visitor, :itemOrder, :strategy, :filter, :init, :maxiterations, :uniqueness, :order, :expander, :vertices, :paths, :database
-  attr_reader :startVertex, :graphName, :edgeCollection
+  attr_accessor :sort, :direction, :maxDepth, :minDepth, :visitor, :itemOrder, :strategy, :filter, :init, :maxiterations, :uniqueness, :order, :expander, :vertices, :paths
+
+  ### RETRIEVE ###
+
+  def startVertex
+    val = @startVertex.split("/")
+    ArangoDocument.new(database: @database, collection: val[0], key: val[1])
+  end
+
+  def edgeCollection
+    ArangoCollection.new(collection: @edgeCollection, database: @database)
+  end
+
+  def database
+    ArangoDatabase.new(database: @database)
+  end
+
+  def graphName
+    ArangoGraph.new(graph: @graphName, database: @database).retrieve
+  end
 
   def startVertex=(startVertex) # TESTED
     if startVertex.is_a?(String)
@@ -100,38 +118,16 @@ class ArangoTraversal < ArangoServer
     }.delete_if{|k,v| v.nil?}
     request = @@request.merge({ :body => body.to_json })
     result = self.class.post("/_db/#{@database}/_api/traversal", request)
-    if @@async == "store"
-      result.headers["x-arango-async-id"]
-    else
-      result = result.parsed_response
-      if result["error"]
-        return @@verbose ? result : result["errorMessage"]
-      else
-        @vertices = result["result"]["visited"]["vertices"].map{|x| ArangoDocument.new(
-          key: x["_key"],
-          collection: x["_id"].split("/")[0],
-          database: @database,
-          body: x
-        )}
-        @paths = result["result"]["visited"]["paths"].map{|x|
-          { "edges" => x["edges"].map{|e| ArangoDocument.new(
-              key: e["_key"],
-              collection: e["_id"].split("/")[0],
-              database: @database,
-              body: e,
-              from: e["_from"],
-              to: e["_to"]
-            )},
-              "vertices" => x["vertices"].map{|v| ArangoDocument.new(
-              key: v["_key"],
-              collection: v["_id"].split("/")[0],
-              database: @database,
-              body: v
-            )}
-          }
-        }
-        return @@verbose ? result : self
-      end
-    end
+    return result.headers["x-arango-async-id"] if @@async == "store"
+    result = result.parsed_response
+    return @@verbose ? result : result["errorMessage"] if result["error"]
+    @vertices = result["result"]["visited"]["vertices"].map{|x| ArangoDocument.new(key: x["_key"], collection: x["_id"].split("/")[0], database: @database, body: x)}
+    @paths = result["result"]["visited"]["paths"].map{|x|
+      {
+        "edges" => x["edges"].map{|e| ArangoDocument.new(key: e["_key"], collection: e["_id"].split("/")[0], database: @database, body: e, from: e["_from"], to: e["_to"] )},
+        "vertices" => x["vertices"].map{|v| ArangoDocument.new(key: v["_key"], collection: v["_id"].split("/")[0], database: @database, body: v )}
+      }
+    }
+    @@verbose ? result : self
   end
 end