1
0
Fork 0
forked from github/pelican
Commit graph

830 commits

Author SHA1 Message Date
Justin Mayer
d0e9c52410 Merge pull request #623 from bbinet/url-save_as-override
Override page 'url' and 'save_as' directly from the page metadata. Fixes #400.
2013-03-04 10:11:45 -08:00
Joseph Reagle
168d713df8 ul/li have no top/bottom margins, but list do 2013-03-03 22:35:56 -08:00
Joseph Reagle
9ed4e77049 improve spacing of p and nested lists 2013-03-03 22:35:03 -08:00
Joseph Reagle
92e9f3b313 bom detection and removal 2013-03-03 22:33:16 -08:00
Eric
11bdb437d2 added unique filtering and config limit param
I hacked some code from other modules and some quick googling, first time with py so this may need to be cleaned up.

The functionality is to have a config var in pythonconfig.py and to remove the duplicates `sorted(set())`
2013-03-03 22:18:59 -08:00
Eric
ccef2a6f13 Settings file is pelicanconf.py now. 2013-03-03 22:18:59 -08:00
dave mankoff
44351aaf31 delete output directory properly 2013-03-03 22:14:05 -08:00
nfletton
4a63695ae2 Fixed pagination link error when <DIRECT_TEMPLATE_NAME>_SAVE_AS setting used.
The unit test for this scenario was passing as it was testing for an incorrect 'page_name' variable being set.
2013-03-03 22:11:09 -08:00
Andrew Spiers
205792e9d4 string types have no decode method in py3 2013-03-03 22:00:37 -08:00
yegle
60ae7aa667 Fix: hashlib.md5 funcition only accepts bytes as input 2013-03-03 21:49:42 -08:00
Richard Duivenvoorde
a13e31a76b adding a stopsever target for make 2013-03-03 21:45:08 -08:00
Richard Duivenvoorde
824edb8823 rsync additions
- adding / otherwise you will endup with output on remote
- adding --cvs-exclude (to not sync cvs stuff)
2013-03-03 21:45:08 -08:00
Simon
a7a71da6df Fix a test in the asciidoc reader, and add asciidoc to travis so that
the related tests will not be skipped.
2013-03-03 21:43:04 -08:00
Steve Schwarz
1bbfdf96a0 Display feed(s) in footer if no SOCIAL links
For sites where there are no SOCIAL links defined the FEED_ALL_ATOM and/or the FEED_ALL_RSS links are not displayed.
Also update the functional tests output.
2013-03-03 21:40:55 -08:00
Eric
e721727476 Allow explicit setting of markdown extensions
These additions are to make it easier to disable pygments or any other
extension the user may not want. In the previous version, these plugins are
hardcoded, but by making it a variable in the config, it is possible to not use
pygments or easily load extra markdown plugins if needed; you can have multiple
plugins in one virtual environment and have different configs load them as
needed.

In my `pelicanconf.py` I then have the following:

    MD_EXTENSIONS = ['extra', 'syntaxhighlighter']

where `syntaxhighlighter` is a custom markdown extension I am working on to use
syntax highlighter instead of pygments for code highlighting.
2013-03-03 21:36:45 -08:00
John Kristensen
4e4080c523 Check output directory exists before doing a clean
- if the output directory does not exist the 'make clean' command fails,
   which also means that the 'make html' command which would otherwise
   create the output directory also fails without generating the output
2013-03-03 21:21:05 -08:00
Steve Schwarz
986733e8fb Corrected parsing of categories/tags 2013-03-03 21:17:42 -08:00
Steve Schwarz
8a6d96b289 pelican_import fix for bs4
Quick fix for this traceback:
$ pelican-import --wpfile ~/Downloads/mysite.wordpress.2013-02-24.xml 
Traceback (most recent call last):
  File "/Users/me/.virtualenvs/pelican/bin/pelican-import", line 8, in <module>
    load_entry_point('pelican==3.2', 'console_scripts', 'pelican-import')()
  File "/Users/me/.virtualenvs/pelican/src/pelican/pelican/tools/pelican_import.py", line 363, in main
    disable_slugs=args.disable_slugs or False)
  File "/Users/me/.virtualenvs/pelican/src/pelican/pelican/tools/pelican_import.py", line 238, in fields2pelican
    for title, content, filename, date, author, categories, tags, in_markup in fields:
  File "/Users/me/.virtualenvs/pelican/src/pelican/pelican/tools/pelican_import.py", line 37, in wp2fields
    if item.fetch('wp:status')[0].contents[0] == "publish":
TypeError: 'NoneType' object is not callable

I'm a BeautifulSoup novice but these changes allowed me to import two of my wordpress.xml files.
2013-03-03 21:17:42 -08:00
Sasha Hart
07f4163300 make develop_server.sh notify/cleanup when pelican or server don't start
After waiting for pelican and server to come up, if either one has
died then give a more helpful message and clean up. Previously did not
check for this, so script informed user that everything was running even
if one or both parts failed for whatever reason.

This is meant to provide a little more user-friendliness
in those cases where user has a develop_server.sh in project directory
but forgot to (re)install pelican, activate relevant virtualenv, etc.
as well as other unforeseen situations where one of the processes does
not start.
2013-03-03 21:08:28 -08:00
Alexis Métaireau
3e364bb8a4 Don't overwrite output_path. Fix #750 2013-03-03 21:00:52 -08:00
Alexis Métaireau
519dcdbcb3 Manual pass on sources for better standards. 2013-03-03 20:12:31 -08:00
Bruno Binet
03f87057c2 update summary plugin so that tests are fixed (hopefully) 2013-03-01 12:59:26 +01:00
Bruno Binet
d68d2debf9 remove hardcoded values for SUMMARY_BEGIN_MARKER and SUMMARY_END_MARKER 2013-03-01 00:06:52 +01:00
Bruno Binet
ed907b4094 PageClass arg is useless in content_object_init 2013-03-01 00:06:05 +01:00
dave mankoff
3f4406dd6b support inline summary specification
update documentation

change summary cutoff to a plugin

remove backup file

fix 3.2 tests

update summary plugin initialization and documentation

update documentation

fix documentation formatting
2013-02-12 22:35:02 -05:00
Bruno Binet
557f1cc956 Merge pull request #719 from streeter/pages_generator_finalized
Add a pages_generator_finalized signal.
2013-02-11 00:37:31 -08:00
Bruno Binet
fdb5759610 Merge pull request #721 from mankyd/log-error
Fix String Formatting Errors
2013-02-11 00:27:34 -08:00
dave mankoff
21ad904abc format exceptions as strings 2013-02-10 20:21:28 -05:00
dave mankoff
5737534302 fix string formatting errors 2013-02-10 20:17:06 -05:00
Chris Streeter
de44644700 Add a pages_generator_finalized signal.
I wrote a plugin that I'd like to also be able to run on pages in
addition to articles. Adding this signal will let me update the content
when a page is finished being generated.
2013-02-10 12:42:54 -08:00
dave mankoff
08439bdcf1 fix null attributes in html parser 2013-02-10 11:02:52 -05:00
Justin Mayer
f3bc2ece86 Merge pull request #382 from mankyd/htmlparser
New, more thorough HTMLParser
2013-02-09 16:48:50 -08:00
Igor Kalnitsky
0285bbcec4 Fix bug with docutils' code directive.
Since version 0.9 `docutils` supports `code` directive. But this directive
can generate fullname classes for the `pygments` style classes.

For example, the following code

```reStructuredText
.. code:: c++

    GetFoo()->do_something();
```

generate the following output

```html
<pre class="code c++ literal-block">
  <span class="name">GetFoo</span>
  <span class="punctuation">()</span>
  <span class="operator">-&gt;</span>
  <span class="name">do_something</span>
  <span class="punctuation">();</span>
</pre>
```

Note, that fullname classes were used, when we need a short one

```html
<pre class="code c++ literal-block">
  <span class="n">GetFoo</span>
  <span class="p">()</span>
  <span class="o">-&gt;</span>
  <span class="n">do_something</span>
  <span class="p">();</span>
</pre>
```
2013-02-08 01:47:20 +02:00
dave mankoff
d5bfec3a8b update documentation and remove commented out code 2013-01-28 22:25:15 -05:00
dave mankoff
2a3d7d0319 fix python3 support 2013-01-28 22:21:45 -05:00
dave mankoff
7b59b34a73 get tests passing 2013-01-28 22:11:06 -05:00
dave mankoff
5f639b9a3b git rebase master 2013-01-28 21:46:54 -05:00
dave mankoff
357f3a3da2 properly write out charref's 2013-01-28 21:46:23 -05:00
dave mankoff
bc2bc7a330 git merge upstream/master 2013-01-28 21:41:42 -05:00
Benoît HERVIER
5f3a3e4582 Update pelican/contents.py
Put a space in error message to not concatain word 'about' and the missing tag
2013-01-24 14:10:26 +01:00
Rıdvan Örsvuran
0288bf1f68 added IGNORE_FILES setting for autoreload 2013-01-23 01:02:46 +01:00
Bruno Binet
ffdf8babbf Merge pull request #651 from traeblain/webasset-config
Update webassets plugin to allow user to pass configuration settings to webassets
2013-01-21 14:32:12 -08:00
Bruno Binet
d9855ae346 Merge pull request #662 from wking/rich-urlwrapper-comparisons
contents: Add rich comparisons to URLWrapper for easy sorting
2013-01-21 13:30:02 -08:00
Bruno Binet
6233f5a409 Merge pull request #667 from wking/page-path
Consolidate Path.filename and and StaticContent.filepath as `source_path`.
2013-01-18 07:30:03 -08:00
W. Trevor King
13cd0a4cb3 contents: Add deprecation warnings for Page.filename and StaticContent.filepath 2013-01-18 08:48:26 -05:00
W. Trevor King
ec50e18a3e utils: Add deprecated_attribute decorator 2013-01-18 08:48:21 -05:00
W. Trevor King
c3c3037a1d utils: Teach mkdir_p to fail if the existing target isn't a directory
Existing symlinks to directories will still pass, because isdir()
follows symbolic links.
2013-01-18 08:32:55 -05:00
W. Trevor King
004adfa5cc content: Convert Path.filename to .source_path
Making everything consistent is a bit awkward, since this is a
commonly used attribute, but I've done my best.

Reasons for not consolidating on `filename`:

* It is often used for the "basename" (last component in the path).
  Using `source_path` makes it clear that this attribute can contain
  multiple components.

Reasons for not consolidating on `filepath`:

* It is barely used in the Pelican source, and therefore easy to
  change.
* `path` is more Pythonic.  The only place `filepath` ever show up in
  the documentation for `os`, `os.path`, and `shutil` is in the
  `os.path.relpath` documentation [1].

Reasons for not consolidating on `path`:

* The Page elements have both a source (this attribute) and a
  destination (.save_as).  To avoid confusion for developers not aware
  of this, make it painfully obvious that this attribute is for the
  source.  Explicit is better than implicit ;).

Where I was touching the line, I also updated the string formatting in
StaticGenerator.generate_output to use the forward compatible
'{}'.format() syntax.

[1]: http://docs.python.org/2/library/os.path.html#os.path.relpath
2013-01-18 07:57:35 -05:00
W. Trevor King
61f05672e6 content: Convert StaticContent.filepath to .filename
For reasons that are unclear to me, StaticContent introduces the
`filepath` attribute rather than using the existing (and semantically
equivalent) Page.filename.  This has caused confusion before [1], and
it's probably a good idea to merge the two.

While I was touching the line, I also updated the string formatting in
StaticGenerator.generate_output to use the forward compatible
'{}'.format() syntax.

[1]: https://github.com/getpelican/pelican/issues/162#issuecomment-3000363
2013-01-18 07:40:42 -05:00
Bruno Binet
08a5ea6fdf Merge pull request #663 from wking/url-format-metadata
contents: Page.url_format should expose all metadata
2013-01-18 03:20:10 -08:00