paulcarey-relaxdb 0.2.8 → 0.3.0

data/spec/document_spec.rb

@@ -3,13 +3,8 @@ require File.dirname(__FILE__) + '/spec_models.rb'
 
 describe RelaxDB::Document do
   
-  before(:all) do
-    RelaxDB.configure(:host => "localhost", :port => 5984)  
-  end
-
   before(:each) do
-    RelaxDB.delete_db "relaxdb_spec_db" rescue "ok"
-    RelaxDB.use_db "relaxdb_spec_db"
+    setup_test_db
   end
       
   describe ".new" do 
@@ -131,43 +126,7 @@ describe RelaxDB::Document do
     end
     
   end
-  
-  describe "#save_all" do
-    
-    before(:each) do
-      # Create the underlying views
-      User.new(:items => [], :invites_received => [], :invites_sent => [])
-    end
-    
-    # it should issue a single POST
-    it "should issue no PUT requests" do
-      RelaxDB.db.put_count = 0
-      RelaxDB.db.get_count = 0
-      
-      i1, i2 = Item.new(:name => "i1"), Item.new(:name => "i2")
-      u = User.new(:items => [i1, i2])
-      u.save_all!
       
-      RelaxDB.db.put_count.should == 0
-      RelaxDB.db.get_count.should == 3
-    end
-    
-  end
-  
-  describe "#all_children" do
-    
-    it "should return an array containing all children" do
-      r = Rating.new
-      p = Photo.new(:rating => r)
-      t = Tag.new
-      t1, t2 = Tagging.new(:photo => p, :tag => t), Tagging.new(:photo => p, :tag => t)
-      p.taggings = [t1, t2]
-      p.all_children.size.should == 3
-      [r, t1, t2].each { |c| p.all_children.should include(c) }
-    end
-    
-  end
-  
   describe "user defined property reader" do
     
     it "should not effect normal operation" do
@@ -226,6 +185,7 @@ describe RelaxDB::Document do
 
     it "should prevent the object from being resaved" do
       p = Atom.new.save.destroy!
+    # Exepcted failure - see http://issues.apache.org/jira/browse/COUCHDB-292      
       lambda { p.save! }.should raise_error
     end
     
@@ -282,11 +242,14 @@ describe RelaxDB::Document do
   
   describe ".all.size" do
     
-    it "should return the total number of docs" do
+    it "should return the total number of docs in a single query" do
       docs = []
       100.times { docs << Atom.new }
       RelaxDB.bulk_save(*docs)
+      
+      RelaxDB.db.get_count = 0
       Atom.all.size.should == 100
+      RelaxDB.db.get_count.should == 1
     end
     
     it "should return 0 when no docs exist" do
@@ -295,12 +258,12 @@ describe RelaxDB::Document do
     
   end
   
-  describe ".all.sorted_by" do
-  
+  describe "by_" do
+      
     it "should sort ascending by default" do
       Post.new(:content => "b").save
       Post.new(:content => "a").save
-      posts = Post.all.sorted_by(:content)
+      posts = Post.by_content
       posts[0].content.should == "a"
       posts[1].content.should == "b"
     end
@@ -308,7 +271,7 @@ describe RelaxDB::Document do
     it "should sort desc when specified" do
       Post.new(:content => "a").save
       Post.new(:content => "b").save
-      posts = Post.all.sorted_by(:content) { |q| q.descending(true) }
+      posts = Post.by_content :descending => true
       posts[0].content.should == "b"
       posts[1].content.should == "a"
     end
@@ -317,7 +280,7 @@ describe RelaxDB::Document do
       t = Time.new
       Post.new(:viewed_at => t+1000, :content => "late").save
       Post.new(:viewed_at => t, :content => "early").save
-      posts = Post.all.sorted_by(:viewed_at)
+      posts = Post.by_viewed_at
       posts[0].content.should == "early"
       posts[1].content.should == "late"
     end
@@ -327,48 +290,47 @@ describe RelaxDB::Document do
       100.times { |i| docs << Primitives.new(:num => i) }
       RelaxDB.bulk_save(*docs)
       # Create the view
-      Primitives.all.sorted_by(:num)
-      res = RelaxDB.view("Primitives", "all_sorted_by_num") { |q| q.reduce(true) }
-      count = RelaxDB.reduce_result(res)
+      Primitives.by_num
+      count = RelaxDB.view "Primitives_by_num", :reduce => true
       count.should == 100
     end
     
     describe "results" do
       
       it "should be an empty array when no docs match" do
-        Post.all.sorted_by(:subject).should == []
+        Post.by_subject.should == []
       end
 
       it "should be retrievable by exact criteria" do
         Post.new(:subject => "foo").save
         Post.new(:subject => "foo").save
         Post.new(:subject => "bar").save
-        Post.all.sorted_by(:subject) { |q| q.key("foo") }.size.should == 2
+        Post.by_subject(:key => "foo").size.should == 2
       end
 
       it "should be retrievable by relative criteria" do
         Rating.new(:stars => 1).save
         Rating.new(:stars => 5).save
-        Rating.all.sorted_by(:stars) { |q| q.endkey(3) }.size.should == 1
+        Rating.by_stars(:endkey => 3).size.should == 1
       end
 
       it "should be retrievable by combined criteria" do
         User.new(:name => "paul", :age => 28).save
         User.new(:name => "paul", :age => 72).save
         User.new(:name => "atlas", :age => 99).save
-        User.all.sorted_by(:name, :age) { |q| q.startkey(["paul",0 ]).endkey(["paul", 50]) }.size.should == 1
+        User.by_name_and_age(:startkey => ["paul",0 ], :endkey => ["paul", 50]).size.should == 1
       end
 
       it "should be retrievable by combined criteria where not all docs contain all attributes" do
         User.new(:name => "paul", :age => 28).save
         User.new(:name => "paul", :age => 72).save
         User.new(:name => "atlas").save
-        User.all.sorted_by(:name, :age) { |q| q.startkey(["paul",0 ]).endkey(["paul", 50]) }.size.should == 1
+        User.by_name_and_age(:startkey => ["paul",0 ], :endkey => ["paul", 50]).size.should == 1
       end
       
       it "should be retrievable by a multi key post" do
         5.times { |i| Primitives.new(:num => i).save }
-        ps = Primitives.all.sorted_by(:num) { |q| q.keys([0, 4]) }
+        ps = Primitives.by_num :keys => [0, 4]
         ps.map { |p| p.num }.should == [0, 4]
       end
 

data/spec/has_many_spec.rb

@@ -4,12 +4,7 @@ require File.dirname(__FILE__) + '/spec_models.rb'
 describe RelaxDB::HasManyProxy do
   
   before(:all) do
-    RelaxDB.configure(:host => "localhost", :port => 5984)  
-  end
-
-  before(:each) do
-    RelaxDB.delete_db "relaxdb_spec_db" rescue "ok"
-    RelaxDB.use_db "relaxdb_spec_db"
+    setup_test_db
   end
 
   describe "has_many" do
@@ -90,22 +85,22 @@ describe RelaxDB::HasManyProxy do
       it "should preserve given relationships across save/load boundary" do
         i1, i2 = Item.new(:name => "i1"), Item.new(:name => "i2")
         u = User.new(:items => [i1, i2])
-        u.save_all!
+        RelaxDB.bulk_save u, *u.items
         u = RelaxDB.load u._id
         u.items.map { |i| i.name }.sort.join.should == "i1i2"
       end
       
       it "should invoke the derived properties writer" do
-        P = Class.new(RelaxDB::Document) do
+        class HmsdParent < RelaxDB::Document
           property :foo, :derived => [:zongs, lambda {|f, o| o.zongs.first.z / 2 }]
-          has_many :zongs, :class => "Zong"
+          has_many :zongs, :class => "HmsdChild"
         end
-        Zong = Class.new(RelaxDB::Document) do
+        class HmsdChild < RelaxDB::Document
           property :z
-          belongs_to :p
+          belongs_to :hmsd_parent
         end
-        oz = Zong.new(:z => 10)
-        op = P.new(:zongs => [oz])
+        oz = HmsdChild.new(:z => 10)
+        op = HmsdParent.new(:zongs => [oz])
         op.foo.should == 5
       end
       
@@ -161,10 +156,12 @@ describe RelaxDB::HasManyProxy do
       describe "#destroy" do
 
         it "should nullify its child relationships" do
+          Item.view_by :user_id
+          
           u = User.new.save
           u.items << Item.new << Item.new    
           u.destroy!
-          Item.all.sorted_by(:user_id) { |q| q.key(u._id) }.should be_empty
+          Item.by_user_id(:key => u._id).should be_empty
         end
 
       end  

data/spec/has_one_spec.rb

@@ -3,13 +3,8 @@ require File.dirname(__FILE__) + '/spec_models.rb'
 
 describe RelaxDB::HasOneProxy do
   
-  before(:all) do
-    RelaxDB.configure(:host => "localhost", :port => 5984)  
-  end
-
   before(:each) do
-    RelaxDB.delete_db "relaxdb_spec_db" rescue "ok"
-    RelaxDB.use_db "relaxdb_spec_db"
+    setup_test_db
   end
         
   describe "has_one" do

data/spec/query_spec.rb

@@ -2,67 +2,71 @@ require File.dirname(__FILE__) + '/spec_helper.rb'
 require File.dirname(__FILE__) + '/spec_models.rb'
 
 describe RelaxDB::Query do
+  
+  before(:all) do
+    RelaxDB.configure :host => "localhost", :port => 5984, :design_doc => ""
+  end
 
   describe "#view_name" do
 
     it "should match a single key attribute" do
-      q = RelaxDB::SortedByView.new("", :foo)
-      q.view_name.should == "all_sorted_by_foo"
+      q = RelaxDB::ViewCreator.by_att_list ["bar"], :foo
+      q.view_name.should == "bar_by_foo"
     end
     
     it "should match key attributes" do
-      q = RelaxDB::SortedByView.new("", :foo, :bar)
-      q.view_name.should == "all_sorted_by_foo_and_bar"
+      q = RelaxDB::ViewCreator.by_att_list ["bar"], :foo, :bar
+      q.view_name.should == "bar_by_foo_and_bar"
     end
   end
   
   describe "#view_path" do
     
-    it "should list design document and view name" do
-      q = RelaxDB::Query.new("Zenith", "mount")
-      q.view_path.should == "_view/Zenith/mount"
+    it "should list design document and view name and default reduce to false" do
+      q = RelaxDB::Query.new("mount")
+      q.view_path.should == "_design//_view/mount?reduce=false"
     end
     
     it "should contain URL and JSON encoded key when the key has been set" do
-      q = RelaxDB::Query.new("", "")
+      q = RelaxDB::Query.new("")
       q.key("olympus")
-      q.view_path.should == "_view//?key=%22olympus%22"
+      q.view_path.should == "_design//_view/?key=%22olympus%22&reduce=false"
     end
     
     it "should honour startkey, endkey and limit" do
-      q = RelaxDB::Query.new("", "")
+      q = RelaxDB::Query.new("")
       q.startkey(["olympus"]).endkey(["vesuvius", 3600]).limit(100)
-      q.view_path.should == "_view//?startkey=%5B%22olympus%22%5D&endkey=%5B%22vesuvius%22%2C3600%5D&limit=100"
+      q.view_path.should == "_design//_view/?startkey=%5B%22olympus%22%5D&endkey=%5B%22vesuvius%22%2C3600%5D&limit=100&reduce=false"
     end
         
     it "should specify a null key if key was set to nil" do
-      q = RelaxDB::Query.new("", "")
+      q = RelaxDB::Query.new("")
       q.key(nil)
-      q.view_path.should == "_view//?key=null"
+      q.view_path.should == "_design//_view/?key=null&reduce=false"
     end
 
     it "should specify a null startkey if startkey was set to nil" do
-      q = RelaxDB::Query.new("", "")
+      q = RelaxDB::Query.new("")
       q.startkey(nil)
-      q.view_path.should == "_view//?startkey=null"
+      q.view_path.should == "_design//_view/?startkey=null&reduce=false"
     end
 
     it "should specify a null endkey if endkey was set to nil" do
-      q = RelaxDB::Query.new("", "")
+      q = RelaxDB::Query.new("")
       q.endkey(nil)
-      q.view_path.should == "_view//?endkey=null"
+      q.view_path.should == "_design//_view/?endkey=null&reduce=false"
     end
     
     it "should not JSON encode the startkey_docid" do
-      q = RelaxDB::Query.new("", "")
+      q = RelaxDB::Query.new("")
       q.startkey_docid("foo")
-      q.view_path.should == "_view//?startkey_docid=foo"
+      q.view_path.should == "_design//_view/?startkey_docid=foo&reduce=false"
     end
 
     it "should not JSON encode the endkey_docid" do
-      q = RelaxDB::Query.new("", "")
+      q = RelaxDB::Query.new("")
       q.endkey_docid("foo")
-      q.view_path.should == "_view//?endkey_docid=foo"
+      q.view_path.should == "_design//_view/?endkey_docid=foo&reduce=false"
     end
     
   end  
@@ -70,7 +74,7 @@ describe RelaxDB::Query do
   describe "#keys" do
     
     it "should return a JSON encoded hash" do
-      q = RelaxDB::Query.new("", "")
+      q = RelaxDB::Query.new("")
       q.keys(["a", "b"])
       q.keys.should == '{"keys":["a","b"]}'
     end

data/spec/references_many_spec.rb

@@ -4,12 +4,7 @@ require File.dirname(__FILE__) + '/spec_models.rb'
 describe RelaxDB::ReferencesManyProxy do
 
   before(:all) do
-    RelaxDB.configure(:host => "localhost", :port => 5984)  
-  end
-
-  before(:each) do
-    RelaxDB.delete_db "relaxdb_spec_db" rescue "ok"
-    RelaxDB.use_db "relaxdb_spec_db"
+    setup_test_db
   end
 
   describe "references_many" do

data/spec/relaxdb_spec.rb

@@ -3,19 +3,14 @@ require File.dirname(__FILE__) + '/spec_models.rb'
 
 describe RelaxDB do
 
-  before(:all) do
-    RelaxDB.configure(:host => "localhost", :port => 5984)  
-  end
-
   before(:each) do
-    RelaxDB.delete_db "relaxdb_spec_db" rescue "ok"
-    RelaxDB.use_db "relaxdb_spec_db"
+    setup_test_db
   end
         
   describe ".create_object" do
     
     it "should return an instance of a known object if passed a hash with a class key" do
-      data = { "class" => "Item" }
+      data = { "relaxdb_class" => "Item" }
       obj = RelaxDB.create_object(data)
       obj.should be_instance_of(Item)
     end
@@ -86,9 +81,9 @@ describe RelaxDB do
       lambda { RelaxDB.bulk_save!(c.new) }.should raise_error(RelaxDB::ValidationFailure)
     end
     
-    it "should raise an exception if a document update conflict occurs on save" do
+    it "will not raise an exception if a document update conflict occurs on save" do
       Atom.new(:_id => "a1").save!
-      lambda { RelaxDB.bulk_save! Atom.new(:_id => "a1") }.should raise_error(RelaxDB::UpdateConflict)
+      RelaxDB.bulk_save! Atom.new(:_id => "a1")
     end
     
   end
@@ -96,13 +91,14 @@ describe RelaxDB do
   describe ".replicate_db" do
     
     it "should replicate the named database" do
-      orig = "relaxdb_spec_db"
-      replica = "relaxdb_spec_db_replica"
-      RelaxDB.delete_db replica rescue "ok"
-      Atom.new.save # implicitly saved to orig
+      orig = "relaxdb_spec"
+      replica = "relaxdb_spec_replicate_test"
+      RelaxDB.delete_db replica rescue :ok
+      class ReplicaTest < RelaxDB::Document; end
+      ReplicaTest.new.save # implicitly saved to orig
       RelaxDB.replicate_db orig, replica
       RelaxDB.use_db replica
-      Atom.all.size.should == 1
+      ReplicaTest.all.size.should == 1      
     end
     
   end
@@ -172,31 +168,49 @@ describe RelaxDB do
       }
     >
     
-    it "should request a view and return a hash" do
-      RelaxDB::DesignDocument.get("viewtest").add_view("simple", "map", map_func).save
-      data = RelaxDB.view("viewtest", "simple")
-      data.should be_instance_of(Hash)
+    it "should request a view and return an array" do
+      RelaxDB::DesignDocument.get(RelaxDB.dd).add_view("simple", "map", map_func).save
+      data = RelaxDB.view("simple")
+      data.should be_instance_of(Array)
     end
 
-    it "may accept a block" do
-      RelaxDB::DesignDocument.get("viewtest").add_view("simple", "map", map_func).save
+    it "may accept query params" do
+      RelaxDB::DesignDocument.get(RelaxDB.dd).add_view("simple", "map", map_func).save
       RelaxDB.db.put("x", {}.to_json)      
       RelaxDB.db.put("y", {}.to_json)      
-      data = RelaxDB.view("viewtest", "simple") { |q| q.key("x") }
-      data["rows"].size.should == 1
+      res = RelaxDB.view "simple", :key => "x"
+      res.first._id.should == "x"
     end
     
     it "should be queryable with a multi key post" do
+      Primitives.view_by :num
+      
       5.times { |i| Primitives.new(:num => i).save }
-      # Create the view
-      Primitives.all.sorted_by(:num) 
-      resp = RelaxDB.view("Primitives", "all_sorted_by_num") do |q| 
-        q.keys([0, 4])
-        q.reduce(false).group(true) # group invocation should hopefully be temporary
-      end
-      RelaxDB.instantiate(resp).map{ |p| p.num }.should == [0, 4]
+      Primitives.by_num
+      result = RelaxDB.view "Primitives_by_num", :keys => [0, 4], :reduce => false
+      result.map{ |p| p.num }.should == [0, 4]
     end
     
+    it "should return nil for a reduce view with no results" do
+      Primitives.view_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.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
+      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)
+      res.size.should == 2
+    end
+
+    
   end
   
   describe ".merge" do
@@ -220,6 +234,51 @@ describe RelaxDB do
         
   end
   
+  describe "create_views disabled" do
+
+    before(:each) do
+      create_test_db 
+      RelaxDB.enable_view_creation false
+    
+      class CvdBar < RelaxDB::Document
+        view_by :foo
+        has_one :foo1
+        has_many :foon
+        references_many :foor
+      end
+    end
+
+    it "should not create any views" do
+      dd = RelaxDB::DesignDocument.get "spec_doc"
+      dd.data["views"].should be_nil
+    end    
+
+  end
+  
+  describe "create_views enabled" do
+
+    before(:each) do
+      create_test_db
+
+      class CveBar < RelaxDB::Document
+        view_by :foo
+        has_one :foo1
+        has_many :foon
+        references_many :foor
+      end
+    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
+  
   # if caching is added
   # it "should offer an example where behaviour is different with caching enabled and caching disabled"
             

data/spec/spec_helper.rb

@@ -8,3 +8,37 @@ end
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'relaxdb'
+
+def setup_test_db
+  # RelaxDB.configure :host => "localhost", :port => 5984, :design_doc => "spec_doc", :logger => Logger.new(STDOUT)
+  RelaxDB.configure :host => "localhost", :port => 5984, :design_doc => "spec_doc"
+  
+  RelaxDB.delete_db "relaxdb_spec" rescue "ok"
+  RelaxDB.use_db "relaxdb_spec"
+  begin
+    RelaxDB.replicate_db "relaxdb_spec_base", "relaxdb_spec"
+    RelaxDB.enable_view_creation
+  rescue => e
+    puts "\n===== Run rake create_base_db before the first spec run ====="
+    puts
+    exit!
+  end
+end
+
+def create_test_db params = {}
+  defaults = {:host => "localhost", :port => 5984, :design_doc => "spec_doc"}
+  RelaxDB.configure defaults.merge(params)
+
+  RelaxDB.delete_db "relaxdb_spec" rescue "ok"
+  RelaxDB.use_db "relaxdb_spec"  
+  RelaxDB.enable_view_creation
+end
+
+def create_base_db
+  RelaxDB.configure :host => "localhost", :port => 5984, :design_doc => "spec_doc"
+  RelaxDB.delete_db "relaxdb_spec_base" rescue "ok"
+  RelaxDB.use_db "relaxdb_spec_base"
+  RelaxDB.enable_view_creation
+  require File.dirname(__FILE__) + '/spec_models.rb'
+  puts "Created relaxdb_spec_base"
+end