couch-db 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e92baa55e77c565b84459f4750ab0cd45f0752e5
-  data.tar.gz: e951689a319ce402fe6aa741d397e7bf5b00249d
+  metadata.gz: adb22712bf4bea4e5380141e86315d4de7d2ce8f
+  data.tar.gz: a7cc0e906777dd05afbe54b4da9584d5101c4d4e
 SHA512:
-  metadata.gz: 801b3abbf35221122df1d5b2e22420452a7d77036a7134907f6ac7c625e687902ea4c478aee9421ab9627224efe51db90f8b179aa01381a2c8a5ac8b874720c2
-  data.tar.gz: 1775111c62395c8a83ba68b6c9032c650375537a47bbde368376da0e3168dcf6756871ba031ad9bef2dfa7be36ff6b50e8bbb037d0b433624ed811807f172230
+  metadata.gz: c442d51f3f9416a73811184e2a1d435f00f4e0b8ac62d3df9de602b535a8e0a475bfe6ebdf9091dc1609c50dda78b635669f4243e72e37c22eb3d29c3e16d11c
+  data.tar.gz: f0dc46cab01abfe0d5205bffcea24292d89ee4ec7b88a489d04d599aa526f1ec09892ad2e7e9b3c72301ab820c8223679c35c2a865c2ea4dcab1c093c5b532cc

data/lib/couch.rb

@@ -63,13 +63,13 @@ module Couch
       #
       # Note that the 'include_docs' parameter must be set to true for this.
       def get_all_docs(database, params)
-        unless params.include_symbol_or_string? :include_docs
-          params.merge!({:include_docs => true})
-        end
+        # unless params.include_symbol_or_string? :include_docs
+        #   params.merge!({:include_docs => true})
+        # end
         postfix = create_postfix(params)
         uri = URI::encode "/#{database}/_all_docs#{postfix}"
         res = get(uri)
-        append_docs(JSON.parse(res.body))
+        JSON.parse(res.body)['rows']
       end
 
 
@@ -204,17 +204,6 @@ module Couch
         all.flatten
       end
 
-      def append_docs(result)
-        docs = []
-        result['rows'].each do |row|
-          if row['error'] or !row['doc']
-            puts "Found row with error:\n#{row['key']}: #{row['error']}\n#{row['reason']}"
-          else
-            docs << row['doc']
-          end
-        end
-        docs
-      end
     end
 
     module Delete
@@ -283,13 +272,14 @@ module Couch
 
   class Server
     attr_accessor :options
-    
+
     def initialize(url, options)
       if url.is_a? String
         url = URI(url)
       end
       @couch_url = url
       @options = options
+      @options[:couch_url] = @couch_url
       @options[:use_ssl] ||= true
       @options[:max_array_length] ||= 250
       @options[:flush_size_mb] ||= 10
@@ -298,9 +288,9 @@ module Couch
       @options[:fail_silent] ||= false
     end
 
-    def delete(uri, open_timeout: 5*30, read_timeout: 5*30, fail_silent: false)
+    def delete(uri)
       Request.new(Net::HTTP::Delete.new(uri), nil,
-                  @options.merge({couch_url: @couch_url, open_timeout: open_timeout, read_timeout: read_timeout, fail_silent: fail_silent})
+                  @options
       ).perform
     end
 
@@ -308,9 +298,9 @@ module Couch
       Request.new(Net::HTTP::Delete.new(uri)).couch_url(@couch_url)
     end
 
-    def head(uri, open_timeout: 5*30, read_timeout: 5*30, fail_silent: true)
+    def head(uri)
       Request.new(Net::HTTP::Head.new(uri), nil,
-                  @options.merge({couch_url: @couch_url, open_timeout: open_timeout, read_timeout: read_timeout, fail_silent: fail_silent})
+                  @options
       ).perform
     end
 

data/lib/couch/db/version.rb

@@ -1,6 +1,6 @@
 module Couch
   # noinspection ALL
   module DB
-    VERSION = '0.10.0'
+    VERSION = '0.11.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couch-db
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Maarten Trompper