relaxdb 0.3.5 → 0.5

data/spec/uuid_generator_spec.rb

@@ -0,0 +1,34 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+require File.dirname(__FILE__) + '/spec_models.rb'
+
+describe RelaxDB::UuidGenerator do
+    
+  before(:all) do
+    setup_test_db
+    @ug = RelaxDB::UuidGenerator
+  end
+  
+  before(:each) do
+    @ug.reset
+  end
+    
+  it "should retrieve UUIDs from CouchDB" do
+    RelaxDB.db.reset_req_count
+    @ug.uuid
+    RelaxDB.db.get_count.should == 1
+  end
+  
+  it "should retrieve count number of UUIDs" do
+    RelaxDB.db.reset_req_count
+    @ug.count = 1
+    3.times { @ug.uuid }
+    RelaxDB.db.get_count.should == 3
+  end
+  
+  it "should retrieve n UUIDs from CouchDB in a single request" do
+    RelaxDB.db.reset_req_count
+    100.times { @ug.uuid }
+    RelaxDB.db.get_count.should == 1
+  end
+  
+end

data/spec/view_by_spec.rb

@@ -3,74 +3,82 @@ require File.dirname(__FILE__) + '/spec_models.rb'
 
 describe "view_by" do
     
-  before(:all) do
-    RelaxDB.configure :host => "localhost", :port => 5984, :design_doc => "spec_doc"    
+  before(:each) do
+    setup_test_db
+                                                                      
+    docs = (1..10).map { |i| Primitives.new :_id => "id#{i}", :str => i.to_s }
+    RelaxDB.bulk_save! *docs
   end
     
-  describe "view_by" do
+  it "should return an array of doc ids for a key" do
+    docs = Primitives.by_str :key => "5"
+    docs.first.should == "id5"
+  end
+  
+  it "should obey startkey and endkey directives" do
+    docs = Primitives.by_str :startkey => "3", :endkey => "6"
+    docs.should == %w(id3 id4 id5 id6)
+  end
+  
+  it "should return all when none specified" do
+    docs = Primitives.by_str 
+    docs.size.should == 10
+  end
+  
+  it "should return arrays that behave normally" do
+    p1 = Primitives.by_str :key => "1"
+    p2 = Primitives.by_str :key => "2"
+    RelaxDB.load!(p1 + p2).map { |p| p.str }.join.should == "12" 
+  end
+  
+  describe "delegator" do
     
-    before(:each) do
-      RelaxDB.delete_db "relaxdb_spec" rescue "ok"
-      RelaxDB.use_db "relaxdb_spec"
-      RelaxDB.enable_view_creation
-
-      class ViewByFoo < RelaxDB::Document
-        property :foo
-        view_by :foo, :descending => true
-      end
-
+    it "should load the returned doc ids" do
+      docs = Primitives.by_str :key => "5"
+      docs.load!.first.str.should == "5"
     end
     
-    it "should create corresponding views" do
-      dd = RelaxDB::DesignDocument.get "spec_doc"
-      dd.data["views"]["ViewByFoo_by_foo"].should be
+    it "should load the doc for a single param" do
+      res = Primitives.by_str "8"
+      res.str.should == "8"
     end
-      
-    it "should create a by_ att list method" do
-      ViewByFoo.new(:foo => :bar).save!
-      res = ViewByFoo.by_foo
-      res.first.foo.should == "bar"
-    end
-        
-    it "should create a paginate_by_ att list method" do
-      ViewByFoo.new(:foo => :bar).save!      
-      res = ViewByFoo.paginate_by_foo :page_params => {}, :startkey => {}, :endkey => nil
-      res.first.foo.should == "bar"
+    
+    it "should return the delegator when no params given" do
+      docs = Primitives.by_str.load!
+      docs.map { |d| d.str }.join.length.should == 11
     end
         
-    it "should apply query defaults to by_" do
-      ViewByFoo.new(:foo => "a").save!
-      ViewByFoo.new(:foo => "b").save!
-      
-      ViewByFoo.by_foo.map{ |o| o.foo }.should == ["b", "a"]
-    end
+  end
+  
+  describe "request count" do
     
-    it "should allow a single arg to be passed to by_" do
-      vbf = ViewByFoo.new(:foo => "a").save!
-      ViewByFoo.by_foo("a").should == vbf
+    before(:each) do
+      RelaxDB.db.reset_req_count
     end
     
-    it "should apply query defaults to paginate_by_" do
-      ViewByFoo.new(:foo => "a").save!
-      ViewByFoo.new(:foo => "b").save!
-      
-      res = ViewByFoo.paginate_by_foo :page_params => {}, :startkey => {}, :endkey => nil
-      res.map{ |o| o.foo }.should == ["b", "a"]
+    it "should not issue any requests before accessingn the delegator" do
+      doc_ids = Primitives.by_str 
+      RelaxDB.db.req_count.should == 0
     end
-    
-    it "should allow query defaults to be overridden for paginate_by_" do
-      ViewByFoo.new(:foo => :bar).save!      
-      res = ViewByFoo.paginate_by_foo :page_params => {}, :startkey => nil, :endkey => {}, :descending => false
-      res.first.foo.should == "bar"      
+        
+    it "should issue a single request when retrieving ids only" do
+      doc_ids = Primitives.by_str 
+      doc_ids[0]
+      RelaxDB.db.req_count.should == 1
     end
     
-    it "should allow query defaults to be overridden for by_" do
-      ViewByFoo.new(:foo => "a").save!
-      ViewByFoo.new(:foo => "b").save!
-      
-      ViewByFoo.by_foo(:descending => false).map{ |o| o.foo }.should == ["a", "b"]
+    it "should make two requests when loading docs after touching ids" do
+      doc_ids = Primitives.by_str 
+      doc_ids[0].should == "id1"
+      doc_ids.load!
+      RelaxDB.db.req_count.should == 2
     end
-        
+    
+    it "should issue a single request when retrieving docs directly" do
+      Primitives.by_str.load!
+      RelaxDB.db.req_count.should == 1
+    end    
+    
   end
     
-end
+end

data/spec/view_docs_by_spec.rb

@@ -0,0 +1,85 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+require File.dirname(__FILE__) + '/spec_models.rb'
+
+describe "view_docs_by" do
+    
+  before(:all) do
+    RelaxDB.configure :host => "localhost", :port => 5984, :design_doc => "spec_doc"    
+  end
+    
+  describe "view_docs_by" do
+    
+    before(:each) do
+      RelaxDB.delete_db "relaxdb_spec" rescue "ok"
+      RelaxDB.use_db "relaxdb_spec"
+      RelaxDB.enable_view_creation
+
+      class ::ViewByFoo < RelaxDB::Document
+        property :foo
+        view_docs_by :foo, :descending => true
+      end
+      
+      RelaxDB::View.design_doc.save
+      
+    end
+    
+    it "should create corresponding views" do
+      dd = RelaxDB::DesignDocument.get "spec_doc"
+      dd.data["views"]["ViewByFoo_by_foo"].should be
+    end
+      
+    it "should create a by_ att list method" do
+      ViewByFoo.new(:foo => :bar).save!
+      res = ViewByFoo.by_foo
+      res.first.foo.should == "bar"
+    end
+        
+    it "should create a paginate_by_ att list method" do
+      ViewByFoo.new(:foo => :bar).save!      
+      res = ViewByFoo.paginate_by_foo :page_params => {}, :startkey => {}, :endkey => nil
+      res.first.foo.should == "bar"
+    end
+        
+    it "should apply query defaults to by_" do
+      ViewByFoo.new(:foo => "a").save!
+      ViewByFoo.new(:foo => "b").save!
+      
+      ViewByFoo.by_foo.map{ |o| o.foo }.should == ["b", "a"]
+    end
+    
+    it "should return the right count size" do
+      docs = (1..101).map { |i| ViewByFoo.new :foo => i }
+      RelaxDB.bulk_save! *docs
+      count = RelaxDB.view "ViewByFoo_by_foo", :reduce => true
+      count.should == 101
+    end
+    
+    it "should allow a single arg to be passed to by_" do
+      vbf = ViewByFoo.new(:foo => "a").save!
+      ViewByFoo.by_foo("a").should == vbf
+    end
+    
+    it "should apply query defaults to paginate_by_" do
+      ViewByFoo.new(:foo => "a").save!
+      ViewByFoo.new(:foo => "b").save!
+      
+      res = ViewByFoo.paginate_by_foo :page_params => {}, :startkey => {}, :endkey => nil
+      res.map{ |o| o.foo }.should == ["b", "a"]
+    end
+    
+    it "should allow query defaults to be overridden for paginate_by_" do
+      ViewByFoo.new(:foo => :bar).save!      
+      res = ViewByFoo.paginate_by_foo :page_params => {}, :startkey => nil, :endkey => {}, :descending => false
+      res.first.foo.should == "bar"      
+    end
+    
+    it "should allow query defaults to be overridden for by_" do
+      ViewByFoo.new(:foo => "a").save!
+      ViewByFoo.new(:foo => "b").save!
+      
+      ViewByFoo.by_foo(:descending => false).map{ |o| o.foo }.should == ["a", "b"]
+    end
+        
+  end
+    
+end

metadata

@@ -1,7 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: relaxdb
 version: !ruby/object:Gem::Version 
-  version: 0.3.5
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  version: "0.5"
 platform: ruby
 authors: 
 - Paul Carey
@@ -9,39 +13,47 @@ autorequire: relaxdb
 bindir: bin
 cert_chain: []
 
-date: 2009-10-22 00:00:00 +01:00
+date: 2010-04-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: extlib
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 4
         version: 0.9.4
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: uuid
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 description: RelaxDB provides a simple interface to CouchDB
 email: paul.p.carey@gmail.com
 executables: []
@@ -57,54 +69,51 @@ files:
 - readme.rb
 - Rakefile
 - docs/spec_results.html
-- lib/more/atomic_bulk_save_support.rb
 - lib/more/grapher.rb
 - lib/relaxdb/all_delegator.rb
-- lib/relaxdb/belongs_to_proxy.rb
 - lib/relaxdb/design_doc.rb
 - lib/relaxdb/document.rb
 - lib/relaxdb/extlib.rb
-- lib/relaxdb/has_many_proxy.rb
-- lib/relaxdb/has_one_proxy.rb
 - lib/relaxdb/migration.rb
 - lib/relaxdb/migration_version.rb
 - lib/relaxdb/net_http_server.rb
 - lib/relaxdb/paginate_params.rb
 - lib/relaxdb/paginator.rb
 - lib/relaxdb/query.rb
-- lib/relaxdb/references_many_proxy.rb
+- lib/relaxdb/references_proxy.rb
 - lib/relaxdb/relaxdb.rb
 - lib/relaxdb/server.rb
 - lib/relaxdb/taf2_curb_server.rb
 - lib/relaxdb/uuid_generator.rb
 - lib/relaxdb/validators.rb
+- lib/relaxdb/view_by_delegator.rb
 - lib/relaxdb/view_object.rb
 - lib/relaxdb/view_result.rb
 - lib/relaxdb/view_uploader.rb
 - lib/relaxdb/views.rb
 - lib/relaxdb.rb
-- spec/belongs_to_spec.rb
+- spec/all_delegator_spec.rb
 - spec/callbacks_spec.rb
 - spec/derived_properties_spec.rb
 - spec/design_doc_spec.rb
 - spec/doc_inheritable_spec.rb
 - spec/document_spec.rb
-- spec/has_many_spec.rb
-- spec/has_one_spec.rb
 - spec/migration_spec.rb
 - spec/migration_version_spec.rb
 - spec/paginate_params_spec.rb
 - spec/paginate_spec.rb
+- spec/qpaginate_spec.rb
 - spec/query_spec.rb
-- spec/references_many_spec.rb
+- spec/references_proxy_spec.rb
 - spec/relaxdb_spec.rb
 - spec/server_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/spec_models.rb
+- spec/uuid_generator_spec.rb
 - spec/view_by_spec.rb
+- spec/view_docs_by_spec.rb
 - spec/view_object_spec.rb
-- spec/view_spec.rb
 has_rdoc: true
 homepage: http://github.com/paulcarey/relaxdb/
 licenses: []
@@ -118,18 +127,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: RelaxDB provides a simple interface to CouchDB

data/lib/more/atomic_bulk_save_support.rb

@@ -1,18 +0,0 @@
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-require 'relaxdb'
-require File.dirname(__FILE__) + '/../../spec/spec_models.rb'
-
-RelaxDB.configure :host => "localhost", :port => 5984
-RelaxDB.delete_db "relaxdb_spec" rescue :ok
-RelaxDB.use_db "relaxdb_spec"
-
-a1 = Atom.new.save!
-a1_dup = a1.dup
-a1.save!
-begin
-  RelaxDB.bulk_save! a1_dup
-  puts "Atomic bulk_save _not_ supported"
-rescue RelaxDB::UpdateConflict
-  puts "Atomic bulk_save supported"
-end
-  

data/lib/relaxdb/has_many_proxy.rb

@@ -1,101 +0,0 @@
-module RelaxDB
-
-  class HasManyProxy
-
-    include Enumerable
-    
-    attr_reader :children
-  
-    def initialize(client, relationship, opts)
-      @client = client 
-      @relationship = relationship
-      @opts = opts
-
-      @target_class = opts[:class] 
-      @relationship_as_viewed_by_target = (opts[:known_as] || client.class.name.snake_case).to_s
-
-      @children = load_children
-    end
-
-    def <<(obj)
-      return false if @children.include?(obj)
-
-      obj.send("#{@relationship_as_viewed_by_target}=".to_sym, @client)
-      if obj.save
-        @children << obj
-        self
-      else
-        false
-      end
-    end
-  
-    def clear
-      @children.each do |c|
-        break_back_link c
-      end
-      @children.clear
-    end
-  
-    def delete(obj)
-      obj = @children.delete(obj)
-      break_back_link(obj) if obj
-    end
-  
-    def break_back_link(obj)
-      if obj
-        obj.send("#{@relationship_as_viewed_by_target}=".to_sym, nil)
-        obj.save
-      end
-    end
-  
-    def empty?
-      @children.empty?
-    end
-  
-    def size
-      @children.size
-    end
-  
-    def [](*args)
-      @children[*args]
-    end
-    
-    def first
-      @children[0]
-    end
-    
-    def last
-      @children[size-1]
-    end
-  
-    def each(&blk)
-      @children.each(&blk)
-    end
-  
-    def reload
-      @children = load_children
-    end
-  
-    def load_children
-      view_name = "#{@client.class}_#{@relationship}"
-      @children = RelaxDB.view(view_name, :key => @client._id)
-    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
-    end
-    
-    # Play nice with Merb partials - [ obj ].flatten invokes
-    # obj.to_ary if it responds to to_ary
-    alias_method :to_ary, :to_a
-  
-  end
-
-end