dolly 3.0.0 → 3.1.2

data/test/mango_test.rb

@@ -0,0 +1,273 @@
+require 'test_helper'
+
+class FooBar < BaseDolly
+  property :foo, :bar
+  property :with_default, default: 1
+  property :boolean, class_name: TrueClass, default: true
+  property :date, class_name: Date
+  property :time, class_name: Time
+  property :datetime, class_name: DateTime
+  property :is_nil, class_name: NilClass, default: nil
+
+  timestamps!
+end
+
+class FooBarTyped < BaseDolly
+  typed_model
+end
+
+class MangoTest < Test::Unit::TestCase
+  DB_BASE_PATH = "http://localhost:5984/test".freeze
+
+  def setup
+    data     = {foo: 'Foo', bar: 'Bar', type: 'foo_bar'}
+
+    all_docs = [ {foo: 'Foo B', bar: 'Bar B', type: 'foo_bar'},  {foo: 'Foo A', bar: 'Bar A', type: 'foo_bar'}]
+
+    view_resp   = build_view_response [data]
+    empty_resp  =  build_view_response []
+    not_found_resp = generic_response [{ key: "foo_bar/2", error: "not_found" }]
+    @multi_resp = build_view_response all_docs
+    @multi_type_resp = build_view_collation_response all_docs
+
+    build_request [["foo_bar","1"]], view_resp
+    build_request [["foo_bar","2"]], empty_resp
+    build_request [["foo_bar","1"],["foo_bar","2"]], @multi_resp
+
+    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, "#{all_docs_path}?key=\"index_foo\"").
+      to_return(body: {
+        total_rows: 2,
+        offset: 0,
+        rows: [{
+          id: '_design/index_foo',
+          key: '_design/index_foo',
+          value: { rev: '1-c5457a0d26da85f15c4ad6bd739e441d' }
+        }]}.to_json)
+
+    stub_request(:get, "#{all_docs_path}?key=\"index_date\"").
+      to_return(body: {
+        total_rows: 2,
+        offset: 0,
+        rows: []}.to_json)
+  end
+
+  test '#find_by' do
+    #TODO: clean up all the fake request creation
+    resp = { docs: [{ foo: 'bar', id: "foo_bar/1"} ] }
+
+    stub_request(:post, query_base_path).
+     to_return(body: resp.to_json)
+
+    key = 'foo'
+    stub_request(:get, "#{all_docs_path}?key=\"_design/index_#{key}\"").
+     to_return(body: index_response(key).to_json)
+
+    assert_equal(FooBar.find_by(foo: 'bar').class, FooBar)
+  end
+
+  test '#find_by for a property that does not have an index' do
+    #TODO: clean up all the fake request creation
+    resp = { docs: [{ foo: 'bar', id: "foo_bar/1"} ] }
+    key = 'date'
+
+    stub_request(:post, query_base_path).
+     to_return(body: resp.to_json)
+
+    stub_request(:get, "#{all_docs_path}?key=\"_design/index_#{key}\"").
+     to_return(body: { rows: [] }.to_json)
+
+    assert_raise Dolly::IndexNotFoundError do
+      FooBar.find_by(date: Date.today)
+    end
+  end
+
+  test '#find_by with no returned data' do
+    resp = { docs: [] }
+
+    stub_request(:post, query_base_path).
+     to_return(body: resp.to_json)
+
+    key = 'foo'
+    stub_request(:get, "#{all_docs_path}?key=\"_design/index_#{key}\"").
+     to_return(body: index_response(key).to_json)
+
+    assert_equal(FooBar.find_by(foo: 'bar'), nil)
+  end
+
+  test '#find_doc_by' do
+    #TODO: clean up all the fake request creation
+    resp = { docs: [{ foo: 'bar', id: "foo_bar/1"} ] }
+
+    stub_request(:post, query_base_path).
+     to_return(body: resp.to_json)
+
+    key = 'foo'
+    stub_request(:get, "#{all_docs_path}?key=\"_design/index_#{key}\"").
+     to_return(body: index_response(key).to_json)
+
+    assert_equal(FooBar.find_doc_by(foo: 'bar').class, Hash)
+  end
+
+  test '#where' do
+    #TODO: clean up all the fake request creation
+    resp = { docs: [{ foo: 'bar', id: "foo_bar/1"} ] }
+
+    stub_request(:post, query_base_path).
+     to_return(body: resp.to_json)
+
+    key = 'foo'
+    stub_request(:get, "#{all_docs_path}?key=\"_design/index_#{key}\"").
+     to_return(body: index_response(key).to_json)
+
+    assert_equal(FooBar.where(foo: { eq: 'bar' }).map(&:class).uniq, [FooBar])
+  end
+
+  test '#where for a property that does not have an index' do
+    #TODO: clean up all the fake request creation
+    resp = { docs: [{ foo: 'bar', id: "foo_bar/1"} ] }
+
+    stub_request(:post, query_base_path).
+     to_return(body: resp.to_json)
+
+    key = 'date'
+    stub_request(:get, "#{all_docs_path}?key=\"_design/index_#{key}\"").
+     to_return(body: { rows: [] }.to_json)
+
+    assert_raise Dolly::IndexNotFoundError do
+      FooBar.where(date: Date.today)
+    end
+  end
+
+  test '#where with no returned data' do
+    resp = { docs: [] }
+
+    stub_request(:post, query_base_path).
+     to_return(body: resp.to_json)
+
+    key = 'foo'
+    stub_request(:get, "#{all_docs_path}?key=\"_design/index_#{key}\"").
+     to_return(body: index_response(key).to_json)
+
+    assert_equal(FooBar.where(foo: 'bar'), [])
+  end
+
+  test '#docs_where' do
+    #TODO: clean up all the fake request creation
+    resp = { docs: [{ foo: 'bar', id: "foo_bar/1"} ] }
+
+    stub_request(:post, query_base_path).
+     to_return(body: resp.to_json)
+
+    key = 'foo'
+    stub_request(:get, "#{all_docs_path}?key=\"_design/index_#{key}\"").
+     to_return(body: index_response(key).to_json)
+
+    assert_equal(FooBar.docs_where(foo: { eq: 'bar' }).map(&:class).uniq, [Hash])
+  end
+
+  test '#build_query' do
+    query = { and: [{ _id: { eq: 'foo_bar/1' } } , { foo: { eq: 'bar'}} ] }
+    opts = {}
+    expected = {"selector"=>{"$and"=>[{:_id=>{"$eq"=>"foo_bar/1"}}, {:foo=>{"$eq"=>"bar"}}]}}
+
+    assert_equal(FooBar.send(:build_query, query, opts), expected)
+  end
+
+  test '#build_query with options' do
+    query = { and: [{ _id: { eq: 'foo_bar/1' } } , { foo: { eq: 'bar'}} ] }
+    opts = { limit: 1, fields: ['foo']}
+    expected = {"selector"=>{"$and"=>[{:_id=>{"$eq"=>"foo_bar/1"}}, {:foo=>{"$eq"=>"bar"}}]}, limit: 1, fields: ['foo']}
+
+    assert_equal(FooBar.send(:build_query, query, opts), expected)
+  end
+
+  test '#build_selectors with invalid operator' do
+    query = { _id: { eeeq: 'foo_bar/1' } }
+
+    assert_raise Dolly::InvalidMangoOperatorError do
+      FooBar.send(:build_selectors, query)
+    end
+  end
+
+  test '#build_selectors with type operator' do
+    query = { _id: { type: "user" } }
+
+    assert_nothing_raised Dolly::InvalidMangoOperatorError do
+      FooBarTyped.send(:build_selectors, query)
+    end
+  end
+
+  test '#build_selectors with $type operator' do
+    query = { _id: { "$type" => "null" } }
+
+    assert_nothing_raised Dolly::InvalidMangoOperatorError do
+      FooBarTyped.send(:build_selectors, query)
+    end
+  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&.empty?
+    stub_request(:get, "#{query_base_path}?#{query.to_s}include_docs=true").
+      to_return(body: body.to_json)
+  end
+
+  def query_base_path
+    "#{DB_BASE_PATH}/_find"
+  end
+
+  def all_docs_path
+    "#{DB_BASE_PATH}/_all_docs"
+  end
+
+  def build_save_request(obj)
+    stub_request(:put, "#{DB_BASE_PATH}/#{CGI.escape(obj.id)}").
+      to_return(body: {ok: true, id: obj.id, rev: "FF0000" }.to_json)
+  end
+
+  def index_response(key)
+    {
+      rows: [
+        {
+          id: "_design/index_#{key}",
+          key: "_design/index_#{key}",
+          value: { rev: '1-c5457a0d26da85f15c4ad6bd739e441d' }
+        }
+      ]
+    }
+  end
+end

data/test/property_manager_test.rb

@@ -0,0 +1,18 @@
+require 'test_helper'
+
+class TestDoc < Dolly::Document
+  property :name, class_name: String
+  property :email, class_name: String
+  property :last_name, class_name: String
+end
+
+class PropertyManagerTest < Test::Unit::TestCase
+  test 'write_attribute with nil value' do
+    doc = TestDoc.new(name: 'name', last_name: nil, email: 'does not change')
+    assert_equal(doc.name, 'name')
+    doc.update_properties(name: nil)
+    assert_equal(doc.name, nil)
+    assert_equal(doc.last_name, nil)
+    assert_equal(doc.email, 'does not change')
+  end
+end

data/test/test_helper.rb

@@ -13,6 +13,7 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 class Test::Unit::TestCase
   DEFAULT_DB = 'test'
+  DB_BASE_PATH = "http://localhost:5984/test".freeze
 
   setup :global_setup
 
@@ -28,4 +29,54 @@ class Test::Unit::TestCase
   def base_path
     %r{http://.*:5984/#{DEFAULT_DB}}
   end
+
+  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_type: id.split("/").first,
+        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&.empty?
+    stub_request(:get, "#{query_base_path}?#{query.to_s}include_docs=true").
+      to_return(body: body.to_json)
+  end
+
+  def query_base_path
+    "#{DB_BASE_PATH}/_all_docs"
+  end
+
+  def build_save_request(obj)
+    stub_request(:put, "#{DB_BASE_PATH}/#{CGI.escape(obj.id)}").
+      to_return(body: {ok: true, id: obj.id, rev: "FF0000" }.to_json)
+  end
 end
+
+class BaseDolly < Dolly::Document; end

data/test/view_query_test.rb

@@ -0,0 +1,27 @@
+ require 'test_helper'
+
+class Foo < Dolly::Document
+end
+
+class ViewQueryTest < Test::Unit::TestCase
+
+  def setup
+    all_docs = [ {foo: 'Foo B', bar: 'Bar B', type: 'foo_bar'},  {foo: 'Foo A', bar: 'Bar A', type: 'foo_bar'}]
+    @multi_type_resp = build_view_collation_response all_docs
+
+    stub_request(:get, "http://localhost:5984/test/_design/doc/_view/id?include_docs=true").
+      to_return(body: @multi_type_resp.to_json)
+
+  end
+
+  test 'raw_view' do
+    assert_equal(Foo.raw_view('doc', 'id'), @multi_type_resp)
+    assert_equal(Foo.raw_view('doc', 'id')[:rows].any?, true)
+    assert_equal(Foo.raw_view('doc', 'id')[:total_rows].nil?, false)
+  end
+
+  test 'view_value' do
+    expected = @multi_type_resp[:rows].flat_map{|res| res[:value]}
+    assert_equal(Foo.view_value('doc', 'id'), expected)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dolly
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.2
 platform: ruby
 authors:
 - javierg
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-06-20 00:00:00.000000000 Z
+date: 2021-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: curb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: test-unit-full
   requirement: !ruby/object:Gem::Requirement
@@ -115,7 +129,10 @@ files:
 - lib/dolly/document_state.rb
 - lib/dolly/document_type.rb
 - lib/dolly/exceptions.rb
+- lib/dolly/framework_helper.rb
 - lib/dolly/identity_properties.rb
+- lib/dolly/mango.rb
+- lib/dolly/mango_index.rb
 - lib/dolly/properties.rb
 - lib/dolly/property.rb
 - lib/dolly/property_manager.rb
@@ -126,19 +143,27 @@ files:
 - lib/dolly/request_header.rb
 - lib/dolly/timestamp.rb
 - lib/dolly/version.rb
+- lib/dolly/view_query.rb
 - lib/railties/railtie.rb
+- lib/refinements/hash_refinements.rb
 - lib/refinements/string_refinements.rb
 - lib/tasks/db.rake
 - test/bulk_document_test.rb
 - test/document_test.rb
+- test/document_type_test.rb
 - test/dummy/config/initializers/filter_parameter_logging.rb
 - test/dummy/log/test.log
+- test/inheritance_test.rb
+- test/mango_index_test.rb
+- test/mango_test.rb
+- test/property_manager_test.rb
 - test/support/test.txt
 - test/test_helper.rb
+- test/view_query_test.rb
 homepage: https://www.amco.me
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -153,15 +178,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: will write something
 test_files:
 - test/dummy/config/initializers/filter_parameter_logging.rb
 - test/dummy/log/test.log
+- test/inheritance_test.rb
+- test/document_type_test.rb
+- test/mango_index_test.rb
 - test/bulk_document_test.rb
+- test/view_query_test.rb
+- test/mango_test.rb
 - test/support/test.txt
 - test/test_helper.rb
 - test/document_test.rb
+- test/property_manager_test.rb