rebat 0.0.1 → 0.1.0

data/lib/rebat/client.rb

@@ -1,8 +1,11 @@
 class Rebat::Client
-  def initialize(host, port, relations)
+  attr_reader :relations
+
+  def initialize(host, port, relations = {})
     @transport = Thrift::BufferedTransport.new(Thrift::Socket.new(host, port))
     @protocol = Thrift::BinaryProtocol.new(@transport)
     @client = Rebat::Thrift::RebatDB::Client.new(@protocol)
+    @relations = relations
 
     @transport.open
   end
@@ -20,7 +23,7 @@ class Rebat::Client
     @transport.close
   end
 
-  def add(from_entity_id, from_entity_type, to_entity_id, to_entity_type, weight, relation_id)
+  def add(from_entity_id, from_entity_type, to_entity_id, to_entity_type, weight, relation_key)
     edge = Rebat::Thrift::Edge.new
 
     edge.fromEntityId   = from_entity_id
@@ -28,35 +31,35 @@ class Rebat::Client
     edge.toEntityId     = to_entity_id
     edge.toEntityType   = to_entity_type
     edge.weight         = weight
-    edge.relationId     = relation_id
+    edge.relationId     = relations[relation_key]
 
     self.send do |client|
       client.addQuery(edge)
     end
   end
 
-  def updateWeight(from_entity_id, from_entity_type, to_entity_id, to_entity_type, relation_id, new_weight)
+  def updateWeight(from_entity_id, from_entity_type, to_entity_id, to_entity_type, relation_key, new_weight)
     edge = Rebat::Thrift::Edge.new
 
     edge.fromEntityId   = from_entity_id
     edge.fromEntityType = from_entity_type
     edge.toEntityId     = to_entity_id
     edge.toEntityType   = to_entity_type
-    edge.relationId     = relation_id
+    edge.relationId     = relations[relation_key]
 
     self.send do |client|
       client.updateWeightQuery(edge, new_weight)
     end
   end
 
-  def delete(from_entity_id, from_entity_type, to_entity_id, to_entity_type, relation_id)
+  def delete(from_entity_id, from_entity_type, to_entity_id, to_entity_type, relation_key)
     edge = Rebat::Thrift::Edge.new
 
     edge.fromEntityId   = from_entity_id
     edge.fromEntityType = from_entity_type
     edge.toEntityId     = to_entity_id
     edge.toEntityType   = to_entity_type
-    edge.relationId     = relation_id
+    edge.relationId     = relations[relation_key]
 
     self.send do |client|
       client.deleteQuery(edge)
@@ -78,4 +81,7 @@ class Rebat::Client
   def exclude(*args)
     Rebat::Selector.new(self).exclude *args
   end
+
+  private
+  attr_reader :transport, :protocol, :client
 end

data/lib/rebat/selector.rb

@@ -6,23 +6,23 @@ class Rebat::Selector
     @query_list = []
   end
 
-  def where(from_entity_id, from_entity_type, to_entity_id, to_entity_type, relation_id)
-    @query_list << create_query(from_entity_id, from_entity_type, to_entity_id, to_entity_type, relation_id, Rebat::Thrift::QueryType::WHERE)
+  def where(from_entity_id, from_entity_type, to_entity_id, to_entity_type, relation_key)
+    @query_list << create_query(from_entity_id, from_entity_type, to_entity_id, to_entity_type, @client.relations[relation_key], Rebat::Thrift::QueryType::WHERE)
     return self
   end
 
-  def union(from_entity_id, from_entity_type, to_entity_id, to_entity_type, relation_id)
-    @query_list << create_query(from_entity_id, from_entity_type, to_entity_id, to_entity_type, relation_id, Rebat::Thrift::QueryType::UNION)
+  def union(from_entity_id, from_entity_type, to_entity_id, to_entity_type, relation_key)
+    @query_list << create_query(from_entity_id, from_entity_type, to_entity_id, to_entity_type, @client.relations[relation_key], Rebat::Thrift::QueryType::UNION)
     return self
   end
 
-  def intersect(from_entity_id, from_entity_type, to_entity_id, to_entity_type, relation_id)
-    @query_list << create_query(from_entity_id, from_entity_type, to_entity_id, to_entity_type, relation_id, Rebat::Thrift::QueryType::INTERSECT)
+  def intersect(from_entity_id, from_entity_type, to_entity_id, to_entity_type, relation_key)
+    @query_list << create_query(from_entity_id, from_entity_type, to_entity_id, to_entity_type, @client.relations[relation_key], Rebat::Thrift::QueryType::INTERSECT)
     return self
   end
 
-  def exclude(from_entity_id, from_entity_type, to_entity_id, to_entity_type, relation_id)
-    @query_list << create_query(from_entity_id, from_entity_type, to_entity_id, to_entity_type, relation_id, Rebat::Thrift::QueryType::EXCLUDE)
+  def exclude(from_entity_id, from_entity_type, to_entity_id, to_entity_type, relation_key)
+    @query_list << create_query(from_entity_id, from_entity_type, to_entity_id, to_entity_type, @client.relations[relation_key], Rebat::Thrift::QueryType::EXCLUDE)
     return self
   end
 

data/lib/rebat/version.rb

@@ -1,3 +1,3 @@
 module Rebat
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rebat
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thrift
-  requirement: &70286233997100 !ruby/object:Gem::Requirement
+  requirement: &70255955289740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70286233997100
+  version_requirements: *70255955289740
 description: ! 'Rebat DB driver for ruby '
 email:
 - omar.mekky@mashsolvents.com