-
Notifications
You must be signed in to change notification settings - Fork 19
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.
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
Removes extraneous newlines. #22
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
module Playgroundbook | ||
class PageProcessor | ||
def strip_extraneous_newlines(page_contents) | ||
# Three cases we need to look for: | ||
# - Extraneous newlines before /*: | ||
# - Extraneous newlines after */ | ||
# - Extraneous newlines either before or after //: | ||
page_contents | ||
.gsub(/\n+\/\*:/, "\n/*:") | ||
.gsub(/\*\/\n+/, "*/\n") | ||
.split(/(\/\/:.*$)\n*/).join("\n") # Important to do this before the next line, because it adds newlines before //: comments. | ||
.gsub(/\n+\/\/:/, "\n//:") | ||
end | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,86 @@ | ||
require File.expand_path('../../spec_helper', __FILE__) | ||
|
||
module Playgroundbook | ||
describe PageProcessor do | ||
let(:page_processor) { PageProcessor.new } | ||
|
||
it 'removes newlines before markdown blocks' do | ||
page_contents = <<-EOS | ||
let a = 6 | ||
|
||
/*: | ||
Some markdown. | ||
*/ | ||
EOS | ||
processed_page_contents = <<-EOS | ||
let a = 6 | ||
/*: | ||
Some markdown. | ||
*/ | ||
EOS | ||
|
||
expect(page_processor.strip_extraneous_newlines(page_contents)).to eq(processed_page_contents) | ||
end | ||
|
||
it 'removes newlines after markdown blocks' do | ||
page_contents = <<-EOS | ||
/*: | ||
Some markdown. | ||
*/ | ||
|
||
let a = 6 | ||
EOS | ||
processed_page_contents = <<-EOS | ||
/*: | ||
Some markdown. | ||
*/ | ||
let a = 6 | ||
EOS | ||
|
||
expect(page_processor.strip_extraneous_newlines(page_contents)).to eq(processed_page_contents) | ||
end | ||
|
||
it 'removes newlines surrounding single-line markdown blocks' do | ||
page_contents = <<-EOS | ||
let a = 6 | ||
|
||
//: Some markdown. | ||
|
||
let b = a | ||
EOS | ||
processed_page_contents = <<-EOS | ||
let a = 6 | ||
//: Some markdown. | ||
let b = a | ||
EOS | ||
|
||
expect(page_processor.strip_extraneous_newlines(page_contents)).to eq(processed_page_contents) | ||
end | ||
|
||
it 'does not strip newlines from code' do | ||
page_contents = <<-EOS | ||
let a = 6 | ||
|
||
let b = a | ||
EOS | ||
|
||
expect(page_processor.strip_extraneous_newlines(page_contents)).to eq(page_contents) | ||
end | ||
|
||
it 'it does not strip newlines from the markdown' do | ||
page_contents = <<-EOS | ||
/*: | ||
|
||
# Header | ||
|
||
Some markdown. The following lines are purposefull left blank. | ||
|
||
|
||
|
||
*/ | ||
EOS | ||
|
||
expect(page_processor.strip_extraneous_newlines(page_contents)).to eq(page_contents) | ||
end | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe break this out into a
strip_extraneous_newlines
method to make it more explicit, since this mainprocess_page
method will likely grow to have more responsibilities eventually.