flockdb 0.6.1 → 0.7.0

data/Gemfile

@@ -0,0 +1,3 @@
+source :rubygems
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,28 @@
+PATH
+  remote: .
+  specs:
+    flockdb (0.6.1)
+      thrift (>= 0.5.0)
+      thrift_client (>= 0.6.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.2)
+    rake (0.8.7)
+    rr (1.0.2)
+    rspec (1.3.2)
+    thrift (0.6.0)
+    thrift_client (0.6.2)
+      thrift (~> 0.6.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.0.10)
+  diff-lcs
+  flockdb!
+  rake (= 0.8.7)
+  rr
+  rspec (~> 1.3.0)

data/Rakefile

@@ -12,23 +12,4 @@ Spec::Rake::SpecTask.new(:spec) do |t|
   t.spec_files = FileList['spec/**/*_spec.rb']
 end
 
-# gemification with jeweler
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "flockdb"
-    gemspec.summary = "Ruby Flock client"
-    gemspec.description = "Get your flock on in Ruby."
-    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.5.0'
-    gemspec.add_dependency 'thrift_client', '>= 0.6.0'
-
-    # development
-    gemspec.add_development_dependency 'rspec'
-    gemspec.add_development_dependency 'rr'
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: gem install jeweler"
-end
+require 'bundler/gem_tasks'

data/flockdb.gemspec

@@ -1,87 +1,31 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
-Gem::Specification.new do |s|
-  s.name = %q{flockdb}
-  s.version = "0.6.1"
+require File.join(File.dirname(__FILE__), 'lib', 'flock', 'version')
 
+Gem::Specification.new do |s|
+  s.name = 'flockdb'
+  s.version = Flock::VERSION
   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.description = %q{Get your flock on in Ruby.}
+  s.summary = "Get your flock on in Ruby"
+  s.description = "Get your flock on in Ruby."
   s.email = %q{freels@twitter.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.md"
-  ]
-  s.files = [
-    ".gitignore",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "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",
-     "lib/flock/operations/complex_operation.rb",
-     "lib/flock/operations/execute_operation.rb",
-     "lib/flock/operations/execute_operations.rb",
-     "lib/flock/operations/query_term.rb",
-     "lib/flock/operations/select_operation.rb",
-     "lib/flock/operations/simple_operation.rb",
-     "lib/flock/service.rb",
-     "lib/flock/thrift.rb",
-     "lib/flockdb.rb",
-     "spec/execute_operations_spec.rb",
-     "spec/flock_spec.rb",
-     "spec/mock_service_spec.rb",
-     "spec/query_term_spec.rb",
-     "spec/simple_operation_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/twitter/flockdb-client}
+  s.extra_rdoc_files = ['README.md', 'LICENSE']
+  s.files = `git ls-files`.split("\n")
+  s.homepage = %q{http://github.com/twitter/flock-client}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Ruby Flock client}
-  s.test_files = [
-    "spec/execute_operations_spec.rb",
-     "spec/flock_spec.rb",
-     "spec/mock_service_spec.rb",
-     "spec/query_term_spec.rb",
-     "spec/simple_operation_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.test_files = `git ls-files`.split("\n").select{|f| f =~ /^spec/}
+  s.rubyforge_project = 'flock-client'
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      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.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.5.0"])
-    s.add_dependency(%q<thrift_client>, [">= 0.6.0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<rr>, [">= 0"])
-  end
+  # dependencies
+  s.add_dependency 'thrift', '>= 0.5.0'
+  s.add_dependency 'thrift_client', '>= 0.6.0'
+  s.add_development_dependency 'bundler', '~> 1.0.10'
+  s.add_development_dependency 'rake', '= 0.8.7'
+  s.add_development_dependency 'rspec', '~> 1.3.0'
+  s.add_development_dependency 'diff-lcs'
+  s.add_development_dependency 'rr'
 end
 

data/lib/flock.rb

@@ -5,26 +5,24 @@ require 'thrift_client'
 require 'flock/mixins/sizeable'
 
 # thrift sources. load order is important.
-module Flock
-  module Edges
-    module FlockDB
-    end
-  end
-end
-require 'flock/thrift'
-
-require 'flock/operation'
-require 'flock/operations/query_term'
-require 'flock/operations/select_operation'
-require 'flock/operations/complex_operation'
-require 'flock/operations/simple_operation'
-require 'flock/operations/execute_operation'
-require 'flock/operations/execute_operations'
-require 'flock/service'
-require 'flock/client'
+$LOAD_PATH << File.join(File.dirname(__FILE__), 'flock', 'gen-rb')
+
+require 'flockdb_types'
+require 'flockdb_constants'
+require 'flock_d_b'
 
 module Flock
-  autoload :MockService, 'flock/mock_service'
+  autoload :MockService,       'flock/mock_service'
+  autoload :Operation,         'flock/operation'
+  autoload :QueryTerm,         'flock/operations/query_term'
+  autoload :SelectOperation,   'flock/operations/select_operation'
+  autoload :ComplexOperation,  'flock/operations/complex_operation'
+  autoload :SimpleOperation,   'flock/operations/simple_operation'
+  autoload :ExecuteOperation,  'flock/operations/execute_operation'
+  autoload :ExecuteOperations, 'flock/operations/execute_operations'
+  autoload :SelectOperations,  'flock/operations/select_operations'
+  autoload :Service,           'flock/service'
+  autoload :Client,            'flock/client'
 
   FlockException = Edges::FlockException
   Priority = Edges::Priority
@@ -41,7 +39,7 @@ module Flock
 
   class UnknownStateError < FlockException
     def initialize(state)
-      super("Unable to look up id for state #{state.inspect}. Valid states are #{ Flock::Client::STATES.keys.sort.map{|s| s.inspect }.join(', ') }")
+      super("Unable to look up id for state #{state.inspect}. Valid states are #{ Flock::QueryTerm::STATES.keys.map{|s| s.inspect }.join(', ') }")
     end
   end
 

data/lib/flock/client.rb

@@ -1,10 +1,5 @@
 class Flock::Client
 
-  # symbol => state_id map
-  STATES = Flock::Edges::EdgeState::VALUE_MAP.inject({}) do |states, (id, name)|
-    states.update name.downcase.to_sym => id
-  end.freeze
-
   attr_accessor :graphs
   attr_reader :service
 
@@ -15,6 +10,7 @@ class Flock::Client
   # takes arguments a list of servers and an options hash to pass to the default service_class,
   # or a service itself
   def initialize(servers = nil, options = {})
+    options = options.dup
     if graphs = (options.delete(:graphs) || Flock.graphs)
       @graphs = graphs
     end
@@ -46,15 +42,27 @@ class Flock::Client
     @cache = {} if @cache
   end
 
-
   # queries
 
+  def multi(&block)
+    select_operations = Flock::SelectOperations.new(self)
+    yield select_operations
+    select_operations
+  end
+
   def select(*query)
-    Flock::SimpleOperation.new(self, _query_args(query))
+    query = query.first if query.size == 1 # supports deprecated API [[1, 2, 3]]
+    Flock::SimpleOperation.new(self, Flock::QueryTerm.new(query, graphs))
+  end
+
+  def get(source, graph, destination)
+    raise ArgumentError unless source.is_a?(Fixnum) && destination.is_a?(Fixnum)
+
+    select(source, graph, destination, [:positive, :removed, :negative, :archived]).edges.paginate(1).current_page.first
   end
 
   def contains(*query)
-    query = _query_args(query)[0, 3]
+    query = Flock::QueryTerm.new(query, graphs).unapply[0, 3]
     _cache :contains, query do
       service.contains(*query)
     end
@@ -70,9 +78,8 @@ class Flock::Client
 
   # edge manipulation
 
-  def update(method, source_id, graph, destination_id, priority = Flock::Priority::High, options = {})
-    execute_at = options.delete(:execute_at)
-    position = options.delete(:position)
+  def update(method, source_id, graph, destination_id, *args)
+    priority, execute_at, position = process_args(args)
 
     _cache_clear
     ops = current_transaction || Flock::ExecuteOperations.new(@service, priority, execute_at)
@@ -87,10 +94,8 @@ class Flock::Client
 
   alias unarchive add
 
-  def transaction(priority = Flock::Priority::High, options = {}, &block)
-    execute_at = options.delete(:execute_at)
-    position = options.delete(:position)
-
+  def transaction(*args, &block)
+    priority, execute_at, _ = process_args(args)
     new_transaction = !in_transaction?
 
     ops =
@@ -116,9 +121,7 @@ class Flock::Client
     !!Thread.current[:edge_transaction]
   end
 
-
-  # graph name lookup utility methods
-
+  private
   def _lookup_graph(key)
     if @graphs.nil? or key.is_a? Integer
       key
@@ -146,4 +149,9 @@ class Flock::Client
     return node.map {|n| n.to_i if n } if node.respond_to? :map
     node.to_i if node
   end
+
+  def process_args(args)
+    options = args.last.is_a?(Hash) ? args.pop : nil
+    [args.first || Flock::Priority::High, options && options[:execute_at], options && options[:position]]
+  end
 end

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

@@ -45,6 +45,38 @@ require 'flockdb_types'
                   raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get failed: unknown result')
                 end
 
+                def get_metadata(source_id, graph_id)
+                  send_get_metadata(source_id, graph_id)
+                  return recv_get_metadata()
+                end
+
+                def send_get_metadata(source_id, graph_id)
+                  send_message('get_metadata', Get_metadata_args, :source_id => source_id, :graph_id => graph_id)
+                end
+
+                def recv_get_metadata()
+                  result = receive_message(Get_metadata_result)
+                  return result.success unless result.success.nil?
+                  raise result.ex unless result.ex.nil?
+                  raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_metadata failed: unknown result')
+                end
+
+                def contains_metadata(source_id, graph_id)
+                  send_contains_metadata(source_id, graph_id)
+                  return recv_contains_metadata()
+                end
+
+                def send_contains_metadata(source_id, graph_id)
+                  send_message('contains_metadata', Contains_metadata_args, :source_id => source_id, :graph_id => graph_id)
+                end
+
+                def recv_contains_metadata()
+                  result = receive_message(Contains_metadata_result)
+                  return result.success unless result.success.nil?
+                  raise result.ex unless result.ex.nil?
+                  raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'contains_metadata failed: unknown result')
+                end
+
                 def select2(queries)
                   send_select2(queries)
                   return recv_select2()
@@ -167,6 +199,28 @@ require 'flockdb_types'
                   write_result(result, oprot, 'get', seqid)
                 end
 
+                def process_get_metadata(seqid, iprot, oprot)
+                  args = read_args(iprot, Get_metadata_args)
+                  result = Get_metadata_result.new()
+                  begin
+                    result.success = @handler.get_metadata(args.source_id, args.graph_id)
+                  rescue Flock::Edges::FlockException => ex
+                    result.ex = ex
+                  end
+                  write_result(result, oprot, 'get_metadata', seqid)
+                end
+
+                def process_contains_metadata(seqid, iprot, oprot)
+                  args = read_args(iprot, Contains_metadata_args)
+                  result = Contains_metadata_result.new()
+                  begin
+                    result.success = @handler.contains_metadata(args.source_id, args.graph_id)
+                  rescue Flock::Edges::FlockException => ex
+                    result.ex = ex
+                  end
+                  write_result(result, oprot, 'contains_metadata', seqid)
+                end
+
                 def process_select2(seqid, iprot, oprot)
                   args = read_args(iprot, Select2_args)
                   result = Select2_result.new()
@@ -313,6 +367,78 @@ require 'flockdb_types'
                 ::Thrift::Struct.generate_accessors self
               end
 
+              class Get_metadata_args
+                include ::Thrift::Struct, ::Thrift::Struct_Union
+                SOURCE_ID = 1
+                GRAPH_ID = 2
+
+                FIELDS = {
+                  SOURCE_ID => {:type => ::Thrift::Types::I64, :name => 'source_id'},
+                  GRAPH_ID => {:type => ::Thrift::Types::I32, :name => 'graph_id'}
+                }
+
+                def struct_fields; FIELDS; end
+
+                def validate
+                end
+
+                ::Thrift::Struct.generate_accessors self
+              end
+
+              class Get_metadata_result
+                include ::Thrift::Struct, ::Thrift::Struct_Union
+                SUCCESS = 0
+                EX = 1
+
+                FIELDS = {
+                  SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => Flock::Edges::Metadata},
+                  EX => {:type => ::Thrift::Types::STRUCT, :name => 'ex', :class => Flock::Edges::FlockException}
+                }
+
+                def struct_fields; FIELDS; end
+
+                def validate
+                end
+
+                ::Thrift::Struct.generate_accessors self
+              end
+
+              class Contains_metadata_args
+                include ::Thrift::Struct, ::Thrift::Struct_Union
+                SOURCE_ID = 1
+                GRAPH_ID = 2
+
+                FIELDS = {
+                  SOURCE_ID => {:type => ::Thrift::Types::I64, :name => 'source_id'},
+                  GRAPH_ID => {:type => ::Thrift::Types::I32, :name => 'graph_id'}
+                }
+
+                def struct_fields; FIELDS; end
+
+                def validate
+                end
+
+                ::Thrift::Struct.generate_accessors self
+              end
+
+              class Contains_metadata_result
+                include ::Thrift::Struct, ::Thrift::Struct_Union
+                SUCCESS = 0
+                EX = 1
+
+                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
+
+                ::Thrift::Struct.generate_accessors self
+              end
+
               class Select2_args
                 include ::Thrift::Struct, ::Thrift::Struct_Union
                 QUERIES = 1