Skip to content

Commit

Permalink
Merge pull request #113 from thilo/master
Browse files Browse the repository at this point in the history 
reuse existing connection when querying lists
  • Loading branch information
@langalex
langalex committed Dec 8, 2015
2 parents 688f896 + 94fad07 commit e92f3cd
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 30 deletions.
2 changes: 1 addition & 1 deletion lib/couch_potato/view/view_query.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def updated_views

def query_view(parameters)
if @list_name
CouchRest.get CouchRest.paramify_url(CouchPotato.full_url_to_database + "/_design/#{@design_document_name}/_list/#{@list_name}/#{@view_name}", parameters)
@database.connection.get CouchRest.paramify_url("/#{@database.name}/_design/#{@design_document_name}/_list/#{@list_name}/#{@view_name}", parameters)
else
@database.view view_url, parameters
end
Expand Down
54 changes: 25 additions & 29 deletions spec/unit/view_query_spec.rb
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
require 'spec_helper'

describe CouchPotato::View::ViewQuery, 'query_view!' do
let(:db) { double 'db', :get => nil, view: nil, :save_doc => nil,
connection: double.as_null_object, name: nil }

before(:each) do
allow(CouchRest).to receive_messages(:get => nil)
CouchPotato::View::ViewQuery.clear_cache
end

it "does not pass a key if conditions are empty" do
db = double 'db', :get => nil, :save_doc => nil
expect(db).to receive(:view).with(anything, {})
CouchPotato::View::ViewQuery.new(db, '', {:view0 => {}}).query_view!
end

it 'updates a view if it does not exist' do
db = double 'db', :get => nil, :view => nil

expect(db).to receive(:save_doc).with(
'views' => {'view' => {'map' => '<map_code>', 'reduce' => '<reduce_code>'}, 'lib' => {'test' => '<lib_code>'}},
'lists' => {},
Expand All @@ -26,7 +25,6 @@
end

it 'only updates a view once' do
db = double :db, view: nil
allow(db).to receive(:get).and_return({'views' => {}}, {'views' => {}, x: 1}) # return something different on the second call otherwise it would never try to update the views twice
query = CouchPotato::View::ViewQuery.new(db, 'design', {:view => {:map => '<map_code>', :reduce => '<reduce_code>'}})

Expand All @@ -36,7 +34,6 @@
end

it 'updates a view again after clearing the view cache' do
db = double :db, view: nil
allow(db).to receive(:get).and_return({'views' => {}}, {'views' => {}, x: 1}) # return something different on the second call otherwise it would never try to update the views twice
query = CouchPotato::View::ViewQuery.new(db, 'design', {:view => {:map => '<map_code>', :reduce => '<reduce_code>'}})

Expand All @@ -48,8 +45,6 @@
end

it 'updates a view in erlang if it does not exist' do
db = double 'db', :get => nil, :view => nil

expect(db).to receive(:save_doc).with(
'views' => {'view' => {'map' => '<map_code>', 'reduce' => '<reduce_code>'}},
'lists' => {}, "_id" => "_design/design", "language" => "erlang")
Expand All @@ -60,47 +55,47 @@
end

it "does not update a view when the views object haven't changed" do
db = double 'db', :get => {'views' => {'view' => {'map' => '<map_code>', 'reduce' => '<reduce_code>'}}}, :view => nil
allow(db).to receive(:get).and_return({'views' => {'view' => {'map' => '<map_code>', 'reduce' => '<reduce_code>'}}})
expect(db).not_to receive(:save_doc)
CouchPotato::View::ViewQuery.new(db, 'design', {:view => {:map => '<map_code>', :reduce => '<reduce_code>'}}, nil, nil).query_view!
end

it "does not update a view when the list function hasn't changed" do
db = double 'db', :get => {'views' => {'view' => {'map' => '<map_code>', 'reduce' => '<reduce_code>'}}, 'lists' => {'list0' => '<list_code>'}}, :view => nil
allow(db).to receive(:get).and_return({'views' => {'view' => {'map' => '<map_code>', 'reduce' => '<reduce_code>'}}, 'lists' => {'list0' => '<list_code>'}})
expect(db).not_to receive(:save_doc)
CouchPotato::View::ViewQuery.new(db, 'design', {:view => {:map => '<map_code>', :reduce => '<reduce_code>'}}, :list0 => '<list_code>').query_view!
end

it "does not update a view when the lib function hasn't changed" do
db = double 'db', :get => {'views' => {'view' => {'map' => '<map_code>', 'reduce' => '<reduce_code>'}, 'lib' => {'test' => '<lib_code>'}}}, :view => nil
allow(db).to receive(:get).and_return({'views' => {'view' => {'map' => '<map_code>', 'reduce' => '<reduce_code>'}, 'lib' => {'test' => '<lib_code>'}}})

expect(db).not_to receive(:save_doc)

CouchPotato::View::ViewQuery.new(db, 'design', {:view => {:map => '<map_code>', :reduce => '<reduce_code>'}}, nil, {'test' => "<lib_code>"}).query_view!
end

it "updates a view when the map function has changed" do
db = double 'db', :get => {'views' => {'view2' => {'map' => '<map_code>', 'reduce' => '<reduce_code>'}}}, :view => nil
allow(db).to receive(:get).and_return({'views' => {'view2' => {'map' => '<map_code>', 'reduce' => '<reduce_code>'}}})
expect(db).to receive(:save_doc)
CouchPotato::View::ViewQuery.new(db, 'design', :view2 => {:map => '<new map_code>', :reduce => '<reduce_code>'}).query_view!
end

it "updates a view when the map function has changed" do
db = double 'db', :get => {'views' => {'view3' => {'map' => '<map_code>'}}}, :view => nil
allow(db).to receive(:get).and_return({'views' => {'view3' => {'map' => '<map_code>'}}})
expect(db).to receive(:save_doc)
CouchPotato::View::ViewQuery.new(db, 'design', :view3 => {:map => '<new map_code>'}).query_view!
end

it "updates a view when the lib hash has changed" do
db = double 'db', :get => {'views' => {'view4' => {'map' => '<map_code>'}}}, 'lib' => {'test' => "<test_lib>"}, :view => nil
allow(db).to receive(:get).and_return({'views' => {'view4' => {'map' => '<map_code>'}}}, 'lib' => {'test' => "<test_lib>"})

expect(db).to receive(:save_doc)

CouchPotato::View::ViewQuery.new(db, 'design', {:view4 => {:map => '<map_code>'}}, nil, {:test => "<test_lib>"}).query_view!
end

it "doesn't override libs with different names" do
db = double 'db', :get => {'views' => {'view5' => {'map' => '<map_code>'}, 'lib' => {'test' => "<test_lib>"}}}, :view => nil
allow(db).to receive(:get).and_return({'views' => {'view5' => {'map' => '<map_code>'}, 'lib' => {'test' => "<test_lib>"}}})
expect(db).to receive(:save_doc).with({
'views' => {
'view5' => {'map' => '<map_code>'},
Expand All @@ -111,7 +106,7 @@
end

it "overrides libs with the same name" do
db = double 'db', :get => {'views' => {'view6' => {'map' => '<map_code>'}, 'lib' => {'test' => "<test_lib>"}}}, :view => nil
allow(db).to receive(:get).and_return({'views' => {'view6' => {'map' => '<map_code>'}, 'lib' => {'test' => "<test_lib>"}}})

expect(db).to receive(:save_doc).with({
'views' => {
Expand All @@ -124,54 +119,55 @@
end

it "does not pass in reduce or lib keys if there is no lib or reduce object" do
db = double 'db', :get => {'views' => {}}, :view => nil
allow(db).to receive(:get).and_return({'views' => {}})
expect(db).to receive(:save_doc).with('views' => {'view7' => {'map' => '<map code>'}})
CouchPotato::View::ViewQuery.new(db, 'design', :view7 => {:map => '<map code>', :reduce => nil}).query_view!
end

it "updates a view when the reduce function has changed" do
db = double 'db', :get => {'views' => {'view8' => {'map' => '<map_code>', 'reduce' => '<reduce_code>'}}}, :view => nil
allow(db).to receive(:get).and_return({'views' => {'view8' => {'map' => '<map_code>', 'reduce' => '<reduce_code>'}}})
expect(db).to receive(:save_doc)
CouchPotato::View::ViewQuery.new(db, 'design', :view8 => {:map => '<map_code>', :reduce => '<new reduce_code>'}).query_view!
end

it "updates a view when the list function has changed" do
db = double 'db', :get => {
allow(db).to receive(:get).and_return({
'views' => {'view9' => {'map' => '<map_code>', 'reduce' => '<reduce_code>'}},
'lists' => {'list1' => '<list_code>'}
}, :view => nil
})
expect(db).to receive(:save_doc)
CouchPotato::View::ViewQuery.new(db, 'design', {:view9 => {:map => '<map_code>', :reduce => '<reduce_code>'}}, :list1 => '<new_list_code>').query_view!
end

it "updates a view when there wasn't a list function but now there is one" do
db = double 'db', :get => {
allow(db).to receive(:get).and_return({
'views' => {'view10' => {'map' => '<map_code>', 'reduce' => '<reduce_code>'}}
}, :view => nil
})
expect(db).to receive(:save_doc)
CouchPotato::View::ViewQuery.new(db, 'design', {:view10 => {:map => '<map_code>', :reduce => '<reduce_code>'}}, :list1 => '<new_list_code>').query_view!
end

it "does not update a view when there is a list function but no list function is passed" do
db = double 'db', :get => {
allow(db).to receive(:get).and_return({
'views' => {'view11' => {'map' => '<map_code>', 'reduce' => '<reduce_code>'}},
'lists' => {'list1' => '<list_code>'}
}, :view => nil
})
expect(db).not_to receive(:save_doc)
CouchPotato::View::ViewQuery.new(db, 'design', {:view11 => {:map => '<map_code>', :reduce => '<reduce_code>'}}, {}).query_view!
end

it "does not update a view when there were no lists before and no list function is passed" do
db = double 'db', :get => {
allow(db).to receive(:get).and_return({
'views' => {'view12' => {'map' => '<map_code>', 'reduce' => '<reduce_code>'}}
}, :view => nil
})
expect(db).not_to receive(:save_doc)
CouchPotato::View::ViewQuery.new(db, 'design', {:view12 => {:map => '<map_code>', :reduce => '<reduce_code>'}}, {}).query_view!
end

it "queries CouchRest directly when querying a list" do
db = double('db').as_null_object
expect(CouchRest).to receive(:get).with('http://127.0.0.1:5984/couch_potato_test/_design/my_design/_list/list1/view13?key=1')
it "queries the database directly when querying a list" do
allow(db).to receive(:name){'my_database'}

expect(db.connection).to receive(:get).with('/my_database/_design/my_design/_list/list1/view13?key=1')
CouchPotato::View::ViewQuery.new(db, 'my_design', {:view13 => {:map => '<map_code>', :reduce => '<reduce_code>'}}, :list1 => '<new_list_code>').query_view!(:key => 1)
end

Expand Down

0 comments on commit e92f3cd

Please sign in to comment.