flockdb 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/flockdb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{flockdb}
-  s.version = "0.3.0"
+  s.version = "0.3.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-04-19}
+  s.date = %q{2010-04-29}
   s.description = %q{Get your flock on in Ruby.}
   s.email = %q{freels@twitter.com}
   s.extra_rdoc_files = [

data/lib/flock/client.rb

@@ -49,8 +49,9 @@ class Flock::Client
   end
 
   def contains(*query)
+    query = _query_args(query)
     _cache :contains, query do
-      select(*query).any?
+      service.contains(*query)
     end
   end
 

data/lib/flock/mock_service.rb

@@ -51,9 +51,15 @@ module Flock
             end
           end
         when Edges::ExecuteOperationType::Remove
-          destination_ids.each do |destination_id|
-            backward_data_source[[destination_id, graph_id]].delete(source_id)
-            forward_data_source[[source_id, graph_id]].delete(destination_id)
+          if destination_ids.nil?
+            backward_data_source.delete([source_id, graph_id]).to_a.each do |n|
+              forward_data_source[[n, graph_id]].delete(source_id)
+            end
+          else
+            destination_ids.each do |destination_id|
+              backward_data_source[[destination_id, graph_id]].delete(source_id)
+              forward_data_source[[source_id, graph_id]].delete(destination_id)
+            end
           end
         when Edges::ExecuteOperationType::Archive
           if destination_ids.nil?
@@ -63,7 +69,14 @@ module Flock
               forward_data_source[[n, graph_id]].delete(source_id)
             end
           else
-            raise "not yet implemented"
+            destination_ids.each do |destination_id|
+              if backward_data_source[[destination_id, graph_id]].delete(source_id)
+                backward_archived_data_source[[destination_id, graph_id]] << source_id
+              end
+              if forward_data_source[[source_id, graph_id]].delete(destination_id)
+                forward_archived_data_source[[source_id, graph_id]] << destination_id
+              end
+            end
           end
         end
       end
@@ -73,15 +86,12 @@ module Flock
       iterate(select_query(select_operations), page)
     end
 
-    def count(select_operations)
-      select_query(select_operations).size
+    def contains(source_id, graph_id, destination_id)
+      !!destinations[[source_id, graph_id]].detect {|i| i == destination_id}
     end
 
-    # FIXME
-    def counts_of_sources_for(destination_ids, graph_id)
-      destination_ids.unpack("Q*").map do |destination_id|
-        (sources[[destination_id, graph_id]] || []).size
-      end.pack("I*")
+    def count(select_operations)
+      select_query(select_operations).size
     end
 
     private
@@ -164,15 +174,5 @@ module Flock
         h[k] = []
       end
     end
-
-    # deprecated
-    public
-    def offset_sources_for(destination_id, graph_id, offset, count)
-      (sources[[destination_id, graph_id]].slice(offset, count) || []).pack("Q*")
-    end
-
-    def offset_destinations_for(source_id, graph_id, offset, count)
-      (destinations[[source_id, graph_id]].slice(offset, count) || []).pack("Q*")
-    end
   end
 end

data/spec/mock_service_spec.rb

@@ -8,7 +8,6 @@ describe Flock::MockService do
     describe 'execute'
     describe 'select'
     describe 'count'
-    describe 'counts_of_sources_for'
 
     # private methods
     describe 'select_query'
@@ -19,9 +18,5 @@ describe Flock::MockService do
     describe 'destinations'
     describe 'archived_sources'
     describe 'archived_destinations'
-
-    # deprecated public methods
-    describe 'offset_sources_for'
-    describe 'offset_destinations_for'
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Matt Freels
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-19 00:00:00 -07:00
+date: 2010-04-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency