flockdb 0.5.1 → 0.6.1

data/Rakefile

@@ -22,8 +22,8 @@ begin
     gemspec.email = "freels@twitter.com"
     gemspec.homepage = "http://github.com/twitter/flockdb-client"
     gemspec.authors = ["Matt Freels", "Rael Dornfest", "Nick Kallen"]
-    gemspec.add_dependency 'thrift', '>= 0.2.0'
-    gemspec.add_dependency 'thrift_client', '>= 0.4.1'
+    gemspec.add_dependency 'thrift', '>= 0.5.0'
+    gemspec.add_dependency 'thrift_client', '>= 0.6.0'
 
     # development
     gemspec.add_development_dependency 'rspec'

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.6.1

data/flockdb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{flockdb}
-  s.version = "0.5.1"
+  s.version = "0.6.1"
 
   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{2010-10-22}
+  s.date = %q{2011-02-28}
   s.description = %q{Get your flock on in Ruby.}
   s.email = %q{freels@twitter.com}
   s.extra_rdoc_files = [
@@ -67,19 +67,19 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<thrift>, [">= 0.2.0"])
-      s.add_runtime_dependency(%q<thrift_client>, [">= 0.4.1"])
+      s.add_runtime_dependency(%q<thrift>, [">= 0.5.0"])
+      s.add_runtime_dependency(%q<thrift_client>, [">= 0.6.0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<rr>, [">= 0"])
     else
-      s.add_dependency(%q<thrift>, [">= 0.2.0"])
-      s.add_dependency(%q<thrift_client>, [">= 0.4.1"])
+      s.add_dependency(%q<thrift>, [">= 0.5.0"])
+      s.add_dependency(%q<thrift_client>, [">= 0.6.0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<rr>, [">= 0"])
     end
   else
-    s.add_dependency(%q<thrift>, [">= 0.2.0"])
-    s.add_dependency(%q<thrift_client>, [">= 0.4.1"])
+    s.add_dependency(%q<thrift>, [">= 0.5.0"])
+    s.add_dependency(%q<thrift_client>, [">= 0.6.0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<rr>, [">= 0"])
   end

data/lib/flock/client.rb

@@ -70,10 +70,13 @@ class Flock::Client
 
   # edge manipulation
 
-  def update(method, source_id, graph, destination_id, priority = Flock::Priority::High)
+  def update(method, source_id, graph, destination_id, priority = Flock::Priority::High, options = {})
+    execute_at = options.delete(:execute_at)
+    position = options.delete(:position)
+
     _cache_clear
-    ops = current_transaction || Flock::ExecuteOperations.new(@service, priority)
-    ops.send(method, *_query_args([source_id, graph, destination_id])[0, 3])
+    ops = current_transaction || Flock::ExecuteOperations.new(@service, priority, execute_at)
+    ops.send(method, *(_query_args([source_id, graph, destination_id])[0, 3] << position))
     ops.apply unless in_transaction?
   end
 
@@ -84,12 +87,15 @@ class Flock::Client
 
   alias unarchive add
 
-  def transaction(priority = Flock::Priority::High, &block)
+  def transaction(priority = Flock::Priority::High, options = {}, &block)
+    execute_at = options.delete(:execute_at)
+    position = options.delete(:position)
+
     new_transaction = !in_transaction?
 
     ops =
       if new_transaction
-        Thread.current[:edge_transaction] = Flock::ExecuteOperations.new(@service, priority)
+        Thread.current[:edge_transaction] = Flock::ExecuteOperations.new(@service, priority, execute_at)
       else
         current_transaction
       end

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

@@ -238,12 +238,11 @@ require 'flockdb_types'
               # HELPER FUNCTIONS AND STRUCTURES
 
               class Contains_args
-                include ::Thrift::Struct
+                include ::Thrift::Struct, ::Thrift::Struct_Union
                 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'},
@@ -255,14 +254,14 @@ require 'flockdb_types'
                 def validate
                 end
 
+                ::Thrift::Struct.generate_accessors self
               end
 
               class Contains_result
-                include ::Thrift::Struct
+                include ::Thrift::Struct, ::Thrift::Struct_Union
                 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}
@@ -273,15 +272,15 @@ require 'flockdb_types'
                 def validate
                 end
 
+                ::Thrift::Struct.generate_accessors self
               end
 
               class Get_args
-                include ::Thrift::Struct
+                include ::Thrift::Struct, ::Thrift::Struct_Union
                 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'},
@@ -293,14 +292,14 @@ require 'flockdb_types'
                 def validate
                 end
 
+                ::Thrift::Struct.generate_accessors self
               end
 
               class Get_result
-                include ::Thrift::Struct
+                include ::Thrift::Struct, ::Thrift::Struct_Union
                 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}
@@ -311,13 +310,13 @@ require 'flockdb_types'
                 def validate
                 end
 
+                ::Thrift::Struct.generate_accessors self
               end
 
               class Select2_args
-                include ::Thrift::Struct
+                include ::Thrift::Struct, ::Thrift::Struct_Union
                 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}}
                 }
@@ -327,14 +326,14 @@ require 'flockdb_types'
                 def validate
                 end
 
+                ::Thrift::Struct.generate_accessors self
               end
 
               class Select2_result
-                include ::Thrift::Struct
+                include ::Thrift::Struct, ::Thrift::Struct_Union
                 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}
@@ -345,13 +344,13 @@ require 'flockdb_types'
                 def validate
                 end
 
+                ::Thrift::Struct.generate_accessors self
               end
 
               class Count2_args
-                include ::Thrift::Struct
+                include ::Thrift::Struct, ::Thrift::Struct_Union
                 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}}}
                 }
@@ -361,16 +360,16 @@ require 'flockdb_types'
                 def validate
                 end
 
+                ::Thrift::Struct.generate_accessors self
               end
 
               class Count2_result
-                include ::Thrift::Struct
+                include ::Thrift::Struct, ::Thrift::Struct_Union
                 SUCCESS = 0
                 EX = 1
 
-                ::Thrift::Struct.field_accessor self, :success, :ex
                 FIELDS = {
-                  SUCCESS => {:type => ::Thrift::Types::STRING, :name => 'success'},
+                  SUCCESS => {:type => ::Thrift::Types::STRING, :name => 'success', :binary => true},
                   EX => {:type => ::Thrift::Types::STRUCT, :name => 'ex', :class => Flock::Edges::FlockException}
                 }
 
@@ -379,13 +378,13 @@ require 'flockdb_types'
                 def validate
                 end
 
+                ::Thrift::Struct.generate_accessors self
               end
 
               class Select_edges_args
-                include ::Thrift::Struct
+                include ::Thrift::Struct, ::Thrift::Struct_Union
                 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}}
                 }
@@ -395,14 +394,14 @@ require 'flockdb_types'
                 def validate
                 end
 
+                ::Thrift::Struct.generate_accessors self
               end
 
               class Select_edges_result
-                include ::Thrift::Struct
+                include ::Thrift::Struct, ::Thrift::Struct_Union
                 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}
@@ -413,13 +412,13 @@ require 'flockdb_types'
                 def validate
                 end
 
+                ::Thrift::Struct.generate_accessors self
               end
 
               class Execute_args
-                include ::Thrift::Struct
+                include ::Thrift::Struct, ::Thrift::Struct_Union
                 OPERATIONS = 1
 
-                ::Thrift::Struct.field_accessor self, :operations
                 FIELDS = {
                   OPERATIONS => {:type => ::Thrift::Types::STRUCT, :name => 'operations', :class => Flock::Edges::ExecuteOperations}
                 }
@@ -429,13 +428,13 @@ require 'flockdb_types'
                 def validate
                 end
 
+                ::Thrift::Struct.generate_accessors self
               end
 
               class Execute_result
-                include ::Thrift::Struct
+                include ::Thrift::Struct, ::Thrift::Struct_Union
                 EX = 1
 
-                ::Thrift::Struct.field_accessor self, :ex
                 FIELDS = {
                   EX => {:type => ::Thrift::Types::STRUCT, :name => 'ex', :class => Flock::Edges::FlockException}
                 }
@@ -445,13 +444,13 @@ require 'flockdb_types'
                 def validate
                 end
 
+                ::Thrift::Struct.generate_accessors self
               end
 
               class Count_args
-                include ::Thrift::Struct
+                include ::Thrift::Struct, ::Thrift::Struct_Union
                 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}}
                 }
@@ -461,14 +460,14 @@ require 'flockdb_types'
                 def validate
                 end
 
+                ::Thrift::Struct.generate_accessors self
               end
 
               class Count_result
-                include ::Thrift::Struct
+                include ::Thrift::Struct, ::Thrift::Struct_Union
                 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}
@@ -479,14 +478,14 @@ require 'flockdb_types'
                 def validate
                 end
 
+                ::Thrift::Struct.generate_accessors self
               end
 
               class Select_args
-                include ::Thrift::Struct
+                include ::Thrift::Struct, ::Thrift::Struct_Union
                 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}
@@ -497,14 +496,14 @@ require 'flockdb_types'
                 def validate
                 end
 
+                ::Thrift::Struct.generate_accessors self
               end
 
               class Select_result
-                include ::Thrift::Struct
+                include ::Thrift::Struct, ::Thrift::Struct_Union
                 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}
@@ -515,6 +514,7 @@ require 'flockdb_types'
                 def validate
                 end
 
+                ::Thrift::Struct.generate_accessors self
               end
 
             end

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

@@ -43,7 +43,7 @@ module Flock
         end
 
         class FlockException < ::Thrift::Exception
-          include ::Thrift::Struct
+          include ::Thrift::Struct, ::Thrift::Struct_Union
           def initialize(message=nil)
             super()
             self.description = message
@@ -53,7 +53,6 @@ module Flock
 
           DESCRIPTION = 1
 
-          ::Thrift::Struct.field_accessor self, :description
           FIELDS = {
             DESCRIPTION => {:type => ::Thrift::Types::STRING, :name => 'description'}
           }
@@ -63,17 +62,17 @@ module Flock
           def validate
           end
 
+          ::Thrift::Struct.generate_accessors self
         end
 
         class Results
-          include ::Thrift::Struct
+          include ::Thrift::Struct, ::Thrift::Struct_Union
           IDS = 1
           NEXT_CURSOR = 2
           PREV_CURSOR = 3
 
-          ::Thrift::Struct.field_accessor self, :ids, :next_cursor, :prev_cursor
           FIELDS = {
-            IDS => {:type => ::Thrift::Types::STRING, :name => 'ids'},
+            IDS => {:type => ::Thrift::Types::STRING, :name => 'ids', :binary => true},
             NEXT_CURSOR => {:type => ::Thrift::Types::I64, :name => 'next_cursor'},
             PREV_CURSOR => {:type => ::Thrift::Types::I64, :name => 'prev_cursor'}
           }
@@ -83,14 +82,14 @@ module Flock
           def validate
           end
 
+          ::Thrift::Struct.generate_accessors self
         end
 
         class Page
-          include ::Thrift::Struct
+          include ::Thrift::Struct, ::Thrift::Struct_Union
           COUNT = 1
           CURSOR = 2
 
-          ::Thrift::Struct.field_accessor self, :count, :cursor
           FIELDS = {
             COUNT => {:type => ::Thrift::Types::I32, :name => 'count'},
             CURSOR => {:type => ::Thrift::Types::I64, :name => 'cursor'}
@@ -101,10 +100,11 @@ module Flock
           def validate
           end
 
+          ::Thrift::Struct.generate_accessors self
         end
 
         class Edge
-          include ::Thrift::Struct
+          include ::Thrift::Struct, ::Thrift::Struct_Union
           SOURCE_ID = 1
           DESTINATION_ID = 2
           POSITION = 3
@@ -112,7 +112,6 @@ module Flock
           COUNT = 5
           STATE_ID = 6
 
-          ::Thrift::Struct.field_accessor self, :source_id, :destination_id, :position, :updated_at, :count, :state_id
           FIELDS = {
             SOURCE_ID => {:type => ::Thrift::Types::I64, :name => 'source_id'},
             DESTINATION_ID => {:type => ::Thrift::Types::I64, :name => 'destination_id'},
@@ -127,22 +126,22 @@ module Flock
           def validate
           end
 
+          ::Thrift::Struct.generate_accessors self
         end
 
         class QueryTerm
-          include ::Thrift::Struct
+          include ::Thrift::Struct, ::Thrift::Struct_Union
           SOURCE_ID = 1
           GRAPH_ID = 2
           IS_FORWARD = 3
           DESTINATION_IDS = 4
           STATE_IDS = 5
 
-          ::Thrift::Struct.field_accessor self, :source_id, :graph_id, :is_forward, :destination_ids, :state_ids
           FIELDS = {
             SOURCE_ID => {:type => ::Thrift::Types::I64, :name => 'source_id'},
             GRAPH_ID => {:type => ::Thrift::Types::I32, :name => 'graph_id'},
             IS_FORWARD => {:type => ::Thrift::Types::BOOL, :name => 'is_forward'},
-            DESTINATION_IDS => {:type => ::Thrift::Types::STRING, :name => 'destination_ids', :optional => true},
+            DESTINATION_IDS => {:type => ::Thrift::Types::STRING, :name => 'destination_ids', :binary => true, :optional => true},
             STATE_IDS => {:type => ::Thrift::Types::LIST, :name => 'state_ids', :element => {:type => ::Thrift::Types::I32}, :optional => true}
           }
 
@@ -151,14 +150,14 @@ module Flock
           def validate
           end
 
+          ::Thrift::Struct.generate_accessors self
         end
 
         class SelectOperation
-          include ::Thrift::Struct
+          include ::Thrift::Struct, ::Thrift::Struct_Union
           OPERATION_TYPE = 1
           TERM = 2
 
-          ::Thrift::Struct.field_accessor self, :operation_type, :term
           FIELDS = {
             OPERATION_TYPE => {:type => ::Thrift::Types::I32, :name => 'operation_type', :enum_class => Flock::Edges::SelectOperationType},
             TERM => {:type => ::Thrift::Types::STRUCT, :name => 'term', :class => Flock::Edges::QueryTerm, :optional => true}
@@ -172,15 +171,15 @@ module Flock
             end
           end
 
+          ::Thrift::Struct.generate_accessors self
         end
 
         class ExecuteOperation
-          include ::Thrift::Struct
+          include ::Thrift::Struct, ::Thrift::Struct_Union
           OPERATION_TYPE = 1
           TERM = 2
           POSITION = 3
 
-          ::Thrift::Struct.field_accessor self, :operation_type, :term, :position
           FIELDS = {
             OPERATION_TYPE => {:type => ::Thrift::Types::I32, :name => 'operation_type', :enum_class => Flock::Edges::ExecuteOperationType},
             TERM => {:type => ::Thrift::Types::STRUCT, :name => 'term', :class => Flock::Edges::QueryTerm},
@@ -195,15 +194,15 @@ module Flock
             end
           end
 
+          ::Thrift::Struct.generate_accessors self
         end
 
         class ExecuteOperations
-          include ::Thrift::Struct
+          include ::Thrift::Struct, ::Thrift::Struct_Union
           OPERATIONS = 1
           EXECUTE_AT = 2
           PRIORITY = 3
 
-          ::Thrift::Struct.field_accessor self, :operations, :execute_at, :priority
           FIELDS = {
             OPERATIONS => {:type => ::Thrift::Types::LIST, :name => 'operations', :element => {:type => ::Thrift::Types::STRUCT, :class => Flock::Edges::ExecuteOperation}},
             EXECUTE_AT => {:type => ::Thrift::Types::I32, :name => 'execute_at', :optional => true},
@@ -218,14 +217,14 @@ module Flock
             end
           end
 
+          ::Thrift::Struct.generate_accessors self
         end
 
         class SelectQuery
-          include ::Thrift::Struct
+          include ::Thrift::Struct, ::Thrift::Struct_Union
           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}
@@ -236,14 +235,14 @@ module Flock
           def validate
           end
 
+          ::Thrift::Struct.generate_accessors self
         end
 
         class EdgeQuery
-          include ::Thrift::Struct
+          include ::Thrift::Struct, ::Thrift::Struct_Union
           TERM = 1
           PAGE = 2
 
-          ::Thrift::Struct.field_accessor self, :term, :page
           FIELDS = {
             TERM => {:type => ::Thrift::Types::STRUCT, :name => 'term', :class => Flock::Edges::QueryTerm},
             PAGE => {:type => ::Thrift::Types::STRUCT, :name => 'page', :class => Flock::Edges::Page}
@@ -254,15 +253,15 @@ module Flock
           def validate
           end
 
+          ::Thrift::Struct.generate_accessors self
         end
 
         class EdgeResults
-          include ::Thrift::Struct
+          include ::Thrift::Struct, ::Thrift::Struct_Union
           EDGES = 1
           NEXT_CURSOR = 2
           PREV_CURSOR = 3
 
-          ::Thrift::Struct.field_accessor self, :edges, :next_cursor, :prev_cursor
           FIELDS = {
             EDGES => {:type => ::Thrift::Types::LIST, :name => 'edges', :element => {:type => ::Thrift::Types::STRUCT, :class => Flock::Edges::Edge}},
             NEXT_CURSOR => {:type => ::Thrift::Types::I64, :name => 'next_cursor'},
@@ -274,6 +273,7 @@ module Flock
           def validate
           end
 
+          ::Thrift::Struct.generate_accessors self
         end
 
       end

data/lib/flock/mock_service.rb

@@ -1,6 +1,5 @@
 module Flock
-  module MockService
-    extend self
+  class MockService
 
     EXEC_OPS = {
       Edges::ExecuteOperationType::Add => :add,

data/lib/flock/operations/execute_operation.rb

@@ -1,12 +1,13 @@
 module Flock
   class ExecuteOperation
-    def initialize(operation_type, query)
-      @operation_type, @query = operation_type, query
+    def initialize(operation_type, query, position = nil)
+      @operation_type, @query, @position = operation_type, query, position
     end
 
     def to_thrift
       op = Edges::ExecuteOperation.new
       op.operation_type = @operation_type
+      op.position = @position if @position
       op.term = QueryTerm.new(@query).to_thrift
       op
     end

data/lib/flock/operations/execute_operations.rb

@@ -1,12 +1,12 @@
 module Flock
   class ExecuteOperations
-    def initialize(service, priority)
-      @service, @operations, @priority = service, [], priority
+    def initialize(service, priority, execute_at = nil)
+      @service, @operations, @priority, @execute_at = service, [], priority, execute_at
     end
 
     Flock::Edges::ExecuteOperationType::VALUE_MAP.each do |op_id, op|
       op = op.downcase
-      class_eval "def #{op}(s, g, d); @operations << ExecuteOperation.new(#{op_id}, [s, g, d]); self end", __FILE__, __LINE__
+      class_eval "def #{op}(s, g, d, p = nil); @operations << ExecuteOperation.new(#{op_id}, [s, g, d], p); self end", __FILE__, __LINE__
     end
 
     def apply
@@ -17,6 +17,7 @@ module Flock
       operations = Edges::ExecuteOperations.new
       operations.operations = @operations.map(&:to_thrift)
       operations.priority = @priority
+      operations.execute_at = @execute_at.to_i if @execute_at
       operations
     end
   end

data/spec/execute_operations_spec.rb

@@ -3,9 +3,33 @@ require 'spec_helper'
 describe Flock::ExecuteOperations do
   describe "#negate" do
     it "should create a negate opperation" do
-      mock(Flock::ExecuteOperation).new(Flock::Edges::ExecuteOperationType::Negate, [1,1,3])
-      operation = Flock::ExecuteOperations.new(Flock::Client.new(Flock::MockService), nil)
+      service = Flock::MockService.new
+      mock(Flock::ExecuteOperation).new(Flock::Edges::ExecuteOperationType::Negate, [1,1,3], nil)
+      operation = Flock::ExecuteOperations.new(service, nil)
       operation.negate(1,1,3)
     end
   end
+
+  describe "adding with timestamp" do
+    it "should pass through" do
+      service = Flock::MockService.new
+      client = Flock::Client.new(service)
+      now = Time.now.to_i
+      thing = Flock::ExecuteOperations.new(service, Flock::Priority::High, now)
+      mock(Flock::ExecuteOperations).new(service, Flock::Priority::High, now) { thing }
+      client.add(1, 1, 3, Flock::Priority::High, :execute_at => now)
+    end
+  end
+
+  describe "adding with position" do
+    it "should pass through" do
+      service = Flock::MockService.new
+      client = Flock::Client.new(service)
+      now = Time.now.to_i
+      thing = Flock::ExecuteOperation.new(1, [1, 1, 3], 12345)
+      mock(Flock::ExecuteOperation).new(1, [1, 1, 3], 12345) { thing}
+      client.add(1, 1, 3, Flock::Priority::High, :position => 12345)
+    end
+  end
+
 end

data/spec/flock_spec.rb

@@ -16,6 +16,15 @@ describe Flock do
     it 'works' do
       flock.contains(1,1,2).should == true
     end
+
+    it 'works within nested transactions' do
+      flock.transaction do
+        flock.transaction do |f|
+          f.add(1,1,5)
+        end
+      end
+      flock.contains(1,1,5).should == true
+    end
   end
 
   describe 'remove' do

data/spec/simple_operation_spec.rb

@@ -3,8 +3,9 @@ require 'spec_helper'
 describe Flock::ExecuteOperations do
   describe "#negate" do
     it "should create a negate operation" do
-      mock(Flock::ExecuteOperation).new(Flock::Edges::ExecuteOperationType::Negate, [1,1,3])
-      operation = Flock::ExecuteOperations.new(Flock::Client.new(Flock::MockService), nil)
+      service = Flock::MockService.new
+      mock(Flock::ExecuteOperation).new(Flock::Edges::ExecuteOperationType::Negate, [1,1,3], nil)
+      operation = Flock::ExecuteOperations.new(Flock::Client.new(service), nil)
       operation.negate(1,1,3)
     end
   end

data/spec/spec_helper.rb

@@ -7,13 +7,15 @@ $: << File.expand_path("#{spec_dir}/../lib")
 require 'flock'
 require 'flock/mock_service'
 
+$mock_service = Flock::MockService.new
+
 Spec::Runner.configure do |config|
   config.mock_with :rr
   config.before do
-    Flock::MockService.clear
+    $mock_service.clear
   end
 end
 
 def new_flock_client
-  Flock.new(Flock::MockService)
+  Flock.new($mock_service)
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flockdb
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 5
   prerelease: false
   segments: 
   - 0
-  - 5
+  - 6
   - 1
-  version: 0.5.1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Matt Freels
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-22 00:00:00 -07:00
+date: 2011-02-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,12 +28,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 11
         segments: 
         - 0
-        - 2
+        - 5
         - 0
-        version: 0.2.0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -44,12 +44,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 7
         segments: 
         - 0
-        - 4
-        - 1
-        version: 0.4.1
+        - 6
+        - 0
+        version: 0.6.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency