couchrest 1.1.2 → 1.1.3

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.3

data/couchrest.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency(%q<rest-client>, ["~> 1.6.1"])
   s.add_dependency(%q<mime-types>, ["~> 1.15"])
-  s.add_dependency(%q<multi_json>, ["~> 1.0.0"])
+  s.add_dependency(%q<multi_json>, ["~> 1.0"])
   s.add_development_dependency(%q<json>, ["~> 1.5.1"])
   s.add_development_dependency(%q<rspec>, "~> 2.6.0")
 end

data/examples/word_count/word_count.rb

@@ -28,7 +28,7 @@ books.keys.each do |book|
     while line = file.gets
       lines << line
       if lines.length > 10
-        db.save({
+        db.save_doc({
           :title => title,
           :chunk => chunk, 
           :text => lines.join('')

data/examples/word_count/word_count_views.rb

@@ -16,9 +16,9 @@ word_count = {
   }'
 }
 
-db.delete db.get("_design/word_count") rescue nil
+db.delete_doc db.get("_design/word_count") rescue nil
 
-db.save({
+db.save_doc({
   "_id" => "_design/word_count",
   :views => {
     :words => word_count

data/history.txt

@@ -1,3 +1,15 @@
+== 1.1.3 - 2012-07-31
+
+* Minor changes
+  * Add support for HTTP HEAD requests (Tim Anglade)
+  * Make CouchRest#database! check if a db exists before creating it (Tim Anglade)
+  * Use _doc suffix in examples for delete and save (Mickael Riga)
+  * Database#view should not modify the params (@krishan)
+  * Fix replication with couchdb >= 1.1.0 (@erickt)
+  * Streamer protection against bad responses improved (@erickt)
+  * Support atomic bulk save requests with all_or_nothing CouchDB parameter (@matthiasjakel)
+  * Update multi_json dependency so we can use any 1.x version (@dgraham)
+
 == 1.1.2 - 2011-07-18
 
 * Minor changes

data/lib/couchrest/database.rb

@@ -163,7 +163,7 @@ module CouchRest
     # missing ids, supply one from the uuid cache.
     #
     # If called with no arguments, bulk saves the cache of documents to be bulk saved.
-    def bulk_save(docs = nil, use_uuids = true)
+    def bulk_save(docs = nil, use_uuids = true, all_or_nothing = false)
       if docs.nil?
         docs = @bulk_save_cache
         @bulk_save_cache = []
@@ -176,7 +176,11 @@ module CouchRest
           doc['_id'] = nextid if nextid
         end
       end
-      CouchRest.post "#{@root}/_bulk_docs", {:docs => docs}
+      request_body = {:docs => docs}
+      if all_or_nothing
+        request_body[:all_or_nothing] = true
+      end
+      CouchRest.post "#{@root}/_bulk_docs", request_body
     end
     alias :bulk_delete :bulk_save
 
@@ -243,6 +247,7 @@ module CouchRest
     # Query a CouchDB view as defined by a <tt>_design</tt> document. Accepts
     # paramaters as described in http://wiki.apache.org/couchdb/HttpViewApi
     def view(name, params = {}, payload = {}, &block)
+      params = params.dup
       payload['keys'] = params.delete(:keys) if params[:keys]
       # Try recognising the name, otherwise assume already prepared
       view_path = name_to_view_path(name)
@@ -341,6 +346,7 @@ module CouchRest
     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))
+      doc_ids = options.delete(:doc_ids)
       payload = options
       if options.has_key?(:target)
         payload['source'] = other_db.root
@@ -348,7 +354,7 @@ module CouchRest
         payload['target'] = other_db.root
       end
       payload['continuous'] = continuous
-      payload['doc_ids'] = options[:doc_ids] if options[:doc_ids]
+      payload['doc_ids'] = doc_ids if doc_ids
       CouchRest.post "#{@host}/_replicate", payload
     end
 

data/lib/couchrest/helper/streamer.rb

@@ -27,14 +27,19 @@ module CouchRest
 
     def open_pipe(cmd, &block)
       first = nil
+      prev = nil
       IO.popen(cmd) do |f|
         first = f.gets # discard header
         while line = f.gets 
           row = parse_line(line)
           block.call row unless row.nil? # last line "}]" discarded
+          prev = line
         end
       end
-      parse_first(first)
+
+      raise RestClient::ServerBrokeConnection if $? && $?.exitstatus != 0
+
+      parse_first(first, prev)
     end
 
     def parse_line line
@@ -44,14 +49,11 @@ module CouchRest
       end
     end
 
-    def parse_first first
+    def parse_first first, last
       return nil unless first
-      parts = first.split(',')
-      parts.pop
-      line = parts.join(',')
-      MultiJson.decode("#{line}}")
-    rescue
-      nil
+      header = MultiJson.decode(last ? first + last : first)
+      header.delete("rows")
+      header
     end
 
   end

data/lib/couchrest/rest_api.rb

@@ -5,7 +5,7 @@ module CouchRest
   # The basic low-level interface for all REST requests to the database. Everything must pass
   # through here before it is sent to the server.
   #
-  # Five types of REST requests are supported: get, put, post, delete, and copy.
+  # Six types of REST requests are supported: get, put, post, delete, copy and head.
   #
   # Requests that do not have a payload, get, delete and copy, accept the URI and options parameters,
   # where as put and post both expect a document as the second parameter.
@@ -69,6 +69,11 @@ module CouchRest
       execute(uri, :copy, opts)
     end
 
+    # Send a HEAD request.
+    def head(uri, options = {})
+      execute(uri, :head, options)
+    end
+
     # The default RestClient headers used in each request.
     def default_headers
       {
@@ -108,7 +113,8 @@ module CouchRest
         :headers => default_headers.merge(options[:headers] || {})
       }
       parser = {
-        :raw => false
+        :raw => false,
+        :head => (method == :head)
       }
       # Split the options
       (options || {}).each do |k,v|
@@ -141,7 +147,7 @@ module CouchRest
 
     # Parse the response provided.
     def parse_response(result, opts = {})
-      opts.delete(:raw) ? result : MultiJson.decode(result, opts.update(:max_nesting => false))
+      (opts.delete(:raw) || opts.delete(:head)) ? result : MultiJson.decode(result, opts.update(:max_nesting => false))
     end
 
     # An array of all the options that should be passed through to restclient.

data/lib/couchrest/server.rb

@@ -55,8 +55,10 @@ module CouchRest
   
     # Creates the database if it doesn't exist
     def database!(name)
-      create_db(name) rescue nil
+      CouchRest.head "#{@uri}/#{name}" # Check if the URL is valid
       database(name)
+    rescue RestClient::ResourceNotFound # Thrown if the HTTP HEAD fails
+      create_db(name)
     end
   
     # GET the welcome message

data/spec/couchrest/database_spec.rb

@@ -137,6 +137,12 @@ describe CouchRest::Database do
       rs = @db.view('first/test', :keys => ["another", "wild"])
       rs['rows'].length.should == 2
     end
+    it "should not modify given params" do
+      original_params = {:keys => ["another", "wild"]}
+      params = original_params.dup
+      rs = @db.view('first/test', params)
+      params.should == original_params
+    end
     it "should accept a block" do
       rows = []
       rs = @db.view('first/test', :include_docs => true) do |row|
@@ -246,6 +252,13 @@ describe CouchRest::Database do
       @db.bulk_save
       @db.get("bulk_cache_1")["val"].should == "test"
     end
+    
+    it "should make an atomic write when all_or_nothing is set" do
+      docs = [{"_id" => "oneB", "wild" => "and random"}, {"_id" => "twoB", "mild" => "yet local"}]
+      CouchRest.should_receive(:post).with("#{COUCHHOST}/couchrest-test/_bulk_docs", {:all_or_nothing => true, :docs => docs})
+      
+      @db.bulk_save(docs, false, true)
+    end
 
     it "should raise an error that is useful for recovery" do
       @r = @db.save_doc({"_id" => "taken", "field" => "stuff"})

data/spec/couchrest/helpers/streamer_spec.rb

@@ -25,18 +25,93 @@ describe CouchRest::Streamer do
 
   it "should GET each row in a view" do
     count = 0
-    @streamer.get("#{@db.root}/_all_docs") do |row|
+    header = @streamer.get("#{@db.root}/_all_docs") do |row|
       count += 1
     end
     count.should == 1001
+    header.should == {"total_rows" => 1001, "offset" => 0}
   end
 
   it "should GET each row in a view with params" do
     count = 0
-    @streamer.get("#{@db.root}/_all_docs?include_docs=true&limit=5") do |row|
+    header = @streamer.get("#{@db.root}/_all_docs?include_docs=true&limit=5") do |row|
       count += 1
     end
     count.should == 5
+    header.should == {"total_rows" => 1001, "offset" => 0}
+  end
+
+  it "should GET no rows in a view with limit=0" do
+    count = 0
+    header = @streamer.get("#{@db.root}/_all_docs?include_docs=true&limit=0") do |row|
+      count += 1
+    end
+    count.should == 0
+    header.should == {"total_rows" => 1001, "offset" => 0}
+  end
+
+  it "should raise an exception receives malformed data" do
+    IO.stub(:popen) do |cmd, block|
+      class F
+        def initialize
+          @lines = [
+            '{"total_rows": 123, "offset": "0", "rows": [',
+            '{"foo": 1},',
+            '{"foo": 2},',
+          ]
+        end
+
+        def gets
+          @lines.shift
+        end
+      end
+
+      f = F.new
+      block.call f
+
+      IO.unstub(:popen)
+      IO.popen 'true' do; end
+    end
+
+    count = 0
+    expect do
+      @streamer.get("#{@db.root}/_all_docs?include_docs=true&limit=0") do |row|
+        count += 1
+      end
+    end.should raise_error(MultiJson::DecodeError)
+  end
+
+  it "should raise an exception if the couch connection fails" do
+    IO.stub(:popen) do |cmd, block|
+      class F
+        def initialize
+          @lines = [
+            '{"total_rows": 123, "offset": "0", "rows": [',
+            '{"foo": 1},',
+            '{"foo": 2},',
+          ]
+        end
+
+        def gets
+          @lines.shift
+        end
+      end
+
+      block.call F.new
+
+      IO.unstub(:popen)
+      IO.popen 'false' do; end
+    end
+
+    count = 0
+
+    expect do
+      @streamer.get("#{@db.root}/_all_docs?include_docs=true&limit=0") do |row|
+        count += 1
+      end
+    end.should raise_error(RestClient::ServerBrokeConnection)
+
+    count.should == 2
   end
 
   it "should POST for each row in a view" do

data/spec/couchrest/rest_api_spec.rb

@@ -17,6 +17,7 @@ describe CouchRest::RestAPI do
       should respond_to :post
       should respond_to :copy
       should respond_to :delete
+      should respond_to :head
     end
 
     it "should provide default headers" do
@@ -206,6 +207,13 @@ describe CouchRest::RestAPI do
 
     end
 
+    describe :head do
+      it "should send basic request" do
+        req = {:url => 'foo', :method => :head, :headers => CouchRest.default_headers}
+        request.should_receive(:execute).with(req).and_return(simple_response)
+        CouchRest.head('foo')
+      end
+    end
 
   end
 

metadata

@@ -1,15 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: couchrest
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 1.1.3
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 2
-  version: 1.1.2
 platform: ruby
-authors: 
+authors:
 - J. Chris Anderson
 - Matt Aimonetti
 - Marcos Tapajos
@@ -18,100 +13,98 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-23 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-31 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rest-client
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 6
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mime-types
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.1
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 1
-        - 15
-        version: "1.15"
+      - !ruby/object:Gem::Version
+        version: '1.15'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: multi_json
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+      - !ruby/object:Gem::Version
+        version: '1.15'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 5
-        - 1
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 1.5.1
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.1
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
-  version_requirements: *id005
-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.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+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: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.md
 - THANKS.md
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -169,41 +162,47 @@ files:
 - spec/spec_helper.rb
 - utils/remap.rb
 - utils/subset.rb
-has_rdoc: true
 homepage: http://github.com/couchrest/couchrest
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Lean and RESTful interface to CouchDB.
-test_files: []
-
+test_files:
+- spec/couchrest/couchrest_spec.rb
+- spec/couchrest/database_spec.rb
+- spec/couchrest/design_spec.rb
+- spec/couchrest/document_spec.rb
+- spec/couchrest/helpers/pager_spec.rb
+- spec/couchrest/helpers/streamer_spec.rb
+- spec/couchrest/rest_api_spec.rb
+- spec/couchrest/server_spec.rb
+- spec/fixtures/attachments/README
+- spec/fixtures/attachments/couchdb.png
+- spec/fixtures/attachments/test.html
+- spec/fixtures/views/lib.js
+- spec/fixtures/views/test_view/lib.js
+- spec/fixtures/views/test_view/only-map.js
+- spec/fixtures/views/test_view/test-map.js
+- spec/fixtures/views/test_view/test-reduce.js
+- spec/spec.opts
+- spec/spec_helper.rb