Merge branch 'release/0.1'

.env.example

@@ -1,17 +1,17 @@
-APP_ENV=local
+APP_ENV=production
-APP_KEY=SomeRandomString
+APP_KEY=SomeRandomString # Leave this
-APP_DEBUG=true
+APP_DEBUG=false
-APP_LOG_LEVEL=debug
+APP_LOG_LEVEL=warning
 APP_TIMEZONE=UTC
 APP_LANG=en
 APP_LOG=daily
 
-DB_CONNECTION=mysql
+DB_CONNECTION=pgsql
 DB_HOST=127.0.0.1
-DB_PORT=3306
+DB_PORT=5432
-DB_DATABASE=homestead
+DB_DATABASE=
-DB_USERNAME=homestead
+DB_USERNAME=
-DB_PASSWORD=secret
+DB_PASSWORD=
 
 CACHE_DRIVER=file
 SESSION_DRIVER=file
@@ -36,12 +36,13 @@ AWS_S3_REGION=region
 AWS_S3_BUCKET=your-bucket
 AWS_S3_URL=https://xxxxxxx.s3-region.amazonaws.com
 
-APP_URL=https://example.com
+APP_URL=https://example.com # This one is necessary
 APP_LONGURL=example.com
 APP_SHORTURL=examp.le
 
-ADMIN_USER=admin
+ADMIN_USER=admin # pick something better, this is used for `/admin`
 ADMIN_PASS=password
+DISPLAY_NAME='Joe Bloggs' # This is used for example in the header and titles
 
 TWITTER_CONSUMER_KEY=
 TWITTER_CONSUMER_SECRET=

.travis.yml

@@ -1,9 +1,10 @@
 language: php
 
 sudo: false
+dist: trusty
 
 addons:
-  postgresql: "9.4"
+  postgresql: "9.5"
 
 services:
   - postgresql
@@ -13,7 +14,7 @@ env:
     - setup=basic
 
 php:
-  - 7.0
+  - 7.0.13 # trusty comes with 7.0.7 by default which segfaults with phpdbg
   - 7.1
   - nightly
 matrix:

app/Http/Controllers/MicropubController.php

@@ -145,7 +145,8 @@ class MicropubController extends Controller
                     'places' => $places,
                 ]);
             }
-            //nope, ho about a config query?
+            //nope, how about a config query?
+            //this should have a media endpoint as well at some point
             if ($request->input('q') == 'config') {
                 return response()->json([
                     'syndicate-to' => config('syndication.targets'),

app/Http/Kernel.php

@@ -31,6 +31,7 @@ class Kernel extends HttpKernel
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
             \App\Http\Middleware\LinkHeadersMiddleware::class,
+            \App\Http\Middleware\DevTokenMiddleware::class,
         ],
 
         'api' => [

app/Http/Middleware/DevTokenMiddleware.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Support\Facades\Storage;
+
+class DevTokenMiddleware
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        if (config('app.env') !== 'production') {
+            session(['me' => env('APP_URL')]);
+            if (Storage::exists('dev-token')) {
+                session(['token' => Storage::get('dev-token')]);
+            }
+        }
+
+        return $next($request);
+    }
+}

app/Providers/AppServiceProvider.php

@@ -5,7 +5,6 @@ namespace App\Providers;
 use App\Tag;
 use App\Note;
 use Validator;
-use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\ServiceProvider;
 
 class AppServiceProvider extends ServiceProvider
@@ -46,14 +45,6 @@ class AppServiceProvider extends ServiceProvider
                 $note->tags()->attach($tagsToAdd);
             }
         });
-
-        //allow micropub use in development
-        if (env('APP_DEBUG') == true) {
-            session(['me' => env('APP_URL')]);
-            if (Storage::exists('dev-token')) {
-                session(['token' => Storage::get('dev-token')]);
-            }
-        }
     }
 
     /**

changelog.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## Version 0.1 (2016-12-10)
+  - Much better testing of micropub endpoints locally and on TravisCI
+  - Updating README
+  - Add IWC logo to footer
+
 ## Version 0.0.18 (2016-12-08)
   - Some minor style tweaks
   - Fix some validation issues

public/assets/css/app.css.map

@@ -10,6 +10,6 @@
 		"../../../resources/assets/sass/mapbox.scss",
 		"../../../resources/assets/sass/contacts.scss"
 	],
-	"mappings": "AAIA,AAAA,IAAI,AAAC,CACD,UAAU,CAAE,UAAW,CACvB,SAAS,CAAE,IAAK,CACnB,AAED,AAAA,CAAC,CACD,AAAC,CAAA,AAAA,QAAQ,CACT,AAAC,CAAA,AAAA,OAAO,AAAC,CACL,UAAU,CAAE,OAAQ,CACvB,ACXD,AAAA,IAAI,AAAC,CACD,SAAS,CAAE,IAAK,CAChB,MAAM,CAAE,MAAO,CACf,YAAY,CAAE,GAAI,CAClB,aAAa,CAAE,GAAI,CACnB,SAAS,CAAE,UAAW,CACzB,AAED,AAAA,UAAU,AAAC,CACP,UAAU,CAAE,MAAO,CACtB,AAED,AAAA,QAAQ,AAAC,CACL,WAAW,CAAE,IAAK,CACrB,AAED,AAAA,KAAK,AAAC,CACF,OAAO,CAAE,IAAK,CACd,cAAc,CAAE,MAAO,CAC1B,AAED,AAAA,cAAc,AAAC,CACX,OAAO,CAAE,IAAK,CACd,cAAc,CAAE,GAAI,CACpB,eAAe,CAAE,aAAc,CAC/B,SAAS,CAAE,MAAO,CACrB,AAED,AAAA,aAAa,AAAC,CACV,OAAO,CAAE,IAAK,CACd,WAAW,CAAE,MAAO,CACvB,AAED,AAAc,aAAD,CAAC,GAAG,AAAC,CACd,YAAY,CAAE,GAAI,CACrB,AAED,AAAa,YAAD,CAAC,GAAG,AAAC,CACb,OAAO,CAAE,YAAa,CACtB,MAAM,CAAE,IAAK,CAChB,AAED,AAAO,IAAH,CAAG,OAAO,AAAC,CACX,UAAU,CAAE,GAAI,CAChB,UAAU,CAAE,cAAe,CAC9B,AAED,AAAA,MAAM,AAAC,CACH,UAAU,CAAE,IAAK,CACpB,AAED,AAAO,MAAD,CAAC,MAAM,AAAC,CACV,WAAW,CAAE,GAAI,CACpB,AAED,AAAA,cAAc,AAAC,CACX,OAAO,CAAE,MAAO,CAChB,MAAM,CAAE,GAAI,CACf,AAED,AAAA,UAAU,AAAC,CACP,UAAU,CAAE,GAAI,CAChB,OAAO,CAAE,KAAM,CACf,SAAS,CAAE,OAAQ,CACtB,AAED,AAAkB,UAAR,AAAA,OAAO,CAAC,GAAG,AAAC,CAClB,MAAM,CAAE,OAAQ,CACnB,AAED,AAAW,UAAD,CAAC,UAAU,AAAC,CAClB,UAAU,CAAE,KAAM,CAClB,SAAS,CAAE,IAAK,CACnB,ACzED,AAAA,IAAI,AAAC,CAED,WAAW,CAAE,iJAGE,CAClB,AAED,AAAA,CAAC,AAAC,CACE,eAAe,CAAE,IAAK,CACtB,aAAa,CAAE,SAAU,CACzB,KAAK,CAAE,IAAK,CACf,AAED,AAAc,aAAD,CAAC,CAAC,AAAC,CACZ,aAAa,CAAE,IAAK,CACvB,AAED,AAAA,KAAK,AAAC,CACF,MAAM,CAAE,GAAI,CACZ,KAAK,CAAE,IAAK,CACf,AAED,AAAA,MAAM,AAAC,CACH,SAAS,CAAE,MAAO,CAClB,UAAU,CAAE,MAAO,CACtB,AC1BD,AAAA,WAAW,AAAC,CACR,KAAK,CAAE,IAAK,CACZ,MAAM,CAAE,IAAK,CACb,OAAO,CAAE,IAAK,CACd,cAAc,CAAE,GAAI,CACpB,eAAe,CAAE,aAAc,CAC/B,WAAW,CAAE,MAAO,CACvB,AAED,AAAY,WAAD,CAAC,EAAE,AAAC,CACX,eAAe,CAAE,IAAK,CACzB,ACXD,AAAA,QAAQ,AAAC,CACL,OAAO,CAAE,IAAK,CACd,cAAc,CAAE,MAAO,CAC1B,AAED,MAAM,EAAL,SAAS,EAAE,KAAK,EACb,AAAW,QAAH,CAAG,GAAG,AAAC,CACX,OAAO,CAAE,IAAK,CACd,cAAc,CAAE,GAAI,CACpB,OAAO,CAAE,MAAO,CACnB,CAGL,MAAM,EAAL,SAAS,EAAE,KAAK,EACb,AAAoB,KAAf,CAAA,AAAA,IAAC,CAAK,SAAS,AAAd,CAAgB,CAClB,KAAK,CAAE,IAAK,CACf,CAGL,AAAS,QAAD,CAAC,KAAK,AAAC,CACX,KAAK,CAAE,GAAI,CACX,YAAY,CAAE,MAAO,CACrB,UAAU,CAAE,KAAM,CACrB,AAED,AAAgC,QAAxB,CAAC,KAAK,AAAA,IAAK,EAAA,AAAA,AAAY,IAAX,CAAD,MAAC,AAAA,GACpB,AAAS,QAAD,CAAC,QAAQ,AAAC,CACd,IAAI,CAAE,CAAE,CACX,AAED,AAAS,QAAD,CAAC,QAAQ,AAAC,CACd,OAAO,CAAE,aAAc,CAC1B,AAED,AAAA,OAAO,AAAC,CACJ,YAAY,CAAE,MAAO,CACxB,ACpCD,AAAA,IAAI,AAAC,CACD,UAAU,CAAE,GAAI,CAChB,MAAM,CAAE,KAAM,CACjB,AAED,AAAA,OAAO,AAAC,CACJ,gBAAgB,CAAw3H,u3HAAC,CACz4H,eAAe,CAAE,OAAQ,CACzB,KAAK,CAAE,IAAK,CACZ,MAAM,CAAE,IAAK,CAChB,AAED,AAAA,SAAS,AAAC,CACN,QAAQ,CAAE,QAAS,CACnB,GAAG,CAAE,CAAE,CACP,IAAI,CAAE,CAAE,CACR,UAAU,CAAE,KAAM,CAClB,OAAO,CAAE,MAAO,CACnB,AAED,AAAU,SAAD,CAAC,KAAK,AAAC,CACZ,WAAW,CAAE,GAAI,CACjB,YAAY,CAAE,GAAI,CACrB,ACvBD,AAAA,QAAQ,AAAC,CACL,OAAO,CAAE,IAAK,CACd,cAAc,CAAE,GAAI,CACpB,UAAU,CAAE,GAAI,CAChB,aAAa,CAAE,eAAgB,CAClC,AAED,AAAS,QAAD,CAAC,GAAG,AAAC,CACT,YAAY,CAAE,MAAO,CACrB,KAAK,CAAE,KAAM,CACb,MAAM,CAAC,KAAM,CAChB",
+	"mappings": "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",
 	"names": []
 }

readme.md

@@ -2,4 +2,46 @@
 
 This is the code that runs my website, [jonnybarnes.uk](https://jonnybarnes.uk).
 
-It’s not quite ready for anyone else, but it will be soon :)
+In theory this is usable by other now :D
+
+Set up the database, this software needs [PostgreSQL](https://wwwpostgresql.org)
+with the [PostGIS](http://postgis.net) plugin. After installing these:
+
+```shell
+$ createdb -E utf8 db_name
+$ psql -d db_name -c 'CREATE EXTENSION postgis'
+```
+
+First get the code, and make sure you’re on the `master` branch. This branch will
+only have tagged releases:
+
+```shell
+$ git clone https://github.com/jonnybarnes/jonnybarnes.uk mysite.com
+$ cd mysite.com
+$ git checkout master
+```
+
+Then we need to set up the environment variables that the app will use.
+
+```shell
+$ cp .env.example .env
+$ vim .env
+```
+
+Fill in the various variables. Then we can set up the app:
+
+```shell
+$ composer install
+$ php artisan key:generate
+$ php artisan migrate
+```
+
+Now we need to edit some config values. In `config/app.php` edit `name`, and in
+`config/syndication.php` edit it to the appropriate values or set targets to `null`.
+
+Some other things that should be changed. Go to `resources/views/master.blade.php`,
+you may not want to link to a projects page. Also in the `<head>` the two last links
+are to my profile pic and pgp key, ammend/remove as desired.
+
+Now point your server to `public/index.php` and viola. Essentially this is a
+Laravel app so debugging things shouldn’t be too hard.

resources/assets/sass/styles.scss

@@ -27,3 +27,12 @@ footer {
     font-size: 0.5rem;
     text-align: center;
 }
+
+footer p > a {
+    border-bottom: none;
+}
+
+.iwc-logo {
+    width: 100px;
+    height: auto;
+}

resources/views/allnotes.blade.php

@@ -1,7 +1,7 @@
 @extends('master')
 
 @section('title')
-Notes « Jonny Barnes
+Notes « 
 @stop
 
 @section('content')

resources/views/allplaces.blade.php

@@ -1,7 +1,7 @@
 @extends('master')
 
 @section('title')
-Places « Jonny Barnes
+Places « 
 @stop
 
 @section('content')

resources/views/colophon.blade.php

@@ -1,5 +1,5 @@
 @extends('master')
-@section('title')Colophon for Jonny Barnes.uk @stop
+@section('title')Colophon for @stop
 
 @section('content')
 <h2>Colophon</h2>

resources/views/contact.blade.php

@@ -1,7 +1,7 @@
 @extends('master')
 
 @section('title')
-Contacts « Jonny Barnes
+Contacts « 
 @stop
 
 @section('content')

resources/views/contacts.blade.php

@@ -1,7 +1,7 @@
 @extends('master')
 
 @section('title')
-Contacts « Jonny Barnes
+Contacts « 
 @stop
 
 @section('content')

resources/views/master.blade.php

@@ -2,12 +2,12 @@
 <html lang="en-GB">
 <head>
   <meta charset="UTF-8">
-  <title>@if (App::environment() == 'local'){!! "[testing] -"!!}@endif @yield('title')</title>
+  <title>@if (App::environment() == 'local'){!! "[testing] -"!!}@endif @yield('title'){{ env('DISPLAY_NAME') }}</title>
   <meta name="viewport" content="width=device-width">
   <link rel="stylesheet" href="/assets/frontend/normalize.css">
   <link rel="stylesheet" href="/assets/css/app.css">
   <link rel="openid.server" href="https://indieauth.com/openid">
-  <link rel="openid.delegate" href="https://jonnybarnes.uk">
+  <link rel="openid.delegate" href="{{ config('app.url') }}">
   <link rel="authorization_endpoint" href="https://indieauth.com/auth">
   <link rel="token_endpoint" href="{{ config('app.url') }}/api/token">
   <link rel="micropub" href="{{ config('app.url') }}/api/post">
@@ -18,7 +18,7 @@
 <body>
   <header id="topheader">
     <a rel="author" href="/">
-      <h1>Jonny Barnes</h1>
+      <h1>{{ env('DISPLAY_NAME') }}</h1>
     </a>
     <nav>
       <a href="/blog">Articles</a>
@@ -43,6 +43,7 @@
     </form>
     <p>The code for <code>{{ env('APP_LONGURL') }}</code> can be found on <a href="https://github.com/jonnybarnes/jonnybarnes.uk">GitHub</a>.</p>
     <p>Built with love: <a href="/colophon">Colophon</a></p>
+    <p><a href="https://indieweb.org"><img src="assets/img/iwc.png" alt="Indie Web Camp logo" class="iwc-logo"></a></p>
 </footer>
 </body>
 </html>

resources/views/micropubnewnotepage.blade.php

@@ -1,7 +1,7 @@
 @extends('master')
 
 @section('title')
-New Note « Jonny Barnes
+New Note « 
 @stop
 
 @section('content')

resources/views/multipost.blade.php

@@ -1,7 +1,7 @@
 @extends('master')
 
 @section('title')
-Articles « Jonny Barnes
+Articles « 
 @stop
 
 @section('content')

resources/views/projects.blade.php

@@ -1,4 +1,5 @@
 @extends('master')
+{{-- This can either be edited or dropped --}}
 @section('title')Jonny Barnes’ Projects @stop
 
 @section('content')

resources/views/rss.blade.php

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
 <channel>
-  <title>Jonny Barnes.uk</title>
+  <title>{{ env('DISPLAY_NAME') }}</title>
   <atom:link href="{{ config('app.url') }}/feed" rel="self" type="application/rss+xml" />
-  <description>An RSS feed of the blog posts found on jonnybarnes.uk</description>
+  <description>An RSS feed of the blog posts found on {{ config('url.longurl') }}</description>
-  <link>https://jonnybarnes.uk</link>
+  <link>{{ config('app.url') }}</link>
   <lastBuildDate>{{ $buildDate }}</lastBuildDate>
   <ttl>1800</ttl>
 

resources/views/search.blade.php

@@ -1,7 +1,7 @@
 @extends('master')
 
 @section('title')
-Search « Jonny Barnes
+Search « 
 @stop
 
 @section('content')

resources/views/singlenote.blade.php

@@ -1,7 +1,7 @@
 @extends('master')
 
 @section('title')
-{{ strip_tags($note->note) }} « Notes « Jonny Barnes
+{{ strip_tags($note->note) }} « Notes « 
 @stop
 
 @section('content')

resources/views/singleplace.blade.php

@@ -1,7 +1,7 @@
 @extends('master')
 
 @section('title')
-{{ $place->name }} « Places « Jonny Barnes
+{{ $place->name }} « Places « 
 @stop
 
 @section('content')

resources/views/singlepost.blade.php

@@ -1,7 +1,7 @@
 @extends('master')
 
 @section('title')
-{{ strip_tags($article->title) }} <?php echo html_entity_decode("&laquo;"); ?> Jonny Barnes
+{{ strip_tags($article->title) }} « 
 @stop
 
 @section('content')

resources/views/taggednotes.blade.php

@@ -1,7 +1,7 @@
 @extends('master')
 
 @section('title')
-Notes <?php echo html_entity_decode('&laquo;'); ?> Jonny Barnes
+Tagged Notes « 
 @stop
 
 @section('content')

resources/views/webmention-endpoint.blade.php

@@ -1,7 +1,7 @@
 @extends('master')
 
 @section('title')
-WebMentions « Jonny Barnes
+WebMentions « 
 @stop
 
 @section('content')

tests/MicropubClientTest.php

@@ -32,18 +32,8 @@ class MicropubClientTest extends TestCase
 
     public function testClientPageRecentAuth()
     {
-        $syndication = [
+        $this->visit($this->appurl . '/notes/new')
-            [
+          ->see($this->appurl);
-                'target' => 'https://twitter.com/jonnybarnes',
-                'name' => 'jonnybarnes on Twitter',
-            ]
-        ];
-        $this->withSession([
-            'me' => $this->appurl,
-            'syndication' => $syndication,
-        ])->visit($this->appurl . '/notes/new')
-          ->see($this->appurl)
-          ->see('https://twitter.com/jonnybarnes');
     }
 
     public function testClientCreatesNewNoteWithTag()
@@ -51,10 +41,7 @@ class MicropubClientTest extends TestCase
         //in this test, the syndication targets are blank
         $faker = \Faker\Factory::create();
         $note = 'Fake note from #PHPUnit: ' . $faker->text;
-        $this->withSession([
+        $this->visit($this->appurl . '/notes/new')
-            'me' => $this->appurl,
-            'token' => $this->getToken()
-        ])->visit($this->appurl . '/notes/new')
           ->type($note, 'content')
           ->press('Submit');
         $this->seeInDatabase('notes', ['note' => $note]);
@@ -78,20 +65,5 @@ class MicropubClientTest extends TestCase
         }
         $newNote = \App\Note::where('note', $note)->first();
         $newNote->forceDelete();
-
-    }
-
-    private function getToken()
-    {
-        $signer = new Sha256();
-        $token = (new Builder())
-            ->set('client_id', 'https://quill.p3k.io')
-            ->set('me', $this->appurl)
-            ->set('scope', 'post')
-            ->set('issued_at', time())
-            ->sign($signer, env('APP_KEY'))
-            ->getToken();
-
-        return $token;
     }
 }