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.

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

Asciidoctor: Copy referenced images #541

Merged
merged 5 commits into from
Jan 30, 2019

Conversation

nik9000
Copy link
Member

@nik9000 nik9000 commented Jan 16, 2019

Mimicks a2x's behavior with regards to images, copying them into the
destionation repository. a2x parses the generated html files but we
don't want to use their parser because we'd like to make a clean break
from a2x. We can't use any of perl's wonderful parsers because we
don't want to add any additional dependencies to the project. Instead,
we use the AST of the parsed asciidoc files and look for images. This
isn't quite the same thing because it'll miss any images that we add
using as part of the xsl transformation but we can handle those
explictly in the perl code if there are any. In addition to not
requiring any more dependencies it has the advantage of build "built in"
to the asciidoctor work so we don't need to work on it later if we
change the perl orchestration stuff. Finally, it is pretty quick because
we don't have to parse all of the generated html - we can just use the
already parsed asciidoctor!

Mimicks `a2x`'s behavior with regards to images, copying them into the
destionation repository. `a2x` parses the generated html files but we
don't want to use their parser because we'd like to make a clean break
from `a2x`. We can't use any of perl's wonderful parsers because we
don't want to add any additional dependencies to the project. Instead,
we use the AST of the parsed asciidoc files and look for images. This
isn't *quite* the same thing because it'll miss any images that we add
using as part of the xsl transformation but we can handle those
explictly in the perl code if there are any. In addition to not
requiring any more dependencies it has the advantage of build "built in"
to the asciidoctor work so we don't need to work on it later if we
change the perl orchestration stuff. Finally, it is pretty quick because
we don't have to parse all of the generated html - we can just use the
already parsed asciidoctor!
Copy link
Member Author

@nik9000 nik9000 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I figured for 70 bytes a pop I could make real png files for testing. They are a 1x1 pixel.

@@ -0,0 +1,69 @@
require 'csv'
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have to parse a comma separated list and the simplest way looks to be to use the built in CSV parsing....

return unless @copied.add? uri # Skip images we've copied before
source = find_source block, uri
return unless source # Skip images we can't find
logger.info message_with_context "copying #{uri}", :source_location => block.source_location
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if info is right here but it doesn't seem too bad. We don't have too many images.

"#{spec_dir}\/not_found.png",\s
"#{tmp}\/not_found.png",\s
"\/dummy2\/not_found.png"
.+
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We list out all of the directories that we try and I don't think that list is worth maintaining here. I do think it is helpful to see it when it fails. Though I don't like how long the list gets.....

@nik9000 nik9000 mentioned this pull request Jan 16, 2019

private
def copy_attributes copied
{

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the funky formatting meant to communicate something here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're returning a map. Would it be clearer if I said return {? I don't ruby too well so I'm not sure.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would avoid confusion with things like block formatting. It makes the reader have to think about whether there are any | | present or something.

image::resources/copy_images/example1.png[]
ASCIIDOC
expect { convert input, attributes }.to raise_error { |error|
expect(error).to be_a(ConvertError)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I found this testing idiom unintuitive. By description this appears to be a positive test, one which should do a thing (and behave doing so) and then verify the thing has been done. But this is looking for an error, and then that error is actually an INFO... it's got a lot to tease apart just to line up what it says it does with how it checks doing it.

I don't know yet if I am requesting a change or not, but even if I figure there's probably a really good explanation for it, I'd still like to hear it because it definitely made me go "...huh?" reviewing it.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It exists because the tests throw a ConvertError if we log anything during the conversion. That way when we're testing that we don't log anything we don't have to do anything - we get that behavior by not catching the exception. It made more sense when I was catching warnings to be honest.

I think I can make this more clear. I'll give it a shot on Monday.

@nik9000
Copy link
Member Author

nik9000 commented Jan 29, 2019

@ddillinger I've merged master into this to fix the dependency issue and cleaned up the error reporting.

Copy link

@ddillinger ddillinger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The test changes are much clearer, thank you for that, it reads easily now (at least to me!). I would like one other little tweak but I don't feel like it's a blocker level change really.


private
def copy_attributes copied
{

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would avoid confusion with things like block formatting. It makes the reader have to think about whether there are any | | present or something.

@nik9000 nik9000 merged commit 7ed5ee3 into elastic:master Jan 30, 2019
@nik9000
Copy link
Member Author

nik9000 commented Jan 30, 2019

Thanks for reviewing @ddillinger! I've added the return like you asked for.

nik9000 added a commit that referenced this pull request Feb 15, 2019
Mimicks `a2x`'s behavior with regards to images, copying them into the
destionation repository. `a2x` parses the generated html files but we
don't want to use their parser because we'd like to make a clean break
from `a2x`. We can't use any of perl's wonderful parsers because we
don't want to add any additional dependencies to the project. Instead,
we use the AST of the parsed asciidoc files and look for images. This
isn't *quite* the same thing because it'll miss any images that we add
using as part of the xsl transformation but we can handle those
explictly in the perl code if there are any. In addition to not
requiring any more dependencies it has the advantage of build "built in"
to the asciidoctor work so we don't need to work on it later if we
change the perl orchestration stuff. Finally, it is pretty quick because
we don't have to parse all of the generated html - we can just use the
already parsed asciidoctor!
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants