relaxdb 0.3.5 → 0.5

data/lib/relaxdb/view_object.rb

@@ -7,7 +7,7 @@ module RelaxDB
       hash.each do |k, v|
 
         if k.to_s =~ /_at$/
-          v = Time.local(*ParseDate.parsedate(v)) rescue v
+          v = Time.parse(v).utc rescue v
         end
 
         instance_variable_set("@#{k}", v)

data/lib/relaxdb/view_uploader.rb

@@ -7,11 +7,17 @@ module RelaxDB
       # Methods must start and finish on different lines
       # The function declaration must start at the beginning of a line
       # As '-' is used as a delimiter, the view name may not contain '-'
-      # Exepcted function declaration form is 
+      # Expected function declaration form is 
       #   function funcname-functype(doc) {
       # For example 
       #   function Users_followers-map(doc) {
       #
+      # Builtin Erlang views may be specified by listing a one-line function
+      # that contains only the builtin name. For example:
+      #  function Users_followers-reduce() {
+      #    _sum
+      #  }
+      #
       def upload(filename)
         lines = File.readlines(filename)
         dd = RelaxDB::DesignDocument.get(RelaxDB.dd)
@@ -37,7 +43,15 @@ module RelaxDB
           declr =~ /(\w)+-(\w)+/
           declr.sub!($&, '')
           view_name, type = $&.split('-')
-          func = lines[m[i]...m[i+1]].join
+          func = lines[m[i]...m[i+1]]
+          
+          # Cater for erlang view shortcuts e.g. _sum, _count etc.
+          if func[1] =~ /\s*_\w+\s*$/
+            func = func[1].strip
+          else
+            func = func.join
+          end
+          
           yield view_name, type, func
         end
       end

data/lib/relaxdb/views.rb

@@ -8,15 +8,23 @@ module RelaxDB
       function(doc) {        
         var class_match = #{kls_check kls}
         if (class_match) {
-          emit(doc._id, doc);
+          emit(doc._id, 1);
         }
       }
       QUERY
             
-      View.new "#{class_name}_all", map, sum_reduce_func      
+      View.new "#{class_name}_all", map, "_sum"
+    end
+    
+    def self.docs_by_att_list(kls, *atts)
+      create_by_att_list "doc", "_count", kls, *atts
     end
     
     def self.by_att_list(kls, *atts)
+      create_by_att_list 1, "_sum", kls, *atts
+    end
+    
+    def self.create_by_att_list emit_val, reduce_func, kls, *atts
       class_name = kls[0]
       key = atts.map { |a| "doc.#{a}" }.join(", ")
       key = atts.size > 1 ? key.sub(/^/, "[").sub(/$/, "]") : key
@@ -26,61 +34,20 @@ module RelaxDB
       function(doc) {
         var class_match = #{kls_check kls}
         if (class_match && #{prop_check}) {
-          emit(#{key}, doc);
+          emit(#{key}, #{emit_val});
         }
       }
       QUERY
       
       view_name = "#{class_name}_by_" << atts.join("_and_")
-      View.new view_name, map, sum_reduce_func
+      View.new view_name, map, reduce_func      
     end
-    
-  
-    def self.has_n(client_class, relationship, target_class, relationship_to_client)
-      map = <<-QUERY
-        function(doc) {
-          if (doc.relaxdb_class == "#{target_class}" && doc.#{relationship_to_client}_id)
-            emit(doc.#{relationship_to_client}_id, doc);
-        }
-      QUERY
       
-      view_name = "#{client_class}_#{relationship}"
-      View.new view_name, map
-    end
-  
-    def self.references_many(client_class, relationship, target_class, peers)
-      map = <<-QUERY
-        function(doc) {
-          if (doc.relaxdb_class == "#{target_class}" && doc.#{peers}) {
-            var i;
-            for(i = 0; i < doc.#{peers}.length; i++) {
-              emit(doc.#{peers}[i], doc);
-            }
-          }
-        }
-      QUERY
-      
-      view_name = "#{client_class}_#{relationship}"
-      View.new view_name, map
-    end
-    
     def self.kls_check kls
       kls_names = kls.map{ |k| %Q("#{k}") }.join(",")
       "[#{kls_names}].indexOf(doc.relaxdb_class) >= 0;"
     end
     
-    def self.sum_reduce_func
-      <<-QUERY
-      function(keys, values, rereduce) {
-        if (rereduce) {
-          return sum(values);
-        } else {
-          return values.length;
-        }
-      }
-      QUERY
-    end    
-    
   end
   
   class View
@@ -93,22 +60,23 @@ module RelaxDB
       @reduce_func = reduce_func
     end
     
-    def design_doc
+    def self.design_doc
       @design_doc ||= DesignDocument.get(RelaxDB.dd) 
     end
     
-    def save
-      dd = design_doc
+    #
+    # A convenience for tests that create their own views
+    #
+    def self.reset
+      @design_doc = nil
+    end
+        
+    def add_to_design_doc
+      dd = View.design_doc
       dd.add_map_view(@view_name, @map_func)
       dd.add_reduce_view(@view_name, @reduce_func) if @reduce_func
-      dd.save
-    end
-    
-    def exists?
-      dd = design_doc
-      dd.data["views"] && dd.data["views"][@view_name]
     end
-    
+        
   end
 
 end

data/readme.rb

@@ -28,9 +28,9 @@ class Invite < RelaxDB::Document
   property :sender_name,
    :derived => [:sender, lambda { |p, o| o.sender.name } ]
   
-  view_by :sender_name
-  view_by :sender_id
-  view_by :recipient_id, :created_at, :descending => true
+  view_docs_by :sender_name
+  view_docs_by :sender_id
+  view_docs_by :recipient_id, :created_at, :descending => true
   
   def on_update_conflict
     puts "conflict!"

data/spec/all_delegator_spec.rb

@@ -0,0 +1,52 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+require File.dirname(__FILE__) + '/spec_models.rb'
+
+describe RelaxDB::AllDelegator do
+  
+  before(:all) do
+    setup_test_db
+  end
+
+  describe "size" do
+  
+    it "should return the total count for a given class" do
+      docs = (1..101).map { |i| Primitives.new :num => i }
+      RelaxDB.bulk_save! *docs
+      Primitives.all.size.should == 101
+    end
+    
+  end
+  
+  describe "all" do
+    
+    it "should return the ids for the given class" do
+      docs = (1..3).map { |i| Primitives.new :_id => "p#{i}" }
+      RelaxDB.bulk_save! *docs
+      Primitives.all.should == %w(p1 p2 p3)
+    end
+    
+  end
+  
+  describe "load" do
+    
+    it "should load all docs for the given class" do
+      docs = (1..3).map { |i| Primitives.new :num => i }
+      RelaxDB.bulk_save! *docs
+      pms = Primitives.all.load!
+      pms.map { |p| p.num }.inject(&:+).should == 6
+    end
+    
+  end
+  
+  describe "destroy" do
+    
+    it "should destroy all docs for the given class" do
+      docs = (1..3).map { |i| Primitives.new :num => i }
+      RelaxDB.bulk_save! *docs
+      Primitives.all.destroy!
+      Primitives.all.load!.should == []
+    end
+    
+  end
+
+end

data/spec/callbacks_spec.rb

@@ -26,14 +26,14 @@ describe RelaxDB::Document, "callbacks" do
     
     it "should prevent the object from being saved if it returns false" do
       c = Class.new(RelaxDB::Document) do
-        before_save lambda { false }
+        before_save lambda { |o| false }
       end
       c.new.save.should == false
     end
     
     it "should add a description to errors when false is returned" do
       c = Class.new(RelaxDB::Document) do
-        before_save lambda { false }
+        before_save lambda { |o| false }
       end
       x = c.new
       x.save
@@ -42,14 +42,14 @@ describe RelaxDB::Document, "callbacks" do
 
     it "should not prevent the object from being saved if it returns nil" do
       c = Class.new(RelaxDB::Document) do
-        before_save lambda { nil }
+        before_save lambda { |o| nil }
       end
       c.new.save!
     end
     
     it "may be a proc" do
       c = Class.new(RelaxDB::Document) do
-        before_save lambda { false }
+        before_save lambda { |o| false }
       end
       c.new.save.should == false      
     end

data/spec/derived_properties_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/spec_models.rb'
 
 class DpInvite < RelaxDB::Document
   property :event_name, :derived => [:event, lambda { |en, i| i.event.name }]
-  belongs_to :event  
+  references :event  
 end
 
 class DpEvent < RelaxDB::Document
@@ -46,7 +46,7 @@ describe RelaxDB::Document, "derived properties" do
   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 }]
-      belongs_to :event
+      references :event
     end
     
     event = Class.new(RelaxDB::Document) do
@@ -61,7 +61,7 @@ describe RelaxDB::Document, "derived properties" do
   it "should have the existing value passed to the first lambda param" do
     invite = Class.new(RelaxDB::Document) do
       property :event_name, :derived => [:event, lambda { |en, i| en.nil? ? i.event.name : "bar" }]
-      belongs_to :event
+      references :event
     end
     
     event = Class.new(RelaxDB::Document) do
@@ -93,7 +93,7 @@ describe RelaxDB::Document, "derived properties" do
       invite = Class.new(RelaxDB::Document) do
         property :name, :derived => [:event, lambda { |en, i| i.event.name }]
         property :location, :derived => [:event, lambda { |en, i| i.event.location }]
-        belongs_to :event
+        references :event
       end
 
       event = Class.new(RelaxDB::Document) do

data/spec/design_doc_spec.rb

@@ -15,8 +15,8 @@ describe RelaxDB::DesignDocument do
   describe "#save" do
     
     it "should create a corresponding document in CouchDB" do
-      RelaxDB::DesignDocument.get("foo").save      
-      RelaxDB.load("_design/foo").should_not be_nil
+      RelaxDB::DesignDocument.get("foo").save
+      RelaxDB::DesignDocument.get("foo").should_not be_nil
     end
     
   end

data/spec/doc_inheritable_spec.rb

@@ -34,8 +34,8 @@ describe "Inheritance" do
       a = Ancestor.new(:x => 0).save!
       d = Descendant.new(:x => 1).save!
 
-      Ancestor.all.should == [a, d]
-      Descendant.all.should == [d]
+      Ancestor.all.load!.should include(a, d)
+      Descendant.all.load!.should == [d]
     end
 
     it "should function with inheritance trees" do

data/spec/document_spec.rb

@@ -25,10 +25,10 @@ describe RelaxDB::Document do
       p.viewed_at.should be_close(now, 1)
     end
     
-    it "will silently ignore parameters that don't specify class attributes" do
-      # Consider this a feature or bug. It allows an object containing both request params
-      # and superflous data to be passed directly to a constructor.
-      Post.new(:foo => "").save
+    it "will fail on parameters that don't specify class attributes" do
+      lambda {
+        Post.new :foo => ""
+      }.should raise_error
     end  
     
     it "should create a document with a non conflicing state" do
@@ -60,6 +60,11 @@ describe RelaxDB::Document do
       json = RelaxDB.get(p._id)
       json["created_at"].should == "1970/01/01 00:00:00 +0000"
     end
+
+    it "should allow to be called with an options argument, to be compatible with ActiveSupport" do
+      s = Time.at(0)
+      lambda { s.to_json( :active_support => 'love' ) }.should_not raise_error(ArgumentError)
+    end
     
   end
   
@@ -112,12 +117,11 @@ describe RelaxDB::Document do
       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
+    it "should set document conflict state on conflicting save" do      
+      a1, a2 = Atom.new(:_id => "a1"), Atom.new(:_id => "a1")
       a1.save!
       a2.save
-      a2.should be_update_conflict
+      a2.should be_update_conflict      
     end
         
   end
@@ -139,13 +143,26 @@ describe RelaxDB::Document do
     end   
     
     it "should raise UpdateConflict on an update conflict" do
-      a1 = Atom.new
-      a2 = a1.dup
+      a1, a2 = Atom.new(:_id => "a1"), Atom.new(:_id => "a1")
       a1.save!
       lambda { a2.save! }.should raise_error(RelaxDB::UpdateConflict)      
     end
     
   end
+  
+  describe "property" do
+    
+    it "may contain another object" do
+      a = Atom.new.save!
+      p = Primitives.new(:context => a).save!
+
+      p = RelaxDB.reload p
+      RelaxDB.db.reset_req_count
+      p.context.to_obj.should == a
+      RelaxDB.db.req_count.should == 0
+    end
+    
+  end
       
   describe "user defined property reader" do
     
@@ -158,27 +175,22 @@ describe RelaxDB::Document do
     it "should not modify internal state" do
       o = BespokeReader.new(:val => 101).save
       o = RelaxDB.load o._id
-      o.instance_variable_get(:@val).should == 101
+      o.data["val"].should == 101
     end
             
   end
 
   describe "user defined property writer" do
     
-    it "should not be used to modify state" do
+    # So this works now, but it hasn't in the past - this behaviour has changed
+    # many times. Use with caution i.e. it wouldn't be wise to rely on this
+    # across a large swathe of your codebase.
+    it "should only be used to modify state with caution" do
       o = BespokeWriter.new(:val => 101).save
       o = RelaxDB.load o._id
-      o.val.should == 81
+      o.val.should == 91
     end
-    
-    it "may be used if effectively idempotent" do
-      o = BespokeWriter.new(:tt => "2009/04/01").save
-      RelaxDB.reload(o).tt.should == Time.parse("2009/04/01")
-      
-      o = BespokeWriter.new(:tt => Time.now).save
-      RelaxDB.reload(o).tt.should be_close(Time.now, 2)
-    end
-        
+            
   end
   
   describe "loaded objects" do
@@ -190,10 +202,9 @@ describe RelaxDB::Document do
       p.str.should == "foo"
       p.num.should == 19.30
       p.true_bool.should be_true
-      # p.false_bool.should be_false
-      p.false_bool.should_not be
+      p.false_bool.should be_false
       p.created_at.should be_close(now, 1)
-      p.empty.should be_nil
+      p.context.should be_nil
     end
     
     it "should be saveable" do
@@ -542,4 +553,15 @@ describe RelaxDB::Document do
     
   end
   
+  describe "initialization process" do
+    
+    it "should not modify internal state unexpectedly" do
+      a = Atom.new
+      c = Contrived.new :context => a
+      c.context_count.should == 1
+      c.foo.should == 10
+    end
+    
+  end
+  
 end