Skip to content

Handle whitespace more generically #69

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Handle whitespace more generically #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
458ab10
Handle whitespace more generically
dwbutler May 25, 2016
86e291e
Test newlines and carriage returns
dwbutler May 25, 2016
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/truncate_html.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
TruncateHtml.configure do |config|
config.length = 100
config.omission = '...'
config.word_boundary = /\S/
config.word_boundary = /(?![[:space:]])./
end


Expand Down
6 changes: 2 additions & 4 deletions lib/truncate_html/html_string.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module TruncateHtml
class HtmlString < String

UNPAIRED_TAGS = %w(br hr img).freeze
REGEX = /(?:<script.*>.*<\/script>)+|<\/?[^>]+>|[[[:alpha:]][0-9]\|`~!@#\$%^&*\(\)\-_\+=\[\]{}:;'²³§",\.\/?]+|\s+|[[:punct:]]/.freeze
REGEX = /(?:<script.*>.*<\/script>)+|<\/?[^>]+>|[[[:alpha:]][0-9]\|`~!@#\$%^&*\(\)\-_\+=\[\]{}:;'²³§",\.\/?]+|[[:space:]]+|[[:punct:]]/.freeze

def initialize(original_html)
super(original_html)
Expand All @@ -13,9 +13,7 @@ def html_tokens
scan(REGEX).map do |token|
HtmlString.new(
token.gsub(
/\n/,' ' #replace newline characters with a whitespace
).gsub(
/\s+/, ' ' #clean out extra consecutive whitespace
/[[:space:]]+/, ' ' #clean out extra consecutive whitespace
)
)
end
Expand Down
4 changes: 2 additions & 2 deletions spec/truncate_html/html_string_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ def html_string(original_string)

describe '#html_tokens' do
it 'returns each token in the string as an array element removing any consecutive whitespace from the string' do
html = '<h1>Hi there</h1> <p>This is sweet!</p> <p> squaremeter m² </p>'
html = "<h1>Hi there</h1> <p>This is sweet!</p> \r\n<p> squaremeter m² </p><div>Non-breaking\nspace here: </div>"
html_string(html).html_tokens.should == ['<h1>', 'Hi', ' ', 'there', '</h1>', ' ', '<p>', 'This', ' ', 'is', ' ', 'sweet!', '</p>',
' ', '<p>', ' ', 'squaremeter', ' ', 'm²', ' ', '</p>']
' ', '<p>', ' ', 'squaremeter', ' ', 'm²', ' ', '</p>', '<div>', 'Non-breaking', ' ', 'space', ' ', 'here:', ' ', '</div>']
end
end

Expand Down