dolly 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8e886107b3a3b884726d4a2497e2e4cd47690bf
-  data.tar.gz: 9fd518c6a9b2c06ca14fbad305bb1afb2d9a8a49
+  metadata.gz: 94c8771287f56c3dc8037d0847c45cde37301bf1
+  data.tar.gz: 60819593da81aa2312205e940753e8358c72d65d
 SHA512:
-  metadata.gz: 7dbe2cc21c9cd20c9f5011fb17ddc3f64856298645ce33c25f0408ba76aa684a68351c270ca76ab29a1a797bb3a4f333afa43570531d7a205616b7e837c09193
-  data.tar.gz: 11c1a0face5e9722e294c6d2ae093997fad57826c8be1e22915448edffd21ca86696362d805bf3ca451719becc1e41228f7873256e4c78821393c385a78b0f5a
+  metadata.gz: 384b3d6789af88ba43e1a3f2f7e05d863f8095625f2f3b0637b497366174361ce434bc42595257d60fca3d8e8f1b2a5bad6123b46c45f346b91b1708c2d55c21
+  data.tar.gz: 0bf4f41521a7755687d6bae67020111f2677d9d8297c0bd72c97a1a8b4dd100cd87e51bf251ec5ee6ba63e84cead812c5fc8ac1666ed7e42f08ecc2eca3dfd20

data/lib/dolly/bulk_document.rb

@@ -0,0 +1,85 @@
+require 'dolly/bulk_error'
+
+module Dolly
+  class BulkDocument
+    include Enumerable
+    extend Forwardable
+
+    DOC_NAME  = "_bulk_docs".freeze
+
+    attr_reader :payload, :database
+    attr_accessor :errors, :response
+
+    def_delegators :docs, :[], :<<
+
+    def initialize database, ary = []
+      @database = database
+      @payload = Hash.new
+      self.payload[:docs] = ary
+    end
+
+    def docs
+      self.payload[:docs]
+    end
+
+    def save
+      return if docs.empty?
+      self.response = JSON::parse self.database.post(DOC_NAME, json_payload)
+      build_errors
+      update_revs
+    end
+
+    def delete
+      return if docs.empty?
+      JSON::parse database.post DOC_NAME, json_payload("_deleted" => true)
+    end
+
+    def clear
+      self.payload[:docs] = []
+      self.response = []
+      self.errors = []
+    end
+
+    def with_errors?
+      response_errors.present?
+    end
+
+    private
+    def update_revs
+      self.response.each do |doc|
+        next if doc['error']
+        item = self.payload[:docs].detect{|d| d.id == doc['id']}
+        if item.nil?
+          self.errors << BulkError.new({"error" => "Document saved but not local rev updated.", "reason" => "Document with id #{doc['id']} on bulk doc was not found in payload.", "obj" => nil})
+          next
+        end
+        item.doc['_rev'] = doc['rev']
+        self.payload[:docs].delete item
+      end
+      clean_response
+    end
+
+    def clean_response
+      self.response.delete_if {|doc| !doc['error'] }
+    end
+
+    def build_errors
+      self.errors = response_errors.map do |err|
+        obj = self.payload[:docs].detect{|d| d.id == err['id']} if err['id']
+        BulkError.new err.merge!("obj" => obj)
+      end
+    end
+
+    def bare_docs
+      self.payload[:docs].map(&:doc)
+    end
+
+    def json_payload opts = {}
+      {docs: bare_docs.map{|d| d.merge(opts)} }.to_json
+    end
+
+    def response_errors
+      self.response.select{|d| d['error']}
+    end
+  end
+end

data/lib/dolly/bulk_error.rb

@@ -0,0 +1,16 @@
+module Dolly
+  class BulkError
+    attr_accessor :obj, :name, :message
+
+    def initialize options = {}
+      self.obj = options['obj']
+      self.name = options['error']
+      self.message = options['reason']
+    end
+
+    def to_s
+      message
+    end
+
+  end
+end

data/lib/dolly/collection.rb

@@ -1,5 +1,3 @@
-require 'dolly/representations/collection_representation'
-
 module Dolly
   class Collection
     extend Forwardable
@@ -44,8 +42,22 @@ module Dolly
       length
     end
 
+    def rows= ary
+      ary.each do |r|
+        next unless r['doc']
+        properties = r['doc']
+        id = properties.delete '_id'
+        rev = properties.delete '_rev' if properties['_rev']
+        document = docs_class.new properties
+        document.doc = properties.merge({'_id' => id, '_rev' => rev})
+        @set << document
+      end
+      @rows = ary
+    end
+
     def load
-      @set = self.extend(representation).from_json(json).rows
+      parsed = JSON::parse json
+      self.rows = parsed['rows']
     end
 
     def to_json options = {}
@@ -54,10 +66,6 @@ module Dolly
     end
 
     private
-    def representation
-      Representations::CollectionRepresentation.config(docs_class)
-    end
-
     def docs_class
       @docs_class
     end

data/lib/dolly/connection.rb

@@ -1,6 +1,7 @@
 require "dolly/request"
 require "dolly/name_space"
 require "dolly/db_config"
+require "dolly/bulk_document"
 
 module Dolly
   module Connection
@@ -13,6 +14,14 @@ module Dolly
       @database ||= Request.new(env)
     end
 
+    def bulk_document
+      @bulk_document ||= BulkDocument.new(database)
+    end
+
+    def bulk_save
+      bulk_document.save
+    end
+
     def database_name value
       @@database_name ||= value
     end

data/lib/dolly/document.rb

@@ -22,6 +22,7 @@ module Dolly
     end
 
     def save
+      self.doc['_id'] = self.class.next_id if self.doc['_id'].blank?
       response = database.put(id_as_resource, self.doc.to_json)
       obj = JSON::parse response.parsed_response
       doc['_rev'] = obj['rev'] if obj['rev']
@@ -33,7 +34,15 @@ module Dolly
       save
     end
 
+    def destroy soft = false
+      #TODO: Add soft delete support
+      q = id_as_resource + "?rev=#{rev}"
+      response = database.delete(q)
+      JSON::parse response.parsed_response
+    end
+
     def rows= col
+      raise Dolly::ResourceNotFound if col.empty?
       col.each{ |r| @doc = r['doc'] }
       _properties.each do |p|
         self.send "#{p.name}=", doc[p.name]
@@ -42,7 +51,9 @@ module Dolly
     end
 
     def from_json string
-      self.class.new.extend(representation).from_json( string )
+      parsed = JSON::parse( string )
+      self.rows = parsed['rows']
+      self
     end
 
     def database
@@ -53,10 +64,6 @@ module Dolly
       CGI::escape id
     end
 
-    def representation
-      Representations::DocumentRepresentation.config(self.properties)
-    end
-
     def self.create options = {}
       obj = new options
       obj.save
@@ -95,7 +102,12 @@ module Dolly
     end
 
     def init_properties options = {}
-      options.each{|k, v| send(:"#{k}=", v)}
+      #TODO: right now not listed properties will be ignored
+      options.each do |k, v|
+        next unless respond_to? :"#{k}="
+        send(:"#{k}=", v)
+      end
+      self.doc ||= {}
     end
   end
 end

data/lib/dolly/interpreter.rb

@@ -0,0 +1,5 @@
+module Dolly
+  module Interpreter
+
+  end
+end

data/lib/dolly/query.rb

@@ -1,7 +1,5 @@
 require "dolly/connection"
 require "dolly/collection"
-require "dolly/representations/document_representation"
-require "dolly/representations/collection_representation"
 require "dolly/name_space"
 require "exceptions/dolly"
 
@@ -40,7 +38,13 @@ module Dolly
       end
 
       def build_collection q
-        Collection.new default_view(q).parsed_response, name.constantize
+        res = default_view(q)
+        Collection.new res.parsed_response, name.constantize
+      end
+
+      def find_with doc, view_name, opts = {}
+        res = view "_design/#{doc}/_view/#{view_name}", opts
+        Collection.new res.parsed_response, name.constantize
       end
 
       def default_view options = {}

data/lib/dolly/request.rb

@@ -1,4 +1,5 @@
 require "httparty"
+require "dolly/bulk_document"
 
 module Dolly
 
@@ -7,7 +8,7 @@ module Dolly
     DEFAULT_HOST = 'localhost'
     DEFAULT_PORT = '5984'
 
-    attr_accessor :database_name, :host, :port
+    attr_accessor :database_name, :host, :port, :bulk_document
 
     def initialize options = {}
       @host = options["host"] || DEFAULT_HOST
@@ -17,6 +18,7 @@ module Dolly
       @username      = options["username"]
       @password      = options["password"]
 
+      @bulk_document = Dolly::BulkDocument.new []
       self.class.base_uri "#{protocol}://#{auth_info}#{host}:#{port}"
     end
 
@@ -29,6 +31,10 @@ module Dolly
       request :put, resource, {body: data}
     end
 
+    def post resource, data
+      request :post, resource, {body: data}
+    end
+
     def delete resource
       request :delete, resource, {}
     end

data/lib/dolly/version.rb

@@ -1,3 +1,3 @@
 module Dolly
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/test/bulk_document_test.rb

@@ -0,0 +1,44 @@
+require 'test_helper'
+
+class Doc < Dolly::Document
+  property :name
+end
+
+class BulkDocumentTest < ActiveSupport::TestCase
+
+  setup do
+    @doc = Dolly::Document.bulk_document
+    @req = "http://localhost:5984/test/_bulk_docs"
+  end
+
+  teardown do
+    @doc.clear
+  end
+
+  test 'bulk document intialize with empty payload' do
+    assert_equal [], @doc.docs
+  end
+
+  test 'adding document to bulk_doc' do
+    d = Doc.new
+    @doc << d
+    assert @doc.docs.include?(d)
+  end
+
+  test 'save document will remove docs from payload' do
+    docs = 3.times.map{ Doc.new name: "a" }
+    docs.each do |d|
+      d.doc['_id'] = "foo_bar/#{SecureRandom.uuid}"
+      @doc << d
+    end
+
+    res = docs.map{|d| {ok: true, id: d.id, rev: "2-#{SecureRandom.uuid}"} }.to_json
+    FakeWeb.register_uri :post, @req, body: res
+
+    @doc.save
+
+    assert_equal [], @doc.errors
+    assert_equal [], @doc.docs
+  end
+
+end

data/test/document_test.rb

@@ -173,6 +173,33 @@ class DocumentTest < ActiveSupport::TestCase
     assert last_2.kind_of?(Dolly::Collection)
   end
 
+  test 'delete method on document' do
+    resp = {ok: true, id: "foo_bar/1", rev: "FF0000"}
+    FakeWeb.register_uri :delete, /http:\/\/localhost:5984\/test\/foo_bar%2F[^\?]+\?rev=.+/, body: resp.to_json
+    doc = FooBar.find "1"
+    doc.destroy
+  end
+
+  test 'soft delete on document' do
+    skip "delete should be able to do soft deletion."
+  end
+
+  test 'query custom view' do
+    FakeWeb.register_uri :get, "http://localhost:5984/test/_design/test/_view/custom_view?key=1&include_docs=true", body: @multi_resp.to_json
+    f = FooBar.find_with "test", "custom_view", key: 1
+    assert_equal 2, f.count
+    f.each{ |d| assert d.kind_of?(FooBar) }
+  end
+
+  test 'new document have id' do
+    foo = FooBar.new
+    assert_equal 0, (foo.id =~ /^foo_bar\/[abcdef0-9]+/i)
+  end
+
+  test 'Dolly::Document have bulk_document instance' do
+    assert Dolly::Document.bulk_document.kind_of?(Dolly::BulkDocument)
+  end
+
   private
   def build_view_response properties
     rows = properties.map.with_index do |v, i|