Improve class handling in PDF

* Update phar
* Fix several sniff errors
* Remove unused converter file
* Update README with better quickstart information
This commit is contained in:
Craig Davis
2014-01-12 14:33:43 -07:00
parent d225525927
commit b87c193db5
6 changed files with 58 additions and 749 deletions

View File

@@ -31,17 +31,17 @@ class HtmlCommand extends Command
'Output destination folder'
)
->addOption(
'template',
't',
InputOption::VALUE_OPTIONAL,
'Which of the templates to use'
'template',
't',
InputOption::VALUE_OPTIONAL,
'Which of the templates to use'
)
->addOption(
'refresh',
'r',
InputOption::VALUE_NONE,
'If set, the html will include a meta command to refresh the ' .
'document every 5 seconds.'
'refresh',
'r',
InputOption::VALUE_NONE,
'If set, the html will include a meta command to refresh the ' .
'document every 5 seconds.'
);
}
@@ -86,12 +86,8 @@ class HtmlCommand extends Command
if (!$template) {
$template = $this->app->defaultTemplate;
}
$templatePath = join(DIRECTORY_SEPARATOR, array(
$this->app->templatePath, basename($template)
));
$templateIndexPath = join(DIRECTORY_SEPARATOR, array(
$templatePath, 'index.html'
));
$templatePath = join(DIRECTORY_SEPARATOR, array($this->app->templatePath, basename($template)));
$templateIndexPath = join(DIRECTORY_SEPARATOR, array($templatePath, 'index.html'));
if (!file_exists($templateIndexPath)) {
$output->writeln(
sprintf(

View File

@@ -26,10 +26,10 @@ class PdfCommand extends HtmlCommand
'Output destination folder'
)
->addOption(
'template',
't',
InputOption::VALUE_NONE,
'Which of the templates to use'
'template',
't',
InputOption::VALUE_NONE,
'Which of the templates to use'
);
}
@@ -46,13 +46,10 @@ class PdfCommand extends HtmlCommand
exec('wkhtmltopdf -V', $results, $returnVal);
if ($returnVal) {
$output->writeln(
sprintf(
"\n<error>Error:</error> Unable to locate wkhtmltopdf.\n" .
" Please make sure that it is installed and available in " .
"your path. \n For installation help, please read: " .
"https://github.com/pdfkit/pdfkit/wiki/Installing-WKHTMLTOPDF \n\n",
$destination
),
"\n<error>Error:</error> Unable to locate wkhtmltopdf.\n" .
" Please make sure that it is installed and available in " .
"your path. \n For installation help, please read: " .
"https://github.com/pdfkit/pdfkit/wiki/Installing-WKHTMLTOPDF \n\n",
$this->app->outputFormat
);
@@ -63,8 +60,10 @@ class PdfCommand extends HtmlCommand
// The pdf needs some extra css rules, and so we'll add them here
// to our html document
// TODO: Update this with the simple DOM to add class
$rendered = str_replace('body class=""', 'body class="pdf"', $rendered);
$simpleDom = new \simple_html_dom($rendered);
$body = $simpleDom->find('body', 0);
$body->class = $body->class . ' pdf';
$rendered = (string) $simpleDom;
// Save to a temp destination for the pdf renderer to use
file_put_contents($pdfSource, $rendered);
@@ -78,7 +77,7 @@ class PdfCommand extends HtmlCommand
$output->writeln(
sprintf(
"Wrote pdf resume to: <info>%s</info>",
$destination
$destFilename
),
$this->app->outputFormat
);