paulcarey-relaxdb 0.2.6 → 0.2.7

data/README.textile

@@ -1,9 +1,23 @@
 h3. What's New?
 
-* Denormalisation via derived properties. Examples in spec/derived_properties_spec.rb.
+* Potentially breaking change. Skipping validations is now done by adding attribute symbols to an object's list rather than passing them to @save@. For example @my_obj.validation_skip_list << :foo@. This offers per object granularity over validations when working with bulk_save.
+
+* Potentially breaking change. @load@ now returns an array if passed an array of size one. Previously it would have returned a single object.
+
+* Update conflict hook and property
+
+* Semantic consistency for bulk_save and bulk_save! wrt to save and save!
+
+* Multiple exception handling improvements
+
+* @save_all@ that issues a bulk_save for an object and its has_one and has_many children
+
+* assignment of @has_many@ relationships
 
 * Validations may be skipped by passing the attribute symbol(s) to @save@ or @save!@.
 
+* Denormalisation via derived properties. Examples in spec/derived_properties_spec.rb.
+
 * Semantic changes for @ has_many#<< @. The parent object is now assigned to the child object *prior* to validation. This potentially breaking change was made to allow child objects to derive properties from a parent object.
 
 * Semantic consistency for load, load!, save and save!. The bang versions raise an exception when their more relaxed siblings would simply return nil.
@@ -18,7 +32,7 @@ h3. What's New?
 ** For example, @ Numbers.all.sorted_by(:val) { |q| q.keys([1,2,3,5]) } @
 * Works with CouchDB 0.9 trunk as of 2009/01/02. Note that pagination won't work correctly on trunk until issue "COUCHDB-135":http://issues.apache.org/jira/browse/COUCHDB-135 is fixed.
 
-*Note*: 0.2.1 requires CouchDB 0.9 trunk. 0.2.0 works with CouchDB 0.8 onwards.
+*Note*: Current versions require CouchDB 0.9 trunk. If you're working with CouchDB 0.8 or 0.8.1, please build from commit @ a8a2d496462 @.
 
 h2. Overview
 

data/Rakefile

@@ -4,7 +4,7 @@ require 'spec/rake/spectask'
 
 PLUGIN = "relaxdb"
 NAME = "relaxdb"
-GEM_VERSION = "0.2.6"
+GEM_VERSION = "0.2.7"
 AUTHOR = "Paul Carey"
 EMAIL = "paul.p.carey@gmail.com"
 HOMEPAGE = "http://github.com/paulcarey/relaxdb/"

data/lib/relaxdb/document.rb

@@ -7,6 +7,9 @@ module RelaxDB
     # Used to store validation messages
     attr_accessor :errors
     
+    # Attribute symbols added to this list won't be validated on save
+    attr_accessor :validation_skip_list
+    
     # Define properties and property methods
     
     def self.property(prop, opts={})
@@ -62,13 +65,13 @@ module RelaxDB
       end          
     end
     
-    def self.create_validation_msg(prop, validation_msg)
+    def self.create_validation_msg(att, validation_msg)
       if validation_msg.is_a?(Proc)        
         validation_msg.arity == 1 ?
-          define_method("#{prop}_validation_msg") { |prop_val| validation_msg.call(prop_val) } :
-          define_method("#{prop}_validation_msg") { |prop_val| validation_msg.call(prop_val, self) } 
+          define_method("#{att}_validation_msg") { |att_val| validation_msg.call(att_val) } :
+          define_method("#{att}_validation_msg") { |att_val| validation_msg.call(att_val, self) } 
       else  
-        define_method("#{prop}_validation_msg") { validation_msg } 
+        define_method("#{att}_validation_msg") { validation_msg } 
       end
     end
     
@@ -84,12 +87,22 @@ module RelaxDB
       @derived_prop_writers ||= {}
     end
     
+    #
+    # The rationale for rescuing the send below is that the lambda for a derived 
+    # property shouldn't need to concern itself with checking the validity of
+    # the underlying property. Nor, IMO, should clients be exposed to the 
+    # possibility of a writer raising an exception.
+    #
     def write_derived_props(source)
       writers = self.class.derived_prop_writers[source]
       if writers 
         writers.each do |prop, writer|
           current_val = send(prop)
-          send("#{prop}=", writer.call(current_val, self))
+          begin
+            send("#{prop}=", writer.call(current_val, self)) 
+          rescue => e
+            RelaxDB.logger.warn "Deriving #{prop} from #{source} raised #{e}"
+          end
         end
       end
     end
@@ -110,6 +123,7 @@ module RelaxDB
       self._id = UuidGenerator.uuid 
       
       @errors = Errors.new
+      @validation_skip_list = []
 
       # Set default properties if this object has not known CouchDB
       unless hash["_rev"]
@@ -201,31 +215,76 @@ module RelaxDB
       data.to_json      
     end
             
-    # Order changed as of 30/10/2008 to be consistent with ActiveRecord
     # Not yet sure of final implemention for hooks - may lean more towards DM than AR
-    def save(*validation_skip_list)
-      return false unless validates?(*validation_skip_list)
-      return false unless before_save
-            
-      set_created_at if new_document? 
-      
-      resp = RelaxDB.db.put(_id, to_json)
-      self._rev = JSON.parse(resp.body)["rev"]
-
+    def save
+      if pre_save && save_to_couch
+        after_save
+        self
+      else
+        false
+      end
+    end  
+    
+    def save_to_couch
+      begin
+        resp = RelaxDB.db.put(_id, to_json)
+        self._rev = JSON.parse(resp.body)["rev"]
+      rescue HTTP_412
+        on_update_conflict
+        @update_conflict = true
+        return false
+      end      
+    end
+    
+    def on_update_conflict
+      # override with any behaviour you want to happen when
+      # CouchDB returns DocumentConflict on an attempt to save
+    end
+    
+    def pre_save
+      return false unless validates?
+      return false unless before_save            
+      set_created_at if new_document?
+      true 
+    end  
+    
+    def post_save
       after_save
+    end
+    
+    def save!
+      if save
+        self
+      elsif update_conflict?
+        raise UpdateConflict, self
+      else
+        raise ValidationFailure, self.errors.to_json
+      end
+    end
+    
+    def save_all
+      RelaxDB.bulk_save(self, *all_children)
+    end
 
-      self
-    end  
+    def save_all!
+      RelaxDB.bulk_save!(self, *all_children)
+    end
+    
+    def all_children      
+      ho = self.class.has_one_rels.map { |r| send(r) }
+      hm = self.class.has_many_rels.inject([]) { |m,r| m += send(r).children }
+      ho + hm
+    end
     
-    def save!(*validation_skip_list)
-      save(*validation_skip_list) || raise(DocumentNotSaved.new(self.errors.to_json))
+    def update_conflict?
+      @update_conflict
     end
     
-    def validates?(*skip_list)
-      props = properties - skip_list
+    def validates?
+      props = properties - validation_skip_list
       prop_vals = props.map { |prop| instance_variable_get("@#{prop}") }
       
-      rels = self.class.belongs_to_rels.keys - skip_list
+      rels = self.class.belongs_to_rels.keys - validation_skip_list
       rel_vals = rels.map { |rel| instance_variable_get("@#{rel}_id") }
       
       att_names = props + rels
@@ -246,7 +305,7 @@ module RelaxDB
       begin
         success = send("validate_#{att_name}", att_val)
       rescue => e
-        RelaxDB.logger.warn("Validating #{att_name} with #{att_val} raised #{e}")
+        RelaxDB.logger.warn "Validating #{att_name} with #{att_val} raised #{e}"
         succes = false
       end
 
@@ -255,8 +314,8 @@ module RelaxDB
           begin
             @errors[att_name] = send("#{att_name}_validation_msg", att_val)
           rescue => e
-            RelaxDB.logger.warn("Validation_msg for #{att_name} with #{att_val} raised #{e}")
-            @errors[att_name] = "validation_msg_exception:invalid:#{att_name_val}"
+            RelaxDB.logger.warn "Validation_msg for #{att_name} with #{att_val} raised #{e}"
+            @errors[att_name] = "validation_msg_exception:invalid:#{att_val}"
           end
         else
           @errors[att_name] = "invalid:#{att_val}"
@@ -322,7 +381,6 @@ module RelaxDB
     end
    
     def self.references_many_rels
-      # Don't force clients to check its instantiated
       @references_many_rels ||= []
     end
    
@@ -334,8 +392,10 @@ module RelaxDB
         create_or_get_proxy(HasManyProxy, relationship, opts)
       end
       
-      define_method("#{relationship}=") do
-        raise "You may not currently assign to a has_many relationship - may be implemented"
+      define_method("#{relationship}=") do |children|
+        create_or_get_proxy(HasManyProxy, relationship, opts).children = children
+        write_derived_props(relationship)
+        children
       end      
     end
 
@@ -354,6 +414,8 @@ module RelaxDB
       
       define_method("#{relationship}=") do |new_target|
         create_or_get_proxy(HasOneProxy, relationship).target = new_target
+        write_derived_props(relationship)
+        new_target
       end
     end
     
@@ -378,6 +440,7 @@ module RelaxDB
       define_method("#{relationship}_id=") do |id|
         instance_variable_set("@#{relationship}_id".to_sym, id)
         write_derived_props(relationship)
+        id
       end
 
       # Allows belongs_to relationships to be used by the paginator
@@ -386,10 +449,16 @@ module RelaxDB
       end
       
       create_validator(relationship, opts[:validator]) if opts[:validator]
+      
+      # Untested below
+      create_validation_msg(relationship, opts[:validation_msg]) if opts[:validation_msg]
+    end
+  
+    class << self
+      alias_method :references, :belongs_to
     end
     
     def self.belongs_to_rels
-      # Don't force clients to check that it's instantiated
       @belongs_to_rels ||= {}
     end
     
@@ -404,6 +473,9 @@ module RelaxDB
     # destroy! nullifies all relationships with peers and children before deleting 
     # itself in CouchDB
     # The nullification and deletion are not performed in a transaction
+    #
+    # TODO: Current implemention may be inappropriate - causing CouchDB to try to JSON
+    # encode undefined. Ensure nil is serialized? See has_many_spec#should nullify its child relationships
     def destroy!
       self.class.references_many_rels.each do |rel|
         send(rel).clear

data/lib/relaxdb/has_many_proxy.rb

@@ -3,6 +3,8 @@ module RelaxDB
   class HasManyProxy
 
     include Enumerable
+    
+    attr_reader :children
   
     def initialize(client, relationship, opts)
       @client = client 
@@ -57,6 +59,14 @@ module RelaxDB
     def [](*args)
       @children[*args]
     end
+    
+    def first
+      @children[0]
+    end
+    
+    def last
+      @children[size-1]
+    end
   
     def each(&blk)
       @children.each(&blk)
@@ -73,6 +83,13 @@ module RelaxDB
       map_function = ViewCreator.has_n(@target_class, @relationship_as_viewed_by_target)
       @children = RelaxDB.retrieve(view_path, design_doc, view_name, map_function)
     end
+    
+    def children=(children)
+      children.each do |obj|
+        obj.send("#{@relationship_as_viewed_by_target}=".to_sym, @client)
+      end
+      @children = children
+    end
   
     def inspect
       @children.inspect

data/lib/relaxdb/relaxdb.rb

@@ -2,6 +2,8 @@ module RelaxDB
 
   class NotFound < StandardError; end
   class DocumentNotSaved < StandardError; end
+  class UpdateConflict < DocumentNotSaved; end
+  class ValidationFailure < DocumentNotSaved; end
   
   @@db = nil
   
@@ -21,11 +23,15 @@ module RelaxDB
     
     # Creates the named database if it doesn't already exist
     def use_db(name)
-      db.use_db(name)
+      db.use_db name
+    end
+    
+    def db_exists?(name)
+      db.db_exists? name
     end
     
     def delete_db(name)
-      db.delete_db(name)
+      db.delete_db name
     end
     
     def list_dbs
@@ -36,41 +42,58 @@ module RelaxDB
       db.replicate_db source, target
     end
     
-    def bulk_save(*objs)
+    def bulk_save!(*objs)
+      pre_save_success = objs.inject(true) { |s, o| s &= o.pre_save }
+      raise ValidationFailure, objs unless pre_save_success
+      
       docs = {}
       objs.each { |o| docs[o._id] = o }
+      
+      begin
+        resp = db.post("_bulk_docs", { "docs" => objs }.to_json )
+        data = JSON.parse(resp.body)
     
-      resp = db.post("_bulk_docs", { "docs" => objs }.to_json )
-      data = JSON.parse(resp.body)
-    
-      data["new_revs"].each do |new_rev|
-        docs[ new_rev["id"] ]._rev = new_rev["rev"]
+        data["new_revs"].each do |new_rev|
+          obj = docs[ new_rev["id"] ]
+          obj._rev = new_rev["rev"]
+          obj.post_save
+        end
+      rescue HTTP_412
+        raise UpdateConflict, objs
       end
     
-      data["ok"]
+      objs
+    end
+    
+    def bulk_save(*objs)
+      begin
+        bulk_save!(*objs)
+      rescue ValidationFailure, UpdateConflict
+        false
+      end
     end
   
-    def load(*ids)
-      if ids.size == 1
+    def load(ids)
+      if ids.is_a? Array
+        resp = db.post("_all_docs?include_docs=true", {:keys => ids}.to_json)
+        data = JSON.parse(resp.body)
+        data["rows"].map { |row| row["doc"] ? create_object(row["doc"]) : nil }
+      else
         begin
-          resp = db.get(ids[0])
+          resp = db.get(ids)
           data = JSON.parse(resp.body)
           create_object(data)
         rescue HTTP_404
           nil
         end
-      else
-        resp = db.post("_all_docs?include_docs=true", {:keys => ids}.to_json)
-        data = JSON.parse(resp.body)
-        data["rows"].map { |row| row["doc"] ? create_object(row["doc"]) : nil }
       end
     end
     
-    def load!(*ids)
-      res = load(*ids)
+    def load!(ids)
+      res = load(ids)
       
-      raise NotFound if res == nil
-      raise NotFound if res.respond_to?(:include?) && res.include?(nil)
+      raise NotFound, ids if res == nil
+      raise NotFound, ids if res.respond_to?(:include?) && res.include?(nil)
       
       res
     end

data/lib/relaxdb/server.rb

@@ -2,6 +2,7 @@ module RelaxDB
   
   class HTTP_404 < StandardError; end
   class HTTP_409 < StandardError; end
+  class HTTP_412 < StandardError; end
 
   class Server
         
@@ -62,13 +63,15 @@ module RelaxDB
   end
       
   class CouchDB
+
+    attr_reader :logger
         
     # Used for test instrumentation only i.e. to assert that 
-    # an expected number of GET requests have been issued
-    attr_accessor :get_count    
+    # an expected number of requests have been issued
+    attr_accessor :get_count, :put_count
         
     def initialize(config)
-      @get_count = 0
+      @get_count, @put_count = 0, 0
       @server = RelaxDB::Server.new(config[:host], config[:port])
       @logger = config[:logger] ? config[:logger] : Logger.new(Tempfile.new('couchdb.log'))
     end
@@ -78,6 +81,10 @@ module RelaxDB
       @db = name
     end
     
+    def db_exists?(name)
+      @server.get("/#{name}") rescue false
+    end
+    
     def delete_db(name)
       @logger.info("Deleting database #{name}")
       @server.delete("/#{name}")
@@ -99,7 +106,7 @@ module RelaxDB
       @server.delete("/#{@db}/#{path}")
     end
     
-    # *ignored allows methods to invoke get or post indifferently
+    # *ignored allows methods to invoke get or post indifferently via send
     def get(path=nil, *ignored)
       @get_count += 1
       @logger.info("GET /#{@db}/#{unesc(path)}")
@@ -112,6 +119,7 @@ module RelaxDB
     end
     
     def put(path=nil, json=nil)
+      @put_count += 1
       @logger.info("PUT /#{@db}/#{unesc(path)} #{json}")
       @server.put("/#{@db}/#{path}", json)
     end
@@ -129,10 +137,10 @@ module RelaxDB
       @db
     end
     
-    def logger
-      @logger
+    def name=(name)
+      @db = name
     end
-    
+        
     private
     
     def create_db_if_non_existant(name)

data/spec/derived_properties_spec.rb

@@ -1,9 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 require File.dirname(__FILE__) + '/spec_models.rb'
 
-# These tests would ideally instrument server.rb, asserting that no
-# HTTP requests are made when retrieving the derived values
-
 class DpInvite < RelaxDB::Document
   property :event_name, :derived => [:event, lambda { |en, i| i.event.name }]
   belongs_to :event  
@@ -46,12 +43,11 @@ describe RelaxDB::Document, "derived properties" do
     i.event_name.should == "shindig"
   end  
   
-  it "will fail when the source_id is updated for a unsaved event" do
-    # Almost certainly not desired - merely codifying current behaviour
-    e = DpEvent.new(:name => "shindig")
-    lambda { DpInvite.new(:event_id => e._id) }.should raise_error
+  it "will not raise an exception when the source is nil" do
+    # See the rationale in Document.write_derived_props
+    DpInvite.new(:event => nil).save!
   end  
-  
+      
   it "should only be updated for registered properties" do
     invite = Class.new(RelaxDB::Document) do
       property :event_name, :derived => [:foo, lambda { |en, i| i.event.name }]

data/spec/document_spec.rb

@@ -36,6 +36,10 @@ describe RelaxDB::Document do
       Post.new(:foo => "").save
     end  
     
+    it "should create a document with a non conflicing state" do
+      Atom.new.should_not be_update_conflict
+    end
+    
   end
   
   describe "#initialize" do
@@ -92,6 +96,14 @@ describe RelaxDB::Document do
       p = Post.new(:created_at => back_then).save
       p.created_at.should be_close(back_then, 1)
     end
+    
+    it "should set document conflict state on conflicting save" do
+      a1 = Atom.new
+      a2 = a1.dup
+      a1.save!
+      a2.save
+      a2.should be_update_conflict
+    end
         
   end
   
@@ -102,15 +114,57 @@ describe RelaxDB::Document do
       RelaxDB.load(a._id).should == a
     end
     
-    it "should throw an exception when an object is not saved" do
+    it "should raise ValidationFailure on validation failure" do
       r = Class.new(RelaxDB::Document) do
         property :thumbs_up, :validator => lambda { false }
       end
       lambda do
         r.new.save!
-      end.should raise_error(RelaxDB::DocumentNotSaved)
+      end.should raise_error(RelaxDB::ValidationFailure)
     end   
     
+    it "should raise UpdateConflict on an update conflict" do
+      a1 = Atom.new
+      a2 = a1.dup
+      a1.save!
+      lambda { a2.save! }.should raise_error(RelaxDB::UpdateConflict)      
+    end
+    
+  end
+  
+  describe "#save_all" do
+    
+    before(:each) do
+      # Create the underlying views
+      User.new(:items => [], :invites_received => [], :invites_sent => [])
+    end
+    
+    it "should issue only a single PUT request" 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
@@ -171,7 +225,7 @@ describe RelaxDB::Document do
 
     it "should prevent the object from being resaved" do
       p = Atom.new.save.destroy!
-      lambda { p.save }.should raise_error
+      lambda { p.save! }.should raise_error
     end
     
     it "will result in undefined behaviour when invoked on unsaved objects" do
@@ -434,7 +488,9 @@ describe RelaxDB::Document do
       r = Class.new(RelaxDB::Document) do
         property :thumbs_up, :validator => lambda { raise }
       end
-      r.new.save!(:thumbs_up)
+      x = r.new
+      x.validation_skip_list << :thumbs_up
+      x.save!
     end
     
   end

data/spec/has_many_spec.rb

@@ -16,7 +16,7 @@ describe RelaxDB::HasManyProxy do
     
     it "should be considered enumerable" do
       u = User.new.save
-      u.items.should be_a_kind_of( Enumerable)
+      u.items.should be_a_kind_of(Enumerable)
     end
     
     it "should actually be enumerable" do
@@ -41,7 +41,7 @@ describe RelaxDB::HasManyProxy do
       m = RelaxDB.load m._id
       m.multi_word_children[0].should == c
     end    
-        
+            
     describe "#<<" do
 
       it "should link the added item to the parent" do
@@ -74,10 +74,39 @@ describe RelaxDB::HasManyProxy do
     end
     
     describe "#=" do
-
-      it "should fail" do
-        # This may be implemented in future
-        lambda { User.new.items = [] }.should raise_error
+      
+      before(:each) do
+        # Create the underlying views
+        User.new(:items => [], :invites_received => [], :invites_sent => [])
+      end
+      
+      it "should not attempt to save the child objects when the relationship is established" do
+        RelaxDB.db.put_count = 0
+        i1, i2 = Item.new(:name => "i1"), Item.new(:name => "i2")
+        User.new(:items => [i1, i2])
+        RelaxDB.db.put_count.should == 0
+      end
+      
+      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!
+        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
+          property :foo, :derived => [:zongs, lambda {|f, o| o.zongs.first.z / 2 }]
+          has_many :zongs, :class => "Zong"
+        end
+        Zong = Class.new(RelaxDB::Document) do
+          property :z
+          belongs_to :p
+        end
+        oz = Zong.new(:z => 10)
+        op = P.new(:zongs => [oz])
+        op.foo.should == 5
       end
       
     end

data/spec/relaxdb_spec.rb

@@ -28,20 +28,69 @@ describe RelaxDB do
     end
     
   end  
-      
+
+  # bulk_save and bulk_save! should match Document#save and Document#save! semantics
   describe ".bulk_save" do
     
     it "should be invokable multiple times" do
-      t1 = Tag.new(:name => "t1")
-      t2 = Tag.new(:name => "t2")
+      t1, t2 = Tag.new, Tag.new
       RelaxDB.bulk_save(t1, t2)
       RelaxDB.bulk_save(t1, t2)
     end
     
+    it "should return the objects it was passed" do
+      t1, t2 = Tag.new, Tag.new
+      ta, tb = RelaxDB.bulk_save(t1, t2)
+      ta.should == t1
+      tb.should == t2
+    end
+    
     it "should succeed when passed no args" do
       RelaxDB.bulk_save
     end
     
+    it "should return false on failure" do
+      c = Class.new(RelaxDB::Document) do
+        property :foo, :validator => lambda { false }
+      end
+      x = c.new
+      RelaxDB.bulk_save(x).should be_false
+    end
+
+    it "should not attempt to save if a pre-save stage fails" do
+      c = Class.new(RelaxDB::Document) do
+        property :foo, :validator => lambda { false }
+      end
+      x = c.new
+      RelaxDB.bulk_save(x)
+      x.should be_new_document
+    end
+    
+    it "should invoke the after-save stage after a successful save" do
+      c = Class.new(RelaxDB::Document) do
+        attr_accessor :foo
+        after_save lambda { |c| c.foo = :bar }
+      end
+      x = c.new
+      RelaxDB.bulk_save(x).first.foo.should == :bar
+    end
+    
+  end
+  
+  describe ".bulk_save!" do
+    
+    it "should raise an exception if a obj fails validation" do
+      c = Class.new(RelaxDB::Document) do
+        property :foo, :validator => lambda { false }
+      end
+      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
+      Atom.new(:_id => "a1").save!
+      lambda { RelaxDB.bulk_save! Atom.new(:_id => "a1") }.should raise_error(RelaxDB::UpdateConflict)
+    end
+    
   end
   
   describe ".replicate_db" do
@@ -68,7 +117,7 @@ describe RelaxDB do
     
     it "should load an arbitrary number of documents" do
       a1, a2 = Atom.new.save, Atom.new.save
-      ar1, ar2 = RelaxDB.load a1._id, a2._id
+      ar1, ar2 = RelaxDB.load [a1._id, a2._id]
       ar1.should == a1
       ar2.should == a2
     end
@@ -79,7 +128,7 @@ describe RelaxDB do
     
     it "should return an array with correctly placed nils when given a list containing non existant doc ids" do
       a1, a2 = Atom.new.save, Atom.new.save
-      res = RelaxDB.load nil, a1._id, nil, a2._id, nil
+      res = RelaxDB.load [nil, a1._id, nil, a2._id, nil]
       res.should == [nil, a1, nil, a2, nil]
     end
     
@@ -95,7 +144,7 @@ describe RelaxDB do
     
     it "should load multiple documents" do
       a1, a2 = Atom.new.save, Atom.new.save
-      ar1, ar2 = RelaxDB.load! a1._id, a2._id
+      ar1, ar2 = RelaxDB.load! [a1._id, a2._id]
       ar1.should == a1
       ar2.should == a2
     end
@@ -109,7 +158,7 @@ describe RelaxDB do
     it "should throw an exception if any of a list of doc ids is for a non-existant doc" do
       a = Atom.new.save
       lambda do
-        RelaxDB.load! nil, a._id
+        RelaxDB.load! [nil, a._id]
       end.should raise_error(RelaxDB::NotFound)
     end
     

data/spec/spec_models.rb

@@ -1,139 +1,150 @@
-class Atom < RelaxDB::Document
-end
+#
+# RSpec loads this file multiple times, thus breaking invocations like Document.has_one_rels
+# The following clause ensures the tests pass, but perhaps Document should raise a warning 
+# if it's loaded more than once...
+#
+unless @spec_models_loaded
+
+  class Atom < RelaxDB::Document
+  end
 
-class Initiative < RelaxDB::Document
-  property :x
-  attr_reader :foo
-  def initialize(svw=true, hash={})
-    super
-    @foo = :bar
+  class Initiative < RelaxDB::Document
+    property :x
+    attr_reader :foo
+    def initialize(*data)
+      super *data
+      @foo = :bar
+    end
   end
-end
 
-class Primitives < RelaxDB::Document
+  class Primitives < RelaxDB::Document
   
-  property :str
-  property :num
-  property :true_bool
-  property :false_bool
-  property :created_at
-  property :empty
+    property :str
+    property :num
+    property :true_bool
+    property :false_bool
+    property :created_at
+    property :empty
   
-end
+  end
 
-class BespokeReader < RelaxDB::Document
-  property :val
-  def val; @val + 5; end
-end
+  class BespokeReader < RelaxDB::Document
+    property :val
+    def val; @val + 5; end
+  end
 
-class BespokeWriter < RelaxDB::Document
-  property :val
-  def val=(v); @val = v - 10; end
-end
+  class BespokeWriter < RelaxDB::Document
+    property :val
+    def val=(v); @val = v - 10; end
+  end
 
-class Letter < RelaxDB::Document
+  class Letter < RelaxDB::Document
   
-  property :letter
-  property :number
+    property :letter
+    property :number
   
-end
+  end
 
-class Invite < RelaxDB::Document
+  class Invite < RelaxDB::Document
   
-  property :message
+    property :message
   
-  belongs_to :sender
-  belongs_to :recipient
+    belongs_to :sender
+    belongs_to :recipient
     
-end
+  end
 
-class Item < RelaxDB::Document
+  class Item < RelaxDB::Document
   
-  property :name
-  belongs_to :user
+    property :name
+    belongs_to :user
   
-end
+  end
 
-class User < RelaxDB::Document
+  class User < RelaxDB::Document
   
-  property :name 
-  property :age
+    property :name, :default => "u" 
+    property :age
   
-  has_many :items, :class => "Item"
+    has_many :items, :class => "Item"
   
-  has_many :invites_received, :class => "Invite", :known_as => :recipient
-  has_many :invites_sent, :class => "Invite", :known_as => :sender
+    has_many :invites_received, :class => "Invite", :known_as => :recipient
+    has_many :invites_sent, :class => "Invite", :known_as => :sender
   
-end
+  end
 
-class Post < RelaxDB::Document
+  class Post < RelaxDB::Document
   
-  property :subject
-  property :content
-  property :created_at
-  property :viewed_at
+    property :subject
+    property :content
+    property :created_at
+    property :viewed_at
   
-end
+  end
 
-class Rating < RelaxDB::Document
+  class Rating < RelaxDB::Document
 
-  property :stars, :default => 5
-  belongs_to :photo
+    property :stars, :default => 5
+    belongs_to :photo
 
-end
+  end
 
-class Photo < RelaxDB::Document
+  class Photo < RelaxDB::Document
   
-  property :name
+    property :name
   
-  has_one :rating
+    has_one :rating
   
-  references_many :tags, :class => "Tag", :known_as => :photos
+    references_many :tags, :class => "Tag", :known_as => :photos
   
-  has_many :taggings, :class => "Tagging"
+    has_many :taggings, :class => "Tagging"
 
-end
+  end
 
-class Tag < RelaxDB::Document
+  class Tag < RelaxDB::Document
   
-  property :name
-  references_many :photos, :class => "Photo", :known_as => :tags
+    property :name
+    references_many :photos, :class => "Photo", :known_as => :tags
   
-  has_many :taggings, :class => "Tagging"
+    has_many :taggings, :class => "Tagging"
   
-end
+  end
 
-class Tagging < RelaxDB::Document
+  class Tagging < RelaxDB::Document
 
-  belongs_to :photo
-  belongs_to :tag
-  property :relevance  
+    belongs_to :photo
+    belongs_to :tag
+    property :relevance  
 
-end
+  end
 
-class MultiWordClass < RelaxDB::Document
-  has_one :multi_word_child
-  has_many :multi_word_children, :class => "MultiWordChild"
-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 MultiWordChild < RelaxDB::Document
+    belongs_to :multi_word_class
+  end
 
-class TwitterUser < RelaxDB::Document
+  class TwitterUser < RelaxDB::Document
   
-  property :name
-  references_many :followers, :class => "User", :known_as => :leaders
-  references_many :leaders, :class => "User", :known_as => :followers
+    property :name
+    references_many :followers, :class => "User", :known_as => :leaders
+    references_many :leaders, :class => "User", :known_as => :followers
   
-end
+  end
 
-class Dysfunctional < RelaxDB::Document
-  has_one :failure
-  has_many :failures, :class => "Failure"
-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
+  end
+
+  @spec_models_loaded = true
 
-class Failure < RelaxDB::Document
-  property :pathological, :validator => lambda { false }
-  belongs_to :dysfunctional
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: paulcarey-relaxdb
 version: !ruby/object:Gem::Version 
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors: 
 - Paul Carey
@@ -9,7 +9,7 @@ autorequire: relaxdb
 bindir: bin
 cert_chain: []
 
-date: 2009-01-08 00:00:00 -08:00
+date: 2009-01-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency