relaxdb 0.3.5 → 0.5

data/spec/migration_spec.rb

@@ -11,10 +11,10 @@ describe RelaxDB::Migration do
   it "should yield each obj to the block and save the result" do
     Primitives.new(:num => 5).save!
     r = @mig.run Primitives do |p|
-      pn = Primitives.new(:num => p.num * 2)
-      [p, pn]
+      p.num *= 2
+      p
     end
-    Primitives.by_num.map { |p| p.num}.should == [5, 10]
+    Primitives.by_num.map { |p| p.num }.should == [10]
   end
     
   it "should raise an exception if a save results in a conflict" do
@@ -42,16 +42,18 @@ describe RelaxDB::Migration do
       RelaxDB.db.reset_req_count
     end
     
-    # Note: two extra requests per paginate_view request are required
+    # Note: three requests per migration loop, plus one for the final loop
+    # where no migration actually occurs. (It would be two for the final
+    # loop except a request isn't isn't the id array passed to load is empty)
     it "should operate on a doc set of the given size aka limit" do
       @mig.run(Primitives, 1) { |p| p.num *= p.num; p }
-      RelaxDB.db.req_count.should == 10 + 5 * 2 
+      RelaxDB.db.req_count.should == 5 * 3 + 1
       Primitives.by_num.map { |p| p.num }.should == [1, 4, 9, 16, 25]      
     end
 
     it "should operate on a doc set of default size" do
       @mig.run(Primitives) { |p| p.num *= p.num; p }
-      RelaxDB.db.req_count.should == 2 + 1 * 2
+      RelaxDB.db.req_count.should == 1 * 3 + 1
       Primitives.by_num.map { |p| p.num }.should == [1, 4, 9, 16, 25]      
     end
   
@@ -66,7 +68,7 @@ describe RelaxDB::Migration do
   describe ".run_all" do
     
     it "should save the version after each successful migration" do
-      @mig.run_all "a/b/1_", lambda {}
+      @mig.run_all ["a/b/1_"], lambda { |o| }
       RelaxDB::MigrationVersion.version.should == 1
     end
 
@@ -74,7 +76,7 @@ describe RelaxDB::Migration do
       v = RelaxDB::MigrationVersion.retrieve
       v.version = 2
       v.save!
-      @mig.run_all "3_", lambda {}
+      @mig.run_all ["3_"], lambda { |o| }
       RelaxDB::MigrationVersion.version.should == 3
     end
     
@@ -82,13 +84,13 @@ describe RelaxDB::Migration do
       v = RelaxDB::MigrationVersion.retrieve
       v.version = 2
       v.save!
-      @mig.run_all "1_foo", lambda {}
+      @mig.run_all ["1_foo"], lambda { |o| }
       RelaxDB::MigrationVersion.version.should == 2
     end
     
     it "should raise an exception on failure" do
       lambda do
-        @mig.run_all "1_foo", lambda { raise "Expected" }
+        @mig.run_all ["1_foo"], lambda { |o| raise "Expected" }
       end.should raise_error(RuntimeError, "Expected")
     end
     

data/spec/qpaginate_spec.rb

@@ -0,0 +1,88 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+require File.dirname(__FILE__) + '/spec_models.rb'
+
+describe "RelaxDB Pagination" do
+    
+  before(:each) do
+    setup_test_db    
+    
+    letters = [ 
+      ["a", 1], ["a", 2], ["a", 3],
+      ["b", 1], ["b", 2], ["b", 3], ["b", 4], ["b", 5], 
+      ["c", 1], ["c", 2] 
+    ].map { |o| Letter.new :letter => o[0], :number => o[1], :_id => "#{o[0]}#{o[1]}" }
+
+    RelaxDB.bulk_save *letters        
+  end
+
+  # helper function
+  def s(letters)
+    letters.map { |l| "#{l.letter}#{l.number}"}.join(", ")
+  end
+  
+  def n(letters)
+    letters.map { |l| "#{l.number}"}.join(", ")
+  end
+    
+  describe "functional tests" do
+
+    it "should navigate through a series" do
+      query = lambda do |page_params|
+        RelaxDB.qpaginate_view "Letter_by_letter_and_number", :page_params => page_params,
+           :startkey => ["a"], :endkey => ["a",{}], :limit => 2,
+           :attributes => [:letter, :number]
+      end
+    
+      letters = query.call({})
+      s(letters).should == "a1, a2"
+      letters.prev_params.should be_false
+          
+      letters = query.call(letters.next_params)
+      s(letters).should == "a3"
+      letters.next_params.should be_false
+          
+      letters = query.call(letters.prev_params)
+      s(letters).should == "a1, a2"
+      letters.next_params.should be    
+    end
+    
+  end
+  
+  describe "Non emitted docs" do
+    
+    before(:each) do
+      map = <<-FUNC
+        function (doc) {
+          if (doc.relaxdb_class === "Letter") {
+            emit([doc.letter, doc.number], null);
+          }
+        }
+      FUNC
+      
+      view_name = "Letter_by_letter_and_number_v2"
+      RelaxDB::DesignDocument.get(RelaxDB.dd).add_map_view(view_name, map).save      
+    end
+    
+    it "should navigate through a series when 1 emitted as val" do
+      query = lambda do |page_params|
+        RelaxDB.qpaginate_docs "Letter_by_letter_and_number_v2", :page_params => page_params,
+           :startkey => ["a"], :endkey => ["a",{}], :limit => 2,
+           :attributes => [:letter, :number]
+      end
+    
+      letters = query.call({})
+      s(letters).should == "a1, a2"
+      letters.prev_params.should be_false
+          
+      letters = query.call(letters.next_params)
+      s(letters).should == "a3"
+      letters.next_params.should be_false
+          
+      letters = query.call(letters.prev_params)
+      s(letters).should == "a1, a2"
+      letters.next_params.should be    
+    end    
+    
+  end
+    
+end

data/spec/query_spec.rb

@@ -10,12 +10,12 @@ describe RelaxDB::Query do
   describe "#view_name" do
 
     it "should match a single key attribute" do
-      q = RelaxDB::ViewCreator.by_att_list ["bar"], :foo
+      q = RelaxDB::ViewCreator.docs_by_att_list ["bar"], :foo
       q.view_name.should == "bar_by_foo"
     end
     
     it "should match key attributes" do
-      q = RelaxDB::ViewCreator.by_att_list ["bar"], :foo, :bar
+      q = RelaxDB::ViewCreator.docs_by_att_list ["bar"], :foo, :bar
       q.view_name.should == "bar_by_foo_and_bar"
     end
   end

data/spec/references_proxy_spec.rb

@@ -0,0 +1,94 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+require File.dirname(__FILE__) + '/spec_models.rb'
+
+describe RelaxDB::ReferencesProxy do
+  
+  before(:all) do
+    setup_test_db
+  end
+
+  describe "references" do
+  
+    it "should return nil when accessed before assignment" do
+      r = Rating.new
+      r.photo.should == nil
+    end
+
+    it "should be establishable via constructor attribute" do
+      p = Photo.new
+      r = Rating.new :photo => p
+      r.photo.should == p
+    end
+    
+    it "should be establishable via constructor id" do
+      p = Photo.new.save
+      r = Rating.new :photo_id => p._id
+      r.photo.should == p
+    end        
+        
+    it "should return the same object on repeated invocations" do
+      p = Photo.new.save
+      r = Rating.new(:photo => p).save
+      r = RelaxDB.load(r._id)
+      r.photo.object_id.should == r.photo.object_id
+    end    
+        
+    it "may be used reciprocally across save / load boundary" do
+      fb, bf = FooBar.new, BarFoo.new
+
+      fb.bf = bf
+      fb.save!
+      bf.fb = fb
+      bf.save!
+      
+      fb = RelaxDB.load fb._id
+      fb.bf.should == bf
+      
+      bf = RelaxDB.load bf._id
+      bf.fb.should == fb
+    end
+    
+    it "should not store the referenced object" do
+      p = Photo.new.save!
+      r = Rating.new(:photo => p).save!
+      
+      r = RelaxDB.reload r
+      RelaxDB.db.reset_req_count
+      
+      r.data["photo"].should be_nil
+      r.photo.should == p
+      
+      RelaxDB.db.req_count.should == 1
+    end
+    
+    describe "validator" do
+      
+      it "should be passed the _id and object" do
+        a = Atom.new(:_id => "atom").save!
+        c = Class.new(RelaxDB::Document) do
+          references :foo, :validator => lambda { |foo_id, obj| foo_id.reverse == obj._id }
+        end
+        c.new(:_id => "mota", :foo => a).save!
+      end
+      
+      it "may be used with a predefined validator" do
+        c = Class.new(RelaxDB::Document) do
+          references :foo, :validator => :required
+        end
+        c.new.save.should be_false
+      end
+
+      it "should be provided with a default error message when validation fails" do
+        c = Class.new(RelaxDB::Document) do
+          references :foo, :validator => :required
+        end
+        x = c.new
+        x.save
+        x.errors[:foo].should_not be_blank
+      end
+          
+    end
+    
+  end
+
+end

data/spec/relaxdb_spec.rb

@@ -10,7 +10,7 @@ describe RelaxDB do
   describe ".create_object" do
     
     it "should return an instance of a known object if passed a hash with a class key" do
-      data = { "relaxdb_class" => "Item" }
+      data = { "relaxdb_class" => "Item", "_rev" => "" }
       obj = RelaxDB.create_object(data)
       obj.should be_instance_of(Item)
     end
@@ -68,7 +68,7 @@ describe RelaxDB do
     
     it "should save non conflicting docs and mark conflicting docs" do
       p1, p2 = Atom.new.save!, Atom.new.save!
-      p1.dup.save!
+      Atom.new(:_id => p1._id, :_rev => p1._rev).save!
       RelaxDB.bulk_save p1, p2
       p1._rev.should =~ /1-/
       p1.should be_update_conflict
@@ -85,7 +85,7 @@ describe RelaxDB do
     describe "all-or-nothing" do
       it "should save non conflicting and conflicting docs" do
         p1, p2 = Primitives.new(:num => 1).save!, Primitives.new(:num => 2).save!
-        p1d = p1.dup
+        p1d = Primitives.new("_id" => p1._id, "_rev" => p1._rev, "relaxdb_class" => "Primitives")
         p1d.num = 11
         p1d.save!
         p1.num = 6
@@ -143,7 +143,7 @@ describe RelaxDB do
     
     it "should raise an exception on document conflict after all docs have been processed" do
       p1, p2 = Atom.new.save!, Atom.new.save!
-      p1.dup.save!
+      Atom.new(:_id => p1._id, :_rev => p1._rev).save!
       lambda { RelaxDB.bulk_save!(p1, p2) }.should raise_error(RelaxDB::UpdateConflict)
       p2._rev.should =~ /2-/
     end
@@ -162,7 +162,11 @@ describe RelaxDB do
       orig = "relaxdb_spec"
       replica = "relaxdb_spec_replicate_test"
       RelaxDB.delete_db replica rescue :ok
-      class ReplicaTest < RelaxDB::Document; end
+      
+      RelaxDB.enable_view_creation
+      class ::ReplicaTest < RelaxDB::Document; end
+      RelaxDB::View.design_doc.save
+      
       ReplicaTest.new.save # implicitly saved to orig
       RelaxDB.replicate_db orig, replica
       RelaxDB.use_db replica
@@ -261,8 +265,17 @@ describe RelaxDB do
       res.first._id.should == "x"
     end
     
+    it "should leave relaxdb_class param intact" do
+      RelaxDB::DesignDocument.get(RelaxDB.dd).add_view("simple", "map", map_func).save
+      a = Atom.new.save!
+      la = RelaxDB.view("simple").first
+      la.should == a
+      la.save!
+      RelaxDB.load! la._id
+    end
+    
     it "should be queryable with a multi key post" do
-      Primitives.view_by :num
+      Primitives.view_docs_by :num
       
       5.times { |i| Primitives.new(:num => i).save }
       Primitives.by_num
@@ -271,18 +284,18 @@ describe RelaxDB do
     end
     
     it "should return nil for a reduce view with no results" do
-      Primitives.view_by :num
+      Primitives.view_docs_by :num
       RelaxDB.view("Primitives_by_num", :reduce => true).should be_nil
     end
 
     it "should return a single value for a reduce view with a single result" do
-      Primitives.view_by :num
+      Primitives.view_docs_by :num
       Primitives.new(:num => :x).save!
       RelaxDB.view("Primitives_by_num", :reduce => true).should == 1
     end
 
     it "should return an array for a reduce view with multiple results" do
-      Primitives.view_by :num
+      Primitives.view_docs_by :num
       2.times { |i| Primitives.new(:num => i).save! }
       res = RelaxDB.view("Primitives_by_num", :reduce => true, :group => true)
       res.should be_an_instance_of(Array)
@@ -320,10 +333,7 @@ describe RelaxDB do
       RelaxDB.enable_view_creation false
     
       class CvdBar < RelaxDB::Document
-        view_by :foo
-        has_one :foo1
-        has_many :foon
-        references_many :foor
+        view_docs_by :foo
       end
     end
 
@@ -339,21 +349,19 @@ describe RelaxDB do
     before(:each) do
       create_test_db
 
-      class CveBar < RelaxDB::Document
-        view_by :foo
-        has_one :foo1
-        has_many :foon
-        references_many :foor
+      RelaxDB.enable_view_creation
+      
+      class ::CveBar < RelaxDB::Document
+        view_docs_by :foo
       end
+      
+      RelaxDB::View.design_doc.save
     end
 
     it "should create all views" do
       dd = RelaxDB::DesignDocument.get "spec_doc"
       dd.data["views"]["CveBar_all"].should be
       dd.data["views"]["CveBar_by_foo"].should be
-      dd.data["views"]["CveBar_foo1"].should be
-      dd.data["views"]["CveBar_foon"].should be
-      dd.data["views"]["CveBar_foor"].should be
     end    
 
   end

data/spec/server_spec.rb

@@ -20,11 +20,12 @@ describe RelaxDB do
         @server.get "/relaxdb_spec/foo"
       end.should raise_error(RelaxDB::HTTP_404)
     end
-
-    it "should raise a RuntimeError for non specific errors" do
+    
+    # Possibly redundant - a RelaxDB::HTTP_404 is raised with CouchDB 0.11
+    it "should raise an error for non specific errors" do
       lambda do
         @server.get "/relaxdb_spec/_design/spec_doc/_view?fail=true"
-      end.should raise_error(RuntimeError)
+      end.should raise_error
     end
     
   end

data/spec/spec_helper.rb

@@ -44,6 +44,7 @@ def create_base_db
   RelaxDB.use_db "relaxdb_spec_base"
   RelaxDB.enable_view_creation
   require File.dirname(__FILE__) + '/spec_models.rb'
+  RelaxDB::View.design_doc.save
   puts "Created relaxdb_spec_base"
 end
 

data/spec/spec_models.rb

@@ -1,3 +1,11 @@
+class FooBar < RelaxDB::Document
+  references :bf
+end
+
+class BarFoo < RelaxDB::Document
+  references :fb
+end
+
 class Atom < RelaxDB::Document
 end
 
@@ -19,9 +27,11 @@ class Primitives < RelaxDB::Document
   property :false_bool
   property :created_at
   property :updated_at
-  property :empty
+  property :context
   
-  view_by :num
+  view_docs_by :num
+  
+  view_by :str
 
 end
 
@@ -30,31 +40,30 @@ end
 
 class BespokeReader < RelaxDB::Document
   property :val
-  def val; @val + 5; end
+  def val; @data["val"] + 5; end
 end
 
 class BespokeWriter < RelaxDB::Document
   property :val
   property :tt
-  def val=(v); @val = v - 10; end
-  def tt=(t); @tt = t.is_a?(String) ? Time.parse(t) : t; end
+  def val=(v); data["val"] = v - 10; end
 end
 
 class Invite < RelaxDB::Document
 
   property :message
 
-  belongs_to :sender
-  belongs_to :recipient
+  references :sender
+  references :recipient
   
 end
 
 class Item < RelaxDB::Document
 
   property :name
-  belongs_to :user
+  references :user
   
-  view_by :user_id
+  view_docs_by :user_id
 
 end
 
@@ -62,13 +71,8 @@ class User < RelaxDB::Document
 
   property :name, :default => "u" 
   property :age
-
-  has_many :items, :class => "Item"
-
-  has_many :invites_received, :class => "Invite", :known_as => :recipient
-  has_many :invites_sent, :class => "Invite", :known_as => :sender
   
-  view_by :name, :age
+  view_docs_by :name, :age
 
 end
 
@@ -79,18 +83,18 @@ class Post < RelaxDB::Document
   property :created_at
   property :viewed_at
   
-  view_by :content
-  view_by :subject
-  view_by :viewed_at
+  view_docs_by :content
+  view_docs_by :subject
+  view_docs_by :viewed_at
 
 end
 
 class Rating < RelaxDB::Document
 
   property :stars, :default => 5
-  belongs_to :photo
+  references :photo
   
-  view_by :stars
+  view_docs_by :stars
 
 end
 
@@ -98,63 +102,32 @@ class Photo < RelaxDB::Document
 
   property :name
 
-  has_one :rating
-
-  references_many :tags, :class => "Tag", :known_as => :photos
-
-  has_many :taggings, :class => "Tagging"
-
 end
 
 class Tag < RelaxDB::Document
 
   property :name
-  references_many :photos, :class => "Photo", :known_as => :tags
-
-  has_many :taggings, :class => "Tagging"
 
 end
 
 class Tagging < RelaxDB::Document
 
-  belongs_to :photo
-  belongs_to :tag
+  references :photo
+  references :tag
   property :relevance  
 
 end
 
-class MultiWordClass < RelaxDB::Document
-  has_one :multi_word_child
-  has_many :multi_word_children, :class => "MultiWordChild"
-end
-
-class MultiWordChild < RelaxDB::Document
-  belongs_to :multi_word_class
-end
-
-class TwitterUser < RelaxDB::Document
-
-  property :name
-  references_many :followers, :class => "User", :known_as => :leaders
-  references_many :leaders, :class => "User", :known_as => :followers
-
-end
-
-class Dysfunctional < RelaxDB::Document
-  has_one :failure
-  has_many :failures, :class => "Failure"
-end
-
 class Failure < RelaxDB::Document
   property :pathological, :validator => lambda { false }
-  belongs_to :dysfunctional
+  references :dysfunctional
 end
 
 class Letter < RelaxDB::Document
   property :letter
   property :number
-  view_by :letter, :number
-  view_by :number
+  view_docs_by :letter, :number
+  view_docs_by :number
 end
 
 class Ancestor < RelaxDB::Document
@@ -168,7 +141,7 @@ class Ancestor < RelaxDB::Document
   property :user_name,
     :derived => [:user, lambda { |p, o| o.user.name } ]
     
-  view_by :x
+  view_docs_by :x
 end
 
 class Descendant < Ancestor
@@ -185,6 +158,24 @@ class RichDescendant < Descendant
     :derived => [:ukulele, lambda { |p, o| o.ukulele.name } ]
 end
 
+class Contrived < RelaxDB::Document
+  
+  attr_accessor :context_count
+  def initialize params = {}
+    @context_count = 0
+    super
+  end
+  
+  property :foo,
+    :default => 5,
+    :derived => [
+      :context,
+      lambda { |f, c| c.context_count += 1; 10 }
+    ]
+  
+  references :context
+end
+
 module Inh
   
   class X < RelaxDB::Document; end