mirror of
https://github.com/codeninjasllc/discourse.git
synced 2024-12-18 11:32:24 -05:00
Merge pull request #170 from alxndr/remove-iconv-100
Removes iconv dependency
This commit is contained in:
commit
7f4ee00228
2 changed files with 4 additions and 10 deletions
|
@ -1,5 +1,3 @@
|
||||||
require 'iconv'
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Given a string, tell us whether or not is acceptable. Also, remove stuff we don't like
|
# Given a string, tell us whether or not is acceptable. Also, remove stuff we don't like
|
||||||
# such as leading / trailing space.
|
# such as leading / trailing space.
|
||||||
|
@ -13,13 +11,10 @@ class TextSentinel
|
||||||
end
|
end
|
||||||
|
|
||||||
def initialize(text, opts=nil)
|
def initialize(text, opts=nil)
|
||||||
if text.present?
|
|
||||||
@text = Iconv.new('UTF-8//IGNORE', 'UTF-8').iconv(text.dup)
|
|
||||||
end
|
|
||||||
|
|
||||||
@opts = opts || {}
|
@opts = opts || {}
|
||||||
|
|
||||||
if @text.present?
|
if text.present?
|
||||||
|
@text = text.encode('UTF-8', invalid: :replace, undef: :replace, replace: '')
|
||||||
@text.strip!
|
@text.strip!
|
||||||
@text.gsub!(/ +/m, ' ') if @opts[:remove_interior_spaces]
|
@text.gsub!(/ +/m, ' ') if @opts[:remove_interior_spaces]
|
||||||
end
|
end
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
|
|
||||||
require 'spec_helper'
|
require 'spec_helper'
|
||||||
require 'text_sentinel'
|
require 'text_sentinel'
|
||||||
require 'iconv'
|
|
||||||
|
|
||||||
describe TextSentinel do
|
describe TextSentinel do
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue