couchrest 0.12.4 → 0.23

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

@@ -0,0 +1,89 @@
+# 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 MethodValidator < GenericValidator
+
+      def initialize(field_name, options={})
+        super
+        @field_name, @options = field_name, options.clone
+        @options[:method] = @field_name unless @options.has_key?(:method)
+      end
+
+      def call(target)
+        result, message = target.send(@options[:method])
+        add_error(target, message, field_name) unless result
+        result
+      end
+
+      def ==(other)
+        @options[:method] == other.instance_variable_get(:@options)[:method] && super
+      end
+    end # class MethodValidator
+
+    module ValidatesWithMethod
+
+      ##
+      # Validate using the given method. The method given needs to return:
+      # [result::<Boolean>, Error Message::<String>]
+      #
+      # @example [Usage]
+      #
+      #   class Page
+      #
+      #     property :zip_code, String
+      #
+      #     validates_with_method :in_the_right_location?
+      #
+      #     def in_the_right_location?
+      #       if @zip_code == "94301"
+      #         return true
+      #       else
+      #         return [false, "You're in the wrong zip code"]
+      #       end
+      #     end
+      #
+      #     # A call to valid? will return false and
+      #     # populate the object's errors with "You're in the
+      #     # wrong zip code" unless zip_code == "94301"
+      #
+      #     # You can also specify field:
+      #
+      #     validates_with_method :zip_code, :in_the_right_location?
+      #
+      #     # it will add returned error message to :zip_code field
+      #
+      def validates_with_method(*fields)
+        opts = opts_from_validator_args(fields)
+        add_validator_to_context(opts, fields, CouchRest::Validation::MethodValidator)
+      end
+
+    end # module ValidatesWithMethod
+  end # module Validation
+end # module CouchRest

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

@@ -0,0 +1,104 @@
+# 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 NumericValidator < GenericValidator
+
+      def initialize(field_name, options={})
+        super
+        @field_name, @options = field_name, options
+        @options[:integer_only] = false unless @options.has_key?(:integer_only)
+      end
+
+      def call(target)
+        value = target.send(field_name)
+        return true if @options[:allow_nil] && value.nil?
+
+        value = value.kind_of?(Float) ? value.to_s('F') : value.to_s
+
+        error_message = @options[:message]
+        precision     = @options[:precision]
+        scale         = @options[:scale]
+
+        if @options[:integer_only]
+          return true if value =~ /\A[+-]?\d+\z/
+          error_message ||= ValidationErrors.default_error_message(:not_an_integer, field_name)
+        else
+          # FIXME: if precision and scale are not specified, can we assume that it is an integer?
+          #        probably not, as floating point numbers don't have hard
+          #        defined scale. the scale floats with the length of the
+          #        integral and precision. Ie. if precision = 10 and integral
+          #        portion of the number is 9834 (4 digits), the max scale will
+          #        be 6 (10 - 4). But if the integral length is 1, max scale
+          #        will be (10 - 1) = 9, so 1.234567890.
+          if precision && scale
+            #handles both Float when it has scale specified and BigDecimal
+            if precision > scale && scale > 0
+              return true if value =~ /\A[+-]?(?:\d{1,#{precision - scale}}|\d{0,#{precision - scale}}\.\d{1,#{scale}})\z/
+            elsif precision > scale && scale == 0
+              return true if value =~ /\A[+-]?(?:\d{1,#{precision}}(?:\.0)?)\z/
+            elsif precision == scale
+              return true if value =~ /\A[+-]?(?:0(?:\.\d{1,#{scale}})?)\z/
+            else
+              raise ArgumentError, "Invalid precision #{precision.inspect} and scale #{scale.inspect} for #{field_name} (value: #{value.inspect} #{value.class})"
+            end
+          elsif precision && scale.nil?
+            # for floats, if scale is not set
+
+            #total number of digits is less or equal precision
+            return true if value.gsub(/[^\d]/, '').length <= precision
+
+            #number of digits before decimal == precision, and the number is x.0. same as scale = 0
+            return true if value =~ /\A[+-]?(?:\d{1,#{precision}}(?:\.0)?)\z/
+          else
+            return true if value =~ /\A[+-]?(?:\d+|\d*\.\d+)\z/
+          end
+          error_message ||= ValidationErrors.default_error_message(:not_a_number, field_name)
+        end
+
+        add_error(target, error_message, field_name)
+
+        # TODO: check the gt, gte, lt, lte, and eq options
+
+        return false
+      end
+    end # class NumericValidator
+
+    module ValidatesIsNumber
+
+      # Validate whether a field is numeric
+      #
+      def validates_is_number(*fields)
+        opts = opts_from_validator_args(fields)
+        add_validator_to_context(opts, fields, CouchRest::Validation::NumericValidator)
+      end
+
+    end # module ValidatesIsNumber
+  end # module Validation
+end # module CouchRest

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

@@ -7,7 +7,15 @@ describe CouchRest::Database do
     @db.delete! rescue nil
     @db = @cr.create_db(TESTDB) rescue nil
   end
-    
+
+  describe "database name including slash" do
+    it "should escape the name in the URI" do
+      db = @cr.database("foo/bar")
+      db.name.should == "foo/bar"
+      db.uri.should == "#{COUCHHOST}/foo%2Fbar"
+    end
+  end
+
   describe "map query with _temp_view in Javascript" do
     before(:each) do
       @db.bulk_save([
@@ -61,7 +69,7 @@ describe CouchRest::Database do
           emit(doc.word,null);
         }
       }'}}
-      @db.save({
+      @db.save_doc({
         "_id" => "_design/test",
         :views => @view
       })
@@ -80,7 +88,7 @@ describe CouchRest::Database do
   
   describe "select from an existing view" do
     before(:each) do
-      r = @db.save({
+      r = @db.save_doc({
         "_id" => "_design/first", 
         :views => {
           :test => {
@@ -129,9 +137,9 @@ describe CouchRest::Database do
 
   describe "GET (document by id) when the doc exists" do
     before(:each) do
-      @r = @db.save({'lemons' => 'from texas', 'and' => 'spain'})
+      @r = @db.save_doc({'lemons' => 'from texas', 'and' => 'spain'})
       @docid = "http://example.com/stuff.cgi?things=and%20stuff"
-      @db.save({'_id' => @docid, 'will-exist' => 'here'})
+      @db.save_doc({'_id' => @docid, 'will-exist' => 'here'})
     end
     it "should get the document" do
       doc = @db.get(@r['id'])
@@ -149,8 +157,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,29 +178,13 @@ 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({'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({"_id" => "bulk_cache_1", "val" => "test"}, true)
+      @db.save_doc({"_id" => "bulk_cache_1", "val" => "test"}, true)
       lambda do
         @db.get('bulk_cache_1')
       end.should raise_error(RestClient::ResourceNotFound)
@@ -201,7 +193,7 @@ describe CouchRest::Database do
     end
 
     it "should raise an error that is useful for recovery" do
-      @r = @db.save({"_id" => "taken", "field" => "stuff"})
+      @r = @db.save_doc({"_id" => "taken", "field" => "stuff"})
       begin
         rs = @db.bulk_save([
             {"_id" => "taken", "wild" => "and random"},
@@ -220,17 +212,43 @@ describe CouchRest::Database do
       @db.documents["total_rows"].should == 0
     end
     it "should create the document and return the id" do
-      r = @db.save({'lemons' => 'from texas', 'and' => 'spain'})
+      r = @db.save_doc({'lemons' => 'from texas', 'and' => 'spain'})
       r2 = @db.get(r['id'])
       r2["lemons"].should == "from texas"
     end
     it "should use PUT with UUIDs" do
       CouchRest.should_receive(:put).and_return({"ok" => true, "id" => "100", "rev" => "55"})
-      r = @db.save({'just' => ['another document']})      
+      r = @db.save_doc({'just' => ['another document']})      
     end
     
   end
-
+  
+  describe "fetch_attachment" do
+    before do
+      @attach = "<html><head><title>My Doc</title></head><body><p>Has words.</p></body></html>"
+      @doc = {
+        "_id" => "mydocwithattachment",
+        "field" => ["some value"],
+        "_attachments" => {
+          "test.html" => {
+            "type" => "text/html",
+            "data" => @attach
+          }
+        }
+      }
+      @db.save_doc(@doc)
+    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
+  end
+  
   describe "PUT attachment from file" do
     before(:each) do
       filename = FIXTURE_PATH + '/attachments/couchdb.png'
@@ -242,7 +260,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
@@ -250,7 +269,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" => {
@@ -260,14 +279,14 @@ describe CouchRest::Database do
           }
         }
       }
-      @db.save(@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
@@ -284,15 +303,16 @@ describe CouchRest::Database do
           }
         }
       }
-      @db.save(doc)
-      doc = @db.get('mydocwithattachment')
+      @db.save_doc(doc)
+      doc['_rev'].should_not be_nil
       doc['field'] << 'another value'
-      @db.save(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
 
@@ -314,22 +334,43 @@ describe CouchRest::Database do
           }
         }
       }
-      @db.save(@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']['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
+  
+  describe "DELETE an attachment directly from the database" do
+    before(:each) do
+      doc = {
+        '_id' => 'mydocwithattachment',
+        '_attachments' => {
+          'test.html' => {
+            'type' => 'text/html',
+            'data' => "<html><head><title>My Doc</title></head><body><p>Has words.</p></body></html>"
+          }
+        }
+      }
+      @db.save_doc(doc)
+      @doc = @db.get('mydocwithattachment')
+    end
+    it "should delete the attachment" do
+      lambda { @db.fetch_attachment(@doc,'test.html') }.should_not raise_error
+      @db.delete_attachment(@doc, "test.html")
+      lambda { @db.fetch_attachment(@doc,'test.html') }.should raise_error(RestClient::ResourceNotFound)
+    end
+  end
 
   describe "POST document with attachment (with funky name)" do
     before(:each) do
@@ -343,14 +384,15 @@ describe CouchRest::Database do
           }
         }
       }
-      @docid = @db.save(@doc)['id']
+      @docid = @db.save_doc(@doc)['id']
     end
     it "should save and be indicated" do
       doc = @db.get(@docid)
       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
@@ -358,15 +400,15 @@ describe CouchRest::Database do
   describe "PUT (new document with url id)" do
     it "should create the document" do
       @docid = "http://example.com/stuff.cgi?things=and%20stuff"
-      @db.save({'_id' => @docid, 'will-exist' => 'here'})
-      lambda{@db.save({'_id' => @docid})}.should raise_error(RestClient::Request::RequestFailed)
+      @db.save_doc({'_id' => @docid, 'will-exist' => 'here'})
+      lambda{@db.save_doc({'_id' => @docid})}.should raise_error(RestClient::Request::RequestFailed)
       @db.get(@docid)['will-exist'].should == 'here'
     end
   end
   
   describe "PUT (new document with id)" do
     it "should start without the document" do
-      # r = @db.save({'lemons' => 'from texas', 'and' => 'spain'})
+      # r = @db.save_doc({'lemons' => 'from texas', 'and' => 'spain'})
       @db.documents['rows'].each do |doc|
         doc['id'].should_not == 'my-doc'
       end
@@ -375,17 +417,17 @@ describe CouchRest::Database do
       # or instead make it return something with a fancy <=> method
     end
     it "should create the document" do
-      @db.save({'_id' => 'my-doc', 'will-exist' => 'here'})
-      lambda{@db.save({'_id' => 'my-doc'})}.should raise_error(RestClient::Request::RequestFailed)
+      @db.save_doc({'_id' => 'my-doc', 'will-exist' => 'here'})
+      lambda{@db.save_doc({'_id' => 'my-doc'})}.should raise_error(RestClient::Request::RequestFailed)
     end
   end
   
   describe "PUT (existing document with rev)" do
     before(:each) do
-      @db.save({'_id' => 'my-doc', 'will-exist' => 'here'})
+      @db.save_doc({'_id' => 'my-doc', 'will-exist' => 'here'})
       @doc = @db.get('my-doc')
       @docid = "http://example.com/stuff.cgi?things=and%20stuff"
-      @db.save({'_id' => @docid, 'now' => 'save'})
+      @db.save_doc({'_id' => @docid, 'now' => 'save'})
     end
     it "should start with the document" do
       @doc['will-exist'].should == 'here'
@@ -394,18 +436,18 @@ describe CouchRest::Database do
     it "should save with url id" do
       doc = @db.get(@docid)
       doc['yaml'] = ['json', 'word.']
-      @db.save doc
+      @db.save_doc doc
       @db.get(@docid)['yaml'].should == ['json', 'word.']
     end
     it "should fail to resave without the rev" do
       @doc['them-keys'] = 'huge'
       @doc['_rev'] = 'wrong'
-      # @db.save(@doc)
-      lambda {@db.save(@doc)}.should raise_error
+      # @db.save_doc(@doc)
+      lambda {@db.save_doc(@doc)}.should raise_error
     end
     it "should update the document" do
       @doc['them-keys'] = 'huge'
-      @db.save(@doc)
+      @db.save_doc(@doc)
       now = @db.get('my-doc')
       now['them-keys'].should == 'huge'
     end
@@ -414,7 +456,7 @@ describe CouchRest::Database do
   describe "cached bulk save" do
     it "stores documents in a database-specific cache" do
       td = {"_id" => "btd1", "val" => "test"}
-      @db.save(td, true)
+      @db.save_doc(td, true)
       @db.instance_variable_get("@bulk_save_cache").should == [td]
       
     end
@@ -423,8 +465,8 @@ describe CouchRest::Database do
       @db.bulk_save_cache_limit = 3
       td1 = {"_id" => "td1", "val" => true}
       td2 = {"_id" => "td2", "val" => 4}
-      @db.save(td1, true)
-      @db.save(td2, true)
+      @db.save_doc(td1, true)
+      @db.save_doc(td2, true)
       lambda do
         @db.get(td1["_id"])
       end.should raise_error(RestClient::ResourceNotFound)
@@ -432,7 +474,7 @@ describe CouchRest::Database do
         @db.get(td2["_id"])
       end.should raise_error(RestClient::ResourceNotFound)
       td3 = {"_id" => "td3", "val" => "foo"}
-      @db.save(td3, true)
+      @db.save_doc(td3, true)
       @db.get(td1["_id"])["val"].should == td1["val"]
       @db.get(td2["_id"])["val"].should == td2["val"]
       @db.get(td3["_id"])["val"].should == td3["val"]
@@ -442,11 +484,11 @@ describe CouchRest::Database do
       td1 = {"_id" => "blah", "val" => true}
       td2 = {"_id" => "steve", "val" => 3}
       @db.bulk_save_cache_limit = 50
-      @db.save(td1, true)
+      @db.save_doc(td1, true)
       lambda do
         @db.get(td1["_id"])
       end.should raise_error(RestClient::ResourceNotFound)
-      @db.save(td2)
+      @db.save_doc(td2)
       @db.get(td1["_id"])["val"].should == td1["val"]
       @db.get(td2["_id"])["val"].should == td2["val"]
     end
@@ -454,27 +496,27 @@ describe CouchRest::Database do
 
   describe "DELETE existing document" do
     before(:each) do
-      @r = @db.save({'lemons' => 'from texas', 'and' => 'spain'})
+      @r = @db.save_doc({'lemons' => 'from texas', 'and' => 'spain'})
       @docid = "http://example.com/stuff.cgi?things=and%20stuff"
-      @db.save({'_id' => @docid, 'will-exist' => 'here'})
+      @db.save_doc({'_id' => @docid, 'will-exist' => 'here'})
     end
     it "should work" do
       doc = @db.get(@r['id'])
       doc['and'].should == 'spain'
-      @db.delete doc
+      @db.delete_doc doc
       lambda{@db.get @r['id']}.should raise_error
     end
     it "should work with uri id" do
       doc = @db.get(@docid)
-      @db.delete doc
+      @db.delete_doc doc
       lambda{@db.get @docid}.should raise_error
     end
     it "should fail without an _id" do
-      lambda{@db.delete({"not"=>"a real doc"})}.should raise_error(ArgumentError)
+      lambda{@db.delete_doc({"not"=>"a real doc"})}.should raise_error(ArgumentError)
     end
     it "should defer actual deletion when using bulk save" do
       doc = @db.get(@docid)
-      @db.delete doc, true
+      @db.delete_doc doc, true
       lambda{@db.get @docid}.should_not raise_error
       @db.bulk_save
       lambda{@db.get @docid}.should raise_error
@@ -484,13 +526,13 @@ describe CouchRest::Database do
   
   describe "COPY existing document" do
     before :each do
-      @r = @db.save({'artist' => 'Zappa', 'title' => 'Muffin Man'})
+      @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.copy @doc, @docid
+        @db.copy_doc @doc, @docid
         newdoc = @db.get(@docid)
         newdoc['artist'].should == 'Zappa'
       end
@@ -500,73 +542,30 @@ describe CouchRest::Database do
     end
     describe "to an existing location" do
       before :each do
-        @db.save({'_id' => @docid, 'will-exist' => 'here'})
+        @db.save_doc({'_id' => @docid, 'will-exist' => 'here'})
       end
       it "should fail without a rev" do
-        lambda{@db.copy @doc, @docid}.should raise_error(RestClient::RequestFailed)
+        lambda{@db.copy_doc @doc, @docid}.should raise_error(RestClient::RequestFailed)
       end
       it "should succeed with a rev" do
         @to_be_overwritten = @db.get(@docid)
-        @db.copy @doc, "#{@docid}?rev=#{@to_be_overwritten['_rev']}"
+        @db.copy_doc @doc, "#{@docid}?rev=#{@to_be_overwritten['_rev']}"
         newdoc = @db.get(@docid)
         newdoc['artist'].should == 'Zappa'
       end
       it "should succeed given the doc to overwrite" do
         @to_be_overwritten = @db.get(@docid)
-        @db.copy @doc, @to_be_overwritten
+        @db.copy_doc @doc, @to_be_overwritten
         newdoc = @db.get(@docid)
         newdoc['artist'].should == 'Zappa'
       end
     end
   end
   
-  describe "MOVE existing document" do
-    before :each do
-      @r = @db.save({'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, @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({'_id' => @docid, 'will-exist' => 'here'})
-      end
-      it "should fail without a rev" do
-        lambda{@db.move @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, "#{@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, @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
-      @db.save({'another' => 'doc', 'will-exist' => 'anywhere'})
+      @db.save_doc({'another' => 'doc', 'will-exist' => 'anywhere'})
     end
     ds = @db.documents
     ds['rows'].should be_an_instance_of(Array)
@@ -577,7 +576,7 @@ describe CouchRest::Database do
   describe "documents / _all_docs" do
     before(:each) do
       9.times do |i|
-        @db.save({'_id' => "doc#{i}",'another' => 'doc', 'will-exist' => 'here'})
+        @db.save_doc({'_id' => "doc#{i}",'another' => 'doc', 'will-exist' => 'here'})
       end
     end
     it "should list documents with keys and such" do
@@ -624,6 +623,72 @@ describe CouchRest::Database do
       @cr.databases.should_not include('couchrest-test')
     end
   end
+  
+  describe "replicating a database" do
+    before do
+      @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'
+    end
+
+    describe "via pulling" do
+      before do
+        @other_db.replicate_from @db
+      end
+      
+      it "contains the document from the original database" do
+        doc = @other_db.get('test_doc')
+        doc['some-value'].should == 'foo'
+      end
+    end
+    
+    describe "via pushing" do
+      before do
+        @db.replicate_to @other_db
+      end
+      
+      it "copies the document to the other database" do
+        doc = @other_db.get('test_doc')
+        doc['some-value'].should == 'foo'
+      end
+    end
+  end
+
+  describe "creating a database" do
+    before(:each) do
+      @db = @cr.database('couchrest-test-db_to_create')
+      @db.delete! if @cr.databases.include?('couchrest-test-db_to_create')
+    end
+    
+    it "should just work fine" do
+      @cr.databases.should_not include('couchrest-test-db_to_create')
+      @db.create!
+      @cr.databases.should include('couchrest-test-db_to_create')
+    end
+  end
+  
+  describe "recreating a database" do
+    before(:each) do
+      @db = @cr.database('couchrest-test-db_to_create')
+      @db2 = @cr.database('couchrest-test-db_to_recreate')
+      @cr.databases.include?(@db.name) ? nil : @db.create!
+      @cr.databases.include?(@db2.name) ? @db2.delete! : nil
+    end
+    
+    it "should drop and recreate a database" do
+       @cr.databases.should include(@db.name)
+       @db.recreate!
+       @cr.databases.should include(@db.name)
+    end
+    
+    it "should recreate a db even tho it doesn't exist" do
+      @cr.databases.should_not include(@db2.name)
+      @db2.recreate!
+      @cr.databases.should include(@db2.name)
+    end
+    
+  end
 
 
-end
+end