wikidata_position_history 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52e5490ed1d01167632b8adc9cb5d9a37912a5accad858b5d2ada5aaa43522ff
-  data.tar.gz: ab39a9aed506e9c77834ed7a7fdc6a9a06006eaee84f14ee9fb0c71eb069c5a8
+  metadata.gz: '08b127d4fefeb6c622042af063ab7574afb3b54f0c1c6dc3cb5329304b6b7c84'
+  data.tar.gz: 72f0be64974066b3b8988f23ac5dde2e5897b8aaa611ff379997053f890b3011
 SHA512:
-  metadata.gz: e7aae1fb45f43c0ba961d878de171e4150194514dc406e0059a8c9bc2544ce2e9549d4e9e07c5da6b7ccfe8a6aec534735c1f645fb026a5eb04512b4cee7f9cb
-  data.tar.gz: 797ab543a4a0ee636ed833a1f200c266ebed7b60872084b6f9b0156b11920dc619c15d4bc19b8326ca747c9f5585df4a81be7b23c5fbdd07a177e3ded1f3f702
+  metadata.gz: c914cfaa9abc6412f04e0482b91facf33d52db8f4b49adea721bbdb5cb7dcd31c9e404f87bd58a09e7843ee8d985f2c2cd30f89953fdeffb54dc3b2749e11e85
+  data.tar.gz: 131ef009d921f4fa974411295f913b8b9df0800f326caf9125e7524d60e627e29e3bf8f7d7303e1a4b258dca4a679568ea3f17944795bd4d68e408c4f8c023c0

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+# [2.1.0] 2020-09-16
+
+* When displaying a list of members for a constituency, also include
+  a 'parliamentary group' (P4100) column, and if there's a
+  'parliamentary term' (P2937) qualifier, use it for the ordinal.
+
 # [2.0.0] 2020-09-16
 
 ## Interface change

data/lib/sparql/mandates_query.rb

@@ -32,7 +32,7 @@ module WikidataPositionHistory
         <<~SPARQL
           # constituency-mandates
 
-          SELECT DISTINCT ?ordinal ?item ?start_date ?start_precision ?end_date ?end_precision ?prev ?next ?nature
+          SELECT DISTINCT ?ordinal ?item ?start_date ?start_precision ?end_date ?end_precision ?party ?prev ?next ?term
           WHERE {
             ?item wdt:P31 wd:Q5 ; p:P39 ?posn .
             ?posn pq:P768 wd:%s .
@@ -40,10 +40,13 @@ module WikidataPositionHistory
 
             OPTIONAL { ?posn pqv:P580 [ wikibase:timeValue ?start_date; wikibase:timePrecision ?start_precision ] }
             OPTIONAL { ?posn pqv:P582 [ wikibase:timeValue ?end_date; wikibase:timePrecision ?end_precision ] }
-            OPTIONAL { ?posn pq:P1365|pq:P155 ?prev }
-            OPTIONAL { ?posn pq:P1366|pq:P156 ?next }
-            OPTIONAL { ?posn pq:P1545 ?ordinal }
-            OPTIONAL { ?posn pq:P5102 ?nature }
+            OPTIONAL { ?posn pq:P1365 ?prev }
+            OPTIONAL { ?posn pq:P1366 ?next }
+            OPTIONAL { ?posn pq:P4100 ?party }
+            OPTIONAL {
+              ?posn pq:P2937 ?term .
+              OPTIONAL { ?term p:P31/pq:P1545 ?ordinal }
+            }
           }
           ORDER BY DESC(?start_date) ?item
         SPARQL
@@ -61,6 +64,10 @@ module WikidataPositionHistory
       item_from(:item)
     end
 
+    def party
+      item_from(:party)
+    end
+
     # TODO: switch to item_from
     def prev
       QueryService::WikidataItem.new(row.dig(:prev, :value)).qlink

data/lib/wikidata_position_history/output_row.rb

@@ -22,6 +22,10 @@ module WikidataPositionHistory
         "#{ordinal}."
       end
 
+      def party
+        current.party
+      end
+
       def officeholder
         current.officeholder
       end

data/lib/wikidata_position_history/template.rb

@@ -50,6 +50,9 @@ module WikidataPositionHistory
         | style="padding:0.5em 2em" | <%= mandate.ordinal_string %>
         | style="padding:0.5em 2em" | <%= bio.map(&:image_link).first %>
         | style="padding:0.5em 2em" | <span style="font-size: <%= mandate.acting? ? '1.25em; font-style: italic;' : '1.5em' %>; display: block;"><%= mandate.officeholder.qlink %></span> <%= mandate.dates %>
+        <% if metadata.constituency? -%>
+        | style="padding:0.5em 1em" | <% if mandate.party %><%= mandate.party.qlink %><% end %>
+        <% end -%>
         | style="padding:0.5em 2em 0.5em 1em; border: none; background: #fff; text-align: left;" | \
         <% mandate.warnings.each do |warning| -%>
         <span style="display: block">[[File:Pictogram voting comment.svg|15px|link=]]&nbsp;<span style="color: #d33; font-weight: bold; vertical-align: middle;"><%= warning.headline %></span>&nbsp;<ref><%= warning.explanation %></ref></span>\

data/lib/wikidata_position_history/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WikidataPositionHistory
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wikidata_position_history
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Tony Bowden