couch-db 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd7e0350e725a546206b7e282da8b3da2243aafe
-  data.tar.gz: 6ca15a89196b694b0da64031c0e71129587c3bcc
+  metadata.gz: 3e3033182fa750ebed0db9996c0b2249377a3188
+  data.tar.gz: b461244dc466eaeadb3b2de587bbe8844f3f3cc9
 SHA512:
-  metadata.gz: e1623c824fc6bf0aaceb843036e75d37fe47a177bdda6e8c9eef3c2a9c952e28c39c561d7a223ec3dcdc22eb2ca5e25a65dd038cacd1f44ee73c5251a51a4eb9
-  data.tar.gz: 647f9b023c4c202f8f384a208156d890ac126bb5da51fd0adc5f5a73ccd148c0fbca2821902c682fc4744394da0c5294b912a204ee10cd082d70221958117c74
+  metadata.gz: 35912a5df5d840696f2b255a84dde4552c6e61e322f631df75d34e6bb9066b1e5bf19dc75451ac518bade1c047a32479aa83e10a5e229748558bb1bff63224ff
+  data.tar.gz: d6879f8c757632d04768102b06e3b12f92cfdbe8dbd7cb12931241d6eb761f7b0cafc2e3a15e6f767daab4fe698a6a85d58a457314ecbdd00a7aa11eae8574c9

data/.gitignore

@@ -7,4 +7,7 @@
 /pkg/
 /spec/reports/
 /tmp/
-.idea/
+.idea/
+
+lol.rb
+rake_secret

data/lib/couch.rb

@@ -15,54 +15,8 @@ class Hash
 end
 
 module Couch
-  module BasicRequest
-    def delete(uri, open_timeout: 5*30, read_timeout: 5*30, fail_silent: false)
-      req=Net::HTTP::Delete.new(uri)
-      req.basic_auth @options[:name], @options[:password]
-      request(req, open_timeout: open_timeout, read_timeout: read_timeout, fail_silent: fail_silent)
-    end
-
-    def head(uri, open_timeout: 5*30, read_timeout: 5*30, fail_silent: true)
-      req = Net::HTTP::Head.new(uri)
-      req.basic_auth @options[:name], @options[:password]
-      request(req, open_timeout: open_timeout, read_timeout: read_timeout, fail_silent: fail_silent)
-    end
-
-    def get(uri, open_timeout: 5*30, read_timeout: 5*30, fail_silent: false)
-      req = Net::HTTP::Get.new(uri)
-      req.basic_auth @options[:name], @options[:password]
-      request(req, open_timeout: open_timeout, read_timeout: read_timeout, fail_silent: fail_silent)
-    end
-
-    def put(uri, json, open_timeout: 5*30, read_timeout: 5*30, fail_silent: false)
-      posty_request(json, Net::HTTP::Put.new(uri), open_timeout: open_timeout, read_timeout: read_timeout, fail_silent: fail_silent)
-    end
-
-    def post(uri, json, open_timeout: 5*30, read_timeout: 5*30, fail_silent: false)
-      posty_request(json, Net::HTTP::Post.new(uri), open_timeout: open_timeout, read_timeout: read_timeout, fail_silent: fail_silent)
-    end
-
-    def posty_request(json, req, open_timeout: 5*30, read_timeout: 5*30, fail_silent: false)
-      req.basic_auth @options[:name], @options[:password]
-      req['Content-Type'] = 'application/json;charset=utf-8'
-      req.body = json
-      request(req, open_timeout: open_timeout, read_timeout: read_timeout, fail_silent: fail_silent)
-    end
-
-    def request(req, open_timeout: 5*30, read_timeout: 5*30, fail_silent: false)
-      res = Net::HTTP.start(@url.host, @url.port,
-                            :use_ssl => @url.scheme =='https') do |http|
-        http.open_timeout = open_timeout
-        http.read_timeout = read_timeout
-        http.request(req)
-      end
-      unless fail_silent or res.kind_of?(Net::HTTPSuccess)
-        # puts "CouchDb responsed with error code #{res.code}"
-        handle_error(req, res)
-      end
-      res
-    end
 
+  module BasicRequest
     def create_postfix(query_params, default='')
       if query_params
         params_a = []
@@ -76,10 +30,6 @@ module Couch
       postfix
     end
 
-    def handle_error(req, res)
-      raise RuntimeError.new("#{res.code}:#{res.message}\nMETHOD:#{req.method}\nURI:#{req.path}\n#{res.body}")
-    end
-
     module Get
       # Returns parsed doc from database
       def get_doc(database, id)
@@ -318,8 +268,18 @@ module Couch
       def get_bytesize_array(docs)
         bytesize = 0
         docs.each do |doc|
-          # TODO: Note that this may be inexact; see documentation for ObjectSpace.memsize_of
+          # 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
@@ -350,11 +310,121 @@ module Couch
       if url.is_a? String
         url = URI(url)
       end
-      @url = url
+      @couch_url = url
       @options = options
       @options[:use_ssl] ||= true
     end
 
+    def delete(uri, open_timeout: 5*30, read_timeout: 5*30, fail_silent: false)
+      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})
+      ).perform
+    end
+
+    def new_delete(uri)
+      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)
+      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})
+      ).perform
+    end
+
+    def new_head(uri)
+      Request.new(Net::HTTP::Head.new(uri)).couch_url(@couch_url)
+    end
+
+    def get(uri, open_timeout: 5*30, read_timeout: 5*30, fail_silent: false)
+      Request.new(
+          Net::HTTP::Get.new(uri), nil,
+          @options.merge({couch_url: @couch_url, open_timeout: open_timeout, read_timeout: read_timeout, fail_silent: fail_silent})
+      ).perform
+    end
+
+    def new_get(uri)
+      Request.new(Net::HTTP::Get.new(uri)).couch_url(@couch_url)
+    end
+
+    def put(uri, json, open_timeout: 5*30, read_timeout: 5*30, fail_silent: false)
+      Request.new(Net::HTTP::Put.new(uri), json,
+                  @options.merge({couch_url: @couch_url, open_timeout: open_timeout, read_timeout: read_timeout, fail_silent: fail_silent})
+      ).perform
+    end
+
+    def new_put(uri)
+      Request.new(Net::HTTP::Put.new(uri)).couch_url(@couch_url)
+    end
+
+    def post(uri, json, open_timeout: 5*30, read_timeout: 5*30, fail_silent: false)
+      Request.new(Net::HTTP::Post.new(uri), json,
+                  @options.merge({couch_url: @couch_url, open_timeout: open_timeout, read_timeout: read_timeout, fail_silent: fail_silent})
+      ).perform
+    end
+
+    def new_post(uri)
+      Request.new(Net::HTTP::Post.new(uri)).couch_url(@couch_url)
+    end
+
+    class Request
+      def initialize(req, json=nil, opts={open_timeout: 5*30, read_timeout: 5*30, fail_silent: false})
+        @req=req
+        @json = json
+        @options = opts
+      end
+
+      def json(json)
+        @json = json
+        self
+      end
+
+      def couch_url(couch_url)
+        @options.merge!({couch_url: couch_url})
+        self
+      end
+
+      def open_timeout(open_timeout)
+        @options.merge!({open_timeout: open_timeout})
+        self
+      end
+
+      def read_timeout(read_timeout)
+        @options.merge!({read_timeout: read_timeout})
+        self
+      end
+
+      def fail_silent(fail_silent)
+        @options.merge!({fail_silent: fail_silent})
+        self
+      end
+
+      def perform
+        @req.basic_auth @options[:name], @options[:password]
+
+        if @json
+          @req['Content-Type'] = 'application/json;charset=utf-8'
+          @req.body = @json
+        end
+
+        res = Net::HTTP.start(@options[:couch_url].host, @options[:couch_url].port,
+                              :use_ssl => @options[:couch_url].scheme =='https') do |http|
+          http.open_timeout = @options[:open_timeout]
+          http.read_timeout = @options[:read_timeout]
+          http.request(@req)
+        end
+
+        unless @options[:fail_silent] or res.kind_of?(Net::HTTPSuccess)
+          # puts "CouchDb responsed with error code #{res.code}"
+          handle_error(@req, res)
+        end
+        res
+      end
+
+      def handle_error(req, res)
+        raise RuntimeError.new("#{res.code}:#{res.message}\nMETHOD:#{req.method}\nURI:#{req.path}\n#{res.body}")
+      end
+    end
+
     include BasicRequest
     include BasicRequest::Head
     include BasicRequest::Get

data/lib/couch/db/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: couch-db
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Maarten Trompper
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-21 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler