arangorb 1.0.0 → 1.1.0

data/lib/ArangoRB_Tran.rb

@@ -18,7 +18,20 @@ class ArangoTransaction < ArangoServer
     @waitForSync = waitForSync
   end
 
-  attr_reader :action, :collections, :params, :lockTimeout, :waitForSync
+  attr_reader :action, :params, :lockTimeout, :waitForSync
+
+  ### RETRIEVE ###
+
+  def collections
+    result = {}
+    result["write"] = @collections["write"].map{|x| ArangoCollection.new(database: @database, collection: x)} unless @collections["write"].nil?
+    result["read"] = @collections["read"].map{|x| ArangoCollection.new(database: @database, collection: x)} unless @collections["read"].nil?
+    result
+  end
+
+  def database
+    ArangoDatabase.new(database: @database)
+  end
 
   def execute # TESTED
     body = {
@@ -30,19 +43,8 @@ class ArangoTransaction < ArangoServer
     }.delete_if{|k,v| v.nil?}.to_json
     request = @@request.merge({ :body => body })
     result = self.class.post("/_db/#{@database}/_api/transaction", request)
-    if @@async == "store"
-      result.headers["x-arango-async-id"]
-    else
-      result = result.parsed_response
-      if @@verbose
-        result
-      else
-        if result["error"]
-          {"message": result["errorMessage"], "stacktrace": result["stacktrace"]}
-        else
-          result["result"]
-        end
-      end
-    end
+    return result.headers["x-arango-async-id"] if @@async == "store"
+    result = result.parsed_response
+    @@verbose ? result : result["error"] ? {"message": result["errorMessage"], "stacktrace": result["stacktrace"]} : result["result"]
   end
 end

data/lib/ArangoRB_User.rb

@@ -9,31 +9,31 @@ class ArangoUser < ArangoServer
   end
 
   attr_reader :user, :active, :extra
+  alias name user
 
-  def create(active: nil, extra: nil) # TESTED
+  def [](database)
+    if self.databases[database] == "rw"
+      ArangoDatabase.new database: database
+    else
+      "This User does not have access to Database #{database}."
+    end
+  end
+  alias database []
+
+  def create # TESTED
     body = {
       "user" => @user,
       "passwd" => @password,
-      "active" => active,
-      "extra" => extra
+      "active" => @active,
+      "extra" => @extra
     }.delete_if{|k,v| v.nil?}.to_json
     request = @@request.merge({ :body => body })
     result = self.class.post("/_api/user", request)
-    resultTemp = result.parsed_response
-    if @@async != "store" && !resultTemp["error"]
-      @active = resultTemp["active"]
-      @extra = resultTemp["extra"]
-    end
     return_result result: result
   end
 
   def retrieve # TESTED
     result = self.class.get("/_api/user/#{@user}", @@request)
-    resultTemp = result.parsed_response
-    if @@async != "store" && !resultTemp["error"]
-      @active = resultTemp["active"]
-      @extra = resultTemp["extra"]
-    end
     return_result result: result
   end
 
@@ -66,27 +66,21 @@ class ArangoUser < ArangoServer
     }.delete_if{|k,v| v.nil?}.to_json
     request = @@request.merge({ :body => body })
     result = self.class.put("/_api/user/#{@user}", request)
-    if @@async == "store"
-      result.headers["x-arango-async-id"]
-    else
-      result = result.parsed_response
-      if @@verbose
-        unless result["error"]
-          @password = password
-          @active = active.nil? || active
-          @extra = extra
-        end
-        result
-      else
-        if result["error"]
-          result["errorMessage"]
-        else
-          @password = password
-          @active = active.nil? || active
-          @extra = extra
-          self
-        end
+    return result.headers["x-arango-async-id"] if @@async == "store"
+    result = result.parsed_response
+    if @@verbose
+      unless result["error"]
+        @password = password
+        @active = active.nil? || active
+        @extra = extra
       end
+      result
+    else
+      return result["errorMessage"] if result["error"]
+      @password = password
+      @active = active.nil? || active
+      @extra = extra
+      self
     end
   end
 
@@ -98,27 +92,21 @@ class ArangoUser < ArangoServer
     }.delete_if{|k,v| v.nil?}.to_json
     request = @@request.merge({ :body => body })
     result = self.class.patch("/_api/user/#{@user}", request)
-    if @@async == "store"
-      result.headers["x-arango-async-id"]
-    else
-      result = result.parsed_response
-      if @@verbose
-        unless result["error"]
-          @password = password
-          @active = active.nil? || active
-          @extra = extra
-        end
-        result
-      else
-        if result["error"]
-          result["errorMessage"]
-        else
-          @password = password
-          @active = active.nil? || active
-          @extra = extra
-          self
-        end
+    return result.headers["x-arango-async-id"] if @@async == "store"
+    result = result.parsed_response
+    if @@verbose
+      unless result["error"]
+        @password = password
+        @active = active.nil? || active
+        @extra = extra
       end
+      result
+    else
+      return result["errorMessage"] if result["error"]
+      @password = password
+      @active = active.nil? || active
+      @extra = extra
+      self
     end
   end
 
@@ -128,25 +116,20 @@ class ArangoUser < ArangoServer
   end
 
   def 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?
-            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)
+      unless result["error"]
+        @active = result["active"]
+        @extra = result["extra"]
       end
+      result
+    else
+      return result["errorMessage"] if result["error"]
+      @active = result["active"]
+      @extra = result["extra"]
+      return true if caseTrue
+      key.nil? ? self : result[key]
     end
   end
 end

data/lib/ArangoRB_Ver.rb

@@ -32,6 +32,9 @@ class ArangoVertex < ArangoDocument
         body["_key"] = @key
         @id = "#{@collection}/#{@key}"
       end
+    elsif key.is_a?(ArangoDocument)
+      @key = key.key
+      @id = key.id
     else
       raise "key should be a String, not a #{key.class}"
     end
@@ -43,27 +46,27 @@ class ArangoVertex < ArangoDocument
     end
   end
 
-  attr_reader :key, :id, :body, :database, :graph, :collection
+  attr_reader :key, :id, :body
+
+  # === RETRIEVE ===
+
+  def graph
+    ArangoGraph.new(graph: @graph, database: @database)
+  end
 
   # === GET ===
 
   def retrieve # TESTED
     result = self.class.get("/_db/#{@database}/_api/gharial/#{@graph}/vertex/#{@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
+    if @@verbose
+      @body = result["vertex"] unless result["error"]
+      result
     else
-      result = result.parsed_response
-      if @@verbose
-        @body = result["vertex"] unless result["error"]
-        result
-      else
-        if result["error"]
-          result["errorMessage"]
-        else
-          @body = result["vertex"]
-          self
-        end
-      end
+      return result["errorMessage"] if result["error"]
+      @body = result["vertex"]
+      self
     end
   end
 
@@ -91,28 +94,22 @@ class ArangoVertex < ArangoDocument
     query = {"waitForSync" => waitForSync, "keepNull" => keepNull}.delete_if{|k,v| v.nil?}
     request = @@request.merge({ :body => body.to_json, :query => query })
     result = self.class.patch("/_db/#{@database}/_api/gharial/#{@graph}/vertex/#{@id}", request)
-    if @@async == "store"
-      result.headers["x-arango-async-id"]
-    else
-      result = result.parsed_response
-      if @@verbose
-        unless result["error"]
-          @key = result["_key"]
-          @id = "#{@collection}/#{@key}"
-          @body = result["vertex"].body
-        end
-        result
-      else
-        if result["error"]
-          result["errorMessage"]
-        else
-          @key = result["vertex"]["_key"]
-          @id = "#{@collection}/#{@key}"
-          @body = @body.merge(body)
-          @body = @body.merge(result["vertex"])
-          self
-        end
+    return result.headers["x-arango-async-id"] if @@async == "store"
+    result = result.parsed_response
+    if @@verbose
+      unless result["error"]
+        @key = result["_key"]
+        @id = "#{@collection}/#{@key}"
+        @body = result["vertex"].body
       end
+      result
+    else
+      return result["errorMessage"] if result["error"]
+      @key = result["vertex"]["_key"]
+      @id = "#{@collection}/#{@key}"
+      @body = @body.merge(body)
+      @body = @body.merge(result["vertex"])
+      self
     end
   end
 
@@ -128,28 +125,22 @@ class ArangoVertex < ArangoDocument
 # === UTILITY ===
 
   def return_result(result:, body: {}, caseTrue: false)
-    if @@async == "store"
-      result.headers["x-arango-async-id"]
-    else
-      result = result.parsed_response
-      if @@verbose
-        unless result["error"]
-          @key = result["vertex"]["_key"]
-          @id = "#{@collection}/#{@key}"
-          @body = result["vertex"].merge(body)
-        end
-        result
-      else
-        if result["error"]
-          result["errorMessage"]
-        else
-          return true if caseTrue
-          @key = result["vertex"]["_key"]
-          @id = "#{@collection}/#{@key}"
-          @body = result["vertex"].merge(body)
-          self
-        end
+    return result.headers["x-arango-async-id"] if @@async == "store"
+    result = result.parsed_response
+    if @@verbose
+      unless result["error"]
+        @key = result["vertex"]["_key"]
+        @id = "#{@collection}/#{@key}"
+        @body = result["vertex"].merge(body)
       end
+      result
+    else
+      return result["errorMessage"] if result["error"]
+      return true if caseTrue
+      @key = result["vertex"]["_key"]
+      @id = "#{@collection}/#{@key}"
+      @body = result["vertex"].merge(body)
+      self
     end
   end
 end

data/spec/arangoRB_helper.rb

@@ -1,2 +1,3 @@
 require "lib/arangoRB_0.1.0_helper"
 require "lib/arangoRB_1.0.0_helper"
+require "lib/arangoRB_1.1.0_helper"

data/spec/lib/0.1.0/arangoC_helper.rb

@@ -91,7 +91,7 @@ describe ArangoCollection do
 
     it "search Document by match" do
       info = @myCollection.documentMatch match: {"num" => 1}
-      expect(info.collection).to eq "MyCollection"
+      expect(info.collection.name).to eq "MyCollection"
     end
 
     it "search Document by key match" do
@@ -126,7 +126,7 @@ describe ArangoCollection do
 
     it "search random Document" do
       info = @myCollection.random
-      expect(info.collection).to eq "MyCollection"
+      expect(info.collection.name).to eq "MyCollection"
     end
 
 

data/spec/lib/0.1.0/arangoDoc_helper.rb

@@ -4,7 +4,7 @@ describe ArangoDocument do
   context "#new" do
     it "create a new Document instance without global" do
       myDocument = ArangoDocument.new collection: "MyCollection", database: "MyDatabase"
-      expect(myDocument.collection).to eq "MyCollection"
+      expect(myDocument.collection.name).to eq "MyCollection"
     end
 
     it "create a new instance with global" do

data/spec/lib/0.1.0/arangoE_helper.rb

@@ -22,7 +22,7 @@ describe ArangoEdge do
   context "#info" do
     it "retrieve Document" do
       myDocument = @myEdge.retrieve
-      expect(myDocument.collection).to eq "MyEdgeCollection"
+      expect(myDocument.collection.name).to eq "MyEdgeCollection"
     end
   end
 

data/spec/lib/0.1.0/arangoS_helper.rb

@@ -4,21 +4,21 @@ describe ArangoServer do
   context "#database" do
     it "setup a global database" do
       ArangoServer.database = "MyDatabase"
-      expect(ArangoServer.database).to eq "MyDatabase"
+      expect(ArangoServer.database.name).to eq "MyDatabase"
     end
   end
 
   context "#graph" do
     it "setup a global graph" do
       ArangoServer.graph = "MyGraph"
-      expect(ArangoServer.graph).to eq "MyGraph"
+      expect(ArangoServer.graph.name).to eq "MyGraph"
     end
   end
 
   context "#collection" do
     it "setup a global collection" do
       ArangoServer.collection = "MyCollection"
-      expect(ArangoServer.collection).to eq "MyCollection"
+      expect(ArangoServer.collection.name).to eq "MyCollection"
     end
   end
 

data/spec/lib/0.1.0/arangoT_helper.rb

@@ -4,22 +4,22 @@ describe ArangoTraversal do
   context "#new" do
     it "create a new Traversal instance" do
       myTraversal = ArangoTraversal.new
-      expect(myTraversal.database).to eq "MyDatabase"
+      expect(myTraversal.database.name).to eq "MyDatabase"
     end
 
     it "instantiate start Vertex" do
       @myTraversal.vertex = @myDoc[0]
-      expect(@myTraversal.vertex).to eq "MyCollection/FirstKey"
+      expect(@myTraversal.vertex.id).to eq "MyCollection/FirstKey"
     end
 
     it "instantiate Graph" do
       @myTraversal.graph = @myGraph
-      expect(@myTraversal.graph).to eq @myGraph.graph
+      expect(@myTraversal.graph.name).to eq @myGraph.graph
     end
 
     it "instantiate EdgeCollection" do
       @myTraversal.collection = @myEdgeCollection
-      expect(@myTraversal.collection).to eq @myEdgeCollection.collection
+      expect(@myTraversal.collection.name).to eq @myEdgeCollection.collection
     end
 
     it "instantiate Direction" do