flockdb 0.4.2 → 0.5.0

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.5.0

data/flockdb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{flockdb}
-  s.version = "0.4.2"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Freels", "Rael Dornfest", "Nick Kallen"]
-  s.date = %q{2011-02-28}
+  s.date = %q{2010-10-19}
   s.description = %q{Get your flock on in Ruby.}
   s.email = %q{freels@twitter.com}
   s.extra_rdoc_files = [
@@ -25,6 +25,9 @@ Gem::Specification.new do |s|
      "flockdb.gemspec",
      "lib/flock.rb",
      "lib/flock/client.rb",
+     "lib/flock/gen-rb/flock_d_b.rb",
+     "lib/flock/gen-rb/flockdb_constants.rb",
+     "lib/flock/gen-rb/flockdb_types.rb",
      "lib/flock/mixins/sizeable.rb",
      "lib/flock/mock_service.rb",
      "lib/flock/operation.rb",
@@ -35,11 +38,7 @@ Gem::Specification.new do |s|
      "lib/flock/operations/select_operation.rb",
      "lib/flock/operations/simple_operation.rb",
      "lib/flock/service.rb",
-     "lib/flock/thrift/edges.rb",
-     "lib/flock/thrift/edges_types.rb",
-     "lib/flock/thrift/flock_constants.rb",
-     "lib/flock/thrift/flock_types.rb",
-     "lib/flock/thrift/shards.rb",
+     "lib/flock/thrift.rb",
      "lib/flockdb.rb",
      "spec/execute_operations_spec.rb",
      "spec/flock_spec.rb",

data/lib/flock.rb

@@ -5,11 +5,13 @@ require 'thrift_client'
 require 'flock/mixins/sizeable'
 
 # thrift sources. load order is important.
-require 'flock/thrift/flock_types'
-require 'flock/thrift/flock_constants'
-require 'flock/thrift/shards'
-require 'flock/thrift/edges_types'
-require 'flock/thrift/edges'
+module Flock
+  module Edges
+    module FlockDB
+    end
+  end
+end
+require 'flock/thrift'
 
 require 'flock/operation'
 require 'flock/operations/query_term'
@@ -24,6 +26,13 @@ require 'flock/client'
 module Flock
   autoload :MockService, 'flock/mock_service'
 
+  FlockException = Edges::FlockException
+  Priority = Edges::Priority
+  CursorStart = -1
+  CursorEnd = 0
+  Page = Edges::Page
+  Results = Edges::Results
+
   class UnknownGraphError < FlockException
     def initialize(graph)
       super("Unable to look up id for graph #{graph.inspect}. Register graphs with Flock.graphs = <graph list>.")

data/lib/flock/client.rb

@@ -94,7 +94,7 @@ class Flock::Client
         current_transaction
       end
 
-    result = yield self
+    result = yield self if block.arity == 1
     ops.apply if new_transaction
     result
 

data/lib/flock/gen-rb/flock_d_b.rb

@@ -0,0 +1,523 @@
+#
+# Autogenerated by Thrift
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'thrift'
+require 'flockdb_types'
+
+        module Flock
+          module Edges
+            module FlockDB
+              class Client
+                include ::Thrift::Client
+
+                def contains(source_id, graph_id, destination_id)
+                  send_contains(source_id, graph_id, destination_id)
+                  return recv_contains()
+                end
+
+                def send_contains(source_id, graph_id, destination_id)
+                  send_message('contains', Contains_args, :source_id => source_id, :graph_id => graph_id, :destination_id => destination_id)
+                end
+
+                def recv_contains()
+                  result = receive_message(Contains_result)
+                  return result.success unless result.success.nil?
+                  raise result.ex unless result.ex.nil?
+                  raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'contains failed: unknown result')
+                end
+
+                def get(source_id, graph_id, destination_id)
+                  send_get(source_id, graph_id, destination_id)
+                  return recv_get()
+                end
+
+                def send_get(source_id, graph_id, destination_id)
+                  send_message('get', Get_args, :source_id => source_id, :graph_id => graph_id, :destination_id => destination_id)
+                end
+
+                def recv_get()
+                  result = receive_message(Get_result)
+                  return result.success unless result.success.nil?
+                  raise result.ex unless result.ex.nil?
+                  raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get failed: unknown result')
+                end
+
+                def select2(queries)
+                  send_select2(queries)
+                  return recv_select2()
+                end
+
+                def send_select2(queries)
+                  send_message('select2', Select2_args, :queries => queries)
+                end
+
+                def recv_select2()
+                  result = receive_message(Select2_result)
+                  return result.success unless result.success.nil?
+                  raise result.ex unless result.ex.nil?
+                  raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'select2 failed: unknown result')
+                end
+
+                def count2(queries)
+                  send_count2(queries)
+                  return recv_count2()
+                end
+
+                def send_count2(queries)
+                  send_message('count2', Count2_args, :queries => queries)
+                end
+
+                def recv_count2()
+                  result = receive_message(Count2_result)
+                  return result.success unless result.success.nil?
+                  raise result.ex unless result.ex.nil?
+                  raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'count2 failed: unknown result')
+                end
+
+                def select_edges(queries)
+                  send_select_edges(queries)
+                  return recv_select_edges()
+                end
+
+                def send_select_edges(queries)
+                  send_message('select_edges', Select_edges_args, :queries => queries)
+                end
+
+                def recv_select_edges()
+                  result = receive_message(Select_edges_result)
+                  return result.success unless result.success.nil?
+                  raise result.ex unless result.ex.nil?
+                  raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'select_edges failed: unknown result')
+                end
+
+                def execute(operations)
+                  send_execute(operations)
+                  recv_execute()
+                end
+
+                def send_execute(operations)
+                  send_message('execute', Execute_args, :operations => operations)
+                end
+
+                def recv_execute()
+                  result = receive_message(Execute_result)
+                  raise result.ex unless result.ex.nil?
+                  return
+                end
+
+                def count(operations)
+                  send_count(operations)
+                  return recv_count()
+                end
+
+                def send_count(operations)
+                  send_message('count', Count_args, :operations => operations)
+                end
+
+                def recv_count()
+                  result = receive_message(Count_result)
+                  return result.success unless result.success.nil?
+                  raise result.ex unless result.ex.nil?
+                  raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'count failed: unknown result')
+                end
+
+                def select(operations, page)
+                  send_select(operations, page)
+                  return recv_select()
+                end
+
+                def send_select(operations, page)
+                  send_message('select', Select_args, :operations => operations, :page => page)
+                end
+
+                def recv_select()
+                  result = receive_message(Select_result)
+                  return result.success unless result.success.nil?
+                  raise result.ex unless result.ex.nil?
+                  raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'select failed: unknown result')
+                end
+
+              end
+
+              class Processor
+                include ::Thrift::Processor
+
+                def process_contains(seqid, iprot, oprot)
+                  args = read_args(iprot, Contains_args)
+                  result = Contains_result.new()
+                  begin
+                    result.success = @handler.contains(args.source_id, args.graph_id, args.destination_id)
+                  rescue Flock::Edges::FlockException => ex
+                    result.ex = ex
+                  end
+                  write_result(result, oprot, 'contains', seqid)
+                end
+
+                def process_get(seqid, iprot, oprot)
+                  args = read_args(iprot, Get_args)
+                  result = Get_result.new()
+                  begin
+                    result.success = @handler.get(args.source_id, args.graph_id, args.destination_id)
+                  rescue Flock::Edges::FlockException => ex
+                    result.ex = ex
+                  end
+                  write_result(result, oprot, 'get', seqid)
+                end
+
+                def process_select2(seqid, iprot, oprot)
+                  args = read_args(iprot, Select2_args)
+                  result = Select2_result.new()
+                  begin
+                    result.success = @handler.select2(args.queries)
+                  rescue Flock::Edges::FlockException => ex
+                    result.ex = ex
+                  end
+                  write_result(result, oprot, 'select2', seqid)
+                end
+
+                def process_count2(seqid, iprot, oprot)
+                  args = read_args(iprot, Count2_args)
+                  result = Count2_result.new()
+                  begin
+                    result.success = @handler.count2(args.queries)
+                  rescue Flock::Edges::FlockException => ex
+                    result.ex = ex
+                  end
+                  write_result(result, oprot, 'count2', seqid)
+                end
+
+                def process_select_edges(seqid, iprot, oprot)
+                  args = read_args(iprot, Select_edges_args)
+                  result = Select_edges_result.new()
+                  begin
+                    result.success = @handler.select_edges(args.queries)
+                  rescue Flock::Edges::FlockException => ex
+                    result.ex = ex
+                  end
+                  write_result(result, oprot, 'select_edges', seqid)
+                end
+
+                def process_execute(seqid, iprot, oprot)
+                  args = read_args(iprot, Execute_args)
+                  result = Execute_result.new()
+                  begin
+                    @handler.execute(args.operations)
+                  rescue Flock::Edges::FlockException => ex
+                    result.ex = ex
+                  end
+                  write_result(result, oprot, 'execute', seqid)
+                end
+
+                def process_count(seqid, iprot, oprot)
+                  args = read_args(iprot, Count_args)
+                  result = Count_result.new()
+                  begin
+                    result.success = @handler.count(args.operations)
+                  rescue Flock::Edges::FlockException => ex
+                    result.ex = ex
+                  end
+                  write_result(result, oprot, 'count', seqid)
+                end
+
+                def process_select(seqid, iprot, oprot)
+                  args = read_args(iprot, Select_args)
+                  result = Select_result.new()
+                  begin
+                    result.success = @handler.select(args.operations, args.page)
+                  rescue Flock::Edges::FlockException => ex
+                    result.ex = ex
+                  end
+                  write_result(result, oprot, 'select', seqid)
+                end
+
+              end
+
+              # HELPER FUNCTIONS AND STRUCTURES
+
+              class Contains_args
+                include ::Thrift::Struct
+                SOURCE_ID = 1
+                GRAPH_ID = 2
+                DESTINATION_ID = 3
+
+                ::Thrift::Struct.field_accessor self, :source_id, :graph_id, :destination_id
+                FIELDS = {
+                  SOURCE_ID => {:type => ::Thrift::Types::I64, :name => 'source_id'},
+                  GRAPH_ID => {:type => ::Thrift::Types::I32, :name => 'graph_id'},
+                  DESTINATION_ID => {:type => ::Thrift::Types::I64, :name => 'destination_id'}
+                }
+
+                def struct_fields; FIELDS; end
+
+                def validate
+                end
+
+              end
+
+              class Contains_result
+                include ::Thrift::Struct
+                SUCCESS = 0
+                EX = 1
+
+                ::Thrift::Struct.field_accessor self, :success, :ex
+                FIELDS = {
+                  SUCCESS => {:type => ::Thrift::Types::BOOL, :name => 'success'},
+                  EX => {:type => ::Thrift::Types::STRUCT, :name => 'ex', :class => Flock::Edges::FlockException}
+                }
+
+                def struct_fields; FIELDS; end
+
+                def validate
+                end
+
+              end
+
+              class Get_args
+                include ::Thrift::Struct
+                SOURCE_ID = 1
+                GRAPH_ID = 2
+                DESTINATION_ID = 3
+
+                ::Thrift::Struct.field_accessor self, :source_id, :graph_id, :destination_id
+                FIELDS = {
+                  SOURCE_ID => {:type => ::Thrift::Types::I64, :name => 'source_id'},
+                  GRAPH_ID => {:type => ::Thrift::Types::I32, :name => 'graph_id'},
+                  DESTINATION_ID => {:type => ::Thrift::Types::I64, :name => 'destination_id'}
+                }
+
+                def struct_fields; FIELDS; end
+
+                def validate
+                end
+
+              end
+
+              class Get_result
+                include ::Thrift::Struct
+                SUCCESS = 0
+                EX = 1
+
+                ::Thrift::Struct.field_accessor self, :success, :ex
+                FIELDS = {
+                  SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => Flock::Edges::Edge},
+                  EX => {:type => ::Thrift::Types::STRUCT, :name => 'ex', :class => Flock::Edges::FlockException}
+                }
+
+                def struct_fields; FIELDS; end
+
+                def validate
+                end
+
+              end
+
+              class Select2_args
+                include ::Thrift::Struct
+                QUERIES = 1
+
+                ::Thrift::Struct.field_accessor self, :queries
+                FIELDS = {
+                  QUERIES => {:type => ::Thrift::Types::LIST, :name => 'queries', :element => {:type => ::Thrift::Types::STRUCT, :class => Flock::Edges::SelectQuery}}
+                }
+
+                def struct_fields; FIELDS; end
+
+                def validate
+                end
+
+              end
+
+              class Select2_result
+                include ::Thrift::Struct
+                SUCCESS = 0
+                EX = 1
+
+                ::Thrift::Struct.field_accessor self, :success, :ex
+                FIELDS = {
+                  SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => Flock::Edges::Results}},
+                  EX => {:type => ::Thrift::Types::STRUCT, :name => 'ex', :class => Flock::Edges::FlockException}
+                }
+
+                def struct_fields; FIELDS; end
+
+                def validate
+                end
+
+              end
+
+              class Count2_args
+                include ::Thrift::Struct
+                QUERIES = 1
+
+                ::Thrift::Struct.field_accessor self, :queries
+                FIELDS = {
+                  QUERIES => {:type => ::Thrift::Types::LIST, :name => 'queries', :element => {:type => ::Thrift::Types::LIST, :element => {:type => ::Thrift::Types::STRUCT, :class => Flock::Edges::SelectOperation}}}
+                }
+
+                def struct_fields; FIELDS; end
+
+                def validate
+                end
+
+              end
+
+              class Count2_result
+                include ::Thrift::Struct
+                SUCCESS = 0
+                EX = 1
+
+                ::Thrift::Struct.field_accessor self, :success, :ex
+                FIELDS = {
+                  SUCCESS => {:type => ::Thrift::Types::STRING, :name => 'success'},
+                  EX => {:type => ::Thrift::Types::STRUCT, :name => 'ex', :class => Flock::Edges::FlockException}
+                }
+
+                def struct_fields; FIELDS; end
+
+                def validate
+                end
+
+              end
+
+              class Select_edges_args
+                include ::Thrift::Struct
+                QUERIES = 1
+
+                ::Thrift::Struct.field_accessor self, :queries
+                FIELDS = {
+                  QUERIES => {:type => ::Thrift::Types::LIST, :name => 'queries', :element => {:type => ::Thrift::Types::STRUCT, :class => Flock::Edges::EdgeQuery}}
+                }
+
+                def struct_fields; FIELDS; end
+
+                def validate
+                end
+
+              end
+
+              class Select_edges_result
+                include ::Thrift::Struct
+                SUCCESS = 0
+                EX = 1
+
+                ::Thrift::Struct.field_accessor self, :success, :ex
+                FIELDS = {
+                  SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => Flock::Edges::EdgeResults}},
+                  EX => {:type => ::Thrift::Types::STRUCT, :name => 'ex', :class => Flock::Edges::FlockException}
+                }
+
+                def struct_fields; FIELDS; end
+
+                def validate
+                end
+
+              end
+
+              class Execute_args
+                include ::Thrift::Struct
+                OPERATIONS = 1
+
+                ::Thrift::Struct.field_accessor self, :operations
+                FIELDS = {
+                  OPERATIONS => {:type => ::Thrift::Types::STRUCT, :name => 'operations', :class => Flock::Edges::ExecuteOperations}
+                }
+
+                def struct_fields; FIELDS; end
+
+                def validate
+                end
+
+              end
+
+              class Execute_result
+                include ::Thrift::Struct
+                EX = 1
+
+                ::Thrift::Struct.field_accessor self, :ex
+                FIELDS = {
+                  EX => {:type => ::Thrift::Types::STRUCT, :name => 'ex', :class => Flock::Edges::FlockException}
+                }
+
+                def struct_fields; FIELDS; end
+
+                def validate
+                end
+
+              end
+
+              class Count_args
+                include ::Thrift::Struct
+                OPERATIONS = 1
+
+                ::Thrift::Struct.field_accessor self, :operations
+                FIELDS = {
+                  OPERATIONS => {:type => ::Thrift::Types::LIST, :name => 'operations', :element => {:type => ::Thrift::Types::STRUCT, :class => Flock::Edges::SelectOperation}}
+                }
+
+                def struct_fields; FIELDS; end
+
+                def validate
+                end
+
+              end
+
+              class Count_result
+                include ::Thrift::Struct
+                SUCCESS = 0
+                EX = 1
+
+                ::Thrift::Struct.field_accessor self, :success, :ex
+                FIELDS = {
+                  SUCCESS => {:type => ::Thrift::Types::I32, :name => 'success'},
+                  EX => {:type => ::Thrift::Types::STRUCT, :name => 'ex', :class => Flock::Edges::FlockException}
+                }
+
+                def struct_fields; FIELDS; end
+
+                def validate
+                end
+
+              end
+
+              class Select_args
+                include ::Thrift::Struct
+                OPERATIONS = 1
+                PAGE = 2
+
+                ::Thrift::Struct.field_accessor self, :operations, :page
+                FIELDS = {
+                  OPERATIONS => {:type => ::Thrift::Types::LIST, :name => 'operations', :element => {:type => ::Thrift::Types::STRUCT, :class => Flock::Edges::SelectOperation}},
+                  PAGE => {:type => ::Thrift::Types::STRUCT, :name => 'page', :class => Flock::Edges::Page}
+                }
+
+                def struct_fields; FIELDS; end
+
+                def validate
+                end
+
+              end
+
+              class Select_result
+                include ::Thrift::Struct
+                SUCCESS = 0
+                EX = 1
+
+                ::Thrift::Struct.field_accessor self, :success, :ex
+                FIELDS = {
+                  SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => Flock::Edges::Results},
+                  EX => {:type => ::Thrift::Types::STRUCT, :name => 'ex', :class => Flock::Edges::FlockException}
+                }
+
+                def struct_fields; FIELDS; end
+
+                def validate
+                end
+
+              end
+
+            end
+
+          end
+        end