wikidata_position_history 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5c2ddb3cb683a9510a52f729a3d49afbf98eddd62b45550fd836b69902dbdb9
-  data.tar.gz: e3c99ce76017a543011b0cd8f10f1d0858b27678a5f878a44076f74d82070c71
+  metadata.gz: 6a2bc5a49d34a368363b7e92ec9e1b0d08b141d96babd15eccf2913d99e9b7b0
+  data.tar.gz: 87594145f811917672fd4772722e086907d508479d73b43bfb21a0aac24e5d27
 SHA512:
-  metadata.gz: 1b97796606a4d6877705a058e17c4b1f112fc9c0621054a479492c3cc9cc5f20477fb9842c54641f6fe79d3f78e205f5433944e2ac598cfe162ca7a5ea155b9c
-  data.tar.gz: 0a5c78cb1e497494fd35102ace5edfac6942d1cbb958d74ec502b36ca70c06503045e7693a4c8423730f3c5d9c0ff371b18a1c504fc9cc8807afc5389e61670b
+  metadata.gz: 6eb361e602c3a34c97bd8b584b4029135d9bb8e14c1f99b2ed513ce049f8df780c9b09ac31941c31a7ebea544d0a6cc0065cb2210bc4af4448de66cfb40800c0
+  data.tar.gz: 1b07fb333e1f13d25985420ec6700f2b0dc81dc98a5c4a762713bcf8426c532b48e28f6d80646d7c5ea85692f63e921748a603708e4d9e7286f254bc8c665e21

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+# [1.9.0] 2020-09-11
+
+## Enhancements
+
+* If a position has any successor or predecessor offices (in "replaces"
+  (P1365) or "replaced by" (P1366)) the report will now display those.
+
 # [1.8.0] 2020-09-09
 
 ## Enhancements

data/lib/sparql/position_query.rb

@@ -8,7 +8,8 @@ module WikidataPositionHistory
         <<~SPARQL
           # position-metadata
 
-          SELECT DISTINCT ?item ?inception ?inception_precision ?abolition ?abolition_precision 
+          SELECT DISTINCT ?item ?inception ?inception_precision ?abolition ?abolition_precision
+                          ?replaces ?replacedBy
                           ?isPosition ?isLegislator
           WHERE {
             VALUES ?item { wd:%s }
@@ -20,7 +21,8 @@ module WikidataPositionHistory
             OPTIONAL { ?item p:P576 [ a wikibase:BestRank ;
               psv:P576 [ wikibase:timeValue ?abolition; wikibase:timePrecision ?abolition_precision ]
             ] }
-            SERVICE wikibase:label { bd:serviceParam wikibase:language "[AUTO_LANGUAGE],en". }
+            OPTIONAL { ?item wdt:P1365 ?replaces }
+            OPTIONAL { ?item wdt:P1366 ?replacedBy }
           }
         SPARQL
       end
@@ -53,6 +55,18 @@ module WikidataPositionHistory
       QueryService::WikidataDate.new(abolition_date_raw, abolition_date_precision)
     end
 
+    def replaces
+      return if replaces_raw.to_s.empty?
+
+      QueryService::WikidataItem.new(replaces_raw)
+    end
+
+    def replaced_by
+      return if replaced_by_raw.to_s.empty?
+
+      QueryService::WikidataItem.new(replaced_by_raw)
+    end
+
     def position?
       row.dig(:isPosition, :value) == 'true'
     end
@@ -65,6 +79,14 @@ module WikidataPositionHistory
 
     attr_reader :row
 
+    def replaces_raw
+      row.dig(:replaces, :value)
+    end
+
+    def replaced_by_raw
+      row.dig(:replacedBy, :value)
+    end
+
     def inception_date_raw
       row.dig(:inception, :value).to_s[0..9]
     end

data/lib/wikidata_position_history/report.rb

@@ -55,6 +55,18 @@ module WikidataPositionHistory
       rows.map(&:item).first
     end
 
+    def replaces
+      return if replaces_list.empty?
+
+      replaces_list.map(&:qlink).join(', ')
+    end
+
+    def replaced_by
+      return if replaced_by_list.empty?
+
+      replaced_by_list.map(&:qlink).join(', ')
+    end
+
     def inception_date
       return if inception_dates.empty?
 
@@ -96,6 +108,14 @@ module WikidataPositionHistory
 
     attr_reader :rows
 
+    def replaces_list
+      rows.map(&:replaces).compact.uniq(&:id).sort_by(&:id)
+    end
+
+    def replaced_by_list
+      rows.map(&:replaced_by).compact.uniq(&:id).sort_by(&:id)
+    end
+
     def inception_dates
       rows.map(&:inception_date).compact.uniq(&:to_s).sort
     end

data/lib/wikidata_position_history/template.rb

@@ -24,12 +24,24 @@ module WikidataPositionHistory
         {| class="wikitable" style="text-align: center; border: none;"
         <% if metadata.abolition_date -%>
         |-
-        | colspan="3" style="padding:0.5em 2em; border: none; background: #fff; font-size: 1.25em; text-align: right;" | '''Position abolished''': <%= metadata.abolition_date %>
-        | style="padding:0.5em 2em 0.5em 1em; border: none; background: #fff; text-align: left;" | \
+        | colspan="2" style="border: none; background: #fff; font-size: 1.15em; text-align: right;" | '''Position abolished''':
+        | style="border: none; background: #fff; text-align: left;" | <%= metadata.abolition_date %>
+        | style="border: none; background: #fff; text-align: left;" | \
         <% [metadata.abolition_warning].compact.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>\
         <% end %>
         <% end -%>
+        <% if metadata.replaced_by -%>
+        |-
+        | colspan="2" style="border: none; background: #fff; font-size: 1.15em; text-align: right;" | '''Replaced by''':
+        | style=" border: none; background: #fff; text-align: left;" | <%= metadata.replaced_by %>
+        | style=" border: none; background: #fff; text-align: left;" |
+        <% end -%>
+        <% if metadata.replaced_by || metadata.abolition_date -%>
+        |-
+        | colspan="3" style="padding:0.5em; border: none; background: #fff"> |&nbsp;
+        | colspan="1" style="padding:0.5em; border: none; background: #fff"> |&nbsp;
+        <% end -%>
         <% table_rows.map(&:values).each do |mandate, bio| -%>
         |-
         | style="padding:0.5em 2em" | <%= mandate.ordinal_string %>
@@ -40,14 +52,26 @@ module WikidataPositionHistory
         <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>\
         <% end %>
         <% end -%>
+        <% if metadata.replaced_by || metadata.abolition_date -%>
+        |-
+        | colspan="3" style="padding:0.5em; border: none; background: #fff"> |&nbsp;
+        | colspan="1" style="padding:0.5em; border: none; background: #fff"> |&nbsp;
+        <% end -%>
         <% if metadata.inception_date -%>
         |-
-        | colspan="3" style="padding:0.5em 2em; border: none; background: #fff; font-size: 1.25em; text-align: right;" | '''Position created''': <%= metadata.inception_date %>
+        | colspan="2" style="border: none; background: #fff; font-size: 1.15em; text-align: right;" | '''Position created''':
+        | style="border: none; background: #fff; text-align: left;" | <%= metadata.inception_date %>
         | style="padding:0.5em 2em 0.5em 1em; border: none; background: #fff; text-align: left;" | \
         <% [metadata.inception_warning].compact.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>\
         <% end %>
         <% end -%>
+        <% if metadata.replaces -%>
+        |-
+        | colspan="2" style=" border: none; background: #fff; font-size: 1.15em; text-align: right;" | '''Replaces''':
+        | style="border: none; background: #fff; text-align: left;" | <%= metadata.replaces %>
+        | style="padding:0.5em 2em 0.5em 1em; border: none; background: #fff; text-align: left;" |
+        <% end -%>
         |}
 
         <div style="margin-bottom:5px; border-bottom:3px solid #2f74d0; font-size:8pt">

data/lib/wikidata_position_history/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wikidata_position_history
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Tony Bowden
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-09 00:00:00.000000000 Z
+date: 2020-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mediawiki-replaceable-content