RubyGems - samflores-couchrest - Versions diffs - 0.2.1 → 0.12.3 - Mend

samflores-couchrest 0.2.1 → 0.12.3

Files changed (66) hide show

data/README.md +10 -34
data/Rakefile +5 -2
data/bin/couchdir +20 -0
data/examples/model/example.rb +13 -19
data/examples/word_count/word_count.rb +24 -3
data/examples/word_count/word_count_query.rb +6 -7
data/lib/couchrest/core/database.rb +49 -126
data/lib/couchrest/core/document.rb +25 -58
data/lib/couchrest/core/model.rb +612 -0
data/lib/couchrest/core/server.rb +10 -47
data/lib/couchrest/core/validations.rb +328 -0
data/lib/couchrest/monkeypatches.rb +0 -95
data/lib/couchrest.rb +10 -57
data/spec/couchrest/core/database_spec.rb +68 -183
data/spec/couchrest/core/design_spec.rb +1 -1
data/spec/couchrest/core/document_spec.rb +104 -285
data/spec/couchrest/core/model_spec.rb +855 -0
data/spec/couchrest/helpers/pager_spec.rb +1 -1
data/spec/spec_helper.rb +7 -13
metadata +17 -83
data/examples/word_count/word_count_views.rb +0 -26
data/lib/couchrest/core/response.rb +0 -16
data/lib/couchrest/mixins/attachments.rb +0 -31
data/lib/couchrest/mixins/callbacks.rb +0 -483
data/lib/couchrest/mixins/design_doc.rb +0 -64
data/lib/couchrest/mixins/document_queries.rb +0 -48
data/lib/couchrest/mixins/extended_attachments.rb +0 -68
data/lib/couchrest/mixins/extended_document_mixins.rb +0 -6
data/lib/couchrest/mixins/properties.rb +0 -125
data/lib/couchrest/mixins/validation.rb +0 -234
data/lib/couchrest/mixins/views.rb +0 -168
data/lib/couchrest/mixins.rb +0 -4
data/lib/couchrest/more/casted_model.rb +0 -28
data/lib/couchrest/more/extended_document.rb +0 -217
data/lib/couchrest/more/property.rb +0 -40
data/lib/couchrest/support/blank.rb +0 -42
data/lib/couchrest/support/class.rb +0 -191
data/lib/couchrest/validation/auto_validate.rb +0 -163
data/lib/couchrest/validation/contextual_validators.rb +0 -78
data/lib/couchrest/validation/validation_errors.rb +0 -118
data/lib/couchrest/validation/validators/absent_field_validator.rb +0 -74
data/lib/couchrest/validation/validators/confirmation_validator.rb +0 -99
data/lib/couchrest/validation/validators/format_validator.rb +0 -117
data/lib/couchrest/validation/validators/formats/email.rb +0 -66
data/lib/couchrest/validation/validators/formats/url.rb +0 -43
data/lib/couchrest/validation/validators/generic_validator.rb +0 -120
data/lib/couchrest/validation/validators/length_validator.rb +0 -134
data/lib/couchrest/validation/validators/method_validator.rb +0 -89
data/lib/couchrest/validation/validators/numeric_validator.rb +0 -104
data/lib/couchrest/validation/validators/required_field_validator.rb +0 -109
data/spec/couchrest/core/server_spec.rb +0 -35
data/spec/couchrest/more/casted_extended_doc_spec.rb +0 -40
data/spec/couchrest/more/casted_model_spec.rb +0 -98
data/spec/couchrest/more/extended_doc_attachment_spec.rb +0 -130
data/spec/couchrest/more/extended_doc_spec.rb +0 -509
data/spec/couchrest/more/extended_doc_view_spec.rb +0 -207
data/spec/couchrest/more/property_spec.rb +0 -130
data/spec/couchrest/support/class_spec.rb +0 -59
data/spec/fixtures/more/article.rb +0 -34
data/spec/fixtures/more/card.rb +0 -20
data/spec/fixtures/more/course.rb +0 -14
data/spec/fixtures/more/event.rb +0 -6
data/spec/fixtures/more/invoice.rb +0 -17
data/spec/fixtures/more/person.rb +0 -8
data/spec/fixtures/more/question.rb +0 -6
data/spec/fixtures/more/service.rb +0 -12

data/spec/couchrest/core/database_spec.rb CHANGED Viewed

@@ -61,7 +61,7 @@ describe CouchRest::Database do
           emit(doc.word,null);
         }
       }'}}
-      @db.save_doc({
+      @db.save({
         "_id" => "_design/test",
         :views => @view
       })
@@ -80,7 +80,7 @@ describe CouchRest::Database do
   describe "select from an existing view" do
     before(:each) do
-      r = @db.save_doc({
+      r = @db.save({
         "_id" => "_design/first",
         :views => {
           :test => {
@@ -129,9 +129,9 @@ describe CouchRest::Database do
   describe "GET (document by id) when the doc exists" do
     before(:each) do
-      @r = @db.save_doc({'lemons' => 'from texas', 'and' => 'spain'})
+      @r = @db.save({'lemons' => 'from texas', 'and' => 'spain'})
       @docid = "http://example.com/stuff.cgi?things=and%20stuff"
-      @db.save_doc({'_id' => @docid, 'will-exist' => 'here'})
+      @db.save({'_id' => @docid, 'will-exist' => 'here'})
     end
     it "should get the document" do
       doc = @db.get(@r['id'])
@@ -176,7 +176,7 @@ describe CouchRest::Database do
     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"})
+      @r = @db.save({'lemons' => 'from texas', 'and' => 'how', "_id" => "oneB"})
       lambda do
       rs = @db.bulk_save([
@@ -192,7 +192,7 @@ describe CouchRest::Database do
     end
     it "should empty the bulk save cache if no documents are given" do
-      @db.save_doc({"_id" => "bulk_cache_1", "val" => "test"}, true)
+      @db.save({"_id" => "bulk_cache_1", "val" => "test"}, true)
       lambda do
         @db.get('bulk_cache_1')
       end.should raise_error(RestClient::ResourceNotFound)
@@ -201,7 +201,7 @@ describe CouchRest::Database do
     end
     it "should raise an error that is useful for recovery" do
-      @r = @db.save_doc({"_id" => "taken", "field" => "stuff"})
+      @r = @db.save({"_id" => "taken", "field" => "stuff"})
       begin
         rs = @db.bulk_save([
             {"_id" => "taken", "wild" => "and random"},
@@ -220,43 +220,17 @@ describe CouchRest::Database do
       @db.documents["total_rows"].should == 0
     end
     it "should create the document and return the id" do
-      r = @db.save_doc({'lemons' => 'from texas', 'and' => 'spain'})
+      r = @db.save({'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_doc({'just' => ['another document']})
+      r = @db.save({'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'
@@ -268,8 +242,7 @@ 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
-      doc = @db.get("attach-this")
-      attachment = @db.fetch_attachment(doc,"couchdb.png")
+      attachment = @db.fetch_attachment("attach-this","couchdb.png")
       attachment.should == image
     end
   end
@@ -277,7 +250,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" => {
@@ -287,14 +260,14 @@ describe CouchRest::Database do
           }
         }
       }
-      @db.save_doc(doc)
-      @doc = @db.get("mydocwithattachment")
+      @db.save(@doc)
     end
     it "should save and be indicated" do
-      @doc['_attachments']['test.html']['length'].should == @attach.length
+      doc = @db.get("mydocwithattachment")
+      doc['_attachments']['test.html']['length'].should == @attach.length
     end
     it "should be there" do
-      attachment = @db.fetch_attachment(@doc,"test.html")
+      attachment = @db.fetch_attachment("mydocwithattachment","test.html")
       attachment.should == @attach
     end
   end
@@ -311,16 +284,15 @@ describe CouchRest::Database do
           }
         }
       }
-      @db.save_doc(doc)
-      doc['_rev'].should_not be_nil
+      @db.save(doc)
+      doc = @db.get('mydocwithattachment')
       doc['field'] << 'another value'
-      @db.save_doc(doc)["ok"].should be_true
+      @db.save(doc)
     end
     it 'should be there' do
-      doc = @db.get('mydocwithattachment')
-      attachment = @db.fetch_attachment(doc, 'test.html')
-      Base64.decode64(attachment).should == @attach
+      attachment = @db.fetch_attachment('mydocwithattachment', 'test.html')
+      attachment.should == @attach
     end
   end
@@ -342,43 +314,22 @@ describe CouchRest::Database do
           }
         }
       }
-      @db.save_doc(@doc)
-      @doc = @db.get("mydocwithattachment")
+      @db.save(@doc)
     end
     it "should save and be indicated" do
-      @doc['_attachments']['test.html']['length'].should == @attach.length
-      @doc['_attachments']['other.html']['length'].should == @attach2.length
+      doc = @db.get("mydocwithattachment")
+      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(@doc,"test.html")
+      attachment = @db.fetch_attachment("mydocwithattachment","test.html")
       attachment.should == @attach
     end
     it "should be there" do
-      attachment = @db.fetch_attachment(@doc,"other.html")
+      attachment = @db.fetch_attachment("mydocwithattachment","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
@@ -392,15 +343,14 @@ describe CouchRest::Database do
           }
         }
       }
-      @docid = @db.save_doc(@doc)['id']
+      @docid = @db.save(@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
-      doc = @db.get(@docid)
-      attachment = @db.fetch_attachment(doc,"http://example.com/stuff.cgi?things=and%20stuff")
+      attachment = @db.fetch_attachment(@docid,"http://example.com/stuff.cgi?things=and%20stuff")
       attachment.should == @attach
     end
   end
@@ -408,15 +358,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_doc({'_id' => @docid, 'will-exist' => 'here'})
-      lambda{@db.save_doc({'_id' => @docid})}.should raise_error(RestClient::Request::RequestFailed)
+      @db.save({'_id' => @docid, 'will-exist' => 'here'})
+      lambda{@db.save({'_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_doc({'lemons' => 'from texas', 'and' => 'spain'})
+      # r = @db.save({'lemons' => 'from texas', 'and' => 'spain'})
       @db.documents['rows'].each do |doc|
         doc['id'].should_not == 'my-doc'
       end
@@ -425,17 +375,17 @@ describe CouchRest::Database do
       # or instead make it return something with a fancy <=> method
     end
     it "should create the document" do
-      @db.save_doc({'_id' => 'my-doc', 'will-exist' => 'here'})
-      lambda{@db.save_doc({'_id' => 'my-doc'})}.should raise_error(RestClient::Request::RequestFailed)
+      @db.save({'_id' => 'my-doc', 'will-exist' => 'here'})
+      lambda{@db.save({'_id' => 'my-doc'})}.should raise_error(RestClient::Request::RequestFailed)
     end
   end
   describe "PUT (existing document with rev)" do
     before(:each) do
-      @db.save_doc({'_id' => 'my-doc', 'will-exist' => 'here'})
+      @db.save({'_id' => 'my-doc', 'will-exist' => 'here'})
       @doc = @db.get('my-doc')
       @docid = "http://example.com/stuff.cgi?things=and%20stuff"
-      @db.save_doc({'_id' => @docid, 'now' => 'save'})
+      @db.save({'_id' => @docid, 'now' => 'save'})
     end
     it "should start with the document" do
       @doc['will-exist'].should == 'here'
@@ -444,18 +394,18 @@ describe CouchRest::Database do
     it "should save with url id" do
       doc = @db.get(@docid)
       doc['yaml'] = ['json', 'word.']
-      @db.save_doc doc
+      @db.save 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(@doc)
-      lambda {@db.save_doc(@doc)}.should raise_error
+      # @db.save(@doc)
+      lambda {@db.save(@doc)}.should raise_error
     end
     it "should update the document" do
       @doc['them-keys'] = 'huge'
-      @db.save_doc(@doc)
+      @db.save(@doc)
       now = @db.get('my-doc')
       now['them-keys'].should == 'huge'
     end
@@ -464,7 +414,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_doc(td, true)
+      @db.save(td, true)
       @db.instance_variable_get("@bulk_save_cache").should == [td]
     end
@@ -473,8 +423,8 @@ describe CouchRest::Database do
       @db.bulk_save_cache_limit = 3
       td1 = {"_id" => "td1", "val" => true}
       td2 = {"_id" => "td2", "val" => 4}
-      @db.save_doc(td1, true)
-      @db.save_doc(td2, true)
+      @db.save(td1, true)
+      @db.save(td2, true)
       lambda do
         @db.get(td1["_id"])
       end.should raise_error(RestClient::ResourceNotFound)
@@ -482,7 +432,7 @@ describe CouchRest::Database do
         @db.get(td2["_id"])
       end.should raise_error(RestClient::ResourceNotFound)
       td3 = {"_id" => "td3", "val" => "foo"}
-      @db.save_doc(td3, true)
+      @db.save(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"]
@@ -492,11 +442,11 @@ describe CouchRest::Database do
       td1 = {"_id" => "blah", "val" => true}
       td2 = {"_id" => "steve", "val" => 3}
       @db.bulk_save_cache_limit = 50
-      @db.save_doc(td1, true)
+      @db.save(td1, true)
       lambda do
         @db.get(td1["_id"])
       end.should raise_error(RestClient::ResourceNotFound)
-      @db.save_doc(td2)
+      @db.save(td2)
       @db.get(td1["_id"])["val"].should == td1["val"]
       @db.get(td2["_id"])["val"].should == td2["val"]
     end
@@ -504,27 +454,27 @@ describe CouchRest::Database do
   describe "DELETE existing document" do
     before(:each) do
-      @r = @db.save_doc({'lemons' => 'from texas', 'and' => 'spain'})
+      @r = @db.save({'lemons' => 'from texas', 'and' => 'spain'})
       @docid = "http://example.com/stuff.cgi?things=and%20stuff"
-      @db.save_doc({'_id' => @docid, 'will-exist' => 'here'})
+      @db.save({'_id' => @docid, 'will-exist' => 'here'})
     end
     it "should work" do
       doc = @db.get(@r['id'])
       doc['and'].should == 'spain'
-      @db.delete_doc doc
+      @db.delete doc
       lambda{@db.get @r['id']}.should raise_error
     end
     it "should work with uri id" do
       doc = @db.get(@docid)
-      @db.delete_doc doc
+      @db.delete doc
       lambda{@db.get @docid}.should raise_error
     end
     it "should fail without an _id" do
-      lambda{@db.delete_doc({"not"=>"a real doc"})}.should raise_error(ArgumentError)
+      lambda{@db.delete({"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 doc, true
+      @db.delete doc, true
       lambda{@db.get @docid}.should_not raise_error
       @db.bulk_save
       lambda{@db.get @docid}.should raise_error
@@ -534,14 +484,15 @@ describe CouchRest::Database do
   describe "COPY existing document" do
     before :each do
-      @r = @db.save_doc({'artist' => 'Zappa', 'title' => 'Muffin Man'})
+      @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.copy_doc @doc, @docid
+        @db.copy @doc, @docid
         newdoc = @db.get(@docid)
+        debugger
         newdoc['artist'].should == 'Zappa'
       end
       it "should fail without an _id" do
@@ -550,20 +501,20 @@ describe CouchRest::Database do
     end
     describe "to an existing location" do
       before :each do
-        @db.save_doc({'_id' => @docid, 'will-exist' => 'here'})
+        @db.save({'_id' => @docid, 'will-exist' => 'here'})
       end
       it "should fail without a rev" do
-        lambda{@db.copy_doc @doc, @docid}.should raise_error(RestClient::RequestFailed)
+        lambda{@db.copy @doc, @docid}.should raise_error(RestClient::RequestFailed)
       end
       it "should succeed with a rev" do
         @to_be_overwritten = @db.get(@docid)
-        @db.copy_doc @doc, "#{@docid}?rev=#{@to_be_overwritten['_rev']}"
+        @db.copy @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 @doc, @to_be_overwritten
+        @db.copy @doc, @to_be_overwritten
         newdoc = @db.get(@docid)
         newdoc['artist'].should == 'Zappa'
       end
@@ -572,13 +523,13 @@ describe CouchRest::Database do
   describe "MOVE existing document" do
     before :each do
-      @r = @db.save_doc({'artist' => 'Zappa', 'title' => 'Muffin Man'})
+      @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 @doc, @docid
+        @db.move @doc, @docid
         newdoc = @db.get(@docid)
         newdoc['artist'].should == 'Zappa'
         lambda {@db.get(@r['id'])}.should raise_error(RestClient::ResourceNotFound)
@@ -590,22 +541,22 @@ describe CouchRest::Database do
     end
     describe "to an existing location" do
       before :each do
-        @db.save_doc({'_id' => @docid, 'will-exist' => 'here'})
+        @db.save({'_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.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 @doc, "#{@docid}?rev=#{@to_be_overwritten['_rev']}"
+        @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 @doc, @to_be_overwritten
+        @db.move @doc, @to_be_overwritten
         newdoc = @db.get(@docid)
         newdoc['artist'].should == 'Zappa'
         lambda {@db.get(@r['id'])}.should raise_error(RestClient::ResourceNotFound)
@@ -616,7 +567,7 @@ describe CouchRest::Database do
   it "should list documents" do
     5.times do
-      @db.save_doc({'another' => 'doc', 'will-exist' => 'anywhere'})
+      @db.save({'another' => 'doc', 'will-exist' => 'anywhere'})
     end
     ds = @db.documents
     ds['rows'].should be_an_instance_of(Array)
@@ -627,7 +578,7 @@ describe CouchRest::Database do
   describe "documents / _all_docs" do
     before(:each) do
       9.times do |i|
-        @db.save_doc({'_id' => "doc#{i}",'another' => 'doc', 'will-exist' => 'here'})
+        @db.save({'_id' => "doc#{i}",'another' => 'doc', 'will-exist' => 'here'})
       end
     end
     it "should list documents with keys and such" do
@@ -674,72 +625,6 @@ 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

data/spec/couchrest/core/design_spec.rb CHANGED Viewed

@@ -62,7 +62,7 @@ describe CouchRest::Design do
   describe "from a saved document" do
     before(:each) do
       @db = reset_test_db!
-      @db.save_doc({
+      @db.save({
         "_id" => "_design/test",
         "views" => {
           "by_name" => {