Remove parsing from db responses

README.md

@@ -2,6 +2,23 @@
 
 Dolly is a Object Oriented CouchDB interface to interact with the JSON documents through CouchDB's RESTful API.
 
+## Versions
+
+### Dolly 1.x
+
+It is only compatible with CouchDB 1.x
+
+### Dolly 2.x
+
+Dolly 2.x is compatible only with CouchDB 2.x and up
+
+#### Braking changes
+
+  * Due to fix on HTTParty, now `parsed_response` returns a `Hash` instead of a `JSON` string.
+    So no need to call `JSON.parse` on db responses.
+  * CochDB 2.0 will not accept post requests to views without a rquest body.
+  * No need to call `to_json` on body values for requests
+
 ## Installation
 
 Add this line to your application's Gemfile:

lib/dolly/collection.rb

@@ -1,11 +1,11 @@
 module Dolly
   class Collection < DelegateClass(Set)
-    attr_accessor :rows
+    attr_accessor :rows, :collection
     attr_writer :json, :docs_class
 
-    def initialize str, docs_class
+    def initialize collection, docs_class
       @docs_class = docs_class
-      @json = str
+      @collection = collection
       initial = []
       super(initial)
       load
@@ -57,8 +57,7 @@ def rows= ary
     end
 
     def load
-      parsed = JSON::parse json
-      self.rows = parsed['rows']
+      self.rows = collection['rows']
     end
 
     def to_json options = {}
@@ -81,7 +80,7 @@ def doc_class id
     end
 
     def json
-      @json
+      @json ||= @collection.to_json
     end
 
   end

lib/dolly/document.rb

@@ -64,7 +64,7 @@ def save options = {}
       set_created_at if timestamps[self.class.name]
       set_updated_at if timestamps[self.class.name]
       response = database.put(id_as_resource, self.doc.to_json)
-      obj = JSON::parse response.parsed_response
+      obj = response.parsed_response
       doc['_rev'] = obj['rev'] if obj['rev']
       obj['ok']
     end
@@ -78,7 +78,7 @@ def destroy hard = true
       if hard
         q = id_as_resource + "?rev=#{rev}"
         response = database.delete(q)
-        JSON::parse response.parsed_response
+        response.parsed_response
       else
         self.doc['_deleted'] = true
         self.save

lib/dolly/property.rb

@@ -4,7 +4,7 @@ class Property
     attr_accessor :name
     attr_reader :class_name, :default
 
-    CANT_CLONE = [NilClass, TrueClass, FalseClass, Fixnum].freeze
+    CANT_CLONE = [NilClass, TrueClass, FalseClass, Integer].freeze
 
     def initialize opts = {}
       @class_name = opts.delete(:class_name) if opts.present?

lib/dolly/query.rb

@@ -18,7 +18,7 @@ def find *keys
         if keys.count > 1
           build_collection( query_hash )
         else
-          self.new.from_json( database.all_docs(query_hash).parsed_response )
+          self.new( database.all_docs(query_hash).parsed_response )
         end
       rescue NoMethodError => err
         if err.message == "undefined method `[]' for nil:NilClass"
@@ -72,7 +72,7 @@ def view doc, options = {}
       end
 
       def raw_view doc, view, opts = {}
-        JSON.parse database.get "_design/#{doc}/_view/#{view}", opts
+        database.get "_design/#{doc}/_view/#{view}", opts
       end
 
     end

lib/dolly/request.rb

@@ -81,11 +81,12 @@ def request method, resource, data = nil
     end
 
     private
+
     def tools path, opts = nil
       data = {}
       q = "?#{CGI.unescape(opts.to_query)}" unless opts.blank?
       data.merge!(basic_auth: auth_info) if auth_info.present?
-      JSON::parse self.class.get("/#{path}#{q}", data)
+      self.class.get("/#{path}#{q}", data)
     end
 
     def auth_info

lib/tasks/db.rake

@@ -38,7 +38,7 @@ namespace :db do
       view_doc.merge!( '_id' => design_doc_name, 'language' => 'coffeescript')
 
       begin
-        hash_doc = JSON::parse Dolly::Document.database.get(view_doc["_id"]).parsed_response
+        hash_doc = Dolly::Document.database.get(view_doc["_id"]).parsed_response
 
         rev = hash_doc.delete('_rev')