From 9a4ef7e7eb1fe73938578d82c2662913e3d51ad6 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 26 Aug 2014 23:32:41 +0300 Subject: Search results libraries added Gitlab::SearchResults and Gitlab::ProjectSearchResults are libraries we are going to use to get search results based on query, enitity type and pagination. It will allow us to get only issues from project #23 where title or description includes 'foo'. Ex: search_results = Gitlab::ProjectSearchResults.new(project.id, 'foo', 'issues') search_results.objects => # [, ] search_results.issues_count => 2 search_results.total_count => 12 (it includes results from comments and merge requests too) Signed-off-by: Dmitriy Zaporozhets --- lib/gitlab/project_search_results.rb | 62 +++++++++++++++++++++++++++++ lib/gitlab/search_results.rb | 75 ++++++++++++++++++++++++++++++++++++ 2 files changed, 137 insertions(+) create mode 100644 lib/gitlab/project_search_results.rb create mode 100644 lib/gitlab/search_results.rb (limited to 'lib') diff --git a/lib/gitlab/project_search_results.rb b/lib/gitlab/project_search_results.rb new file mode 100644 index 00000000000..b0a0bee1c81 --- /dev/null +++ b/lib/gitlab/project_search_results.rb @@ -0,0 +1,62 @@ +module Gitlab + class ProjectSearchResults < SearchResults + attr_reader :project, :repository_ref + + def initialize(project_id, query, scope = nil, page = nil, repository_ref = nil) + @project = Project.find(project_id) + @repository_ref = repository_ref + @page = page + @query = Shellwords.shellescape(query) if query.present? + @scope = scope + + unless %w(blobs notes issues merge_requests).include?(@scope) + @scope = default_scope + end + end + + def objects + case scope + when 'notes' + notes.page(page).per(per_page) + when 'blobs' + Kaminari.paginate_array(blobs).page(page).per(per_page) + else + super + end + end + + def total_count + @total_count ||= issues_count + merge_requests_count + blobs_count + notes_count + end + + def blobs_count + @blobs_count ||= blobs.count + end + + def notes_count + @notes_count ||= notes.count + end + + private + + def blobs + if project.empty_repo? + [] + else + project.repository.search_files(query, repository_ref) + end + end + + def notes + Note.where(project_id: limit_project_ids).search(query).order('updated_at DESC') + end + + def default_scope + 'blobs' + end + + def limit_project_ids + [project.id] + end + end +end diff --git a/lib/gitlab/search_results.rb b/lib/gitlab/search_results.rb new file mode 100644 index 00000000000..1325d542a0f --- /dev/null +++ b/lib/gitlab/search_results.rb @@ -0,0 +1,75 @@ +module Gitlab + class SearchResults + attr_reader :scope, :objects, :query, :page + + # Limit search results by passed project ids + # It allows us to search only for projects user has access to + attr_reader :limit_project_ids + + def initialize(limit_project_ids, query, scope = nil, page = nil) + @limit_project_ids = limit_project_ids || Project.all + @page = page + @query = Shellwords.shellescape(query) if query.present? + @scope = scope + + unless %w(projects issues merge_requests).include?(@scope) + @scope = default_scope + end + end + + def objects + case scope + when 'projects' + projects.page(page).per(per_page) + when 'issues' + issues.page(page).per(per_page) + when 'merge_requests' + merge_requests.page(page).per(per_page) + else + Kaminari.paginate_array([]).page(page).per(per_page) + end + end + + def total_count + @total_count ||= projects_count + issues_count + merge_requests_count + end + + def projects_count + @projects_count ||= projects.count + end + + def issues_count + @issues_count ||= issues.count + end + + def merge_requests_count + @merge_requests_count ||= merge_requests.count + end + + def empty? + total_count.zero? + end + + private + + def projects + Project.where(id: limit_project_ids).search(query) + end + + def issues + Issue.where(project_id: limit_project_ids).search(query).order('updated_at DESC') + end + + def merge_requests + MergeRequest.in_projects(limit_project_ids).search(query).order('updated_at DESC') + end + + def default_scope + 'projects' + end + + def per_page + 20 + end + end +end -- cgit v1.2.1 From 9e5bc432630d04867cea9f38383d1a4fc49b62cd Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 27 Aug 2014 00:04:14 +0300 Subject: Pass scope and page to Gitlab::SearchResults#objects instead of initialize Signed-off-by: Dmitriy Zaporozhets --- lib/gitlab/project_search_results.rb | 14 ++------------ lib/gitlab/search_results.rb | 12 +++--------- 2 files changed, 5 insertions(+), 21 deletions(-) (limited to 'lib') diff --git a/lib/gitlab/project_search_results.rb b/lib/gitlab/project_search_results.rb index b0a0bee1c81..71b8f4f452e 100644 --- a/lib/gitlab/project_search_results.rb +++ b/lib/gitlab/project_search_results.rb @@ -2,19 +2,13 @@ module Gitlab class ProjectSearchResults < SearchResults attr_reader :project, :repository_ref - def initialize(project_id, query, scope = nil, page = nil, repository_ref = nil) + def initialize(project_id, query, repository_ref = nil) @project = Project.find(project_id) @repository_ref = repository_ref - @page = page @query = Shellwords.shellescape(query) if query.present? - @scope = scope - - unless %w(blobs notes issues merge_requests).include?(@scope) - @scope = default_scope - end end - def objects + def objects(scope, page) case scope when 'notes' notes.page(page).per(per_page) @@ -51,10 +45,6 @@ module Gitlab Note.where(project_id: limit_project_ids).search(query).order('updated_at DESC') end - def default_scope - 'blobs' - end - def limit_project_ids [project.id] end diff --git a/lib/gitlab/search_results.rb b/lib/gitlab/search_results.rb index 1325d542a0f..57b2ad887e3 100644 --- a/lib/gitlab/search_results.rb +++ b/lib/gitlab/search_results.rb @@ -1,23 +1,17 @@ module Gitlab class SearchResults - attr_reader :scope, :objects, :query, :page + attr_reader :query # Limit search results by passed project ids # It allows us to search only for projects user has access to attr_reader :limit_project_ids - def initialize(limit_project_ids, query, scope = nil, page = nil) + def initialize(limit_project_ids, query) @limit_project_ids = limit_project_ids || Project.all - @page = page @query = Shellwords.shellescape(query) if query.present? - @scope = scope - - unless %w(projects issues merge_requests).include?(@scope) - @scope = default_scope - end end - def objects + def objects(scope, page) case scope when 'projects' projects.page(page).per(per_page) -- cgit v1.2.1 From 8b00d01c6711918951a7951cff3e57660c807ae7 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 27 Aug 2014 12:47:30 +0300 Subject: Search by issue/mr title and description Signed-off-by: Dmitriy Zaporozhets --- lib/gitlab/search_results.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/gitlab/search_results.rb b/lib/gitlab/search_results.rb index 57b2ad887e3..a4d27e0cd27 100644 --- a/lib/gitlab/search_results.rb +++ b/lib/gitlab/search_results.rb @@ -51,11 +51,11 @@ module Gitlab end def issues - Issue.where(project_id: limit_project_ids).search(query).order('updated_at DESC') + Issue.where(project_id: limit_project_ids).full_search(query).order('updated_at DESC') end def merge_requests - MergeRequest.in_projects(limit_project_ids).search(query).order('updated_at DESC') + MergeRequest.in_projects(limit_project_ids).full_search(query).order('updated_at DESC') end def default_scope -- cgit v1.2.1 From c5c906fe6472f953b379aca4c34fad23b3b7742e Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 27 Aug 2014 15:26:35 +0300 Subject: Fix tests Signed-off-by: Dmitriy Zaporozhets --- lib/gitlab/project_search_results.rb | 2 +- lib/gitlab/search_results.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/gitlab/project_search_results.rb b/lib/gitlab/project_search_results.rb index 71b8f4f452e..90511662b20 100644 --- a/lib/gitlab/project_search_results.rb +++ b/lib/gitlab/project_search_results.rb @@ -8,7 +8,7 @@ module Gitlab @query = Shellwords.shellescape(query) if query.present? end - def objects(scope, page) + def objects(scope, page = nil) case scope when 'notes' notes.page(page).per(per_page) diff --git a/lib/gitlab/search_results.rb b/lib/gitlab/search_results.rb index a4d27e0cd27..75a3dfe37c3 100644 --- a/lib/gitlab/search_results.rb +++ b/lib/gitlab/search_results.rb @@ -11,7 +11,7 @@ module Gitlab @query = Shellwords.shellescape(query) if query.present? end - def objects(scope, page) + def objects(scope, page = nil) case scope when 'projects' projects.page(page).per(per_page) -- cgit v1.2.1