Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Normalize text input into search / ingest channels #8

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −5
Open

Normalize text input into search / ingest channels #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/sonic/channels/base.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def normalize(value)
end

def sanitize(value)
value.gsub('"', '\\"').gsub(/[\r\n]+/, ' ')
value.gsub('"', '\\"').gsub(/[\r\n]+/, '\\n').gsub(/\\/, '\\\\')
end

def quote(value)
Expand Down
4 changes: 2 additions & 2 deletions lib/sonic/channels/ingest.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ module Sonic
module Channels
class Ingest < Base
def push(collection, bucket, object, text, lang = nil)
arr = [collection, bucket, object, quote(text)]
arr = [collection, bucket, object, normalize(text)]
arr << "LANG(#{lang})" if lang

execute('PUSH', *arr)
end

def pop(collection, bucket, object, text)
execute('POP', collection, bucket, object, quote(text))
execute('POP', collection, bucket, object, normalize(text))
end

def count(collection, bucket = nil, object = nil)
Expand Down
4 changes: 2 additions & 2 deletions lib/sonic/channels/search.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module Sonic
module Channels
class Search < Base
def query(collection, bucket, terms, limit = nil, offset = nil, lang = nil) # rubocop:disable Metrics/ParameterLists, Metrics/LineLength
arr = [collection, bucket, quote(terms)]
arr = [collection, bucket, normalize(terms)]
arr << "LIMIT(#{limit})" if limit
arr << "OFFSET(#{offset})" if offset
arr << "LANG(#{lang})" if lang
Expand All @@ -13,7 +13,7 @@ def query(collection, bucket, terms, limit = nil, offset = nil, lang = nil) # ru
end

def suggest(collection, bucket, word, limit = nil)
arr = [collection, bucket, quote(word)]
arr = [collection, bucket, normalize(word)]
arr << "LIMIT(#{limit})" if limit

execute('SUGGEST', *arr) do
Expand Down