jrun-couchrest 0.12.6 → 0.17.1

data/lib/couchrest/validation/validators/required_field_validator.rb

@@ -0,0 +1,109 @@
+# Extracted from dm-validations 0.9.10
+#
+# Copyright (c) 2007 Guy van den Berg
+# 
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+module CouchRest
+  module Validation
+
+    ##
+    #
+    # @author Guy van den Berg
+    # @since  0.9
+    class RequiredFieldValidator < GenericValidator
+
+      def initialize(field_name, options={})
+        super
+        @field_name, @options = field_name, options
+      end
+
+      def call(target)
+        value = target.validation_property_value(field_name)
+        property = target.validation_property(field_name)
+        return true if present?(value, property)
+
+        error_message = @options[:message] || default_error(property)
+        add_error(target, error_message, field_name)
+
+        false
+      end
+
+      protected
+
+      # Boolean property types are considered present if non-nil.
+      # Other property types are considered present if non-blank.
+      # Non-properties are considered present if non-blank.
+      def present?(value, property)
+        boolean_type?(property) ? !value.nil? : !value.blank?
+      end
+
+      def default_error(property)
+        actual = boolean_type?(property) ? :nil : :blank
+        ValidationErrors.default_error_message(actual, field_name)
+      end
+
+      # Is +property+ a boolean property?
+      #
+      # Returns true for Boolean, ParanoidBoolean, TrueClass, etc. properties.
+      # Returns false for other property types.
+      # Returns false for non-properties.
+      def boolean_type?(property)
+        property ? property.type == TrueClass : false
+      end
+
+    end # class RequiredFieldValidator
+
+    module ValidatesPresent
+
+      ##
+      # Validates that the specified attribute is present.
+      #
+      # For most property types "being present" is the same as being "not
+      # blank" as determined by the attribute's #blank? method. However, in
+      # the case of Boolean, "being present" means not nil; i.e. true or
+      # false.
+      #
+      # @note
+      #   dm-core's support lib adds the blank? method to many classes,
+      # @see lib/dm-core/support/blank.rb (dm-core) for more information.
+      #
+      # @example [Usage]
+      #
+      #   class Page
+      #
+      #     property :required_attribute, String
+      #     property :another_required, String
+      #     property :yet_again, String
+      #
+      #     validates_present :required_attribute
+      #     validates_present :another_required, :yet_again
+      #
+      #     # a call to valid? will return false unless
+      #     # all three attributes are !blank?
+      #   end
+      def validates_present(*fields)
+        opts = opts_from_validator_args(fields)
+        add_validator_to_context(opts, fields, CouchRest::Validation::RequiredFieldValidator)
+      end
+
+    end # module ValidatesPresent
+  end # module Validation
+end # module CouchRest

data/spec/couchrest/core/database_spec.rb

@@ -149,8 +149,8 @@ describe CouchRest::Database do
           {"mild" => "yet local"},
           {"another" => ["set","of","keys"]}
         ])
-      rs['new_revs'].each do |r|
-        @db.get(r['id'])
+      rs.each do |r|
+        @db.get(r['id']).rev.should == r["rev"]
       end
     end
     
@@ -170,26 +170,10 @@ describe CouchRest::Database do
           {"_id" => "twoB", "mild" => "yet local"},
           {"another" => ["set","of","keys"]}
         ])
-      rs['new_revs'].each do |r|
-        @db.get(r['id'])
+      rs.each do |r|
+        @db.get(r['id']).rev.should == r["rev"]
       end
     end
-    
-    it "in the case of an id conflict should not insert anything" do
-      @r = @db.save_doc({'lemons' => 'from texas', 'and' => 'how', "_id" => "oneB"})
-      
-      lambda do
-      rs = @db.bulk_save([
-          {"_id" => "oneB", "wild" => "and random"},
-          {"_id" => "twoB", "mild" => "yet local"},
-          {"another" => ["set","of","keys"]}
-        ])
-      end.should raise_error(RestClient::RequestFailed)
-    
-      lambda do
-        @db.get('twoB')
-      end.should raise_error(RestClient::ResourceNotFound)
-    end
 
     it "should empty the bulk save cache if no documents are given" do
       @db.save_doc({"_id" => "bulk_cache_1", "val" => "test"}, true)
@@ -244,12 +228,14 @@ describe CouchRest::Database do
           }
         }
       }
-      @db.save(@doc)
+      @db.save_doc(@doc)
     end
     
-    it "should get the attachment with the doc's _id" do
-      @db.fetch_attachment("mydocwithattachment", "test.html").should == @attach
-    end
+    # Depreacated
+    # it "should get the attachment with the doc's _id" do
+    #   @db.fetch_attachment("mydocwithattachment", "test.html").should == @attach
+    # end
+    
     it "should get the attachment with the doc itself" do
       @db.fetch_attachment(@db.get('mydocwithattachment'), 'test.html').should == @attach
     end
@@ -266,7 +252,8 @@ describe CouchRest::Database do
     it "should save the attachment to a new doc" do
       r = @db.put_attachment({'_id' => 'attach-this'}, 'couchdb.png', image = @file.read, {:content_type => 'image/png'})
       r['ok'].should == true
-      attachment = @db.fetch_attachment("attach-this","couchdb.png")
+      doc = @db.get("attach-this")
+      attachment = @db.fetch_attachment(doc,"couchdb.png")
       attachment.should == image
     end
   end
@@ -274,7 +261,7 @@ describe CouchRest::Database do
   describe "PUT document with attachment" do
     before(:each) do
       @attach = "<html><head><title>My Doc</title></head><body><p>Has words.</p></body></html>"
-      @doc = {
+      doc = {
         "_id" => "mydocwithattachment",
         "field" => ["some value"],
         "_attachments" => {
@@ -284,14 +271,14 @@ describe CouchRest::Database do
           }
         }
       }
-      @db.save_doc(@doc)
+      @db.save_doc(doc)
+      @doc = @db.get("mydocwithattachment")
     end
     it "should save and be indicated" do
-      doc = @db.get("mydocwithattachment")
-      doc['_attachments']['test.html']['length'].should == @attach.length
+      @doc['_attachments']['test.html']['length'].should == @attach.length
     end
     it "should be there" do
-      attachment = @db.fetch_attachment("mydocwithattachment","test.html")
+      attachment = @db.fetch_attachment(@doc,"test.html")
       attachment.should == @attach
     end
   end
@@ -309,14 +296,15 @@ describe CouchRest::Database do
         }
       }
       @db.save_doc(doc)
-      doc = @db.get('mydocwithattachment')
+      doc['_rev'].should_not be_nil
       doc['field'] << 'another value'
-      @db.save_doc(doc)
+      @db.save_doc(doc)["ok"].should be_true
     end
     
     it 'should be there' do
-      attachment = @db.fetch_attachment('mydocwithattachment', 'test.html')
-      attachment.should == @attach
+      doc = @db.get('mydocwithattachment')
+      attachment = @db.fetch_attachment(doc, 'test.html')
+      Base64.decode64(attachment).should == @attach
     end
   end
 
@@ -339,18 +327,18 @@ describe CouchRest::Database do
         }
       }
       @db.save_doc(@doc)
+      @doc = @db.get("mydocwithattachment")
     end
     it "should save and be indicated" do
-      doc = @db.get("mydocwithattachment")
-      doc['_attachments']['test.html']['length'].should == @attach.length
-      doc['_attachments']['other.html']['length'].should == @attach2.length
+      @doc['_attachments']['test.html']['length'].should == @attach.length
+      @doc['_attachments']['other.html']['length'].should == @attach2.length
     end
     it "should be there" do
-      attachment = @db.fetch_attachment("mydocwithattachment","test.html")
+      attachment = @db.fetch_attachment(@doc,"test.html")
       attachment.should == @attach
     end
     it "should be there" do
-      attachment = @db.fetch_attachment("mydocwithattachment","other.html")
+      attachment = @db.fetch_attachment(@doc,"other.html")
       attachment.should == @attach2
     end
   end
@@ -366,13 +354,13 @@ describe CouchRest::Database do
           }
         }
       }
-      @db.save(doc)
+      @db.save_doc(doc)
       @doc = @db.get('mydocwithattachment')
     end
     it "should delete the attachment" do
-      lambda { @db.fetch_attachment('mydocwithattachment','test.html') }.should_not raise_error
+      lambda { @db.fetch_attachment(@doc,'test.html') }.should_not raise_error
       @db.delete_attachment(@doc, "test.html")
-      lambda { @db.fetch_attachment('mydocwithattachment','test.html') }.should raise_error(RestClient::ResourceNotFound)
+      lambda { @db.fetch_attachment(@doc,'test.html') }.should raise_error(RestClient::ResourceNotFound)
     end
   end
 
@@ -395,7 +383,8 @@ describe CouchRest::Database do
       doc['_attachments']['http://example.com/stuff.cgi?things=and%20stuff']['length'].should == @attach.length
     end
     it "should be there" do
-      attachment = @db.fetch_attachment(@docid,"http://example.com/stuff.cgi?things=and%20stuff")
+      doc = @db.get(@docid)
+      attachment = @db.fetch_attachment(doc,"http://example.com/stuff.cgi?things=and%20stuff")
       attachment.should == @attach
     end
   end
@@ -565,49 +554,6 @@ describe CouchRest::Database do
     end
   end
   
-  describe "MOVE existing document" do
-    before :each do
-      @r = @db.save_doc({'artist' => 'Zappa', 'title' => 'Muffin Man'})
-      @docid = 'tracks/zappa/muffin-man'
-      @doc = @db.get(@r['id'])
-    end
-    describe "to a new location" do
-      it "should work" do
-        @db.move_doc @doc, @docid
-        newdoc = @db.get(@docid)
-        newdoc['artist'].should == 'Zappa'
-        lambda {@db.get(@r['id'])}.should raise_error(RestClient::ResourceNotFound)
-      end
-      it "should fail without an _id or _rev" do
-        lambda{@db.move({"not"=>"a real doc"})}.should raise_error(ArgumentError)
-        lambda{@db.move({"_id"=>"not a real doc"})}.should raise_error(ArgumentError)
-      end
-    end
-    describe "to an existing location" do
-      before :each do
-        @db.save_doc({'_id' => @docid, 'will-exist' => 'here'})
-      end
-      it "should fail without a rev" do
-        lambda{@db.move_doc @doc, @docid}.should raise_error(RestClient::RequestFailed)
-        lambda{@db.get(@r['id'])}.should_not raise_error
-      end
-      it "should succeed with a rev" do
-        @to_be_overwritten = @db.get(@docid)
-        @db.move_doc @doc, "#{@docid}?rev=#{@to_be_overwritten['_rev']}"
-        newdoc = @db.get(@docid)
-        newdoc['artist'].should == 'Zappa'
-        lambda {@db.get(@r['id'])}.should raise_error(RestClient::ResourceNotFound)
-      end
-      it "should succeed given the doc to overwrite" do
-        @to_be_overwritten = @db.get(@docid)
-        @db.move_doc @doc, @to_be_overwritten
-        newdoc = @db.get(@docid)
-        newdoc['artist'].should == 'Zappa'
-        lambda {@db.get(@r['id'])}.should raise_error(RestClient::ResourceNotFound)
-      end
-    end
-  end
-  
   
   it "should list documents" do
     5.times do
@@ -672,7 +618,7 @@ describe CouchRest::Database do
   
   describe "replicating a database" do
     before do
-      @db.save({'_id' => 'test_doc', 'some-value' => 'foo'})
+      @db.save_doc({'_id' => 'test_doc', 'some-value' => 'foo'})
       @other_db = @cr.database 'couchrest-test-replication'
       @other_db.delete! rescue nil
       @other_db = @cr.create_db 'couchrest-test-replication'
@@ -704,7 +650,7 @@ describe CouchRest::Database do
   describe "creating a database" do
     before(:each) do
       @db = @cr.database('couchrest-test-db_to_create')
-      @db.delete!
+      @db.delete! if @cr.databases.include?('couchrest-test-db_to_create')
     end
     
     it "should just work fine" do
@@ -742,4 +688,4 @@ describe CouchRest::Database do
   end
 
 
-end
+end

data/spec/couchrest/core/document_spec.rb

@@ -199,57 +199,13 @@ describe CouchRest::Document do
       end
     end
   end
-
-  describe "MOVE existing document" do
-    before :each do
-      @db = reset_test_db!
-      @resp = @db.save_doc({'key' => 'value'})
-      @docid = 'new-location'
-      @doc = @db.get(@resp['id'])
-    end
-    describe "to a new location" do
-      it "should work" do
-        @doc.move @docid
-        newdoc = @db.get(@docid)
-        newdoc['key'].should == 'value'
-        lambda {@db.get(@resp['id'])}.should raise_error(RestClient::ResourceNotFound)
-      end
-      it "should fail without a database" do
-        lambda{CouchRest::Document.new({"not"=>"a real doc"}).move}.should raise_error(ArgumentError)
-        lambda{CouchRest::Document.new({"_id"=>"not a real doc"}).move}.should raise_error(ArgumentError)
-      end
-    end
-    describe "to an existing location" do
-      before :each do
-        @db.save_doc({'_id' => @docid, 'will-exist' => 'here'})
-      end
-      it "should fail without a rev" do
-        lambda{@doc.move @docid}.should raise_error(RestClient::RequestFailed)
-        lambda{@db.get(@resp['id'])}.should_not raise_error
-      end
-      it "should succeed with a rev" do
-        @to_be_overwritten = @db.get(@docid)
-        @doc.move "#{@docid}?rev=#{@to_be_overwritten['_rev']}"
-        newdoc = @db.get(@docid)
-        newdoc['key'].should == 'value'
-        lambda {@db.get(@resp['id'])}.should raise_error(RestClient::ResourceNotFound)
-      end
-      it "should succeed given the doc to overwrite" do
-        @to_be_overwritten = @db.get(@docid)
-        @doc.move @to_be_overwritten
-        newdoc = @db.get(@docid)
-        newdoc['key'].should == 'value'
-        lambda {@db.get(@resp['id'])}.should raise_error(RestClient::ResourceNotFound)
-      end
-    end
-  end
 end
 
 describe "dealing with attachments" do
   before do
     @db = reset_test_db!
     @attach = "<html><head><title>My Doc</title></head><body><p>Has words.</p></body></html>"
-    response = @db.save({'key' => 'value'})
+    response = @db.save_doc({'key' => 'value'})
     @doc = @db.get(response['id'])
   end
   

data/spec/couchrest/core/server_spec.rb

@@ -0,0 +1,35 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe CouchRest::Server do
+  
+  describe "available databases" do
+    before(:each) do
+      @couch = CouchRest::Server.new
+    end
+
+    after(:each) do
+      @couch.available_databases.each do |ref, db|
+        db.delete!
+      end
+    end
+    
+    it "should let you add more databases" do
+      @couch.available_databases.should be_empty
+      @couch.define_available_database(:default, "cr-server-test-db")
+      @couch.available_databases.keys.should include(:default)
+    end
+    
+    it "should verify that a database is available" do
+      @couch.define_available_database(:default, "cr-server-test-db")
+      @couch.available_database?(:default).should be_true
+      @couch.available_database?("cr-server-test-db").should be_true
+      @couch.available_database?(:matt).should be_false
+    end
+    
+    it "should let you set a default database" do
+      @couch.default_database = 'cr-server-test-default-db'
+      @couch.available_database?(:default).should be_true
+    end
+  end
+  
+end

data/spec/couchrest/more/casted_extended_doc_spec.rb

@@ -0,0 +1,40 @@
+require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require File.join(FIXTURE_PATH, 'more', 'card')
+
+class Car < CouchRest::ExtendedDocument
+  use_database TEST_SERVER.default_database
+  
+  property :name
+  property :driver, :cast_as => 'Driver'
+end
+
+class Driver < CouchRest::ExtendedDocument
+  use_database TEST_SERVER.default_database
+  # You have to add a casted_by accessor if you want to reach a casted extended doc parent
+  attr_accessor :casted_by
+  
+  property :name
+end
+
+describe "casting an extended document" do
+  
+  before(:each) do
+    @car    = Car.new(:name => 'Renault 306')
+    @driver = Driver.new(:name => 'Matt')
+  end
+  
+  # it "should not create an empty casted object" do
+  #   @car.driver.should be_nil
+  # end
+  
+  it "should let you assign the casted attribute after instantializing an object" do
+    @car.driver = @driver
+    @car.driver.name.should == 'Matt'
+  end
+  
+  it "should let the casted document who casted it" do
+    Car.new(:name => 'Renault 306', :driver => @driver)
+    @car.driver.casted_by.should == @car
+  end
+  
+end