Skip to content

Commit

Permalink
[fc] Repository: plone.outputfilters
Browse files Browse the repository at this point in the history
Branch: refs/heads/master
Date: 2022-04-19T17:22:02+03:00
Author: MrTango (MrTango) <md@derico.de>
Commit: plone/plone.outputfilters@d501f93

Add image_srcset output filter

Files changed:
A news/49.feature
A plone/outputfilters/filters/image_srcset.py
M plone/outputfilters/filters/configure.zcml
M plone/outputfilters/filters/resolveuid_and_caption.py
M plone/outputfilters/tests/test_resolveuid_and_caption.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-04-20T11:49:18+03:00
Author: MrTango (MrTango) <md@derico.de>
Commit: plone/plone.outputfilters@b190b71

Fix resolve_uid_and_caption tests

Files changed:
M plone/outputfilters/tests/test_resolveuid_and_caption.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-04-20T11:49:49+03:00
Author: MrTango (MrTango) <md@derico.de>
Commit: plone/plone.outputfilters@e700516

prevent image_srcset from breaking when srcset config is missing, add tests

Files changed:
A plone/outputfilters/tests/test_image_srcset.py
M plone/outputfilters/filters/image_srcset.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-04-22T14:41:32+03:00
Author: MrTango (MrTango) <md@derico.de>
Commit: plone/plone.outputfilters@0812821

copy all attributes except src/srcset from images in srcset filter

Files changed:
M plone/outputfilters/filters/image_srcset.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-04-22T14:44:04+03:00
Author: MrTango (MrTango) <md@derico.de>
Commit: plone/plone.outputfilters@a5c1abc

set width/height on img and inside srcset

Files changed:
M plone/outputfilters/filters/resolveuid_and_caption.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-05-05T13:57:19+03:00
Author: MrTango (MrTango) <md@derico.de>
Commit: plone/plone.outputfilters@8bec6fd

refactor image srcset filter

Files changed:
M plone/outputfilters/filters/image_srcset.py
M plone/outputfilters/filters/resolveuid_and_caption.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-05-08T21:00:42+03:00
Author: MrTango (MrTango) <md@derico.de>
Commit: plone/plone.outputfilters@785b0fe

set w parameter in srcset definitions

Files changed:
M plone/outputfilters/filters/image_srcset.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-05-08T21:15:25+03:00
Author: MrTango (MrTango) <md@derico.de>
Commit: plone/plone.outputfilters@4e1b6cd

Add img width/height in resolveuid_and_caption filter if not present

Files changed:
M plone/outputfilters/filters/image_srcset.py
M plone/outputfilters/filters/resolveuid_and_caption.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-05-16T18:02:58+02:00
Author: MrTango (MrTango) <md@derico.de>
Commit: plone/plone.outputfilters@0ba15c7

use new url method in @@images view to postpone image scale creating until browser reuqests it

Files changed:
M plone/outputfilters/filters/resolveuid_and_caption.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-05-16T22:15:05+02:00
Author: MrTango (MrTango) <md@derico.de>
Commit: plone/plone.outputfilters@7528e72

use new pre scale parameter

Files changed:
M plone/outputfilters/filters/resolveuid_and_caption.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-05-18T17:43:15+02:00
Author: MrTango (MrTango) <md@derico.de>
Commit: plone/plone.outputfilters@8dbc336

Fix captioning of picture tags

Files changed:
M plone/outputfilters/browser/captioned_image.pt
M plone/outputfilters/filters/configure.zcml
M plone/outputfilters/filters/image_srcset.py
M plone/outputfilters/filters/resolveuid_and_caption.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-05-24T20:44:17+03:00
Author: MrTango (MrTango) <md@derico.de>
Commit: plone/plone.outputfilters@17157fd

do not use title as alt attribute content

Files changed:
M plone/outputfilters/filters/resolveuid_and_caption.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-06-01T21:00:06+03:00
Author: MrTango (MrTango) <md@derico.de>
Commit: plone/plone.outputfilters@ce96bc9

refacture image_srcset method to be reusable in plone.namedfile

Files changed:
A plone/outputfilters/utils.py
M plone/outputfilters/filters/image_srcset.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-06-02T10:35:02+03:00
Author: MrTango (MrTango) <md@derico.de>
Commit: plone/plone.outputfilters@b2b2f8f

fix update_src_scale method

Files changed:
M plone/outputfilters/filters/resolveuid_and_caption.py
M plone/outputfilters/utils.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-06-02T11:31:39+03:00
Author: MrTango (MrTango) <md@derico.de>
Commit: plone/plone.outputfilters@8371ce0

Fix image_srcset tests

Files changed:
M plone/outputfilters/tests/test_image_srcset.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-06-03T19:45:03+03:00
Author: MrTango (MrTango) <md@derico.de>
Commit: plone/plone.outputfilters@25c15cd

move utils.Img2PictureTag from outputfilter to namedfile.picture

Files changed:
M plone/outputfilters/filters/image_srcset.py
D plone/outputfilters/utils.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-06-03T19:45:21+03:00
Author: MrTango (MrTango) <md@derico.de>
Commit: plone/plone.outputfilters@5befed3

prettify soup output

Files changed:
M plone/outputfilters/filters/image_srcset.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-06-03T19:46:14+03:00
Author: MrTango (MrTango) <md@derico.de>
Commit: plone/plone.outputfilters@76705bb

cleanup

Files changed:
M plone/outputfilters/filters/resolveuid_and_caption.py
M plone/outputfilters/tests/test_resolveuid_and_caption.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-06-03T19:46:34+03:00
Author: MrTango (MrTango) <md@derico.de>
Commit: plone/plone.outputfilters@f734494

fix test

Files changed:
M plone/outputfilters/tests/test_resolveuid_and_caption.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-06-07T17:26:22+03:00
Author: MrTango (MrTango) <md@derico.de>
Commit: plone/plone.outputfilters@be09d6a

rename image_srcset to picture_variants, fix captioning

Files changed:
A plone/outputfilters/filters/picture_variants.py
A plone/outputfilters/tests/test_picture_variants.py
M plone/outputfilters/filters/configure.zcml
M plone/outputfilters/filters/resolveuid_and_caption.py
M plone/outputfilters/tests/test_resolveuid_and_caption.py
D plone/outputfilters/filters/image_srcset.py
D plone/outputfilters/tests/test_image_srcset.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-06-08T16:09:28+03:00
Author: MrTango (MrTango) <md@derico.de>
Commit: plone/plone.outputfilters@bc7647b

refacture use of Img2PictureTag/get_picture_variants, and fix tests

Files changed:
M plone/outputfilters/filters/picture_variants.py
M plone/outputfilters/filters/resolveuid_and_caption.py
M plone/outputfilters/tests/test_resolveuid_and_caption.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-06-08T15:55:01+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plone.outputfilters@c02dbb9

Fixed getting width and height for img with resolveuid without @@images.

Try @@images/image in that case.
Renamed test_image_captioning_resolveuid to test_image_captioning_resolveuid_bare so you can run this test on its own.

Files changed:
M plone/outputfilters/filters/resolveuid_and_caption.py
M plone/outputfilters/tests/test_resolveuid_and_caption.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-06-08T17:26:29+03:00
Author: MrTango (MrTango) <md@derico.de>
Commit: plone/plone.outputfilters@fc8cae0

fix test_image_captioning_relative_path_private_folder

Files changed:
M plone/outputfilters/filters/resolveuid_and_caption.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-06-08T17:27:06+03:00
Author: MrTango (MrTango) <md@derico.de>
Commit: plone/plone.outputfilters@0ffd853

remove wrong tests, srcset is not allowed in video/audio

Files changed:
M plone/outputfilters/tests/test_resolveuid_and_caption.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-06-08T17:41:07+03:00
Author: MrTango (MrTango) <md@derico.de>
Commit: plone/plone.outputfilters@8e23b0a

fix test

Files changed:
M plone/outputfilters/README.rst
M plone/outputfilters/tests/test_resolveuid_and_caption.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-06-08T17:43:44+03:00
Author: MrTango (MrTango) <md@derico.de>
Commit: plone/plone.outputfilters@bf3670e

fix last test

Files changed:
M plone/outputfilters/tests/test_resolveuid_and_caption.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-06-08T17:46:23+03:00
Author: MrTango (MrTango) <md@derico.de>
Commit: plone/plone.outputfilters@283332a

fix it again ;)

Files changed:
M plone/outputfilters/tests/test_resolveuid_and_caption.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-06-08T17:57:33+03:00
Author: MrTango (MrTango) <md@derico.de>
Commit: plone/plone.outputfilters@52a4650

use plone.app.uuid.utils.uuidToObject, add dependency to plone.namedfile

Files changed:
M plone/outputfilters/filters/resolveuid_and_caption.py
M setup.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-06-08T17:02:36+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plone.outputfilters@e434a29

Add dependency on plone.app.uuid

Files changed:
M setup.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-06-08T18:13:09+03:00
Author: MrTango (MrTango) <md@derico.de>
Commit: plone/plone.outputfilters@bfd44ed

deactivate print statement

Files changed:
M plone/outputfilters/tests/test_picture_variants.py
M plone/outputfilters/tests/test_resolveuid_and_caption.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-06-08T18:13:19+03:00
Author: MrTango (MrTango) <md@derico.de>
Commit: plone/plone.outputfilters@7b4a8f5

Merge branch 'mrtango-image-sourcesets-filter' of https://github.com/plone/plone.outputfilters into mrtango-image-sourcesets-filter

Files changed:
M setup.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-06-08T17:35:28+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plone.outputfilters@6ee7150

Add some deprecation warnings in resolveuid.

Other code should import from plone.app.uuid.utils.
Removed our tests for these functions: uuidToObject and uuidToURL.

Files changed:
M plone/outputfilters/browser/resolveuid.py
M plone/outputfilters/tests/test_resolveuid_and_caption.py
M setup.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-06-10T01:18:12+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plone.outputfilters@5f74d9b

Revert "Add some deprecation warnings in resolveuid."

This reverts commit 6ee71503c52c422a795fba74625b46f3f6a553df.
It causes test failures in plone.restapi.

Also, we should test what happens in our own code when you are anonymous and we call `uuidToObject` on a uuid of a private object.
Actually, that seems to work, at least for a simple link, both with our version of this function and with the version from `plone.app.uuid`.
But I don't know why it works.

Files changed:
M plone/outputfilters/browser/resolveuid.py
M plone/outputfilters/tests/test_resolveuid_and_caption.py
M setup.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-06-10T01:25:22+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plone.outputfilters@99f0203

Do add deprecation warnings for our own uuidToObject and uuidToURL.

Files changed:
M plone/outputfilters/browser/resolveuid.py
M setup.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-06-10T13:36:13+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plone.outputfilters@10651b9

Removed _shorttag_replace from picture_variants filter.

This was copied from the resolve_uid_and_caption filter, but was missing the singleton_tags definition.

I don't think it is needed in resolve_uid_and_caption either.
It is meant to replace singleton tags without any content which should not be singleton tags.
For example change `&lt;p /&gt;` into `&lt;p&gt;&lt;/p&gt;`.
But beautifulsoup is already doing that for us:

```
&gt;&gt;&gt; print(BeautifulSoup("&lt;p /&gt;", "html.parser"))
&lt;p&gt;&lt;/p&gt;
```

Cleanup (plus possibly adding a test) can be done later, to not overfill this PR.

Files changed:
M plone/outputfilters/filters/picture_variants.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-06-10T17:27:28+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plone.outputfilters@73af19d

Use our own version of uuidToObject.

The one from plone.app.uuid does an extra security check.
We *should* be using that one, instead of having our own slightly different copy.
But let's do that in a later PR, where we can focus on what might possibly break because of this.
See plone/plone.outputfilters#52

Files changed:
M plone/outputfilters/filters/resolveuid_and_caption.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-06-16T14:21:48+02:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/plone.outputfilters@397c7e7

fix test

Files changed:
M plone/outputfilters/tests/test_picture_variants.py
Repository: plone.outputfilters

Branch: refs/heads/master
Date: 2022-06-16T18:53:51+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plone.outputfilters@f28f92e

Merge pull request #49 from plone/mrtango-image-sourcesets-filter

Add image sourcesets filter

Files changed:
A news/49.feature
A plone/outputfilters/filters/picture_variants.py
A plone/outputfilters/tests/test_picture_variants.py
M plone/outputfilters/README.rst
M plone/outputfilters/browser/captioned_image.pt
M plone/outputfilters/browser/resolveuid.py
M plone/outputfilters/filters/configure.zcml
M plone/outputfilters/filters/resolveuid_and_caption.py
M plone/outputfilters/tests/test_resolveuid_and_caption.py
M setup.py
  • Loading branch information
mauritsvanrees committed Jun 16, 2022
1 parent 7cdc8d0 commit b5dbceb
Showing 1 changed file with 523 additions and 120 deletions.
Loading

0 comments on commit b5dbceb

Please sign in to comment.