Skip to content

Commit

Permalink
% Refactoring code according to ruby norms
Browse files Browse the repository at this point in the history
  • Loading branch information
luispereira committed May 17, 2016
1 parent d548090 commit a36bb7e
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion lib/alfi/cli.rb
Expand Up @@ -10,7 +10,7 @@ def exit_with(message)
end

def call(arguments)
@searchType = Array.new
@searchType = []
create_options_parser
search_param = @all_defined_arguments.include?(arguments.first) ? nil : arguments.shift
@bintray_username = nil
Expand Down
4 changes: 2 additions & 2 deletions lib/alfi/providers/base.rb
@@ -1,10 +1,10 @@
class Alfi::Providers::Base
def initialize(query, searchType)
def initialize(query, search_type)
@query = query
@uri = URI.parse(query_url(query))
@http = Net::HTTP.new(@uri.host, @uri.port)
@request = Net::HTTP::Get.new(@uri.request_uri)
@searchType = searchType
@search_type = search_type
request_extensions if self.class.method_defined?(:request_extensions)
end

Expand Down
4 changes: 2 additions & 2 deletions lib/alfi/providers/bintray.rb
Expand Up @@ -36,7 +36,7 @@ def request_extensions
end

def call
if @searchType.empty? || @searchType.include?('jcenter') || @searchType.include?('maven')
if @search_type.empty? || @search_type.include?('jcenter') || @search_type.include?('maven')
begin
response = @http.request(@request)
rescue SocketError
Expand All @@ -50,7 +50,7 @@ def call
add_to_list " # #{'-'*20}Bintray#{'-'*20}" if response_json.size > 0

response_json.group_by { |package| package['repo'] }.each do |provider, repositories|
if @searchType.empty? || @searchType.include?(provider)
if @search_type.empty? || @search_type.include?(provider)
add_to_list " # #{PROVIDERS_TEXTS[provider]}"
repositories.each do |repo|
add_repo_to_list "#{repo['system_ids'][0]}:#{repo['latest_version']}" if repo['system_ids'].size > 0
Expand Down
2 changes: 1 addition & 1 deletion lib/alfi/providers/maven.rb
Expand Up @@ -4,7 +4,7 @@ def query_url(query)
end

def call
if @searchType.empty? || @searchType.include?('m')
if @search_type.empty? || @search_type.include?('m')
begin
response = @http.request(@request)
rescue SocketError
Expand Down
2 changes: 1 addition & 1 deletion lib/alfi/providers/offline.rb
@@ -1,6 +1,6 @@
# require 'alfi/providers/base'
class Alfi::Providers::Offline < Alfi::Providers::Base
def initialize(query, searchType)
def initialize(query, search_type)
@query = query
end

Expand Down
8 changes: 4 additions & 4 deletions lib/alfi/search.rb
Expand Up @@ -9,14 +9,14 @@ def exit_with(message)
exit 1
end

def call(search_param, searchType)
def call(search_param, search_type)
return puts 'The search needs 3+ characters'.red if search_param.size < 3
puts "Searching...\n"

Alfi::Providers.all.each { |cc| cc.new(search_param, searchType).call }
Alfi::Providers.all.each { |cc| cc.new(search_param, search_type).call }

exit_with('No results'.red) if $result_list.empty? && $suggestions.empty?
num_results = total_results()
num_results = total_results_count()

if num_results > 0
puts "\ndependencies {\n"
Expand All @@ -30,7 +30,7 @@ def call(search_param, searchType)
puts "Did you mean: #{$suggestions.join(', ').yellow}"
end

def total_results()
def total_results_count()
return $result_list.count { |r| r.strip[0] != '#' }
end
end
10 changes: 5 additions & 5 deletions spec/alfi_spec.rb
Expand Up @@ -2,20 +2,20 @@

describe Alfi do
it 'Test the query_url' do
str = Alfi::Providers::Maven.new('picasso', Array.new).query_url('picasso')
str = Alfi::Providers::Maven.new('picasso', []).query_url('picasso')
expect(str).to eq 'http://search.maven.org/solrsearch/select?q=picasso&rows=350&wt=json'
end

it 'Test search with repository' do
maven = Alfi::Search.new
maven.call('sPref', Array.new(1, "maven"))
expect(maven.total_results).to be >= 1
maven.call('sPref', ["maven"])
expect(maven.total_results_count).to be >= 1
end

context 'suggestions' do
it 'should return 0 suggestions' do
VCR.use_cassette('search_active_android_with_no_suggestions') do
maven_provider = Alfi::Providers::Maven.new('active-android', Array.new)
maven_provider = Alfi::Providers::Maven.new('active-android', [])

expect(maven_provider).to_not receive(:add_suggestions)
maven_provider.call
Expand All @@ -24,7 +24,7 @@

it 'should return suggestions' do
VCR.use_cassette('search_picassoa_with_suggestions') do
maven_provider = Alfi::Providers::Maven.new('picassoa', Array.new)
maven_provider = Alfi::Providers::Maven.new('picassoa', [])

expect(maven_provider).to receive(:add_suggestions).with(array_including('picasso', 'piccolo'))
maven_provider.call
Expand Down

0 comments on commit a36bb7e

Please sign in to comment.