dolly 1.1.7 → 3.1.1

data/test/document_test.rb

@@ -1,7 +1,5 @@
 require 'test_helper'
 
-class BaseDolly < Dolly::Document; end
-
 class BarFoo < BaseDolly
   property :a, :b, :c, :d, :e, :f, :g, :h, :i, :j, :k, :l, :m, :n, :persist
 end
@@ -30,7 +28,7 @@ class FooBaz < Dolly::Document
 end
 
 class WithTime < Dolly::Document
-  property :created_at, default: -> {Time.now}
+  property :created_at, default: -> { Time.now }
 end
 
 class TestFoo < Dolly::Document
@@ -41,7 +39,7 @@ class DocumentWithValidMethod < Dolly::Document
   property :foo
 
   def valid?
-    foo.present?
+    !foo.nil?
   end
 end
 
@@ -53,8 +51,7 @@ class Bar < FooBar
   property :a, :b
 end
 
-class DocumentTest < ActiveSupport::TestCase
-  DB_BASE_PATH = "http://localhost:5984/test".freeze
+class DocumentTest < Test::Unit::TestCase
 
   def setup
     data     = {foo: 'Foo', bar: 'Bar', type: 'foo_bar'}
@@ -72,23 +69,51 @@ class DocumentTest < ActiveSupport::TestCase
     build_request [["foo_bar","1"],["foo_bar","2"]], @multi_resp
 
     #TODO: Mock Dolly::Request to return helper with expected response. request builder can be tested by itself.
-    FakeWeb.register_uri :get, "#{query_base_path}?startkey=%22foo_bar%2F%22&endkey=%22foo_bar%2F%EF%BF%B0%22&include_docs=true", body: @multi_resp.to_json
-    FakeWeb.register_uri :get, "#{query_base_path}?startkey=%22foo_bar%2F%22&endkey=%22foo_bar%2F%EF%BF%B0%22&limit=1&include_docs=true", body: view_resp.to_json
-    FakeWeb.register_uri :get, "#{query_base_path}?endkey=%22foo_bar%2F%22&startkey=%22foo_bar%2F%EF%BF%B0%22&limit=1&descending=true&include_docs=true", body: view_resp.to_json
-    FakeWeb.register_uri :get, "#{query_base_path}?startkey=%22foo_bar%2F%22&endkey=%22foo_bar%22%2C%7B%7D&limit=2&include_docs=true", body: @multi_resp.to_json
-    FakeWeb.register_uri :get, "#{query_base_path}?endkey=%22foo_bar%2F%22&startkey=%22foo_bar%2F%EF%BF%B0%22&limit=2&descending=true&include_docs=true", body: @multi_resp.to_json
-    FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%22foo_bar%2F1%22%5D&include_docs=true", body: view_resp.to_json
-    FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%5D&include_docs=true", body: not_found_resp.to_json
-    FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%22foo_bar%2Ferror%22%5D&include_docs=true", body: 'error', status: ["500", "Error"]
-    FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%22foo_bar%2F1%22%2C%22foo_bar%2F2%22%5D&include_docs=true", body: @multi_resp.to_json
-    FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%22foo_bar%2F2%22%5D&include_docs=true", body: not_found_resp.to_json
-    FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%22foo_bar%2Fbig_doc%22%5D&include_docs=true", body: build_view_response([data.merge(other_property: 'other')]).to_json
+    stub_request(:get, "#{query_base_path}?startkey=%22foo_bar%2F%22&endkey=%22foo_bar%2F%EF%BF%B0%22&include_docs=true").
+      to_return(body: @multi_resp.to_json)
+
+    stub_request(:get, "#{query_base_path}?startkey=%22foo_bar%2F%22&endkey=%22foo_bar%2F%EF%BF%B0%22&limit=1&include_docs=true").
+      to_return(body: view_resp.to_json)
+
+    stub_request(:get, "#{query_base_path}?startkey=%22foo_bar%2F%22&endkey=%22foo_bar%2F%EF%BF%B0%22&limit=2&include_docs=true").
+      to_return(body: view_resp.to_json)
+
+    stub_request(:get, "#{query_base_path}?endkey=%22foo_bar%2F%22&startkey=%22foo_bar%2F%EF%BF%B0%22&limit=1&descending=true&include_docs=true").
+      to_return(body: view_resp.to_json)
+
+    stub_request(:get, "#{query_base_path}?startkey=%22foo_bar%2F%22&endkey=%22foo_bar%22%2C%7B%7D&limit=2&include_docs=true").
+      to_return(body: @multi_resp.to_json)
+
+    stub_request(:get, "#{query_base_path}?endkey=%22foo_bar%2F%22&startkey=%22foo_bar%2F%EF%BF%B0%22&limit=2&descending=true&include_docs=true").
+      to_return(body: @multi_resp.to_json)
+
+    stub_request(:get, "#{query_base_path}?keys=%5B%22foo_bar%2F1%22%5D&include_docs=true").
+      to_return(body: view_resp.to_json)
+
+    stub_request(:get, "#{query_base_path}?keys=%5B%5D&include_docs=true").
+      to_return(body: not_found_resp.to_json)
+
+    stub_request(:get, "#{query_base_path}?keys=%5B%22foo_bar%2Ferror%22%5D&include_docs=true").
+      to_return(body: 'error', status: ["500", "Error"])
+
+    stub_request(:get, "#{query_base_path}?keys=%5B%22foo_bar%2F1%22%2C%22foo_bar%2F2%22%5D&include_docs=true").
+      to_return(body: @multi_resp.to_json)
+
+    stub_request(:get, "#{query_base_path}?keys=%5B%22foo_bar%2F2%22%5D&include_docs=true").
+      to_return(status: 404, body: not_found_resp.to_json)
+
+    stub_request(:get, "#{query_base_path}?keys=%5B%22foo_bar%2Fbig_doc%22%5D&include_docs=true").
+      to_return(body: build_view_response([data.merge(other_property: 'other')]).to_json)
+
   end
 
   test 'new in memory document' do
     #TODO: clean up all the fake request creation
     resp = {ok: true, id: "foo_bar/1", rev: "FF0000"}
-    FakeWeb.register_uri :put, /http:\/\/localhost:5984\/test\/foo_bar%2F.+/, body: resp.to_json
+
+    stub_request(:put, /http:\/\/localhost:5984\/test\/foo_bar%2F.+/).
+     to_return(body: resp.to_json)
+
     properties = {foo: 1, bar: 2, boolean: false}
     foo = FooBar.new properties
     assert_equal 1, foo.with_default
@@ -100,15 +125,15 @@ class DocumentTest < ActiveSupport::TestCase
 
   test 'empty find should raise error' do
     assert_raise Dolly::ResourceNotFound do
-      FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%5D&include_docs=true", :status => ["404", "Not Found"]
-      foo = FooBar.find
+      stub_request(:get, "#{query_base_path}?keys=%5B%5D&include_docs=true").to_return(status: 404)
+      FooBar.find
     end
   end
 
   test 'error on server raises Dolly::ServerError' do
     assert_raise Dolly::ServerError do
-      FakeWeb.register_uri :get, "#{query_base_path}?keys=", :status => ["500", "Error"]
-      foo = FooBar.find 'error'
+      stub_request(:get, "#{query_base_path}?keys=").to_return(status: 500)
+      FooBar.find 'error'
     end
   end
 
@@ -175,28 +200,36 @@ class DocumentTest < ActiveSupport::TestCase
 
   test 'getting not found document' do
     assert_raise Dolly::ResourceNotFound do
-      missing = FooBar.find "2"
+      FooBar.find "2"
     end
   end
 
   test 'reload reloads the doc attribute from database' do
     assert foo = FooBar.find('1')
-    expected_doc = foo.doc.dup
-    FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%22foo_bar%2F0%22%5D&include_docs=true", body: build_view_response([expected_doc]).to_json
+    expected_doc = foo.send(:doc).dup
+
+    stub_request(:get, "#{query_base_path}?keys=%5B%22foo_bar%2F0%22%5D&include_docs=true").
+      to_return(body: build_view_response([expected_doc]).to_json)
+
     assert foo.foo = 1
-    assert_not_equal expected_doc, foo.doc
+    assert_not_equal expected_doc, foo.send(:doc)
     assert foo.reload
-    assert_equal expected_doc, foo.doc
+    assert_equal expected_doc, foo.send(:doc)
   end
 
   test 'accessors work as expected after reload' do
     resp = {ok: true, id: "foo_bar/1", rev: "FF0000"}
-    FakeWeb.register_uri :put, "http://localhost:5984/test/foo_bar%2F0", body: resp.to_json
+    stub_request(:put, "http://localhost:5984/test/foo_bar%2F0").
+      to_return(body: resp.to_json)
+
     assert foo = FooBar.find('1')
     assert foo.foo = 1
     assert foo.save
-    assert expected_doc = foo.doc
-    FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%22foo_bar%2F0%22%5D&include_docs=true", body: build_view_response([expected_doc]).to_json
+    assert expected_doc = foo.send(:doc)
+
+    stub_request(:get, "#{query_base_path}?keys=%5B%22foo_bar%2F0%22%5D&include_docs=true").
+      to_return(body: build_view_response([expected_doc]).to_json)
+
     assert foo.reload
     assert_equal 1, foo.foo
   end
@@ -228,9 +261,11 @@ class DocumentTest < ActiveSupport::TestCase
 
   test 'multi response with right data' do
     all = FooBar.all
-    ids = @multi_resp[:rows].map{|d| d[:id]}
+    @multi_resp[:rows].map{|d| d[:id]}
+    @multi_resp[:rows].map{|d| d[:doc][:bar]}
+
     foos = @multi_resp[:rows].map{|d| d[:doc][:foo]}
-    bars = @multi_resp[:rows].map{|d| d[:doc][:bar]}
+
     all.each do |d|
       assert foos.include?(d.foo)
     end
@@ -258,26 +293,34 @@ class DocumentTest < ActiveSupport::TestCase
 
   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
+
+    stub_request(:delete, /http:\/\/localhost:5984\/test\/foo_bar%2F[^\?]+\?rev=.+/).
+      to_return(body: resp.to_json)
+
     doc = FooBar.find "1"
     doc.destroy
   end
 
   test 'soft delete on document' do
     assert doc = FooBar.find("1")
+    build_save_request(doc)
     assert doc.destroy(false)
-    assert_equal true, doc.doc['_deleted']
+    assert_equal true, doc.send(:doc)[:_deleted]
   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
+    stub_request(:get, "http://localhost:5984/test/_design/test/_view/custom_view?key=1&include_docs=true").
+      to_return(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 'query custom view collation' do
-    FakeWeb.register_uri :get, "http://localhost:5984/test/_design/test/_view/custom_view?startkey=%5B1%5D&endkey=%5B1%2C%7B%7D%5D&include_docs=true", body: @multi_type_resp.to_json
+    stub_request(:get, "http://localhost:5984/test/_design/test/_view/custom_view?startkey=%5B1%5D&endkey=%5B1%2C%7B%7D%5D&include_docs=true").
+      to_return(body: @multi_type_resp.to_json)
+
     f = FooBar.find_with "test", "custom_view", { startkey: [1], endkey: [1, {}]}
     assert_equal 2, f.count
     assert f.first.kind_of?(FooBar)
@@ -328,7 +371,7 @@ class DocumentTest < ActiveSupport::TestCase
   end
 
   test 'update document propertys with bang' do
-    foo = FooBar.new 'id' => 'a', foo: 'ab', bar: 'ba'
+    foo = FooBar.new 'id'=> 'a', foo: 'ab', bar: 'ba'
     foo.expects(:save).once
     foo.update_properties! foo: 'c'
   end
@@ -342,13 +385,17 @@ class DocumentTest < ActiveSupport::TestCase
 
   test 'set updated at' do
     foo = FooBar.new 'id' => 'a', foo: 'ab'
+    build_save_request foo
     foo.update_properties! foo: 'c'
     assert_equal Time.now.to_s, foo.updated_at.to_s
   end
 
   test 'created at is set' do
     resp = {ok: true, id: "foo_bar/1", rev: "FF0000"}
-    FakeWeb.register_uri :put, /http:\/\/localhost:5984\/test\/foo_bar%2F.+/, body: resp.to_json
+
+    stub_request(:put, /http:\/\/localhost:5984\/test\/foo_bar%2F.+/).
+      to_return(body: resp.to_json)
+
     properties = {foo: 1, bar: 2, boolean: false}
     foo = FooBar.new properties
     foo.save
@@ -357,6 +404,9 @@ class DocumentTest < ActiveSupport::TestCase
 
   test 'reader :bar is not calling the writer :bar=' do
     foo = FooBar.new
+
+    build_save_request(foo)
+
     foo.bar = 'bar'
     foo.save!
     foo.expects(:bar=).times(0)
@@ -370,6 +420,9 @@ class DocumentTest < ActiveSupport::TestCase
 
   test 'persisted? returns false if _rev is not present' do
     foo = FooBar.new
+
+    build_save_request(foo)
+
     assert_equal foo.persisted?, false
     assert foo.save
     assert_equal foo.persisted?, true
@@ -377,14 +430,20 @@ class DocumentTest < ActiveSupport::TestCase
 
   test 'can save without timestamps' do
     resp = {ok: true, id: "foo_bar/1", rev: "FF0000"}
-    FakeWeb.register_uri :put, /http:\/\/localhost:5984\/test\/foo_baz%2F.+/, body: resp.to_json
+
+    stub_request(:put, /http:\/\/localhost:5984\/test\/foo_baz%2F.+/)
+      .to_return(body: resp.to_json)
+
     foobaz = FooBaz.new foo: {foo: :bar}
     assert foobaz.save!
   end
 
   test 'property writes work correctly with pipe equals' do
     resp = {ok: true, id: "foo_bar/1", rev: "FF0000"}
-    FakeWeb.register_uri :put, /http:\/\/localhost:5984\/test\/foo_baz%2F.+/, body: resp.to_json
+
+    stub_request(:put, /http:\/\/localhost:5984\/test\/foo_baz%2F.+/).
+      to_return(body: resp.to_json)
+
     foobaz = FooBaz.new foo: {'foo' => 'bar'}
     foobaz.add_to_foo 'bar', 'bar'
     assert_equal foobaz.foo, {'foo' => 'bar', 'bar' => 'bar'}
@@ -392,25 +451,28 @@ class DocumentTest < ActiveSupport::TestCase
 
   test 'default should populate before save' do
     test_foo = TestFoo.new
-    assert_equal 'FOO', test_foo.doc['default_test_property']
+    assert_equal 'FOO', test_foo.default_test_property
   end
 
   test 'default should be overridden by params' do
     test_foo = TestFoo.new(default_test_property: 'bar')
-    assert_equal 'bar', test_foo.doc['default_test_property']
+    assert_equal 'bar', test_foo.default_test_property
   end
 
   test 'doc and method and instance var are the same' do
     test_foo = FooBar.new
     test_foo.foo = 'test_value'
     assert_equal 'test_value', test_foo.foo
-    assert_equal 'test_value', test_foo.doc['foo']
+    assert_equal 'test_value', test_foo.send(:doc)[:foo]
     assert_equal 'test_value', test_foo.instance_variable_get(:@foo)
   end
 
   test 'created at is current time' do
     resp = {ok: true, id: "with_time/timed", rev: "FF0000"}
-    FakeWeb.register_uri :put, /http:\/\/localhost:5984\/test\/with_time%2F.+/, body: resp.to_json
+
+    stub_request(:put, /http:\/\/localhost:5984\/test\/with_time%2F.+/).
+      to_return(body: resp.to_json)
+
     test = WithTime.new id: "timed"
     assert test.respond_to?(:created_at)
     assert test.save
@@ -420,7 +482,8 @@ class DocumentTest < ActiveSupport::TestCase
   test 'nil default' do
     properties = {foo: nil, is_nil: nil}
     resp = {ok: true, id: "foo_bar/1", rev: "FF0000"}
-    FakeWeb.register_uri :put, /http:\/\/localhost:5984\/test\/foo_bar%2F.+/, body: resp.to_json
+    stub_request(:put, /http:\/\/localhost:5984\/test\/foo_bar%2F.+/).
+      to_return(body: resp.to_json)
     foo = FooBar.new properties
     foo.save
     properties.each do |k, v|
@@ -444,19 +507,21 @@ class DocumentTest < ActiveSupport::TestCase
 
   test 'save returns false for invalid document on save' do
     foo = DocumentWithValidMethod.new
-    assert_not foo.save
+    assert_equal foo.save, false
   end
 
   test 'save succeeds for invalid document if skipping validations' do
     resp = {ok: true, id: "document_with_valid_method/1", rev: "FF0000"}
-    FakeWeb.register_uri :put, /http:\/\/localhost:5984\/test\/document_with_valid_method%2F.+/, body: resp.to_json
+    stub_request(:put, /http:\/\/localhost:5984\/test\/document_with_valid_method%2F.+/).
+      to_return(body: resp.to_json)
+
     foo = DocumentWithValidMethod.new
     assert foo.save(validate: false)
   end
 
   test 'default objects are not the same in memory' do
     doc_with_same_default = DocWithSameDefaults.new
-    assert_not doc_with_same_default.foo.equal? doc_with_same_default.bar
+    assert_not_same doc_with_same_default.foo, doc_with_same_default.bar
     doc_with_same_default.foo.push 'foo'
     assert doc_with_same_default.bar == []
   end
@@ -473,71 +538,41 @@ class DocumentTest < ActiveSupport::TestCase
 
   test 'attach_file! will add a standalone attachment to the document' do
     assert save_response = {ok: true, id: "base_dolly/79178957-96ff-40d9-9ecb-217fa35bdea7", rev: "1"}
-    assert FakeWeb.register_uri :put, /http:\/\/localhost:5984\/test\/base_dolly%2F.+/, body: save_response.to_json
+
+    assert stub_request(:put, /http:\/\/localhost:5984\/test\/base_dolly%2F.+/).
+      to_return(body: save_response.to_json)
+
     assert doc = BaseDolly.new
     assert doc.save
     assert resp = {ok: true, id: '79178957-96ff-40d9-9ecb-217fa35bdea7', rev: '2'}
-    assert FakeWeb.register_uri :put, /http:\/\/localhost:5984\/test\/base_dolly\/79178957-96ff-40d9-9ecb-217fa35bdea7\/test.txt/, body: resp.to_json
+    assert stub_request(:put, /http:\/\/localhost:5984\/test\/base_dolly\/79178957-96ff-40d9-9ecb-217fa35bdea7\/test.txt/)
+      .to_return(body: resp.to_json)
+
     assert data = File.open("#{FileUtils.pwd}/test/support/test.txt").read
     assert doc.attach_file! 'test.txt', 'text/plain', data
   end
 
   test 'attach_file! will add an inline attachment if specified' do
     assert save_response = {ok: true, id: "base_dolly/79178957-96ff-40d9-9ecb-217fa35bdea7", rev: "1"}
-    assert FakeWeb.register_uri :put, /http:\/\/localhost:5984\/test\/base_dolly%2F.+/, body: save_response.to_json
+
+    assert stub_request(:put, /http:\/\/localhost:5984\/test\/base_dolly%2F.+/).
+     to_return(body: save_response.to_json)
+
     assert doc = BaseDolly.new
     assert doc.save
     assert resp = {ok: true, id: '79178957-96ff-40d9-9ecb-217fa35bdea7', rev: '2'}
-    assert FakeWeb.register_uri :put, /http:\/\/localhost:5984\/test\/base_dolly\/79178957-96ff-40d9-9ecb-217fa35bdea7\/test.txt/, body: resp.to_json
+
+    assert stub_request(:put, /http:\/\/localhost:5984\/test\/base_dolly\/79178957-96ff-40d9-9ecb-217fa35bdea7\/test.txt/).
+      to_return(body: resp.to_json)
+
     assert data = File.open("#{FileUtils.pwd}/test/support/test.txt").read
     assert doc.attach_file! 'test.txt', 'text/plain', data, inline: true
-    assert doc.doc['_attachments']['test.txt'].present?
-    assert_equal Base64.encode64(data), doc.doc['_attachments']['test.txt']['data']
+    assert_equal doc.send(:doc)['_attachments']['test.txt']&.empty?, false
+    assert_equal Base64.encode64(data), doc.send(:doc)['_attachments']['test.txt']['data']
   end
 
   test "new object from inhereted document" do
     assert bar = Bar.new(a: 1)
     assert_equal 1, bar.a
   end
-
-  private
-  def generic_response rows, count = 1
-    {total_rows: count, offset:0, rows: rows}
-  end
-
-  def build_view_response properties
-    rows = properties.map.with_index do |v, i|
-      {
-        id: "foo_bar/#{i}",
-        key: "foo_bar",
-        value: 1,
-        doc: {_id: "foo_bar/#{i}", _rev: SecureRandom.hex}.merge!(v)
-      }
-    end
-    generic_response rows, properties.count
-  end
-
-  def build_view_collation_response properties
-    rows = properties.map.with_index do |v, i|
-      id = i.zero? ? "foo_bar/#{i}" : "baz/#{i}"
-      {
-        id: id,
-        key: "foo_bar",
-        value: 1,
-        doc: {_id: id, _rev: SecureRandom.hex}.merge!(v)
-      }
-    end
-    generic_response rows, properties.count
-  end
-
-
-  def build_request keys, body, view_name = 'foo_bar'
-    query = "keys=#{CGI::escape keys.to_s.gsub(' ','')}&" unless keys.blank?
-    FakeWeb.register_uri :get, "#{query_base_path}?#{query.to_s}include_docs=true", body: body.to_json
-  end
-
-  def query_base_path
-    "#{DB_BASE_PATH}/_all_docs"
-  end
-
 end

data/test/document_type_test.rb

@@ -0,0 +1,28 @@
+require 'test_helper'
+
+class TypedDoc < Dolly::Document
+  typed_model
+end
+
+class UntypedDoc < Dolly::Document
+end
+
+class DocumentTypeTest < Test::Unit::TestCase
+  test 'typed?' do
+    assert_equal(TypedDoc.new.typed?, true)
+    assert_equal(UntypedDoc.new.typed?, false)
+  end
+
+  test 'typed_model' do
+    assert_equal(TypedDoc.new.type, nil)
+    assert_equal(UntypedDoc.new.respond_to?(:type), false)
+    assert_raise NoMethodError do
+      UntypedDoc.new.type
+    end
+  end
+
+  test 'set_type' do
+    assert_equal(TypedDoc.new.set_type, TypedDoc.name_paramitized)
+    assert_equal(UntypedDoc.new.set_type, nil)
+  end
+end

data/test/dummy/config/initializers/filter_parameter_logging.rb

@@ -0,0 +1,4 @@
+# Be sure to restart your server when you modify this file.
+
+# Configure sensitive parameters which will be filtered from the log file.
+Rails.application.config.filter_parameters += [:password]