arangorb 0.1.0 → 1.0.0

data/spec/lib/1.0.0/arangoS_helper.rb

@@ -0,0 +1,196 @@
+require_relative './../../spec_helper'
+
+describe ArangoServer do
+  context "#general" do
+    it "address" do
+      expect(ArangoServer.address).to eq "localhost:8529"
+    end
+
+    it "username" do
+      expect(ArangoServer.username).to eq "root"
+    end
+
+    it "request" do
+      expect(ArangoServer.request[":body"].class).to be NilClass
+    end
+  end
+
+  context "#user" do
+    it "setup a global user" do
+      ArangoServer.user = "MyUser2"
+      expect(ArangoServer.user).to eq "MyUser2"
+    end
+  end
+
+  context "#monitoring" do
+    it "log" do
+      expect(ArangoServer.log["totalAmount"]).to be >= 0
+    end
+
+    it "reload" do
+      expect(ArangoServer.reload).to be true
+    end
+
+    it "statistics" do
+      expect(ArangoServer.statistics["enabled"]).to be true
+    end
+
+    it "statisticsDescription" do
+      expect(ArangoServer.statistics(description: true)["groups"][0].nil?).to be false
+    end
+
+    it "role" do
+      expect(ArangoServer.role.class).to eq String
+    end
+
+    # it "server" do
+    #   expect(ArangoServer.server.class).to eq String
+    # end
+
+    it "serverID" do
+      expect(ArangoServer.serverId.to_i).to be >= 1
+    end
+
+    # it "clusterStatistics" do
+    #   expect(ArangoServer.clusterStatistics.class).to eq String
+    # end
+  end
+
+  context "#lists" do
+    it "endpoints" do
+      expect(ArangoServer.endpoints[0].keys[0]).to eq "endpoint"
+    end
+
+    it "users" do
+      expect(ArangoServer.users[0].class).to be ArangoUser
+    end
+
+    it "databases" do
+      expect(ArangoServer.databases[0].class).to be ArangoDatabase
+    end
+  end
+
+  context "#async" do
+    it "create async" do
+      ArangoServer.async = "store"
+      expect(ArangoServer.async).to eq "store"
+    end
+
+    it "pendingAsync" do
+      ArangoServer.async = "store"
+      ArangoAQL.new(query: "FOR u IN MyCollection RETURN u.num").execute
+      expect(ArangoServer.pendingAsync).to eq []
+    end
+
+    it "fetchAsync" do
+      ArangoServer.async = "store"
+      id = ArangoAQL.new(query: "FOR u IN MyCollection RETURN u.num").execute
+      expect(ArangoServer.fetchAsync(id: id)["count"]).to eq 18
+    end
+
+    it "retrieveAsync" do
+      ArangoServer.async = "store"
+      ArangoAQL.new(query: "FOR u IN MyCollection RETURN u.num").execute
+      expect(ArangoServer.retrievePendingAsync).to eq []
+    end
+
+    it "cancelAsync" do
+      ArangoServer.async = "store"
+      id = ArangoAQL.new(query: "FOR u IN MyCollection RETURN u.num").execute
+      expect(ArangoServer.cancelAsync(id: id)).to eq "not found"
+    end
+
+    it "destroyAsync" do
+      ArangoServer.async = "store"
+      id = ArangoAQL.new(query: "FOR u IN MyCollection RETURN u.num").execute
+      expect(ArangoServer.destroyAsync type: id).to be true
+    end
+  end
+
+  context "#batch" do
+    it "batch" do
+      ArangoServer.async = false
+      ArangoCollection.new.create
+      queries = [{
+        "type": "POST",
+        "address": "/_db/MyDatabase/_api/collection",
+        "body": {"name": "newCOLLECTION"},
+        "id": "1"
+      },
+      {
+        "type": "GET",
+        "address": "/_api/database",
+        "id": "2"
+      }]
+      expect((ArangoServer.batch queries: queries).class).to be String
+    end
+
+    it "createDumpBatch" do
+      expect((ArangoServer.createDumpBatch ttl: 100).to_i).to be > 1
+    end
+
+    it "prolongDumpBatch" do
+      dumpBatchID = ArangoServer.createDumpBatch ttl: 100
+      expect((ArangoServer.prolongDumpBatch ttl: 100, id: dumpBatchID).to_i).to be > 1
+    end
+
+    it "destroyDumpBatch" do
+      dumpBatchID = ArangoServer.createDumpBatch ttl: 100
+      expect(ArangoServer.destroyDumpBatch id: dumpBatchID).to be true
+    end
+  end
+
+  context "#task" do
+    it "tasks" do
+      result = ArangoServer.tasks
+      expect(result[0].id.class).to be String
+    end
+  end
+
+  context "#miscellaneous" do
+    it "version" do
+      expect(ArangoServer.version["server"]).to eq "arango"
+    end
+
+    it "propertyWAL" do
+      ArangoServer.changePropertyWAL historicLogfiles: 14
+      expect(ArangoServer.propertyWAL["historicLogfiles"]).to eq 14
+    end
+
+    it "flushWAL" do
+      expect(ArangoServer.flushWAL).to be true
+    end
+
+    it "transactions" do
+      expect(ArangoServer.transactions["runningTransactions"]).to be >= 0
+    end
+
+    it "time" do
+      expect(ArangoServer.time.class).to be Float
+    end
+
+    it "echo" do
+      expect(ArangoServer.echo["user"]).to eq "root"
+    end
+
+    it "databaseVersion" do
+      expect(ArangoServer.databaseVersion.to_i).to be >= 1
+    end
+
+    it "sleep" do
+      expect(ArangoServer.sleep duration: 10).to be >= 1
+    end
+
+    # it "shutdown" do
+    #   result = ArangoServer.shutdown
+    #   `sudo service arangodb restart`
+    #   expect(result).to eq "OK"
+    # end
+
+    # it "test" do
+    #   print ArangoServer.test body: {"num" => 1}
+    # end
+  end
+
+
+end

data/spec/lib/1.0.0/arangoTa_helper.rb

@@ -0,0 +1,49 @@
+require_relative './../../spec_helper'
+
+describe ArangoTask do
+  context "#new" do
+    it "create new instance" do
+      myArangoTask = ArangoTask.new id: "mytaskid", name: "MyTaskID", command: "(function(params) { require('@arangodb').print(params); })(params)", params: {"foo" => "bar", "bar" => "foo"}, period: 2
+      expect(myArangoTask.params["foo"]).to eq "bar"
+    end
+  end
+
+  context "#create" do
+    it "create a new Task instance" do
+      myArangoTask = ArangoTask.new name: "MyTaskID", command: "(function(params) { require('@arangodb').print(params); })(params)", params: {"foo" => "bar", "bar" => "foo"}, period: 2
+      expect(myArangoTask.create.created.class).to eq Float
+    end
+
+    it "create a new Task instance with ID" do
+      myArangoTask = ArangoTask.new id: "mytaskid", name: "MyTaskID", command: "(function(params) { require('@arangodb').print(params); })(params)", params: {"foo2" => "bar2", "bar2" => "foo2"}, period: 2
+      expect(myArangoTask.create.params["foo2"]).to eq "bar2"
+    end
+
+    it "duplilcate a Task instance with ID" do
+      myArangoTask = ArangoTask.new id: "mytaskid", name: "MyTaskID", command: "(function(params) { require('@arangodb').print(params); })(params)", params: {"foo21" => "bar2", "bar21" => "foo21"}, period: 2
+      expect(myArangoTask.create).to eq "duplicate task id"
+    end
+  end
+
+  context "#retrieve" do
+    it "retrieve lists" do
+      myArangoTask = ArangoTask.new name: "MyTaskID", command: "(function(params) { require('@arangodb').print(params); })(params)", params: {"foo2" => "bar2", "bar2" => "foo2"}, period: 2
+      myArangoTask.create
+      result = ArangoTask.tasks.map{|x| x.database}
+      expect(result.include? 'MyDatabase').to be true
+    end
+
+    it "retrieve" do
+      myArangoTask = ArangoTask.new name: "MyTaskID", command: "(function(params) { require('@arangodb').print(params); })(params)", params: {"foo2" => "bar2", "bar2" => "foo2"}, period: 2
+      myArangoTask.create
+      expect(myArangoTask.retrieve.params["foo2"]).to eq "bar2"
+    end
+  end
+
+  context "#destroy" do
+    it "destroy" do
+      myArangoTask = ArangoTask.new id: "mytaskid"
+      expect(myArangoTask.destroy).to be true
+    end
+  end
+end

data/spec/lib/1.0.0/arangoTr_helper.rb

@@ -0,0 +1,15 @@
+require_relative './../../spec_helper'
+
+describe ArangoTransaction do
+  context "#new and use" do
+    it "create new instance" do
+      myArangoTransaction = ArangoTransaction.new action: "function(){ var db = require('@arangodb').db; db.MyCollection.save({}); return db.MyCollection.count(); }", write: @myCollection
+      expect(myArangoTransaction.collections["write"][0]).to eq "MyCollection"
+    end
+
+    it "execute" do
+      myArangoTransaction = ArangoTransaction.new action: "function(){ var db = require('@arangodb').db; db.MyCollection.save({}); return db.MyCollection.count(); }", write: @myCollection
+      expect(myArangoTransaction.execute).to be >= 1
+    end
+  end
+end

data/spec/lib/1.0.0/arangoU_helper.rb

@@ -0,0 +1,72 @@
+require_relative './../../spec_helper'
+
+describe ArangoUser do
+  context "#new" do
+    it "create a new User without global" do
+      myUser = ArangoUser.new user: "MyUser2", password: "Test"
+      expect(myUser.user).to eq "MyUser2"
+    end
+
+    it "create a new instance with global" do
+      myUser = ArangoUser.new
+      expect(myUser.user).to eq "MyUser"
+    end
+  end
+
+  context "#create" do
+    it "create a new user" do
+      @myUser.destroy
+      @myUser = ArangoUser.new user: "MyUser", password: "Test"
+      result = @myUser.create
+      expect(result.user).to eq "MyUser"
+    end
+
+    it "create a duplicate user" do
+      result = @myUser.create
+      expect(result).to eq "duplicate user"
+    end
+  end
+
+  context "#info" do
+    it "retrieve User" do
+      myUser = @myUser.retrieve
+      expect(myUser.active).to be true
+    end
+  end
+
+  context "#database" do
+    it "grant" do
+      result = @myUser.grant database: @myDatabase
+      expect(result).to be true
+    end
+
+    it "databases" do
+      result = @myUser.databases
+      expect(result["MyDatabase"]).to eq "rw"
+    end
+
+    it "revoke" do
+      result = @myUser.revoke database: @myDatabase
+      expect(result).to be true
+    end
+  end
+
+  context "#modify" do
+    it "replace" do
+      @myUser.replace active: false, password: "Test"
+      expect(@myUser.active).to be false
+    end
+
+    it "update" do
+      @myUser.update active: false, password: "Test"
+      expect(@myUser.active).to be false
+    end
+  end
+
+  context "#destroy" do
+    it "destroy" do
+      result = @myUser.destroy
+      expect(result).to be true
+    end
+  end
+end

data/spec/lib/arangoRB_0.1.0_helper.rb

@@ -0,0 +1,9 @@
+require "lib/0.1.0/arangoS_helper"
+require "lib/0.1.0/arangoDB_helper"
+require "lib/0.1.0/arangoC_helper"
+require "lib/0.1.0/arangoDoc_helper"
+require "lib/0.1.0/arangoG_helper"
+require "lib/0.1.0/arangoV_helper"
+require "lib/0.1.0/arangoE_helper"
+require "lib/0.1.0/arangoT_helper"
+require "lib/0.1.0/arangoAQL_helper"

data/spec/lib/arangoRB_1.0.0_helper.rb

@@ -0,0 +1,6 @@
+require "lib/1.0.0/arangoS_helper"
+require "lib/1.0.0/arangoDB_helper"
+require "lib/1.0.0/arangoC_helper"
+require "lib/1.0.0/arangoU_helper"
+require "lib/1.0.0/arangoTr_helper"
+require "lib/1.0.0/arangoTa_helper"

data/spec/spec_helper.rb

@@ -3,4 +3,38 @@ require_relative File.expand_path('../../lib/arangorb', __FILE__)
 
 RSpec.configure do |config|
 	config.color = true
+	config.before(:all) do
+		ArangoServer.default_server user: "root", password: "", server: "localhost", port: "8529"
+		ArangoServer.database = "MyDatabase"
+		ArangoServer.collection = "MyCollection"
+		ArangoServer.graph = "MyGraph"
+		ArangoServer.user = "MyUser"
+		ArangoServer.verbose = false
+		ArangoServer.async = false
+		@myDatabase = ArangoDatabase.new.create
+		@myGraph = ArangoGraph.new.create
+		@myCollection = ArangoCollection.new.create
+		@myCollectionB = ArangoCollection.new(collection: "MyCollectionB").create
+		@myDocument = ArangoDocument.new(body: {"Hello" => "World", "num" => 1}, key: "FirstDocument").create
+		@myEdgeCollection = ArangoCollection.new(collection: "MyEdgeCollection").create_edge_collection
+		@myGraph.addVertexCollection collection: "MyCollection"
+		@myGraph.addEdgeCollection collection: "MyEdgeCollection", from: "MyCollection", to: "MyCollection"
+		@myAQL = ArangoAQL.new query: "FOR u IN MyCollection RETURN u.num"
+		@myDoc = @myCollection.create_document document: [{"num" => 1, "_key" => "FirstKey"}, {"num" => 1}, {"num" => 1}, {"num" => 1}, {"num" => 1}, {"num" => 1}, {"num" => 1}, {"num" => 2}, {"num" => 2}, {"num" => 2}, {"num" => 3}, {"num" => 2}, {"num" => 5}, {"num" => 2}]
+		@myEdgeCollection.create_edge from: [@myDoc[0].id, @myDoc[1].id, @myDoc[2].id, @myDoc[3].id, @myDoc[7].id], to: [@myDoc[4].id, @myDoc[5].id, @myDoc[6].id, @myDoc[8].id]
+		@myVertex = ArangoVertex.new(body: {"Hello" => "World", "num" => 1}, key: "FirstVertex").create
+		@vertexA = ArangoVertex.new(body: {"Hello" => "World", "num" => 1}).create
+	  @vertexB = ArangoVertex.new(body: {"Hello" => "Moon", "num" => 2}).create
+	  @myEdge = ArangoEdge.new(from: @vertexA, to: @vertexB, collection: "MyEdgeCollection").create
+		@myIndex = @myCollection.createIndex unique: false, fields: "num", type: "hash", id: "MyIndex"
+		@myTraversal = ArangoTraversal.new
+		@myUser = ArangoUser.new.create
+	end
+
+	config.after(:all) do
+		ArangoDatabase.new.destroy
+		ArangoUser.new.destroy
+		@myUser.destroy unless @myUser.nil?
+		@myIndex.destroy unless @myIndex.nil?
+	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arangorb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Stefano Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-27 00:00:00.000000000 Z
+date: 2016-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -30,9 +30,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.0
-description: ArangoDB is a powerful mixed database based on documents and graphs,
-  with an interesting language called AQl. ArangoRB is a Ruby gems to use Ruby to
-  interact with its HTTP API.
+description: ArangoDB is a powerful mixed database based on documents and graphs.
+  ArangoRB is an experimental Ruby gems that uses ArangoDB's HTTP API.
 email:
 - stefano@seluxit.com
 executables: []
@@ -49,20 +48,34 @@ files:
 - lib/ArangoRB_Doc.rb
 - lib/ArangoRB_Edg.rb
 - lib/ArangoRB_Gra.rb
+- lib/ArangoRB_Index.rb
 - lib/ArangoRB_Ser.rb
+- lib/ArangoRB_Task.rb
 - lib/ArangoRB_Tra.rb
+- lib/ArangoRB_Tran.rb
+- lib/ArangoRB_User.rb
 - lib/ArangoRB_Ver.rb
 - lib/arangorb.rb
 - spec/arangoRB_helper.rb
-- spec/lib/arangoAQL_helper.rb
-- spec/lib/arangoC_helper.rb
-- spec/lib/arangoDB_helper.rb
-- spec/lib/arangoDoc_helper.rb
-- spec/lib/arangoE_helper.rb
-- spec/lib/arangoG_helper.rb
-- spec/lib/arangoS_helper.rb
-- spec/lib/arangoT_helper.rb
-- spec/lib/arangoV_helper.rb
+- spec/arangoRestart_helper.rb
+- spec/lib/0.1.0/arangoAQL_helper.rb
+- spec/lib/0.1.0/arangoC_helper.rb
+- spec/lib/0.1.0/arangoDB_helper.rb
+- spec/lib/0.1.0/arangoDoc_helper.rb
+- spec/lib/0.1.0/arangoE_helper.rb
+- spec/lib/0.1.0/arangoG_helper.rb
+- spec/lib/0.1.0/arangoS_helper.rb
+- spec/lib/0.1.0/arangoT_helper.rb
+- spec/lib/0.1.0/arangoV_helper.rb
+- spec/lib/1.0.0/arangoC_helper.rb
+- spec/lib/1.0.0/arangoDB_helper.rb
+- spec/lib/1.0.0/arangoI_helper.rb
+- spec/lib/1.0.0/arangoS_helper.rb
+- spec/lib/1.0.0/arangoTa_helper.rb
+- spec/lib/1.0.0/arangoTr_helper.rb
+- spec/lib/1.0.0/arangoU_helper.rb
+- spec/lib/arangoRB_0.1.0_helper.rb
+- spec/lib/arangoRB_1.0.0_helper.rb
 - spec/spec_helper.rb
 homepage: https://github.com/StefanoMartin/ArangoRB
 licenses:
@@ -84,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A simple ruby client for ArangoDB

data/spec/lib/arangoE_helper.rb

@@ -1,70 +0,0 @@
-require_relative './../spec_helper'
-
-describe ArangoE do
-  before :all do
-    ArangoS.default_server user: "root", password: "tretretre", server: "localhost", port: "8529"
-    ArangoS.database = "MyDatabase"
-    ArangoS.collection = "MyCollection"
-    ArangoS.graph = "MyGraph"
-    ArangoDB.new.create
-    @myGraph = ArangoG.new.create
-    @myCollection = ArangoC.new.create
-    @myEdgeCollection = ArangoC.new(collection: "MyEdgeCollection").create_edge_collection
-    @myGraph.addVertexCollection collection: "MyCollection"
-    @myGraph.addEdgeCollection collection: "MyEdgeCollection", from: "MyCollection", to: "MyCollection"
-    @vertexA = ArangoV.new(body: {"Hello" => "World", "num" => 1}).create
-    @vertexB = ArangoV.new(body: {"Hello" => "Moon", "num" => 2}).create
-    @myEdge = ArangoE.new(from: @vertexA, to: @vertexB, collection: "MyEdgeCollection").create
-  end
-
-  after :all do
-    ArangoDB.new.destroy
-  end
-
-  context "#new" do
-    it "create a new Edge instance" do
-      a = ArangoV.new(key: "myA", body: {"Hello" => "World"}).create
-      b = ArangoV.new(key: "myB", body: {"Hello" => "World"}).create
-      myEdgeDocument = ArangoE.new collection: "MyEdgeCollection", from: a, to: b
-      expect(myEdgeDocument.body["_from"]).to eq a.id
-    end
-  end
-
-  context "#create" do
-    it "create a new Edge" do
-      myDoc = @myCollection.create_document document: [{"A" => "B", "num" => 1}, {"C" => "D", "num" => 3}]
-      myEdge = ArangoE.new from: myDoc[0].id, to: myDoc[1].id, collection: "MyEdgeCollection"
-      myEdge = myEdge.create
-      expect(myEdge.body["_from"]).to eq myDoc[0].id
-    end
-  end
-
-  context "#info" do
-    it "retrieve Document" do
-      myDocument = @myEdge.retrieve
-      expect(myDocument.collection).to eq "MyEdgeCollection"
-    end
-  end
-
-  context "#modify" do
-    it "replace" do
-      a = ArangoV.new(body: {"Hello" => "World"}).create
-      b = ArangoV.new(body: {"Hello" => "World!!"}).create
-      myDocument = @myEdge.replace body: {"_from" => a.id, "_to" => b.id}
-      expect(myDocument.body["_from"]).to eq a.id
-    end
-
-    it "update" do
-      cc = ArangoV.new(body: {"Hello" => "World!!!"}).create
-      myDocument = @myEdge.update body: {"_to" => cc.id}
-      expect(myDocument.body["_to"]).to eq cc.id
-    end
-  end
-
-  context "#destroy" do
-    it "delete a Document" do
-      result = @myEdge.destroy
-      expect(result).to eq true
-    end
-  end
-end

data/spec/lib/arangoS_helper.rb

@@ -1,28 +0,0 @@
-require_relative './../spec_helper'
-
-describe ArangoS do
-  before :all do
-    ArangoS.default_server user: "root", password: "tretretre", server: "localhost", port: "8529"
-  end
-
-  context "#database" do
-    it "setup a global database" do
-      ArangoS.database = "MyDatabase"
-      expect(ArangoS.database).to eq "MyDatabase"
-    end
-  end
-
-  context "#graph" do
-    it "setup a global graph" do
-      ArangoS.graph = "MyGraph"
-      expect(ArangoS.graph).to eq "MyGraph"
-    end
-  end
-
-  context "#collection" do
-    it "setup a global collection" do
-      ArangoS.collection = "MyCollection"
-      expect(ArangoS.collection).to eq "MyCollection"
-    end
-  end
-end

data/spec/lib/arangoT_helper.rb

@@ -1,67 +0,0 @@
-require_relative './../spec_helper'
-
-describe ArangoT do
-  before :all do
-    ArangoS.default_server user: "root", password: "tretretre", server: "localhost", port: "8529"
-    ArangoS.database = "MyDatabase"
-    ArangoS.collection = "MyCollection"
-    ArangoS.graph = "MyGraph"
-    ArangoDB.new.create
-    @myGraph = ArangoG.new.create
-    @myCollection = ArangoC.new.create
-    @myEdgeCollection = ArangoC.new(collection: "MyEdgeCollection").create_edge_collection
-    @myGraph.addEdgeCollection collection: "MyEdgeCollection", from: "MyCollection", to: "MyCollection"
-    @myTransaction = ArangoT.new
-    @myDoc = @myCollection.create_document document: [{"num" => 1, "_key" => "FirstKey"}, {"num" => 2}, {"num" => 3}, {"num" => 4}, {"num" => 5}, {"num" => 6}, {"num" => 7}]
-    @myEdgeCollection.create_edge from: [@myDoc[0].id, @myDoc[1].id, @myDoc[2].id, @myDoc[3].id], to: [@myDoc[4].id, @myDoc[5].id, @myDoc[6].id]
-  end
-
-  after :all do
-    ArangoDB.new.destroy
-  end
-
-  context "#new" do
-    it "create a new Transaction instance" do
-      myTransaction = ArangoT.new
-      expect(@myTransaction.database).to eq "MyDatabase"
-    end
-
-    it "instantiate start Vertex" do
-      @myTransaction.vertex = @myDoc[0]
-      expect(@myTransaction.vertex).to eq "MyCollection/FirstKey"
-    end
-
-    it "instantiate Graph" do
-      @myTransaction.graph = @myGraph
-      expect(@myTransaction.graph).to eq @myGraph.graph
-    end
-
-    it "instantiate EdgeCollection" do
-      @myTransaction.collection = @myEdgeCollection
-      expect(@myTransaction.collection).to eq @myEdgeCollection.collection
-    end
-
-    it "instantiate Direction" do
-      @myTransaction.in
-      expect(@myTransaction.direction).to eq "inbound"
-    end
-
-    it "instantiate Max" do
-      @myTransaction.max = 3
-      expect(@myTransaction.max).to eq 3
-    end
-
-    it "instantiate Min" do
-      @myTransaction.min = 1
-      expect(@myTransaction.min).to eq 1
-    end
-  end
-
-  context "#execute" do
-    it "execute Transaction" do
-      @myTransaction.any
-      @myTransaction.execute
-      expect(@myTransaction.vertices.length).to eq 30
-    end
-  end
-end