couch-db 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e3033182fa750ebed0db9996c0b2249377a3188
-  data.tar.gz: b461244dc466eaeadb3b2de587bbe8844f3f3cc9
+  metadata.gz: e92baa55e77c565b84459f4750ab0cd45f0752e5
+  data.tar.gz: e951689a319ce402fe6aa741d397e7bf5b00249d
 SHA512:
-  metadata.gz: 35912a5df5d840696f2b255a84dde4552c6e61e322f631df75d34e6bb9066b1e5bf19dc75451ac518bade1c047a32479aa83e10a5e229748558bb1bff63224ff
-  data.tar.gz: d6879f8c757632d04768102b06e3b12f92cfdbe8dbd7cb12931241d6eb761f7b0cafc2e3a15e6f767daab4fe698a6a85d58a457314ecbdd00a7aa11eae8574c9
+  metadata.gz: 801b3abbf35221122df1d5b2e22420452a7d77036a7134907f6ac7c625e687902ea4c478aee9421ab9627224efe51db90f8b179aa01381a2c8a5ac8b874720c2
+  data.tar.gz: 1775111c62395c8a83ba68b6c9032c650375537a47bbde368376da0e3168dcf6756871ba031ad9bef2dfa7be36ff6b50e8bbb037d0b433624ed811807f172230

data/.travis.yml

@@ -3,4 +3,5 @@ rvm:
   - 2.1.6
   - 2.2.2
   - 2.0.0
+  - 1.9.3
 before_install: gem install bundler -v 1.10

data/couch-request.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors = ['Maarten Trompper']
   spec.email = ['maartentrompper@gmail.com']
 
-  spec.required_ruby_version = '>= 2'
+  spec.required_ruby_version = '>= 1.9'
 
   spec.summary = %q{Interface with a CouchDB database. Focuses on bulk requests.}
   # spec.description   = %q{Write a longer description or delete this line.}

data/lib/couch.rb

@@ -15,7 +15,6 @@ class Hash
 end
 
 module Couch
-
   module BasicRequest
     def create_postfix(query_params, default='')
       if query_params
@@ -235,17 +234,13 @@ module Couch
         post("/#{database}/_bulk_docs", body)
       end
 
-      def post_bulk_throttled(db, docs, max_size_mb: 15, max_array_length: 300, &block)
+      def post_bulk_throttled(db, docs, &block)
         # puts "Flushing #{docs.length} docs"
         bulk = []
-        bytesize = 0
         docs.each do |doc|
           bulk << doc
-          # TODO: Note that this may be inexact; see documentation for ObjectSpace.memsize_of
-          bytesize += ObjectSpace.memsize_of doc
-          if bytesize/1024/1024 > max_size_mb or bulk.length >= max_array_length
+          if bulk.to_json.bytesize/1024/1024 > options[:flush_size_mb] or bulk.length >= options[:max_array_length]
             handle_bulk_flush(bulk, db, block)
-            bytesize=0
           end
         end
         if bulk.length > 0
@@ -254,8 +249,8 @@ module Couch
       end
 
 
-      def post_bulk_if_big_enough(db, docs, flush_size_mb: 10, max_array_length: 300)
-        flush = (get_bytesize_array(docs) >= (flush_size_mb*1024*1024) or docs.length >= max_array_length)
+      def post_bulk_if_big_enough(db, docs)
+        flush = (docs.to_json.bytesize / 1024 >= (options[:flush_size_mb]*1024) or docs.length >= options[:max_array_length])
         if flush
           post_bulk_throttled(db, docs)
           docs.clear
@@ -265,25 +260,6 @@ module Couch
 
       private
 
-      def get_bytesize_array(docs)
-        bytesize = 0
-        docs.each do |doc|
-          # Note that this may be inexact; see documentation for ObjectSpace.memsize_of
-          bytesize += ObjectSpace.memsize_of doc
-
-          if doc['_attachments']
-            doc['_attachments'].each do |att|
-              att.each do |val|
-                if val['data']
-                  bytesize += val['data'].length # Number of chars, i.e. bytes
-                end
-              end
-            end
-          end
-        end
-        bytesize
-      end
-
       def handle_bulk_flush(bulk, db, block)
         res = post_bulk(db, bulk)
         error_count=0
@@ -306,6 +282,8 @@ module Couch
   end
 
   class Server
+    attr_accessor :options
+    
     def initialize(url, options)
       if url.is_a? String
         url = URI(url)
@@ -313,6 +291,11 @@ module Couch
       @couch_url = url
       @options = options
       @options[:use_ssl] ||= true
+      @options[:max_array_length] ||= 250
+      @options[:flush_size_mb] ||= 10
+      @options[:open_timeout] ||= 5*30
+      @options[:read_timeout] ||= 5*30
+      @options[:fail_silent] ||= false
     end
 
     def delete(uri, open_timeout: 5*30, read_timeout: 5*30, fail_silent: false)

data/lib/couch/db/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: couch-db
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Maarten Trompper
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2'
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="