Skip to content

Commit 613e245

Browse files
committed
fix: use 'uri' to percent-encode string
- explicitly require 'uri'. resolve #34 - uri is a lighter library compared to erb
1 parent 77e9244 commit 613e245

16 files changed

+16
-15
lines changed

lib/typesense.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
module Typesense
44
end
55

6+
require 'uri'
67
require_relative 'typesense/version'
78
require_relative 'typesense/configuration'
89
require_relative 'typesense/client'

lib/typesense/alias.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def delete
1818
private
1919

2020
def endpoint_path
21-
"#{Aliases::RESOURCE_PATH}/#{ERB::Util.url_encode(@name)}"
21+
"#{Aliases::RESOURCE_PATH}/#{URI.encode_www_form_component(@name)}"
2222
end
2323
end
2424
end

lib/typesense/aliases.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def [](alias_name)
2424
private
2525

2626
def endpoint_path(alias_name)
27-
"#{Aliases::RESOURCE_PATH}/#{ERB::Util.url_encode(alias_name)}"
27+
"#{Aliases::RESOURCE_PATH}/#{URI.encode_www_form_component(alias_name)}"
2828
end
2929
end
3030
end

lib/typesense/analytics_rule.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def delete
1818
private
1919

2020
def endpoint_path
21-
"#{AnalyticsRules::RESOURCE_PATH}/#{ERB::Util.url_encode(@rule_name)}"
21+
"#{AnalyticsRules::RESOURCE_PATH}/#{URI.encode_www_form_component(@rule_name)}"
2222
end
2323
end
2424
end

lib/typesense/analytics_rules.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def [](rule_name)
2424
private
2525

2626
def endpoint_path(operation = nil)
27-
"#{AnalyticsRules::RESOURCE_PATH}#{operation.nil? ? '' : "/#{ERB::Util.url_encode(operation)}"}"
27+
"#{AnalyticsRules::RESOURCE_PATH}#{operation.nil? ? '' : "/#{URI.encode_www_form_component(operation)}"}"
2828
end
2929
end
3030
end

lib/typesense/collection.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def delete
2727
private
2828

2929
def endpoint_path
30-
"#{Collections::RESOURCE_PATH}/#{ERB::Util.url_encode(@name)}"
30+
"#{Collections::RESOURCE_PATH}/#{URI.encode_www_form_component(@name)}"
3131
end
3232
end
3333
end

lib/typesense/document.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def update(partial_document, options = {})
2323
private
2424

2525
def endpoint_path
26-
"#{Collections::RESOURCE_PATH}/#{ERB::Util.url_encode(@collection_name)}#{Documents::RESOURCE_PATH}/#{ERB::Util.url_encode(@document_id)}"
26+
"#{Collections::RESOURCE_PATH}/#{URI.encode_www_form_component(@collection_name)}#{Documents::RESOURCE_PATH}/#{URI.encode_www_form_component(@document_id)}"
2727
end
2828
end
2929
end

lib/typesense/documents.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def delete(query_parameters = {})
7575
private
7676

7777
def endpoint_path(operation = nil)
78-
"#{Collections::RESOURCE_PATH}/#{ERB::Util.url_encode(@collection_name)}#{Documents::RESOURCE_PATH}#{operation.nil? ? '' : "/#{operation}"}"
78+
"#{Collections::RESOURCE_PATH}/#{URI.encode_www_form_component(@collection_name)}#{Documents::RESOURCE_PATH}#{operation.nil? ? '' : "/#{operation}"}"
7979
end
8080
end
8181
end

lib/typesense/key.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def delete
1818
private
1919

2020
def endpoint_path
21-
"#{Keys::RESOURCE_PATH}/#{ERB::Util.url_encode(@id)}"
21+
"#{Keys::RESOURCE_PATH}/#{URI.encode_www_form_component(@id)}"
2222
end
2323
end
2424
end

lib/typesense/override.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def delete
1919
private
2020

2121
def endpoint_path
22-
"#{Collections::RESOURCE_PATH}/#{ERB::Util.url_encode(@collection_name)}#{Overrides::RESOURCE_PATH}/#{ERB::Util.url_encode(@override_id)}"
22+
"#{Collections::RESOURCE_PATH}/#{URI.encode_www_form_component(@collection_name)}#{Overrides::RESOURCE_PATH}/#{URI.encode_www_form_component(@override_id)}"
2323
end
2424
end
2525
end

0 commit comments

Comments
 (0)