1
0
Fork 0
forked from github/pelican
Commit graph

1,523 commits

Author SHA1 Message Date
Justin Mayer
f3bc2ece86 Merge pull request #382 from mankyd/htmlparser
New, more thorough HTMLParser
2013-02-09 16:48:50 -08:00
dave mankoff
5f5b300ba5 fix documentation 2013-02-09 09:51:02 -05:00
dave mankoff
8ba6a4d19d fix documentation 2013-02-09 09:27:45 -05:00
Bruno Binet
06899aa826 Merge pull request #710 from ikalnitsky/code-directive
Fix bug with docutils' code directive.
2013-02-08 23:08:01 -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
9e51e767d4 git pull origin htmlparser 2013-01-28 21:51:17 -05:00
dave mankoff
e6a4fe3fc4 fix grammar 2013-01-28 21:50:09 -05:00
dave mankoff
bf6f16e383 add documentation for html reader 2013-01-28 21:50:09 -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
Bruno Binet
90672e5491 Merge pull request #697 from khertan/master
Adding a missing space in one error message
2013-01-24 05:47:28 -08: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
Alexis Metaireau
c8da208a91 Merge pull request #691 from webdesignhero/master
Related Post Plugin Example
2013-01-23 04:05:42 -08:00
Bruno Binet
b642d2247d Merge branch 'pr/648'
closes #648
closes #585
2013-01-23 01:04:26 +01:00
Rıdvan Örsvuran
0288bf1f68 added IGNORE_FILES setting for autoreload 2013-01-23 01:02:46 +01:00
Bruno Binet
a7b18515a1 Merge branch 'pr/634'
closes #634
2013-01-21 23:49:52 +01:00
Michael Reneer
a441596b07 Cleaned up markdown test cases:
- test_article_with_md_extension
- test_article_with_mkd_extension
- test_article_with_markdown_extension

and replaced with:

- test_article_with_metadata
- test_article_with_file_extensions
2013-01-21 23:49:16 +01:00
Michael Reneer
56a276d92e Added unit test to test the markdown file extension. 2013-01-21 23:49:16 +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
efbce9a375 Merge branch 'pr/643' 2013-01-21 23:20:13 +01:00
Simon
688dee2dca Improve importer documentation. 2013-01-21 23:19:23 +01: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
abc73d9d98 Merge pull request #653 from alefteris/docs-depedencies-update
Docs depedencies update
2013-01-21 13:12:42 -08:00
Eric
0a6294a2a3 More clear example for related posts
The existing related posts example doesn't show properties for the collection, this could be confusing to individuals who are not programmers, because as it was the code would render five bullet points.

I am also looking to add some type of loop control or if statement to the loop to detect duplicate, I tried t a dictionary sort filter through jinja, bu that through an error, the following is not guarantted to work then:


		{% set LASTARTICLE = "notset" %}
		{% if article.related_posts %}
			<ul>
			{% for related_post in article.related_posts|dictsort(false, 'url')  %}
				{% if not (LASTARTICLE == related_post.url) %}
				   <li><a href="{{ related_post.url }}">{{ related_post.title }}</a></li>
				{% endif %}
				{% set LASTARTICLE = related_post.url %}
			{% endfor %}
			</ul>
		{% endif %}

the dicsort does not work (is this not a dict, I'm not a python guy so I'm just hacking at it.
2013-01-20 17:27:28 -06:00
Bruno Binet
67a67846aa temporary deactivate travis tests for Python 3.3
the functional tests currently fail on Python 3.3 because the feeds output
differs. (see #688)

this is a temporary fix that will make travis happy while we provide a valid
fix for this issue.
2013-01-19 17:10:14 +01:00
Bruno Binet
b01ddbb29c fix python 3.3 travis build
unittest2py3k is requiredfor python 3.3 (instead of unittest2)
2013-01-19 16:44:14 +01:00
Bruno Binet
86f8743b1b Merge branch 'pr/687' 2013-01-19 16:38:27 +01:00
W. Trevor King
763244dad5 tox.ini: Test on Python 3.3 as well as 2.7 and 3.2
I just copied the 3.2 environment for 3.3.  They should be similar,
but it's possible some packages have extra issues on 3.3.
2013-01-18 19:47:02 -05:00
W. Trevor King
5466ffd614 .travis.yml: Test on Python 3.3 as well as 2.7 and 3.2
If we advertise 3.3 support in setup.py, we should test for it.
2013-01-18 19:45:44 -05:00
W. Trevor King
6686f1c9bd setup.py: Update trove classifiers to Python 2.7, 3.2, and 3.3 2013-01-18 19:44:44 -05: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
Bruno Binet
370640e008 Merge pull request #664 from wking/mkdir-p-nondir-error
utils: Teach mkdir_p to fail if the existing target isn't a directory
2013-01-18 06:39:58 -08:00
W. Trevor King
13b36a5c34 test_utils: Add log count checks to test_deprecated_attribute 2013-01-18 08:48:26 -05:00
W. Trevor King
4fcdaa91e9 tests/support: Factor LogCountHandler testing out into LoggedTestCase
To avoid duplicating boilerplate when we need to test logged messages
outside of TestPelican.
2013-01-18 08:48:26 -05: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
54a9132aea tests: Update tests after filename/filepath -> source_path 2013-01-18 08:07:49 -05:00
W. Trevor King
9b574361c9 doc: convert Markdown example to source_path and modernize 2013-01-18 07:57:53 -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
W. Trevor King
d2a221c899 contents: Encode Unicode locales for Python 2 in Page.__init__
Python 2.7 chokes on Unicode locales:

  $ python2.7
  >>> import locale
  >>> locale.setlocale(locale.LC_ALL, u'ja_JP.utf8')
  Traceback (most recent call last):
    ...
  ValueError: too many values to unpack

With the addition of:

  from __future__ import unicode_literals

to tests/test_contents.py in:

  commit bebb94c15b
  Author: W. Trevor King <wking@tremily.us>
  Date:   Tue Jan 15 22:50:58 2013 -0500

    test_contents.py: Add URLWrapper comparison tests

the locale strings in TestPage.test_datetime are interpreted as
Unicode.  Rather than fixing the encoding there, this patch updates
Page to handle Unicode locales automatically.
2013-01-17 09:49:03 -05:00
W. Trevor King
733ab8ae6c test_contents: Add tests for metadata export from Page.url_format 2013-01-15 23:08:32 -05:00
W. Trevor King
bebb94c15b test_contents.py: Add URLWrapper comparison tests
The name switch between wrapper_a and wrapper_b ensures that we're not
secretly comparing some other field (e.g. id(object)).
2013-01-15 22:52:02 -05:00
W. Trevor King
656b5150ff docs/themes.rst: Document URLWrapper sorting for use in Jinja templates 2013-01-15 22:52:01 -05:00