mongo_delegate 0.1.2 → 0.2.0

data/README.rdoc

@@ -6,11 +6,11 @@ A DelegateCollection wraps a local collection and remote collection in one objec
 
 This was inspired by things I've been told about Goldman Sachs' proprietary object database.  You can point one database at another remote database, and it will function in this manner. 
 
-The classic use case is debugging a production problem, or developing while using production data.  
+=== The classic use case is debugging a production problem, or developing while using production data. 
 
 The annoying ways
 * Generate data that mimics production
-* get a production dump and load it locally
+* Get a production dump and load it locally
 * "Test" in production while walking on eggshells to make sure not to break anything
 
 The easy way

data/Rakefile

@@ -50,3 +50,16 @@ Rake::RDocTask.new do |rdoc|
 end
 
 Jeweler::GemcutterTasks.new
+
+task :run_specs do
+  require 'directory_watcher'
+
+  dw = DirectoryWatcher.new '.'
+  dw.glob = "**/*"
+  dw.interval = 0.25
+  dw.add_observer {|*args| Rake::Task['spec'].execute }
+
+  dw.start
+  gets      # when the user hits "enter" the script will terminate
+  dw.stop
+end

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/lib/mongo_delegate/composite_cursor.rb

@@ -1,3 +1,34 @@
+class Mongo::Cursor
+  def foc
+    formatted_order_clause
+  rescue => exp
+    return nil
+  end
+end
+
+class Numeric
+  def sortflip
+    self * -1.0
+  end
+end
+
+class String
+  def num_val
+    return 0 if length == 0
+    self[-1] + 500*self[0..-2].num_val
+  end
+  def sortflip
+    opposite_word
+  end
+  def opposite_word
+    res = " " * length
+    for i in (0...length)
+      res[i] = 255-self[i]
+    end
+    res
+  end
+end
+
 class CompositeCursor
   class FindOps
     attr_accessor :res, :cursor
@@ -5,10 +36,22 @@ class CompositeCursor
     def options; cursor.options; end
     fattr(:num_using) { res.map { |x| x[0].to_af.size }.sum }
     fattr(:found_ids) { res.map { |x| x[1].to_af.map { |x| x['_id'] } }.flatten }
+    fattr(:limit) do
+      if options[:limit]
+        if options[:sort]
+          options[:limit]
+        else
+          options[:limit] - num_using
+        end
+      else
+        nil
+      end
+    end
     fattr(:ops) do
       r = {}
-      r[:limit] = (options[:limit] - num_using) if options[:limit]
-      r[:skip] = [(options[:skip] - found_ids.size ),0].max if options[:skip]
+      r[:limit] = limit if limit
+      r[:skip] = [(options[:skip] - found_ids.size ),0].max if options[:skip] && !options[:sort]
+      r[:sort] = options[:sort] if options[:sort]
       r
     end
     def zero_limit?
@@ -20,9 +63,23 @@ class CompositeCursor
   include FromHash
   include Enumerable
   def to_af; rows; end
-  fattr(:rows) do
+  def sort_proc
+    foc = cursors.first.foc
+    return nil unless foc
+    lambda do |doc|
+      foc.map { |k,v| (v == 1) ? doc[k] : doc[k].sortflip }
+    end
+  end
+  fattr(:raw_rows) do
     cursors.map { |x| x.to_af }.flatten
   end
+  fattr(:rows) do
+    res = raw_rows
+    res = res.sort_by(&sort_proc) if sort_proc
+    res = res[0...(options[:limit])] if options[:limit]
+    res = res[(options[:skip])..-1] if options[:skip] && options[:sort]
+    res
+  end
   def each(&b)
     rows.each(&b)
   end

data/spec/delegating_collection_spec.rb

@@ -1,55 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-class Array
-  def num_from_bytes
-    return 0 if empty?
-    self[-1] + 256 * self[0..-2].num_from_bytes
-  end
-  def time_from_bytes
-    Time.at(num_from_bytes)
-  end
-end
-
-class Numeric
-  def to_bytes
-    return [] if self == 0
-    (self/256).to_bytes + [self%256]
-  end
-  def to_bytes4
-    res = to_bytes
-    while res.length < 4
-      res = [0] + res
-    end
-    res
-  end
-end
-
-class Time
-  def to_small_mongo_id
-    res = Mongo::ObjectID.new
-    res.data = to_i.to_bytes4 + (0...8).map { |x| 0 }
-    res
-  end
-  def to_big_mongo_id
-    res = Mongo::ObjectID.new
-    res.data = to_i.to_bytes4 + (0...8).map { |x| 255 }
-    res
-  end
-end
-
-class Mongo::ObjectID
-  attr_accessor :data
-  def time
-    data[0...4].time_from_bytes
-  end
-end
-
-class Hash
-  def created_at
-    self['_id'].time
-  end
-end
-
 context Mongo::DelegatingCollection do
   def setup_coll
     @start_time = Time.now 
@@ -57,8 +7,8 @@ context Mongo::DelegatingCollection do
     @db = Mongo::DelegatingDatabase.new(:remote => @conn.db('dc-remote'), :local => @conn.db('dc-local'))
     @d = @db.collection('abc')
     @d.remove
-    @remotes = %w(Ellen Randy Barbara).each { |x| @d.remote.save(:name => x) }
-    @locals = %w(Mike Lou Lowell).each { |x| @d.local.save(:name => x) }
+    @remotes = %w(Barbara Danny Frank).each { |x| @d.remote.save(:name => x) }
+    @locals = %w(Adam Chris Eric).each { |x| @d.local.save(:name => x) }
     @all = @remotes + @locals
   end
   context 'find' do
@@ -67,7 +17,7 @@ context Mongo::DelegatingCollection do
       @d.find.count.should == @all.size
     end
     it 'find doesnt return dups' do
-      @d.save(@d.remote.find_one(:name => 'Randy'))
+      @d.save(@d.remote.find_one(:name => @remotes.first))
       @d.find.count.should == @all.size
       @d.find.unpruned_rows.size.should == @all.size + 1
     end
@@ -77,9 +27,9 @@ context Mongo::DelegatingCollection do
       @d.find.rows
     end
     it 'find returns local precedence' do
-      r = @d.remote.find_one(:name => 'Randy').merge(:age => 'old')
+      r = @d.remote.find_one(:name => @remotes.first).merge(:age => 'old')
       @d.local.save(r)
-      @d.find_one(:name => 'Randy')['age'].should == 'old'
+      @d.find_one(:name => @remotes.first)['age'].should == 'old'
     end
     it 'respects limit' do
       @d.find({},:limit => 4).to_af.size.should == 4
@@ -91,25 +41,52 @@ context Mongo::DelegatingCollection do
       @d.find({},:limit => 2).rows
     end
     it 'respects skip' do
-      @d.find({},:skip => 1).to_af.size.should == 5
-      @d.find({},:skip => 1).map { |x| x['name'] }.sort.should == @all.reject { |x| x == 'Mike' }.sort
+      @d.find({},:skip => 1).to_af.size.should == @all.size - 1
+      @d.find({},:skip => 1).map { |x| x['name'] }.sort.should == @all.reject { |x| x == @locals.first }.sort
     end
     it 'respects skip whole collection' do
-      @d.find({},:skip => 4).to_af.size.should == 2
+      @d.find({},:skip => 4).to_af.size.should == @all.size - 4
     end
     it 'wont return remote records that were skipped locally' do
-      @d.local.save(@d.remote.find_one(:name => 'Randy'))
-      @d.find({},:skip => 5).to_af.size.should == 1
+      @d.local.save(@d.remote.find_one(:name => @remotes.first))
+      @d.find({},:skip => 5).to_af.size.should == @all.size - 5
     end
     it 'respects skip and limit' do
       @d.find({},:skip => 1, :limit => 4).to_af.size.should == 4
     end
     it 'count doesnt fetch records' do
       mock.instance_of(Mongo::Cursor).to_a.times(0)
-      @d.count.should == 6
+      @d.count.should == @all.size
     end
-    it 'abc' do
-      @d.local.scope_gte('_id' => @start_time.to_small_mongo_id).count.should == 3
+    # it 'abc' do
+    #   @d.local.scope_gte('_id' => @start_time.to_small_mongo_id).count.should == 3
+    # end
+    context 'sorting' do
+      it 'honors sort order when retreiving all records' do
+        @d.find({},:sort => [['name','ascending']]).map { |x| x['name'] }.should == @all.sort
+      end
+      it 'honors reverse sort order when retreiving all records' do
+        @d.find({},:sort => [['name','descending']]).map { |x| x['name'] }.should == @all.sort.reverse
+      end
+      it 'honors sort order with a limit' do
+        exp = @all.sort[0...4]
+        @d.find({},:sort => [['name','ascending']], :limit => 4).map { |x| x['name'] }.should == exp
+      end
+      it 'honors sort order with a limit desc' do
+        exp = @all.sort.reverse[0...4]
+        @d.find({},:sort => [['name','descending']], :limit => 4).map { |x| x['name'] }.should == exp
+      end
+      it 'honors sort order with a skip' do
+        exp = @all.sort[1..-1]
+        @d.find({},:sort => [['name','ascending']], :skip => 1).map { |x| x['name'] }.should == exp
+      end
+      it 'honors sort order with a skip desc' do
+        exp = @all.sort.reverse[1..-1]
+        @d.find({},:sort => [['name','descending']], :skip => 1).map { |x| x['name'] }.should == exp
+      end
+      it 'when sorting with a limit, never retreives more than the limit from any one collection' do
+        @d.find({},:sort => [['name','ascending']], :limit => 2).raw_rows.size.should == 4
+      end
     end
     # it 'count honors remote deletes' do
     #   @d.remote.find.each { |x| @d.save(x) }
@@ -126,16 +103,16 @@ context Mongo::DelegatingCollection do
       @d.local.count.should == @locals.size + 1
     end
     it 'updating a non-dup shouldnt mark it as a dup' do
-      r = @d.local.find_one(:name => 'Mike').merge(:foo => :bar)
+      r = @d.local.find_one(:name => @locals.first).merge(:foo => :bar)
       @d.save(r)
       @d.count.should == 6
-      @d.local.find_one(:name => 'Mike')['_duplicate'].should be_nil
+      @d.local.find_one(:name => @locals.first)['_duplicate'].should be_nil
     end
     it 'saving a dup for first time should mark it as a dup' do
-      r = @d.remote.find_one(:name => 'Randy')
+      r = @d.remote.find_one(:name => @remotes.first)
       @d.save(r)
       @d.count.should == 6
-      @d.local.find_one(:name => 'Randy')['_duplicate'].should == true
+      @d.local.find_one(:name => @remotes.first)['_duplicate'].should == true
     end
   end
 end

data/spec/id_time.rb

@@ -0,0 +1,49 @@
+class Array
+  def num_from_bytes
+    return 0 if empty?
+    self[-1] + 256 * self[0..-2].num_from_bytes
+  end
+  def time_from_bytes
+    Time.at(num_from_bytes)
+  end
+end
+
+class Numeric
+  def to_bytes
+    return [] if self == 0
+    (self/256).to_bytes + [self%256]
+  end
+  def to_bytes4
+    res = to_bytes
+    while res.length < 4
+      res = [0] + res
+    end
+    res
+  end
+end
+
+class Time
+  def to_small_mongo_id
+    res = Mongo::ObjectID.new
+    res.data = to_i.to_bytes4 + (0...8).map { |x| 0 }
+    res
+  end
+  def to_big_mongo_id
+    res = Mongo::ObjectID.new
+    res.data = to_i.to_bytes4 + (0...8).map { |x| 255 }
+    res
+  end
+end
+
+class Mongo::ObjectID
+  attr_accessor :data
+  def time
+    data[0...4].time_from_bytes
+  end
+end
+
+class Hash
+  def created_at
+    self['_id'].time
+  end
+end

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ require 'mongo_delegate'
 require 'spec'
 require 'spec/autorun'
 require 'rr'
+require File.join(File.dirname(__FILE__),"id_time")
 
 Spec::Runner.configure do |config|
   config.mock_with :rr

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_delegate
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors: 
 - Mike Harris
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-14 00:00:00 -05:00
+date: 2010-01-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -151,5 +151,6 @@ specification_version: 3
 summary: restful interface to delegate mongodb records
 test_files: 
 - spec/delegating_collection_spec.rb
+- spec/id_time.rb
 - spec/mongo_delegate_spec.rb
 - spec/spec_helper.rb