Skip to content

Commit 060a6e8

Browse files
committed
pluginkit
Signed-off-by: Bruno Meilick <[email protected]>
1 parent 6d8c2b3 commit 060a6e8

14 files changed

+726
-67
lines changed

.editorconfig

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
[*.{css,scss,less,js,json,ts,sass,html,hbs,mustache,phtml,html.twig,md,yml}]
2+
charset = utf-8
3+
indent_style = space
4+
indent_size = 2
5+
end_of_line = lf
6+
insert_final_newline = true
7+
trim_trailing_whitespace = true
8+
insert_final_newline = true
9+
10+
[*.md]
11+
indent_size = 4
12+
trim_trailing_whitespace = false
13+
14+
[site/templates/**.php]
15+
indent_size = 2
16+
17+
[site/snippets/**.php]
18+
indent_size = 2
19+
20+
[package.json,.{babelrc,editorconfig,eslintrc,lintstagedrc,stylelintrc}]
21+
indent_style = space
22+
indent_size = 2

.gitignore

100644100755
Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,24 @@
1-
/vendor
2-
/kirby3-feed.zip
3-
/composer.lock
4-
/kirby
1+
# OS files
2+
.DS_Store
3+
.php_cs.cache
4+
5+
# files of Composer dependencies that are not needed for the plugin
6+
/vendor/**/.*
7+
/vendor/**/*.json
8+
/vendor/**/*.txt
9+
/vendor/**/*.md
10+
/vendor/**/*.yml
11+
/vendor/**/*.yaml
12+
/vendor/**/*.xml
13+
/vendor/**/*.dist
14+
/vendor/**/readme.php
15+
/vendor/**/LICENSE
16+
/vendor/**/COPYING
17+
/vendor/**/VERSION
18+
/vendor/**/docs/*
19+
/vendor/**/example/*
20+
/vendor/**/examples/*
21+
/vendor/**/test/*
22+
/vendor/**/tests/*
23+
/vendor/**/php4/*
24+
/vendor/getkirby/composer-installer

README.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
11
# Kirby 3 Feed
22

3-
![GitHub release](https://img.shields.io/github/release/bnomei/kirby3-feed.svg?maxAge=1800) ![License](https://img.shields.io/github/license/mashape/apistatus.svg) ![Kirby Version](https://img.shields.io/badge/Kirby-3%2B-black.svg)
3+
![GitHub release](https://img.shields.io/github/release/bnomei/kirby3-feed.svg?maxAge=1800) ![License](https://img.shields.io/github/license/mashape/apistatus.svg) ![Kirby Version](https://img.shields.io/badge/Kirby-3%2B-black.svg) ![Kirby 3 Pluginkit](https://img.shields.io/badge/Pluginkit-YES-cca000.svg)
44

55
Generate a RSS/JSON-Feed from a Pages-Collection.
66

77
## Commercial Usage
88

99
This plugin is free but if you use it in a commercial project please consider to
10-
- [make a donation 🍻](https://www.paypal.me/bnomei/5) or
10+
- [make a donation 🍻](https://www.paypal.me/bnomei/3) or
1111
- [buy me ☕](https://buymeacoff.ee/bnomei) or
1212
- [buy a Kirby license using this affiliate link](https://a.paddle.com/v2/click/1129/35731?link=1170)
1313

1414
## Installation
1515

16-
- for devkit-setup use `composer require bnomei/kirby3-feed` or
17-
- extract latest release of [kirby3-feed.zip](https://github.com/bnomei/kirby3-feed/releases/download/v1.0.9/kirby3-feed.zip) as folder `site/plugins/kirby3-feed`
18-
19-
> Installation as a gitsubmodule is *not* supported.
20-
16+
- unzip [master.zip](https://github.com/bnomei/kirby3-feed/archive/master.zip) as folder `site/plugins/kirby3-feed` or
17+
- `git submodule add https://github.com/bnomei/kirby3-feed.git site/plugins/kirby3-feed` or
18+
- `composer require bnomei/kirby3-feed`
2119

2220
## Usage
2321

composer.json

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "bnomei/kirby3-feed",
3-
"type": "plugin",
4-
"version": "1.0.9",
3+
"type": "kirby-plugin",
4+
"version": "1.1.0",
55
"description": "Generate a RSS/JSON-Feed from a Pages-Collection",
66
"license": "MIT",
77
"authors": [
@@ -20,9 +20,6 @@
2020
"json"
2121
],
2222
"autoload": {
23-
"files": [
24-
"config.php"
25-
],
2623
"psr-4": {
2724
"Bnomei\\": "classes/"
2825
}
@@ -31,27 +28,8 @@
3128
"optimize-autoloader": true,
3229
"sort-packages": true
3330
},
34-
"repositories": [
35-
{
36-
"type": "vcs",
37-
"url": "https://github.com/k-next/kirby"
38-
}
39-
],
4031
"require": {
4132
"php": ">=7.1.0",
42-
"getkirby/cms": "^3.0.0-RC-2.0"
43-
},
44-
"conflict": {
45-
"getkirby/kirby": "<3.0"
46-
},
47-
"scripts": {
48-
"zip": [
49-
"rm kirby3-feed.zip",
50-
"composer install --no-dev",
51-
"composer remove getkirby/cms",
52-
"composer dumpautoload -o",
53-
"zip -r kirby3-feed.zip . -x *.git*",
54-
"composer require getkirby/cms:'^3.0.0-RC-2.0'"
55-
]
33+
"getkirby/composer-installer": "^1.1"
5634
}
5735
}

composer.lock

Lines changed: 58 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config.php

Lines changed: 0 additions & 30 deletions
This file was deleted.

index.php

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,32 @@
11
<?php
22

3-
require_once __DIR__ . '/vendor/autoload.php';
3+
@include_once __DIR__ . '/vendor/autoload.php';
4+
5+
Kirby::plugin('bnomei/feed', [
6+
'options' => [
7+
'cache' => true,
8+
'debugforce' => true,
9+
'expires' => (60*24*7), // minutes
10+
'mime' => null,
11+
],
12+
'snippets' => [
13+
'feed/rss' => __DIR__ . '/snippets/feed/rss.php',
14+
'feed/json' => __DIR__ . '/snippets/feed/json.php',
15+
],
16+
'pagesMethods' => [ // PAGES not PAGE
17+
'feed' => function ($options = [], $force = null) {
18+
$string = \Bnomei\Feed::feed($this, $options, $force);
19+
$mime = option('bnomei.feed.mime');
20+
$snippet = \Kirby\Toolkit\A::get($options, 'snippet');
21+
22+
if ($mime) {
23+
return new Response($string, $mime);
24+
} elseif ($snippet == 'feed/json' || \Bnomei\Feed::isJson($string)) {
25+
return new Response($string, 'application/json');
26+
} elseif ($snippet == 'feed/rss' || \Bnomei\Feed::isXml($string)) {
27+
return new Response($string, 'application/rss+xml');
28+
}
29+
return $return;
30+
}
31+
]
32+
]);

vendor/autoload.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?php
2+
3+
// autoload.php @generated by Composer
4+
5+
require_once __DIR__ . '/composer/autoload_real.php';
6+
7+
return ComposerAutoloaderInit45a522cc481f3a000a8b0f17388d1766::getLoader();

0 commit comments

Comments
 (0)