Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
cocoapods
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gengmeiios
cocoapods
Commits
0bb22042
Commit
0bb22042
authored
Nov 02, 2015
by
Muhammed Yavuz Nuzumlali
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Export sorting logic to a method. Add specs for sort algorithm.
parent
3bddb659
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
69 additions
and
5 deletions
+69
-5
Gemfile.lock
Gemfile.lock
+1
-1
sources_manager.rb
lib/cocoapods/sources_manager.rb
+17
-4
sources_manager_spec.rb
spec/unit/sources_manager_spec.rb
+51
-0
No files found.
Gemfile.lock
View file @
0bb22042
...
@@ -49,7 +49,7 @@ GIT
...
@@ -49,7 +49,7 @@ GIT
GIT
GIT
remote: https://github.com/CocoaPods/cocoapods-search.git
remote: https://github.com/CocoaPods/cocoapods-search.git
revision:
1dd4aba6378678ca45e364e58f96196937fd297b
revision:
4281e740769875ba4e48748b73c7ff832a8d336e
branch: master
branch: master
specs:
specs:
cocoapods-search (0.1.0)
cocoapods-search (0.1.0)
...
...
lib/cocoapods/sources_manager.rb
View file @
0bb22042
...
@@ -125,6 +125,7 @@ module Pod
...
@@ -125,6 +125,7 @@ module Pod
end
end
end
end
found_set_symbols
=
query_word_results_hash
.
values
.
reduce
(
:&
)
found_set_symbols
=
query_word_results_hash
.
values
.
reduce
(
:&
)
found_set_symbols
||=
[]
sets
=
found_set_symbols
.
map
do
|
symbol
|
sets
=
found_set_symbols
.
map
do
|
symbol
|
aggregate
.
representative_set
(
symbol
.
to_s
)
aggregate
.
representative_set
(
symbol
.
to_s
)
end
end
...
@@ -138,15 +139,27 @@ module Pod
...
@@ -138,15 +139,27 @@ module Pod
raise
Informative
,
"Unable to find a pod with name
#{
extra
}
"
\
raise
Informative
,
"Unable to find a pod with name
#{
extra
}
"
\
"matching `
#{
query
}
`"
"matching `
#{
query
}
`"
end
end
sorted_sets
(
sets
,
query_word_regexps
)
end
# Sort sets
# Returns given set array by sorting it in-place.
sets
.
sort_by!
{
|
set
|
#
# @param [Array<Set>] sets
# Array of sets to be sorted.
#
# @param [Array<Regexp>] query_word_regexps
# Array of regexp objects for user query.
#
# @return [Array<Set>] Given sets parameter itself after sorting it in-place.
#
def
sorted_sets
(
sets
,
query_word_regexps
)
sets
.
sort_by!
do
|
set
|
pre_match_length
=
nil
pre_match_length
=
nil
found_query_index
=
nil
found_query_index
=
nil
found_query_count
=
0
found_query_count
=
0
query_word_regexps
.
each_with_index
do
|
q
,
idx
|
query_word_regexps
.
each_with_index
do
|
q
,
idx
|
if
(
m
=
set
.
name
.
match
(
/
#{
q
}
/i
))
if
(
m
=
set
.
name
.
match
(
/
#{
q
}
/i
))
pre_match_length
||=
(
m
.
pre_match
.
length
)
pre_match_length
||=
(
m
.
pre_match
.
length
)
found_query_index
||=
idx
found_query_index
||=
idx
found_query_count
+=
1
found_query_count
+=
1
end
end
...
@@ -154,7 +167,7 @@ module Pod
...
@@ -154,7 +167,7 @@ module Pod
pre_match_length
||=
1000
pre_match_length
||=
1000
found_query_index
||=
1000
found_query_index
||=
1000
[
-
found_query_count
,
pre_match_length
,
found_query_index
,
set
.
name
.
downcase
]
[
-
found_query_count
,
pre_match_length
,
found_query_index
,
set
.
name
.
downcase
]
}
end
sets
sets
end
end
...
...
spec/unit/sources_manager_spec.rb
View file @
0bb22042
...
@@ -84,6 +84,57 @@ module Pod
...
@@ -84,6 +84,57 @@ module Pod
sets
.
any?
{
|
s
|
s
.
name
==
'BananaLib'
}.
should
.
be
.
true
sets
.
any?
{
|
s
|
s
.
name
==
'BananaLib'
}.
should
.
be
.
true
end
end
describe
'Sorting algorithm'
do
before
do
@test_search_results
=
%w(HockeyKit DLSuit VCLReachability NPReachability AVReachability PYNetwork
SCNetworkReachability AFNetworking Networking)
.
map
do
|
name
|
Specification
::
Set
.
new
(
name
)
end
end
it
'puts pod with exact match at the first index while sorting'
do
regexps
=
[
/networking/i
]
sets
=
SourcesManager
.
sorted_sets
(
@test_search_results
,
regexps
)
sets
[
0
].
name
.
should
==
'Networking'
end
it
'puts pod with less prefix length before pods with more prefix length in search results'
do
regexps
=
[
/reachability/i
]
sets
=
SourcesManager
.
sorted_sets
(
@test_search_results
,
regexps
)
sets
.
index
{
|
s
|
s
.
name
==
'AVReachability'
}.
should
.
be
<
sets
.
index
{
|
s
|
s
.
name
==
'VCLReachability'
}
end
it
'puts pod with more query word match before pods with less match in multi word query search results'
do
regexps
=
[
/network/i
,
/reachability/i
]
sets
=
SourcesManager
.
sorted_sets
(
@test_search_results
,
regexps
)
sets
.
index
{
|
s
|
s
.
name
==
'SCNetworkReachability'
}.
should
.
be
<
sets
.
index
{
|
s
|
s
.
name
==
'AVReachability'
}
end
it
'puts pod matching first query word before pods matching later words in multi word query search results'
do
regexps
=
[
/network/i
,
/reachability/i
]
sets
=
SourcesManager
.
sorted_sets
(
@test_search_results
,
regexps
)
sets
.
index
{
|
s
|
s
.
name
==
'PYNetwork'
}.
should
.
be
<
sets
.
index
{
|
s
|
s
.
name
==
'AVReachability'
}
end
it
'puts pod matching first query word before pods matching later words in multi word query search results'
do
regexps
=
[
/network/i
,
/reachability/i
]
sets
=
SourcesManager
.
sorted_sets
(
@test_search_results
,
regexps
)
sets
.
index
{
|
s
|
s
.
name
==
'PYNetwork'
}.
should
.
be
<
sets
.
index
{
|
s
|
s
.
name
==
'AVReachability'
}
end
it
'alphabetically sorts pods having exact other conditions'
do
regexps
=
[
/reachability/i
]
sets
=
SourcesManager
.
sorted_sets
(
@test_search_results
,
regexps
)
sets
.
index
{
|
s
|
s
.
name
==
'AVReachability'
}.
should
.
be
<
sets
.
index
{
|
s
|
s
.
name
==
'NPReachability'
}
end
it
'alphabetically sorts pods whose names does not match query'
do
regexps
=
[
/reachability/i
]
sets
=
SourcesManager
.
sorted_sets
(
@test_search_results
,
regexps
)
sets
.
index
{
|
s
|
s
.
name
==
'DLSuit'
}.
should
.
be
<
sets
.
index
{
|
s
|
s
.
name
==
'HockeyKit'
}
end
end
it
"generates the search index before performing a search if it doesn't exits"
do
it
"generates the search index before performing a search if it doesn't exits"
do
SourcesManager
.
stubs
(
:all
).
returns
([
@test_source
])
SourcesManager
.
stubs
(
:all
).
returns
([
@test_source
])
Source
::
Aggregate
.
any_instance
.
expects
(
:generate_search_index_for_source
).
with
(
@test_source
).
returns
(
'BananaLib'
=>
[
'BananaLib'
])
Source
::
Aggregate
.
any_instance
.
expects
(
:generate_search_index_for_source
).
with
(
@test_source
).
returns
(
'BananaLib'
=>
[
'BananaLib'
])
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment