couchrest 0.37 → 0.38

data/README.md

@@ -8,7 +8,7 @@ to CouchDB's API endpoints so you don't have to.
 
 CouchRest is designed to make a simple base for application and framework-specific object oriented APIs. CouchRest is Object-Mapper agnostic, the parsed JSON it returns from CouchDB shows up as subclasses of Ruby's Hash. Naked JSON, just as it was mean to be.
 
-Note: CouchRest only support CouchDB 0.9.0 or newer.
+**Note: CouchRest only support CouchDB 0.9.0 or newer. Some features requires CouchDB 0.10.0 or newer.**
 
 ## Easy Install
 
@@ -33,11 +33,11 @@ Check the wiki for documentation and examples [http://wiki.github.com/couchrest/
 
 ## Contact
 
-Please post bugs, suggestions and patches to the bug tracker at <http://jchris.lighthouseapp.com/projects/17807-couchrest/overview>.
+Please post bugs, suggestions and patches to the bug tracker at [http://github.com/couchrest/couchrest/issues](http://github.com/couchrest/couchrest/issues).
 
-Follow us on Twitter: http://twitter.com/couchrest
+Follow us on Twitter: [http://twitter.com/couchrest](http://twitter.com/couchrest)
 
-Also, check http://twitter.com/#search?q=%23couchrest
+Also, check [http://twitter.com/#search?q=%23couchrest](http://twitter.com/#search?q=%23couchrest)
       
 ## Ruby on Rails
 

data/Rakefile

@@ -26,8 +26,9 @@ begin
     gemspec.has_rdoc = true
     gemspec.add_dependency("rest-client", ">= 0.5")
     gemspec.add_dependency("mime-types", ">= 1.15")
+    gemspec.add_dependency("json", "1.2.4")
     gemspec.version = CouchRest::VERSION
-    gemspec.date = "2008-11-22"
+    gemspec.date = Time.now.strftime("%Y-%m-%d")
     gemspec.require_path = "lib"
   end
 rescue LoadError

data/couchrest.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{couchrest}
-  s.version = "0.37"
+  s.version = "0.38"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["J. Chris Anderson", "Matt Aimonetti", "Marcos Tapajos", "Will Leinweber"]
-  s.date = %q{2010-03-30}
+  s.date = %q{2010-07-28}
   s.description = %q{CouchRest provides a simple interface on top of CouchDB's RESTful HTTP API, as well as including some utility scripts for managing views and attachments.}
   s.email = %q{jchris@apache.org}
   s.extra_rdoc_files = [
@@ -127,7 +127,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/couchrest/couchrest}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Lean and RESTful interface to CouchDB.}
   s.test_files = [
     "spec/couchrest/core/couchrest_spec.rb",
@@ -167,16 +167,19 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rest-client>, [">= 0.5"])
       s.add_runtime_dependency(%q<mime-types>, [">= 1.15"])
+      s.add_runtime_dependency(%q<json>, ["= 1.2.4"])
     else
       s.add_dependency(%q<rest-client>, [">= 0.5"])
       s.add_dependency(%q<mime-types>, [">= 1.15"])
+      s.add_dependency(%q<json>, ["= 1.2.4"])
     end
   else
     s.add_dependency(%q<rest-client>, [">= 0.5"])
     s.add_dependency(%q<mime-types>, [">= 1.15"])
+    s.add_dependency(%q<json>, ["= 1.2.4"])
   end
 end
 

data/history.txt

@@ -4,6 +4,14 @@
 
 * Minor enhancements
 
+== 0.38
+
+* Major enhancements
+	* Add create_target option to Database#replicate_to and #replicate_from. http://github.com/couchrest/couchrest/issues/#issue/26 (Alexander Uvarov) 
+
+* Minor enhancements
+  * Support for CouchDB 1.0
+
 == 0.37
 
 * Minor enhancements

data/lib/couchrest.rb

@@ -28,7 +28,7 @@ require 'couchrest/monkeypatches'
 
 # = CouchDB, close to the metal
 module CouchRest
-  VERSION    = '0.37' unless self.const_defined?("VERSION")
+  VERSION    = '0.38' unless self.const_defined?("VERSION")
   
   autoload :Server,       'couchrest/core/server'
   autoload :Database,     'couchrest/core/database'
@@ -159,4 +159,4 @@ module CouchRest
       url
     end
   end # class << self
-end
+end

data/lib/couchrest/core/database.rb

@@ -65,7 +65,7 @@ module CouchRest
       keys = params.delete(:keys)
       funcs = funcs.merge({:keys => keys}) if keys
       url = CouchRest.paramify_url "#{@root}/_temp_view", params
-      JSON.parse(HttpAbstraction.post(url, funcs.to_json, {"Content-Type" => 'application/json'}))
+      CouchRest.post(url, funcs)
     end
     
     # backwards compatibility is a plus
@@ -115,7 +115,7 @@ module CouchRest
     def put_attachment(doc, name, file, options = {})
       docid = escape_docid(doc['_id'])
       uri = url_for_attachment(doc, name)
-      JSON.parse(HttpAbstraction.put(uri, file, options))
+      JSON.parse(HttpAbstraction.put(uri, file, CouchRest.default_headers.update(options)))
     end
     
     # DELETE an attachment directly from CouchDB
@@ -123,13 +123,13 @@ module CouchRest
       uri = url_for_attachment(doc, name)
       # this needs a rev
       begin
-        JSON.parse(HttpAbstraction.delete(uri))
+        CouchRest.delete(uri)
       rescue Exception => error
         if force
           # get over a 409
           doc = get(doc['_id'])
           uri = url_for_attachment(doc, name)
-          JSON.parse(HttpAbstraction.delete(uri))
+          CouchRest.delete(uri)
         else
           error
         end
@@ -302,17 +302,17 @@ module CouchRest
     ensure
       create!
     end
-    
+
     # Replicates via "pulling" from another database to this database. Makes no attempt to deal with conflicts.
-    def replicate_from other_db, continuous=false
-      replicate other_db, continuous, :target => name
+    def replicate_from(other_db, continuous = false, create_target = false)
+      replicate(other_db, continuous, :target => name, :create_target => create_target)
     end
-    
+
     # Replicates via "pushing" to another database. Makes no attempt to deal with conflicts.
-    def replicate_to other_db, continuous=false
-      replicate other_db, continuous, :source => name
+    def replicate_to(other_db, continuous = false, create_target = false)
+      replicate(other_db, continuous, :source => name, :create_target => create_target)
     end
-    
+
     # DELETE the database itself. This is not undoable and could be rather
     # catastrophic. Use with care!
     def delete!
@@ -322,7 +322,7 @@ module CouchRest
 
     private
     
-    def replicate other_db, continuous, options
+    def replicate(other_db, continuous, options)
       raise ArgumentError, "must provide a CouchReset::Database" unless other_db.kind_of?(CouchRest::Database)
       raise ArgumentError, "must provide a target or source option" unless (options.key?(:target) || options.key?(:source))
       payload = options

data/lib/couchrest/core/rest_api.rb

@@ -1,9 +1,16 @@
 module RestAPI
 
+  def default_headers
+    {
+      :content_type => :json,
+      :accept       => :json
+    }
+  end
+
   def put(uri, doc = nil)
     payload = doc.to_json if doc
     begin
-      JSON.parse(HttpAbstraction.put(uri, payload))
+      JSON.parse(HttpAbstraction.put(uri, payload, default_headers))
     rescue Exception => e
       if $DEBUG
         raise "Error while sending a PUT request #{uri}\npayload: #{payload.inspect}\n#{e}"
@@ -15,7 +22,7 @@ module RestAPI
 
   def get(uri)
     begin
-      JSON.parse(HttpAbstraction.get(uri), :max_nesting => false)
+      JSON.parse(HttpAbstraction.get(uri, default_headers), :max_nesting => false)
     rescue => e
       if $DEBUG
         raise "Error while sending a GET request #{uri}\n: #{e}"
@@ -28,7 +35,7 @@ module RestAPI
   def post(uri, doc = nil)
     payload = doc.to_json if doc
     begin
-      JSON.parse(HttpAbstraction.post(uri, payload))
+      JSON.parse(HttpAbstraction.post(uri, payload, default_headers))
     rescue Exception => e
       if $DEBUG
         raise "Error while sending a POST request #{uri}\npayload: #{payload.inspect}\n#{e}"
@@ -39,11 +46,11 @@ module RestAPI
   end
 
   def delete(uri)
-    JSON.parse(HttpAbstraction.delete(uri))
+    JSON.parse(HttpAbstraction.delete(uri, default_headers))
   end
 
   def copy(uri, destination) 
-    JSON.parse(HttpAbstraction.copy(uri, {'Destination' => destination}))
+    JSON.parse(HttpAbstraction.copy(uri, default_headers.merge('Destination' => destination)))
   end 
 
-end
+end

data/lib/couchrest/core/server.rb

@@ -73,6 +73,8 @@ module CouchRest
     # Restart the CouchDB instance
     def restart!
       CouchRest.post "#{@uri}/_restart"
+    rescue RestClient::ServerBrokeConnection
+      # Shouldn't really happen, but does in CouchDB 1.0.0
     end
 
     # Retrive an unused UUID from CouchDB. Server instances manage caching a list of unused UUIDs.

data/spec/couchrest/core/couchrest_spec.rb

@@ -28,6 +28,13 @@ describe CouchRest do
   
   it "should restart" do
     @cr.restart!
+    begin
+      @cr.info
+    rescue
+      # Give the couchdb time to restart
+      sleep 0.2
+      retry
+    end
   end
 
   it "should provide one-time access to uuids" do
@@ -181,4 +188,4 @@ describe CouchRest do
     end
   end
 
-end
+end

data/spec/couchrest/core/database_spec.rb

@@ -702,81 +702,111 @@ describe CouchRest::Database do
       @cr.databases.should_not include('couchrest-test')
     end
   end
-  
+
   describe "simply replicating a database" do
-    before do
+    before(:each) do
       @db.save_doc({'_id' => 'test_doc', 'some-value' => 'foo'})
-      @other_db = @cr.database REPLICATIONDB
-      @other_db.delete! rescue nil
-      @other_db = @cr.create_db REPLICATIONDB
+      @other_db = @cr.database(REPLICATIONDB)
     end
 
-    describe "via pulling" do
-      before do
-        @other_db.replicate_from @db
-      end
-      
+    shared_examples_for "simply replicated" do
       it "contains the document from the original database" do
         doc = @other_db.get('test_doc')
         doc['some-value'].should == 'foo'
       end
     end
-    
+
+    describe "via pulling" do
+      before(:each) do
+        @other_db.recreate!
+        @other_db.replicate_from @db
+      end
+
+      it_should_behave_like "simply replicated"
+    end
+
     describe "via pushing" do
-      before do
+      before(:each) do
+        @other_db.recreate!
         @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'
+
+      it_should_behave_like "simply replicated"
+    end
+
+    describe "implicitly creating target" do
+      describe "via pulling" do
+        before(:each) do
+          @other_db.replicate_from(@db, false, true)
+        end
+
+        it_should_behave_like "simply replicated"
+      end
+
+      describe "via pushing" do
+        before(:each) do
+          @db.replicate_to(@other_db, false, true)
+        end
+
+        it_should_behave_like "simply replicated"
       end
     end
   end
-    
+
   describe "continuously replicating a database" do
-    before do
+    before(:each) do
       @db.save_doc({'_id' => 'test_doc', 'some-value' => 'foo'})
-      @other_db = @cr.database REPLICATIONDB
-      @other_db.delete! rescue nil
-      @other_db = @cr.create_db REPLICATIONDB
+      @other_db = @cr.database(REPLICATIONDB)
     end
 
-    describe "via pulling" do
-      before do
-        @other_db.replicate_from @db, true
-      end
-      
+    shared_examples_for "continuously replicated" do
       it "contains the document from the original database" do
-        sleep(1) # Allow some time to replicate
+        sleep(1.5) # Allow some time to replicate
         doc = @other_db.get('test_doc')
         doc['some-value'].should == 'foo'
       end
-      
+
       it "contains documents saved after replication initiated" do
         @db.save_doc({'_id' => 'test_doc_after', 'some-value' => 'bar'})
-        sleep(1) # Allow some time to replicate
+        sleep(1.5) # Allow some time to replicate
         doc = @other_db.get('test_doc_after')
         doc['some-value'].should == 'bar'
       end
     end
-    
+
+    describe "via pulling" do
+      before(:each) do
+        @other_db.recreate!
+        @other_db.replicate_from(@db, true)
+      end
+
+      it_should_behave_like "continuously replicated"
+    end
+
     describe "via pushing" do
-      before do
-        @db.replicate_to @other_db, true
+      before(:each) do
+        @other_db.recreate!
+        @db.replicate_to(@other_db, true)
       end
-      
-      it "copies the document to the other database" do
-        sleep(1) # Allow some time to replicate
-        doc = @other_db.get('test_doc')
-        doc['some-value'].should == 'foo'
+
+      it_should_behave_like "continuously replicated"
+    end
+
+    describe "implicitly creating target" do
+      before(:each) do
+        @other_db.replicate_from(@db, true, true)
       end
-      
-      it "copies documents saved after replication initiated" do
-        @db.save_doc({'_id' => 'test_doc_after', 'some-value' => 'bar'})
-        sleep(1) # Allow some time to replicate
-        doc = @other_db.get('test_doc_after')
-        doc['some-value'].should == 'bar'
+
+      after(:each) do
+        @other_db.delete!
+      end
+
+      describe "via pulling" do
+        it_should_behave_like "continuously replicated"
+      end
+
+      describe "via pushing" do
+        it_should_behave_like "continuously replicated"
       end
     end
   end

metadata

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 37
-  version: "0.37"
+  - 38
+  version: "0.38"
 platform: ruby
 authors: 
 - J. Chris Anderson
@@ -16,13 +16,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-30 00:00:00 -03:00
+date: 2010-07-28 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -36,6 +37,7 @@ dependencies:
   name: mime-types
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -45,6 +47,21 @@ dependencies:
         version: "1.15"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 4
+        version: 1.2.4
+  type: :runtime
+  version_requirements: *id003
 description: CouchRest provides a simple interface on top of CouchDB's RESTful HTTP API, as well as including some utility scripts for managing views and attachments.
 email: jchris@apache.org
 executables: []
@@ -171,6 +188,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -178,6 +196,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -187,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Lean and RESTful interface to CouchDB.