flockdb 0.6.1 → 0.7.0

data/lib/flock/operations/select_operations.rb

@@ -0,0 +1,97 @@
+module Flock
+  class SelectOperations
+    EMPTY = Flock::Operation.new do |page|
+      [[], Flock::CursorEnd, Flock::CursorEnd]
+    end
+
+    [:each, :to_ary, :size, :first].each do |method|
+      class_eval("def #{method}(*args, &block); operation.#{method}(*args, &block) end", __FILE__, __LINE__)
+    end
+
+    include Enumerable
+
+    def initialize(client)
+      @client = client
+      @service = client.service
+      @selecticons = []
+    end
+
+    def select(*query)
+      selecticon = Selecticon.new(Flock::QueryTerm.new(query, @client.graphs))
+      @selecticons << selecticon
+      selecticon
+    end
+
+    def to_thrift_edges
+      @selecticons.map do |selecticon|
+        selecticon.to_thrift_edges
+      end
+    end
+
+    def to_thrift_ids
+      @selecticons.map do |selecticon|
+        selecticon.to_thrift_ids
+      end
+    end
+
+    def operation
+      if @selecticons.any?
+        @service.select2(to_thrift_ids).map do |results|
+          # Note: pagination will not work for now.
+          Flock::Operation.new do |page|
+            [results.ids.unpack("Q*"), Flock::CursorEnd, Flock::CursorEnd]
+          end
+        end
+      else
+        EMPTY
+      end
+    end
+
+    def edges
+      if @selecticons.any?
+        @service.select_edges(to_thrift_edges).map do |results|
+          # Note: pagination will not work for now.
+          Flock::Operation.new do |page|
+            [results.edges, Flock::CursorEnd, Flock::CursorEnd]
+          end
+        end
+      else
+        EMPTY
+      end
+    end
+
+    class Selecticon
+      def initialize(term)
+        @term = term
+        @count, @cursor = 20, Flock::CursorStart
+      end
+
+      def paginate(count, cursor = Flock::CursorStart)
+        @count, @cursor = count, cursor
+      end
+
+      def to_thrift_ids
+        query = Edges::SelectQuery.new
+        operation = Edges::SelectOperation.new
+        operation.operation_type = Edges::SelectOperationType::SimpleQuery
+        operation.term = @term.to_thrift
+        query.operations = [operation]
+        page = Flock::Page.new
+        page.cursor = @cursor
+        page.count = @count
+        query.page = page
+        query
+      end
+
+      def to_thrift_edges
+        query = Edges::EdgeQuery.new
+        query.term = @term.to_thrift
+        page = Flock::Page.new
+        page.cursor = @cursor
+        page.count = @count
+        query.page = page
+        query
+      end
+    end
+  end
+end

data/lib/flock/operations/simple_operation.rb

@@ -2,15 +2,30 @@ module Flock
   class SimpleOperation < SelectOperation
     def initialize(client, query)
       super(client)
-      @query = query
+      @term = query
+    end
+
+    def edges
+      Flock::Operation.new do |page|
+        query = to_thrift_edges
+        query.page = page
+        result = @service.select_edges(Array(query)).first
+        [result.edges, result.next_cursor, result.prev_cursor]
+      end
     end
 
     def to_thrift
       operation = Edges::SelectOperation.new
       operation.operation_type = Edges::SelectOperationType::SimpleQuery
-      operation.term = QueryTerm.new(@query).to_thrift
+      operation.term = @term.to_thrift
 
       Array(operation)
     end
+
+    def to_thrift_edges
+      query = Edges::EdgeQuery.new
+      query.term = @term.to_thrift
+      query
+    end
   end
 end

data/lib/flock/service.rb

@@ -10,7 +10,7 @@ module Flock
         servers = Array(servers)
       end
 
-      super(Edges::FlockDB::Client, servers, DEFAULTS.merge(options))
+      super(Edges::Client, servers, DEFAULTS.merge(options))
     end
   end
 end

data/lib/flock/version.rb

@@ -0,0 +1,3 @@
+module Flock
+  VERSION = '0.7.0'
+end

data/spec/execute_operations_spec.rb

@@ -3,9 +3,8 @@ require 'spec_helper'
 describe Flock::ExecuteOperations do
   describe "#negate" do
     it "should create a negate opperation" do
-      service = Flock::MockService.new
-      mock(Flock::ExecuteOperation).new(Flock::Edges::ExecuteOperationType::Negate, [1,1,3], nil)
-      operation = Flock::ExecuteOperations.new(service, nil)
+      mock(Flock::ExecuteOperation).new(Flock::Edges::ExecuteOperationType::Negate, Flock::QueryTerm.new([1,1,3]), nil)
+      operation = Flock::ExecuteOperations.new(Flock::Client.new(Flock::MockService), nil)
       operation.negate(1,1,3)
     end
   end
@@ -26,8 +25,8 @@ describe Flock::ExecuteOperations 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}
+      thing = Flock::ExecuteOperation.new(1, Flock::QueryTerm.new([1, 1, 3]), 12345)
+      mock(Flock::ExecuteOperation).new(1, Flock::QueryTerm.new([1, 1, 3]), 12345) { thing}
       client.add(1, 1, 3, Flock::Priority::High, :position => 12345)
     end
   end

data/spec/flock_spec.rb

@@ -145,6 +145,22 @@ describe Flock do
     end
   end
 
+  describe "positions" do
+    it "works" do
+      flock.add(4,5,6,:position => 7)
+      flock.get(4,5,6).position.should == 7
+    end
+
+    it "behaves like the server, not moving position on double adds, but moving position on delete-add" do
+      flock.add(4,5,6,:position => 7)
+      flock.add(4,5,6,:position => 8)
+      flock.get(4,5,6).position.should == 7
+      flock.remove(4,5,6)
+      flock.add(4,5,6,:position => 8)
+      flock.get(4,5,6).position.should == 8
+    end
+  end
+
   describe 'select' do
     attr_accessor :query
 
@@ -165,6 +181,53 @@ describe Flock do
       flock.select(user, 1, nil).to_a.sort.should == [2, 3]
     end
 
+    it "supports selecting states" do
+      flock.remove(5,1,1)
+
+      flock.select(5, 1, nil, 0).to_a.sort.should == []
+      flock.select(5, 1, nil, :positive).to_a.sort.should == []
+      flock.select([5, 1, nil, :positive]).to_a.sort.should == []
+      flock.select(5, 1, nil, 1).to_a.sort.should == [1]
+      flock.select(5, 1, nil, :removed).to_a.sort.should == [1]
+      flock.select([5, 1, nil, :removed]).to_a.sort.should == [1]
+      flock.select(5, 1, nil, 2).to_a.sort.should == []
+      flock.select(5, 1, nil, :archived).to_a.sort.should == []
+      flock.select([5, 1, nil, :archived]).to_a.sort.should == []
+      flock.select(5, 1, nil, 0, 1, 2).to_a.sort.should == [1]
+      flock.select(5, 1, nil, [0, 1, 2]).to_a.sort.should == [1]
+      flock.select(5, 1, nil, [:positive, :removed, :archived]).to_a.sort.should == [1]
+      flock.select([5, 1, nil, [:positive, :removed, :archived]]).to_a.sort.should == [1]
+    end
+
+    it 'supports rad graphs' do
+      flock.select(1, :schmaph, nil).to_a.sort.should == [2, 3]
+    end
+
+    describe 'edges' do
+      it 'works' do
+        time = Time.now
+        stub(Time).now { time }
+
+        edge1 = Flock::Edges::Edge.new
+        edge1.source_id = 1
+        edge1.destination_id = 2
+        edge1.position = Time.now.to_i
+        edge1.updated_at = Time.now.to_i
+        edge1.count = 1
+        edge1.state_id = 0
+
+        edge2 = Flock::Edges::Edge.new
+        edge2.source_id = 1
+        edge2.destination_id = 3
+        edge2.position = Time.now.to_i
+        edge2.updated_at = Time.now.to_i
+        edge2.count = 1
+        edge2.state_id = 0
+
+        flock.select(1,1,nil).edges.to_a.should == [edge1, edge2]
+      end
+    end
+
     describe 'to_a' do
       it 'works' do
         flock.select(1,1,nil).to_a.sort.should == [2, 3]
@@ -214,5 +277,56 @@ describe Flock do
         end
       end
     end
+
+    describe 'multi' do
+      it 'works' do
+        results = flock.multi do |m|
+          m.select(1,1,nil)
+          m.select(nil,1,1)
+        end
+        first, second = results
+        first.to_a.should == [2, 3]
+        second.to_a.should == [2, 4]
+      end
+
+      it 'works with empty multis' do
+        results = flock.multi { |m| }
+        results.to_a.should == []
+      end
+
+      describe 'edges' do
+        it 'works' do
+          time = Time.now
+          stub(Time).now { time }
+
+          prototype = Flock::Edges::Edge.new
+          prototype.position = Time.now.to_i
+          prototype.updated_at = Time.now.to_i
+          prototype.count = 1
+          prototype.state_id = 0
+
+          results = flock.multi do |m|
+            m.select(1,1,nil)
+            m.select(nil,1,1)
+          end.edges
+          first, second = results
+
+          a = prototype.dup
+          a.source_id, a.destination_id = 1, 2
+
+          b = prototype.dup
+          b.source_id, b.destination_id = 1, 3
+
+          first.to_a.should == [a, b]
+
+          c = prototype.dup
+          c.destination_id, c.source_id = 2, 1
+
+          d = prototype.dup
+          d.destination_id, d.source_id = 4, 1
+          second.to_a.should == [c, d]
+        end
+      end
+    end
   end
 end

data/spec/query_term_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe Flock::QueryTerm do
   describe '#new' do
-    it 'requires a query of length 4' do
-      lambda { Flock::QueryTerm.new([1, 1, 1, 1, 1]) }.should raise_error(ArgumentError)
+    it 'requires a query of length >= 3' do
+      lambda { Flock::QueryTerm.new([1, 1]) }.should raise_error(ArgumentError)
     end
 
     it 'has a source, graph, destination, and states' do
@@ -62,4 +62,16 @@ describe Flock::QueryTerm do
       @term.to_thrift.state_ids.should == [Flock::Edges::EdgeState::Positive, Flock::Edges::EdgeState::Negative]
     end
   end
+
+  describe 'when given symbols' do
+    it 'works for graphs' do
+      expected = Flock::QueryTerm.new([1, 1, 2, [Flock::Edges::EdgeState::Positive, Flock::Edges::EdgeState::Negative]])
+      qt = Flock::QueryTerm.new([1, :follows, 2, [Flock::Edges::EdgeState::Positive, Flock::Edges::EdgeState::Negative]], :follows => 1)
+    end
+
+    it 'works for states' do
+      expected = Flock::QueryTerm.new([1, 1, 2, [Flock::Edges::EdgeState::Positive, Flock::Edges::EdgeState::Negative]])
+      qt = Flock::QueryTerm.new([1, :follows, 2, :positive, :negative], :follows => 1)
+     end
+  end
 end

data/spec/simple_operation_spec.rb

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

data/spec/spec_helper.rb

@@ -17,5 +17,5 @@ Spec::Runner.configure do |config|
 end
 
 def new_flock_client
-  Flock.new($mock_service)
+  Flock.new($mock_service, :graphs => { :schmaph => 1 })
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flockdb
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: false
+  hash: 3
+  prerelease: 
   segments: 
   - 0
-  - 6
-  - 1
-  version: 0.6.1
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Matt Freels
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-28 00:00:00 -08:00
+date: 2011-06-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,9 +53,57 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: bundler
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 0
+        - 10
+        version: 1.0.10
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
+        version: 0.8.7
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: diff-lcs
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -65,11 +113,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rr
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -79,7 +127,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id007
 description: Get your flock on in Ruby.
 email: freels@twitter.com
 executables: []
@@ -87,14 +135,15 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
 - README.md
+- LICENSE
 files: 
 - .gitignore
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
-- VERSION
 - flockdb.gemspec
 - lib/flock.rb
 - lib/flock/client.rb
@@ -109,9 +158,11 @@ files:
 - lib/flock/operations/execute_operations.rb
 - lib/flock/operations/query_term.rb
 - lib/flock/operations/select_operation.rb
+- lib/flock/operations/select_operations.rb
 - lib/flock/operations/simple_operation.rb
 - lib/flock/service.rb
 - lib/flock/thrift.rb
+- lib/flock/version.rb
 - lib/flockdb.rb
 - spec/execute_operations_spec.rb
 - spec/flock_spec.rb
@@ -121,7 +172,7 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://github.com/twitter/flockdb-client
+homepage: http://github.com/twitter/flock-client
 licenses: []
 
 post_install_message: 
@@ -149,15 +200,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.7
+rubyforge_project: flock-client
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Ruby Flock client
+summary: Get your flock on in Ruby
 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.opts
 - spec/spec_helper.rb