paulcarey-relaxdb 0.3.1 → 0.3.2

data/Rakefile

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

data/lib/relaxdb/document.rb

@@ -61,6 +61,7 @@ module RelaxDB
   
     property :_id 
     property :_rev        
+    property :_conflicts        
     
     def self.create_validator(att, v)
       method_name = "validate_#{att}"
@@ -198,17 +199,25 @@ module RelaxDB
         resp = RelaxDB.db.put(_id, to_json)
         self._rev = JSON.parse(resp.body)["rev"]
       rescue HTTP_409
-        on_update_conflict
-        @update_conflict = true
+        conflicted
         return false
       end      
     end
     
+    def conflicted
+      @update_conflict = true
+      on_update_conflict
+    end    
+    
     def on_update_conflict
       # override with any behaviour you want to happen when
       # CouchDB returns DocumentConflict on an attempt to save
     end
     
+    def update_conflict?
+      @update_conflict
+    end    
+    
     def pre_save
       set_timestamps
       return false unless validates?
@@ -238,11 +247,7 @@ module RelaxDB
         raise ValidationFailure, self.errors.to_json
       end
     end
-        
-    def update_conflict?
-      @update_conflict
-    end
-    
+            
     def validates?
       props = properties - validation_skip_list
       prop_vals = props.map { |prop| instance_variable_get("@#{prop}") }

data/lib/relaxdb/paginator.rb

@@ -18,6 +18,11 @@ module RelaxDB
         :descending => @orig_paginate_params.descending, :reduce => true
     end
     
+    #
+    # view_keys are used to determine the params for the prev and next links. If a view_key is a symbol
+    # the key value will be the result of invoking the method named by the symbol on the first / last 
+    # element in the result set. If a view_key is not a symbol, its value will be used directly.
+    #
     def add_next_and_prev(docs, view_name, view_keys)
       unless docs.empty?
         no_docs = docs.size
@@ -45,14 +50,14 @@ module RelaxDB
     end
     
     def create_next(doc, view_keys)
-      next_key = view_keys.map { |a| doc.send(a) }
+      next_key = view_keys.map { |a| a.is_a?(Symbol) ? doc.send(a) : a }
       next_key = next_key.length == 1 ? next_key[0] : next_key
       next_key_docid = doc._id
       { :startkey => next_key, :startkey_docid => next_key_docid, :descending => @orig_paginate_params.descending }
     end
     
     def create_prev(doc, view_keys)
-      prev_key = view_keys.map { |a| doc.send(a) }
+      prev_key = view_keys.map { |a| a.is_a?(Symbol) ? doc.send(a) : a }
       prev_key = prev_key.length == 1 ? prev_key[0] : prev_key
       prev_key_docid = doc._id
       prev_params = { :startkey => prev_key, :startkey_docid => prev_key_docid, :descending => !@orig_paginate_params.descending }

data/lib/relaxdb/query.rb

@@ -51,7 +51,7 @@ module RelaxDB
     end
     
     def view_path
-      uri = "_design/#{RelaxDB.dd}/_view/#{@view_name}"
+      uri = (@view_name =~ /^_/) ? @view_name : "_design/#{RelaxDB.dd}/_view/#{@view_name}"
       
       query = ""
       @@params.each do |param|

data/lib/relaxdb/references_many_proxy.rb

@@ -25,8 +25,7 @@ module RelaxDB
         obj.send(@relationship_as_viewed_by_target).send(:<<, @client, true) 
     
         # Bulk save to ensure relationship is persisted on both sides
-        # TODO: Should this be bulk_save! ? Probably.
-        RelaxDB.bulk_save(@client, obj)
+        RelaxDB.bulk_save! @client, obj
       end
     
       self

data/lib/relaxdb/relaxdb.rb

@@ -49,6 +49,11 @@ module RelaxDB
       db.db_exists? name
     end
     
+    def db_info
+      data = JSON.parse db.get.body
+      create_object data
+    end
+    
     def delete_db(name)
       db.delete_db name
     end
@@ -62,25 +67,35 @@ module RelaxDB
     end
     
     def bulk_save!(*objs)
+      if objs[0].equal? :all_or_nothing
+        objs.shift
+        all_or_nothing = true
+      end
+      
       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)
-    
-        data.each do |new_rev|
-          obj = docs[ new_rev["id"] ]
+      data = { "docs" => objs }
+      data[:all_or_nothing] = true if all_or_nothing
+      resp = db.post("_bulk_docs", data.to_json )
+      data = JSON.parse(resp.body)
+  
+      conflicted = []
+      data.each do |new_rev|
+        obj = docs[ new_rev["id"] ]
+        if new_rev["rev"]
           obj._rev = new_rev["rev"]
           obj.post_save
+        else
+          conflicted << obj._id
+          obj.conflicted
         end
-      rescue HTTP_409
-        raise UpdateConflict, objs
       end
-    
+  
+      raise UpdateConflict, conflicted.inspect unless conflicted.empty?
       objs
     end
     
@@ -96,7 +111,12 @@ module RelaxDB
       load(obj._id)
     end
   
-    def load(ids)
+    #
+    # Examples:
+    #   RelaxDB.load "foo", :conflicts => true
+    #   RelaxDB.load ["foo", "bar"]
+    #
+    def load(ids, atts={})
       # RelaxDB.logger.debug(caller.inject("#{db.name}/#{ids}\n") { |a, i| a += "#{i}\n" })
       
       if ids.is_a? Array
@@ -105,9 +125,11 @@ module RelaxDB
         data["rows"].map { |row| row["doc"] ? create_object(row["doc"]) : nil }
       else
         begin
-          resp = db.get(ids)
-          data = JSON.parse(resp.body)
-          create_object(data)
+          qs = atts.map{ |k, v| "#{k}=#{v}" }.join("&")
+          qs = atts.empty? ? ids : "#{ids}?#{qs}"
+          resp = db.get qs
+          data = JSON.parse resp.body
+          create_object data
         rescue HTTP_404
           nil
         end

data/lib/relaxdb/server.rb

@@ -15,7 +15,7 @@ module RelaxDB
     def initialize(config)
       @get_count, @post_count, @put_count = 0, 0, 0
       @server = RelaxDB::Server.new(config[:host], config[:port])
-      @logger = config[:logger] ? config[:logger] : Logger.new(Tempfile.new('couchdb.log'))
+      @logger = config[:logger] ? config[:logger] : Logger.new(Tempfile.new('relaxdb.log'))
     end
     
     def use_db(name)
@@ -27,6 +27,7 @@ module RelaxDB
       @server.get("/#{name}") rescue false
     end
     
+    # URL encode slashes e.g. RelaxDB.delete_db "foo%2Fbar"
     def delete_db(name)
       @logger.info("Deleting database #{name}")
       @server.delete("/#{name}")
@@ -83,6 +84,14 @@ module RelaxDB
     def name=(name)
       @db = name
     end
+    
+    def req_count
+      get_count + put_count + post_count
+    end
+    
+    def reset_req_count
+      @get_count = @put_count = @post_count = 0
+    end
         
     private
     

data/spec/query_spec.rb

@@ -69,6 +69,12 @@ describe RelaxDB::Query do
       q.view_path.should == "_design//_view/?endkey_docid=foo&reduce=false"
     end
     
+    it "should not include design or view if it starts with a _" do
+      q = RelaxDB::Query.new "_"
+      # q.view_path.should == "_"
+      q.view_path.should == "_?reduce=false"
+    end
+    
   end  
   
   describe "#keys" do

data/spec/relaxdb_spec.rb

@@ -70,6 +70,60 @@ describe RelaxDB do
       RelaxDB.bulk_save(x).first.foo.should == :bar
     end
     
+    it "should save non conflicting docs and mark conflicting docs" do
+      p1, p2 = Atom.new.save!, Atom.new.save!
+      p1.dup.save!
+      RelaxDB.bulk_save p1, p2
+      p1._rev.should =~ /1-/
+      p1.should be_update_conflict
+      p2._rev.should =~ /2-/
+    end
+    
+    #
+    # This spec is as much a verification of my understanding of
+    # bulk_save semantics as it is a test of RelaxDB
+    #
+    # See http://mail-archives.apache.org/mod_mbox/couchdb-dev/200905.mbox/%3CF476A3D8-8F50-40A0-8668-C00D72196FBA@apache.org%3E
+    # for an explanation of the final section 
+    #
+    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.num = 11
+        p1d.save!
+        p1.num = 6
+        RelaxDB.bulk_save :all_or_nothing, p1, p2
+        p1._rev.should =~ /2-/
+        p2._rev.should =~ /2-/
+        
+        p1 = RelaxDB.load p1._id, :conflicts => true
+        p1n1 = p1.num
+        p1 = RelaxDB.load p1._id, :rev => p1._conflicts[0]
+        p1n2 = p1.num
+        if p1n1 == 11
+          p1n2.should == 6
+        else
+          p1n1.should == 6 && p1n2.should == 11
+        end
+      end
+      
+      #
+      # Test behind 
+      # http://mail-archives.apache.org/mod_mbox/couchdb-dev/200905.mbox/%3CF476A3D8-8F50-40A0-8668-C00D72196FBA@apache.org%3E
+      # Effectively defunct
+      # 
+      # it "non-deterministic winner" do
+      #   p = Primitives.new(:num => 1).save!
+      #   pd = p.dup
+      #   p.num = 2
+      #   p.save!
+      #   pd.num = 3
+      #   RelaxDB.bulk_save :all_or_nothing, pd
+      #   RelaxDB.reload(p).num.should == 2
+      # end
+    end
+        
   end
   
   describe ".bulk_save!" do
@@ -81,13 +135,21 @@ describe RelaxDB do
       lambda { RelaxDB.bulk_save!(c.new) }.should raise_error(RelaxDB::ValidationFailure)
     end
     
-    it "will not raise an exception if a document update conflict occurs on save" do
-      Atom.new(:_id => "a1").save!
-      RelaxDB.bulk_save! Atom.new(:_id => "a1")
+    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!
+      lambda { RelaxDB.bulk_save!(p1, p2) }.should raise_error(RelaxDB::UpdateConflict)
+      p2._rev.should =~ /2-/
     end
     
   end
   
+  describe ".db_info" do
+    it "should return db info" do
+      RelaxDB.db_info.doc_count.should == 1
+    end
+  end
+  
   describe ".replicate_db" do
     
     it "should replicate the named database" do

data/spec/spec_models.rb

@@ -180,7 +180,7 @@ class RichDescendant < Descendant
   
   references :ukulele
   property :ukulele_name,
-    :derived => [:ukulele, lambda { |p, o| o.user.name } ]
+    :derived => [:ukulele, lambda { |p, o| o.ukulele.name } ]
 end
 
 module Inh

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: paulcarey-relaxdb
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Paul Carey
@@ -9,7 +9,7 @@ autorequire: relaxdb
 bindir: bin
 cert_chain: []
 
-date: 2009-03-31 00:00:00 -07:00
+date: 2009-05-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency