Merge branch 'master' into gh-pages

davorg · Jan 16, 2015 · 9db9dea · 9db9dea
2 parents 4749587 + e6610c8
commit 9db9dea
Show file tree

Hide file tree

Showing 679 changed files with 668,219 additions and 40 deletions.
diff --git a/bin/get_cands b/bin/get_cands
@@ -9,10 +9,14 @@ use open IO => ':encoding(utf8)';
 use JSON;
 use LWP::Simple;
 use DateTime;
+use Getopt::Long;
 
 use lib 'lib';
 use TwittElection::Schema;
 
+my $verbose;
+GetOptions(verbose => \$verbose);
+
 my $sch = TwittElection::Schema->get_schema;
 
 my $cons_rs;
@@ -84,7 +88,7 @@ foreach my $con ($cons_rs->all) {
       } else {
 	say "* No change $cand->{name} / ",
             $cand->{party_memberships}{2015}{name},
-            " / \@$cand->{twitter_username}";
+            " / \@$cand->{twitter_username}" if $verbose;
       }
     } else {
       say "* Adding $cand->{name} / ",
@@ -103,9 +107,12 @@ foreach my $con ($cons_rs->all) {
 
   # Any candidates left in %curr_cands need to be deleted
   foreach (keys %curr_cands) {
-    $can_rs->search({
-      yournextmp_id => $_,
-    })->delete;
+    my $curr_cand = $curr_cands{$_};
+    say '* Deleting ', $curr_cand->name, ' / ',
+        $curr_cand->party->name,
+        ' / ', $curr_cand->twitter;
+    $curr_cand->delete;
+    $changed = 1;
   }
 
   if ($changed) {

diff --git a/c/aberavon.html b/c/aberavon.html
@@ -81,10 +81,11 @@ <h1>Aberavon</h1>
               <li>Jonathan Tier (Green)</li>
               <li>Stephen Kinnock (Labour)<br><a href="https://twitter.com/SKinnock">@SKinnock</a></li>
               <li>Helen Ceri Clarke (Liberal Democrat)<br><a href="https://twitter.com/helenceri">@helenceri</a></li>
-              <li>Captain Beany (Independent)</li>
+              <li>Captain Beany (Independent)<br><a href="https://twitter.com/captainbeany">@captainbeany</a></li>
             </ul>
             <p><small>If you wish to make any corrections to this list, please see the
               <a href="https://yournextmp.com/constituency/66101">Aberavon page</a> on <a href="https://yournextmp.com/">YourNextMP</a>.</small></p>
+            <p><script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></p>
           </div>
         </div>
       </div>

diff --git a/c/aberconwy.html b/c/aberconwy.html
@@ -84,6 +84,7 @@ <h1>Aberconwy</h1>
             </ul>
             <p><small>If you wish to make any corrections to this list, please see the
               <a href="https://yournextmp.com/constituency/66085">Aberconwy page</a> on <a href="https://yournextmp.com/">YourNextMP</a>.</small></p>
+            <p><script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></p>
           </div>
         </div>
       </div>

diff --git a/c/aberdeen-north.html b/c/aberdeen-north.html
@@ -83,6 +83,7 @@ <h1>Aberdeen North</h1>
             </ul>
             <p><small>If you wish to make any corrections to this list, please see the
               <a href="https://yournextmp.com/constituency/14398">Aberdeen North page</a> on <a href="https://yournextmp.com/">YourNextMP</a>.</small></p>
+            <p><script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></p>
           </div>
         </div>
       </div>

diff --git a/c/aberdeen-south.html b/c/aberdeen-south.html
@@ -83,6 +83,7 @@ <h1>Aberdeen South</h1>
             </ul>
             <p><small>If you wish to make any corrections to this list, please see the
               <a href="https://yournextmp.com/constituency/14399">Aberdeen South page</a> on <a href="https://yournextmp.com/">YourNextMP</a>.</small></p>
+            <p><script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></p>
           </div>
         </div>
       </div>

diff --git a/c/airdrie-and-shotts.html b/c/airdrie-and-shotts.html
@@ -82,6 +82,7 @@ <h1>Airdrie and Shotts</h1>
             </ul>
             <p><small>If you wish to make any corrections to this list, please see the
               <a href="https://yournextmp.com/constituency/14400">Airdrie and Shotts page</a> on <a href="https://yournextmp.com/">YourNextMP</a>.</small></p>
+            <p><script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></p>
           </div>
         </div>
       </div>

diff --git a/c/aldershot.html b/c/aldershot.html
@@ -85,6 +85,7 @@ <h1>Aldershot</h1>
             </ul>
             <p><small>If you wish to make any corrections to this list, please see the
               <a href="https://yournextmp.com/constituency/65730">Aldershot page</a> on <a href="https://yournextmp.com/">YourNextMP</a>.</small></p>
+            <p><script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></p>
           </div>
         </div>
       </div>

diff --git a/c/aldridge-brownhills.html b/c/aldridge-brownhills.html
@@ -83,6 +83,7 @@ <h1>Aldridge-Brownhills</h1>
             </ul>
             <p><small>If you wish to make any corrections to this list, please see the
               <a href="https://yournextmp.com/constituency/65773">Aldridge-Brownhills page</a> on <a href="https://yournextmp.com/">YourNextMP</a>.</small></p>
+            <p><script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></p>
           </div>
         </div>
       </div>

diff --git a/c/altrincham-and-sale-west.html b/c/altrincham-and-sale-west.html
@@ -85,6 +85,7 @@ <h1>Altrincham and Sale West</h1>
             </ul>
             <p><small>If you wish to make any corrections to this list, please see the
               <a href="https://yournextmp.com/constituency/65892">Altrincham and Sale West page</a> on <a href="https://yournextmp.com/">YourNextMP</a>.</small></p>
+            <p><script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></p>
           </div>
         </div>
       </div>

diff --git a/c/alyn-and-deeside.html b/c/alyn-and-deeside.html
@@ -86,6 +86,7 @@ <h1>Alyn and Deeside</h1>
             </ul>
             <p><small>If you wish to make any corrections to this list, please see the
               <a href="https://yournextmp.com/constituency/66103">Alyn and Deeside page</a> on <a href="https://yournextmp.com/">YourNextMP</a>.</small></p>
+            <p><script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></p>
           </div>
         </div>
       </div>

diff --git a/c/amber-valley.html b/c/amber-valley.html
@@ -85,6 +85,7 @@ <h1>Amber Valley</h1>
             </ul>
             <p><small>If you wish to make any corrections to this list, please see the
               <a href="https://yournextmp.com/constituency/65809">Amber Valley page</a> on <a href="https://yournextmp.com/">YourNextMP</a>.</small></p>
+            <p><script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></p>
           </div>
         </div>
       </div>

diff --git a/c/angus.html b/c/angus.html
@@ -84,6 +84,7 @@ <h1>Angus</h1>
             </ul>
             <p><small>If you wish to make any corrections to this list, please see the
               <a href="https://yournextmp.com/constituency/14401">Angus page</a> on <a href="https://yournextmp.com/">YourNextMP</a>.</small></p>
+            <p><script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></p>
           </div>
         </div>
       </div>

diff --git a/c/arfon.html b/c/arfon.html
@@ -84,6 +84,7 @@ <h1>Arfon</h1>
             </ul>
             <p><small>If you wish to make any corrections to this list, please see the
               <a href="https://yournextmp.com/constituency/66108">Arfon page</a> on <a href="https://yournextmp.com/">YourNextMP</a>.</small></p>
+            <p><script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></p>
           </div>
         </div>
       </div>

diff --git a/c/argyll-and-bute.html b/c/argyll-and-bute.html
@@ -85,6 +85,7 @@ <h1>Argyll and Bute</h1>
             </ul>
             <p><small>If you wish to make any corrections to this list, please see the
               <a href="https://yournextmp.com/constituency/14402">Argyll and Bute page</a> on <a href="https://yournextmp.com/">YourNextMP</a>.</small></p>
+            <p><script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></p>
           </div>
         </div>
       </div>

diff --git a/c/arundel-and-south-downs.html b/c/arundel-and-south-downs.html
@@ -84,6 +84,7 @@ <h1>Arundel and South Downs</h1>
             </ul>
             <p><small>If you wish to make any corrections to this list, please see the
               <a href="https://yournextmp.com/constituency/65784">Arundel and South Downs page</a> on <a href="https://yournextmp.com/">YourNextMP</a>.</small></p>
+            <p><script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></p>
           </div>
         </div>
       </div>

diff --git a/c/ashfield.html b/c/ashfield.html
@@ -84,6 +84,7 @@ <h1>Ashfield</h1>
             </ul>
             <p><small>If you wish to make any corrections to this list, please see the
               <a href="https://yournextmp.com/constituency/65895">Ashfield page</a> on <a href="https://yournextmp.com/">YourNextMP</a>.</small></p>
+            <p><script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></p>
           </div>
         </div>
       </div>

diff --git a/c/ashford.html b/c/ashford.html
@@ -83,6 +83,7 @@ <h1>Ashford</h1>
             </ul>
             <p><small>If you wish to make any corrections to this list, please see the
               <a href="https://yournextmp.com/constituency/65811">Ashford page</a> on <a href="https://yournextmp.com/">YourNextMP</a>.</small></p>
+            <p><script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></p>
           </div>
         </div>
       </div>

diff --git a/c/ashton-under-lyne.html b/c/ashton-under-lyne.html
@@ -82,6 +82,7 @@ <h1>Ashton-under-Lyne</h1>
             </ul>
             <p><small>If you wish to make any corrections to this list, please see the
               <a href="https://yournextmp.com/constituency/66056">Ashton-under-Lyne page</a> on <a href="https://yournextmp.com/">YourNextMP</a>.</small></p>
+            <p><script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></p>
           </div>
         </div>
       </div>

diff --git a/c/aylesbury.html b/c/aylesbury.html
@@ -83,6 +83,7 @@ <h1>Aylesbury</h1>
             </ul>
             <p><small>If you wish to make any corrections to this list, please see the
               <a href="https://yournextmp.com/constituency/65739">Aylesbury page</a> on <a href="https://yournextmp.com/">YourNextMP</a>.</small></p>
+            <p><script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></p>
           </div>
         </div>
       </div>

diff --git a/c/ayr-carrick-and-cumnock.html b/c/ayr-carrick-and-cumnock.html
@@ -82,6 +82,7 @@ <h1>Ayr, Carrick and Cumnock</h1>
             </ul>
             <p><small>If you wish to make any corrections to this list, please see the
               <a href="https://yournextmp.com/constituency/14403">Ayr, Carrick and Cumnock page</a> on <a href="https://yournextmp.com/">YourNextMP</a>.</small></p>
+            <p><script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></p>
           </div>
         </div>
       </div>

diff --git a/c/banbury-2.html b/c/banbury-2.html
@@ -86,6 +86,7 @@ <h1>Banbury</h1>
             </ul>
             <p><small>If you wish to make any corrections to this list, please see the
               <a href="https://yournextmp.com/constituency/66008">Banbury page</a> on <a href="https://yournextmp.com/">YourNextMP</a>.</small></p>
+            <p><script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></p>
           </div>
         </div>
       </div>

diff --git a/c/banff-and-buchan.html b/c/banff-and-buchan.html
@@ -82,6 +82,7 @@ <h1>Banff and Buchan</h1>
             </ul>
             <p><small>If you wish to make any corrections to this list, please see the
               <a href="https://yournextmp.com/constituency/14404">Banff and Buchan page</a> on <a href="https://yournextmp.com/">YourNextMP</a>.</small></p>
+            <p><script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></p>
           </div>
         </div>
       </div>

diff --git a/c/barking.html b/c/barking.html
@@ -85,6 +85,7 @@ <h1>Barking</h1>
             </ul>
             <p><small>If you wish to make any corrections to this list, please see the
               <a href="https://yournextmp.com/constituency/65662">Barking page</a> on <a href="https://yournextmp.com/">YourNextMP</a>.</small></p>
+            <p><script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></p>
           </div>
         </div>
       </div>

diff --git a/c/barnsley-central-2.html b/c/barnsley-central-2.html
@@ -83,6 +83,7 @@ <h1>Barnsley Central</h1>
             </ul>
             <p><small>If you wish to make any corrections to this list, please see the
               <a href="https://yournextmp.com/constituency/65665">Barnsley Central page</a> on <a href="https://yournextmp.com/">YourNextMP</a>.</small></p>
+            <p><script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></p>
           </div>
         </div>
       </div>

diff --git a/c/barnsley-east.html b/c/barnsley-east.html
@@ -82,6 +82,7 @@ <h1>Barnsley East</h1>
             </ul>
             <p><small>If you wish to make any corrections to this list, please see the
               <a href="https://yournextmp.com/constituency/66012">Barnsley East page</a> on <a href="https://yournextmp.com/">YourNextMP</a>.</small></p>
+            <p><script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></p>
           </div>
         </div>
       </div>

diff --git a/c/barrow-and-furness-2.html b/c/barrow-and-furness-2.html
@@ -86,6 +86,7 @@ <h1>Barrow and Furness</h1>
             </ul>
             <p><small>If you wish to make any corrections to this list, please see the
               <a href="https://yournextmp.com/constituency/66006">Barrow and Furness page</a> on <a href="https://yournextmp.com/">YourNextMP</a>.</small></p>
+            <p><script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></p>
           </div>
         </div>
       </div>

diff --git a/c/basildon-and-billericay.html b/c/basildon-and-billericay.html
@@ -83,6 +83,7 @@ <h1>Basildon and Billericay</h1>
             </ul>
             <p><small>If you wish to make any corrections to this list, please see the
               <a href="https://yournextmp.com/constituency/65898">Basildon and Billericay page</a> on <a href="https://yournextmp.com/">YourNextMP</a>.</small></p>
+            <p><script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></p>
           </div>
         </div>
       </div>

diff --git a/c/basingstoke.html b/c/basingstoke.html
@@ -83,6 +83,7 @@ <h1>Basingstoke</h1>
             </ul>
             <p><small>If you wish to make any corrections to this list, please see the
               <a href="https://yournextmp.com/constituency/65623">Basingstoke page</a> on <a href="https://yournextmp.com/">YourNextMP</a>.</small></p>
+            <p><script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></p>
           </div>
         </div>
       </div>

diff --git a/c/bassetlaw.html b/c/bassetlaw.html
@@ -83,6 +83,7 @@ <h1>Bassetlaw</h1>
             </ul>
             <p><small>If you wish to make any corrections to this list, please see the
               <a href="https://yournextmp.com/constituency/65711">Bassetlaw page</a> on <a href="https://yournextmp.com/">YourNextMP</a>.</small></p>
+            <p><script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></p>
           </div>
         </div>
       </div>