wikidata_position_history 1.7.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc98f35825bd450d052eaf0bbb84934db297933bce312b88fd8b545474b742bf
-  data.tar.gz: 663abb5df3df62744eebbdeaea9ce2e63bf90aeff5335bf2406ae66306dd7608
+  metadata.gz: 52e5490ed1d01167632b8adc9cb5d9a37912a5accad858b5d2ada5aaa43522ff
+  data.tar.gz: ab39a9aed506e9c77834ed7a7fdc6a9a06006eaee84f14ee9fb0c71eb069c5a8
 SHA512:
-  metadata.gz: d06f8f44b1b84107e9bed22f158479f2be66569511ee1f9dea33ceaa788a9cff118b15e3e0960723cc943a290f832c6442f5c8c8659fb275002449e57c90d285
-  data.tar.gz: edae0f0fc3223778d655546c873792f81da0f514c50be44e27a192717df11c2672eedc251e2cf210ab4e623cdd0c5a232b6e65671c7cc9b2a356a1498ed3426f
+  metadata.gz: e7aae1fb45f43c0ba961d878de171e4150194514dc406e0059a8c9bc2544ce2e9549d4e9e07c5da6b7ccfe8a6aec534735c1f645fb026a5eb04512b4cee7f9cb
+  data.tar.gz: 797ab543a4a0ee636ed833a1f200c266ebed7b60872084b6f9b0156b11920dc619c15d4bc19b8326ca747c9f5585df4a81be7b23c5fbdd07a177e3ded1f3f702

data/CHANGELOG.md

@@ -1,20 +1,105 @@
 # Changelog
 
+# [2.0.0] 2020-09-16
+
+## Interface change
+
+* `Report#wikitext_with_header` has been removed. This was undocumented,
+  and only used internally, so should not be a breaking change, but if
+  anything *was* using it, that will now break loudly (but, usefully,
+  should also break very early.)
+
+## Enhancements
+
+* A {{PositionHolderHistory}} template can now also be added to items
+  representing single-member constituencies, to see the history of
+  representatives for that seat.
+
+# [1.11.0] 2020-09-14
+
+## Enhancements
+
+* Wikidata now has a new {{QB}} template to link to _both_ an Item and
+  its Talk page. As the PositionHolderHistory template for a position
+  often lives on its Talk page, any link to a position item now uses
+  this template, for easier of access to that. (Requested by Tagishsimon:
+  https://twitter.com/Tagishsimon/status/1304363879322079233)
+
+* The change to how warnings templates work from the last release (i.e.
+  using on-wiki templates, so they can be improved or translated, or used
+  to look for problems via backlinks) definitely seems to have been a good
+  idea, so now the warnings for having an unexpected number of inception
+  or abolition dates have also been adjusted to work the same way.
+
+# [1.10.0] 2020-09-13
+
+## Enhancements
+
+* If some other position has a "replaces" (P1365) or "replaced by"
+  (P1366) pointing to _this_ position, but this position doesn't have
+  the reciprocal inverse claims back to that one, include them as a
+  successor/predecessor, but warn that it’s only an indirect connection.
+
+* The warnings in the above case now use an on-wiki template for their
+  text. This means they can be translated into other languages, and also
+  means that backlinks to these templates, via WhatLinksHere, can act as
+  a TODO list. The other warnings will be migrated to this approach Real
+  Soon Now™.
+
+# [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
+
+* If the very latest person we know of having held this position also
+  has a 'replaced by' qualifier, that’s a sign that the successor should
+  really also have a suitable P39, and actually appear here too. So we
+  want to display a warning in such cases. Likewise if the earliest person
+  we know if also has a 'replaces'
+
+* This report is meant to be used with positions that are held by only a
+  single person at a time. Using it to produce a report of everyone who
+  has been, say, a Member of the UK Parliament, is the sort of thing that
+  will cause all manner of havoc, as it will try to display tens of
+  thousands of people, all of whom have overlaps with other members etc.
+  So we now sanity-check first of all that the position isn't legislative,
+  and produce a nice "Don’t do that!" message in such cases.
+
+* It seems that the recent ability to handle dates that are only know at
+  decade-level precision isn’t actually enough, as we have some that we
+  only know at century-level precision! (For example, that the position of
+  Lord Chancellor of Ireland was created some time in the 12th Century.)
+  Such dates will now appear in a nicer format.
+
+* Sometimes updating the table looks like something has changed, but
+  really the only difference is that a few of people who have no dates
+  are shuffled around a bit in the list. This is because we previously
+  only sorted by date order, so people with no dates were effectively in a
+  random order. Now we sort those people by ID too, which should minimise
+  the number of times an update will appear in your watchlist, only to
+  discover nothing significant actually happened.
+
 # [1.7.0] 2020-09-08
 
-# Enchancements
+## Enchancements
 
-* Yesterday’s future, when we said we'd do something a little better
+* Yesterday’s future, when we said we’d do something a little better
   with positions that have multiple inception or abolition dates, has
   arrived. Now we display all of them (with a warning), rather than just
   picking one semi-randomly.
 
-# Improvements
+## Improvements
 
 * A query like https://w.wiki/bVz is taking about 6 seconds to run.
   Changing that to https://w.wiki/bW3 drops that to about half a second.
   If you were to guess that the first has now been replaced by the
-  second, you'd be entirely correct.
+  second, you’d be entirely correct.
 
 # [1.6.0] 2020-09-07
 
@@ -22,7 +107,7 @@
 
 * If a position has an inception date and/or abolition date, those will
   now also be displayed. (If a position has more than one of either of
-  those — which really shouldn't happen, but sometimes does — then the
+  those — which really shouldn’t happen, but sometimes does — then the
   behaviour may not be particularly sensible. Later evolutions of this
   feature will hopefully handle that better.)
 
@@ -39,7 +124,7 @@
 
 * When showing the results for a position from long long ago (such as
   the High Kings of Ireland), display the dates as "862 – 879" not as
-  "862 – 879"
+  "0862 – 0879"
 * If we only know that someone took (or left) office sometime in a given
   decade (i.e. at date precision 8), display that as (say) "1930s"
 

data/exe/position-history-for-item

@@ -8,4 +8,4 @@ if ARGV.size != 1
 e.g. #{$PROGRAM_NAME} Q14211'"
 end
 
-puts WikidataPositionHistory::Report.new(ARGV.first).wikitext_with_header
+puts WikidataPositionHistory::Report.new(ARGV.first).wikitext

data/lib/query_service.rb

@@ -37,6 +37,10 @@ module QueryService
       @url = url
     end
 
+    def eql?(other)
+      id == other.id
+    end
+
     def id
       url.split('/').last unless url.to_s.empty?
     end
@@ -45,6 +49,18 @@ module QueryService
       "{{Q|#{id}}}" if id
     end
 
+    def qblink
+      "{{QB|#{id}}}" if id
+    end
+
+    def qlink_i
+      "''#{qlink}''" if qlink
+    end
+
+    def qblink_i
+      "''#{qblink}''" if qblink
+    end
+
     private
 
     attr_reader :url
@@ -54,7 +70,7 @@ module QueryService
   class WikidataDate
     include Comparable
 
-    DATELEN = { '11' => 10, '10' => 7, '9' => 4, '8' => 4 }.freeze
+    DATELEN = { '11' => 10, '10' => 7, '9' => 4, '8' => 4, '7' => 2 }.freeze
 
     def initialize(str, precision)
       @str = str
@@ -105,6 +121,7 @@ module QueryService
     end
 
     def precisioned_string
+      return "#{truncated_string}. century" if precision == '7'
       return "#{truncated_string}s" if precision == '8'
 
       truncated_string

data/lib/sparql/bio_query.rb

@@ -21,16 +21,28 @@ module WikidataPositionHistory
         SPARQL
       end
     end
-  end
 
-  # Represents a single row returned from the Position query
-  class BioRow
-    def initialize(row)
-      @row = row
+    # Biographical data for Members for a Constituency
+    class ConstituencyBioQuery < ItemQuery
+      def raw_sparql
+        <<~SPARQL
+          # constituency-biodata
+
+          SELECT DISTINCT ?item ?image
+          WHERE {
+            ?item wdt:P31 wd:Q5 ; p:P39/pq:P768 wd:%s .
+            OPTIONAL { ?item wdt:P18 ?image }
+          }
+          ORDER BY ?item
+        SPARQL
+      end
     end
+  end
 
+  # Represents a single row returned from the Position query
+  class BioRow < SPARQL::QueryRow
     def person
-      QueryService::WikidataItem.new(row.dig(:item, :value))
+      item_from(:item)
     end
 
     def image_title
@@ -47,10 +59,8 @@ module WikidataPositionHistory
 
     private
 
-    attr_reader :row
-
     def image_url
-      row.dig(:image, :value)
+      raw(:image)
     end
   end
 end

data/lib/sparql/item_query.rb

@@ -4,7 +4,7 @@ require 'erb'
 
 module WikidataPositionHistory
   module SPARQL
-    # Turn raw SPARQL into result objects
+    # Abstract class to turn raw SPARQL into result objects
     class ItemQuery
       def initialize(itemid)
         @itemid = itemid
@@ -34,5 +34,34 @@ module WikidataPositionHistory
         @json ||= QueryService::Query.new(sparql).results
       end
     end
+
+    # Abstract class to represents a single row returned from a query
+    class QueryRow
+      def initialize(row)
+        @row = row
+      end
+
+      protected
+
+      attr_reader :row
+
+      def item_from(key)
+        value = raw(key)
+        return if value.to_s.empty?
+
+        QueryService::WikidataItem.new(value)
+      end
+
+      def date_from(key, precision_key)
+        trunc = raw(key).to_s[0..9]
+        return if trunc.empty?
+
+        QueryService::WikidataDate.new(trunc, raw(precision_key))
+      end
+
+      def raw(key)
+        row.dig(key, :value)
+      end
+    end
   end
 end

data/lib/sparql/mandates_query.rb

@@ -21,39 +21,57 @@ module WikidataPositionHistory
             OPTIONAL { ?posn pq:P1545 ?ordinal }
             OPTIONAL { ?posn pq:P5102 ?nature }
           }
-          ORDER BY DESC(?start_date)
+          ORDER BY DESC(?start_date) ?item
         SPARQL
       end
     end
-  end
 
-  # Represents a single row returned from the Mandates query
-  class MandateRow
-    def initialize(row)
-      @row = row
+    # SPARQL for fetching all mandates of a single-member district
+    class ConstituencyMandatesQuery < ItemQuery
+      def raw_sparql
+        <<~SPARQL
+          # constituency-mandates
+
+          SELECT DISTINCT ?ordinal ?item ?start_date ?start_precision ?end_date ?end_precision ?prev ?next ?nature
+          WHERE {
+            ?item wdt:P31 wd:Q5 ; p:P39 ?posn .
+            ?posn pq:P768 wd:%s .
+            FILTER NOT EXISTS { ?posn wikibase:rank wikibase:DeprecatedRank }
+
+            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 }
+          }
+          ORDER BY DESC(?start_date) ?item
+        SPARQL
+      end
     end
+  end
 
+  # Represents a single row returned from the Mandates query
+  class MandateRow < SPARQL::QueryRow
     def ordinal
-      row.dig(:ordinal, :value)
+      raw(:ordinal)
     end
 
     def officeholder
-      QueryService::WikidataItem.new(row.dig(:item, :value))
-    end
-
-    # TODO: rename or remove. 'item' is meaningless/ambiguous
-    def item
-      officeholder.qlink
+      item_from(:item)
     end
 
+    # TODO: switch to item_from
     def prev
       QueryService::WikidataItem.new(row.dig(:prev, :value)).qlink
     end
 
+    # TODO: switch to item_from
     def next
       QueryService::WikidataItem.new(row.dig(:next, :value)).qlink
     end
 
+    # TODO: switch to item_from
     def nature
       QueryService::WikidataItem.new(row.dig(:nature, :value)).id
     end
@@ -63,35 +81,11 @@ module WikidataPositionHistory
     end
 
     def start_date
-      return if start_date_raw.empty?
-
-      QueryService::WikidataDate.new(start_date_raw, start_date_precision)
+      date_from(:start_date, :start_precision)
     end
 
     def end_date
-      return if end_date_raw.empty?
-
-      QueryService::WikidataDate.new(end_date_raw, end_date_precision)
-    end
-
-    def start_date_raw
-      row.dig(:start_date, :value).to_s[0..9]
+      date_from(:end_date, :end_precision)
     end
-
-    def end_date_raw
-      row.dig(:end_date, :value).to_s[0..9]
-    end
-
-    def start_date_precision
-      row.dig(:start_precision, :value)
-    end
-
-    def end_date_precision
-      row.dig(:end_precision, :value)
-    end
-
-    private
-
-    attr_reader :row
   end
 end

data/lib/sparql/position_query.rb

@@ -8,71 +8,88 @@ module WikidataPositionHistory
         <<~SPARQL
           # position-metadata
 
-          SELECT DISTINCT ?item ?inception ?inception_precision ?abolition ?abolition_precision ?isPosition
+          SELECT DISTINCT ?item ?inception ?inception_precision ?abolition ?abolition_precision
+                          ?replaces ?replacedBy ?derivedReplaces ?derivedReplacedBy
+                          ?isPosition ?isLegislator
+                          ?isConstituency ?representative_count ?legislature
           WHERE {
             VALUES ?item { wd:%s }
-            BIND(EXISTS { wd:%s wdt:P279+ wd:Q4164871  } as ?isPosition)
+            BIND(EXISTS { wd:%s wdt:P279+ wd:Q4164871 } as ?isPosition)
+            BIND(EXISTS { wd:%s wdt:P279+ wd:Q4175034 } as ?isLegislator)
+            BIND(EXISTS { wd:%s wdt:P31/wdt:P279+ wd:Q192611 } as ?isConstituency)
+
             OPTIONAL { ?item p:P571 [ a wikibase:BestRank ;
               psv:P571 [ wikibase:timeValue ?inception; wikibase:timePrecision ?inception_precision ]
             ] }
             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 }
+            OPTIONAL { ?derivedReplaces wdt:P1366 ?item }
+            OPTIONAL { ?derivedReplacedBy wdt:P1365 ?item }
+
+            OPTIONAL { # if constituency
+              ?item p:P1410 [ a wikibase:BestRank ; ps:P1410 ?representative_count ; pq:P194 ?legislature ]
+            }
           }
         SPARQL
       end
 
       def sparql_args
-        [itemid, itemid]
+        [itemid] * 4
       end
     end
   end
 
   # Represents a single row returned from the Position query
-  class PositionRow
-    def initialize(row)
-      @row = row
-    end
-
+  class PositionRow < SPARQL::QueryRow
     def item
-      QueryService::WikidataItem.new(row.dig(:item, :value))
+      item_from(:item)
     end
 
     def inception_date
-      return if inception_date_raw.empty?
-
-      QueryService::WikidataDate.new(inception_date_raw, inception_date_precision)
+      date_from(:inception, :inception_precision)
     end
 
     def abolition_date
-      return if abolition_date_raw.empty?
+      date_from(:abolition, :abolition_precision)
+    end
 
-      QueryService::WikidataDate.new(abolition_date_raw, abolition_date_precision)
+    def replaces
+      item_from(:replaces)
     end
 
-    def position?
-      row.dig(:isPosition, :value) == 'true'
+    def replaced_by
+      item_from(:replacedBy)
     end
 
-    private
+    def derived_replaces
+      item_from(:derivedReplaces)
+    end
+
+    def derived_replaced_by
+      item_from(:derivedReplacedBy)
+    end
 
-    attr_reader :row
+    def position?
+      raw(:isPosition) == 'true'
+    end
 
-    def inception_date_raw
-      row.dig(:inception, :value).to_s[0..9]
+    def legislator?
+      raw(:isLegislator) == 'true'
     end
 
-    def abolition_date_raw
-      row.dig(:abolition, :value).to_s[0..9]
+    def constituency?
+      raw(:isConstituency) == 'true'
     end
 
-    def inception_date_precision
-      row.dig(:inception_precision, :value)
+    def legislature
+      item_from(:legislature)
     end
 
-    def abolition_date_precision
-      row.dig(:abolition_precision, :value)
+    def representative_count
+      raw(:representative_count).to_i
     end
   end
 end

data/lib/wikidata_position_history.rb

@@ -7,6 +7,7 @@ require 'sparql/bio_query'
 require 'sparql/mandates_query'
 require 'wikidata_position_history/checks'
 require 'wikidata_position_history/template'
+require 'wikidata_position_history/output_row'
 require 'wikidata_position_history/report'
 require 'wikidata_position_history/version'
 

data/lib/wikidata_position_history/checks.rb

@@ -17,19 +17,20 @@ module WikidataPositionHistory
 
     attr_reader :later, :current, :earlier
 
-    def successor
+    # TODO: replace these with objects instead of strings
+    def successor_qlink
       current.next
     end
 
-    def predecessor
+    def predecessor_qlink
       current.prev
     end
 
-    def latest_holder?
+    def later_holder?
       !!later
     end
 
-    def earliest_holder?
+    def earlier_holder?
       !!earlier
     end
   end
@@ -46,7 +47,7 @@ module WikidataPositionHistory
       end
 
       def possible_explanation
-        "#{current.item} is missing #{missing.map { |field| "{{P|#{field_map[field]}}}" }.join(', ')}"
+        "#{current.officeholder.qlink} is missing #{missing.map { |field| "{{P|#{field_map[field]}}}" }.join(', ')}"
       end
 
       def missing
@@ -76,14 +77,14 @@ module WikidataPositionHistory
 
       def expect_prev?
         return unless earlier
-        return if earlier.item == current.item # sucessive terms by same person
+        return if earlier.officeholder.id == current.officeholder.id # sucessive terms by same person
 
         !current.acting?
       end
 
       def expect_next?
         return unless later
-        return if later.item == current.item # sucessive terms by same person
+        return if later.officeholder.id == current.officeholder.id # sucessive terms by same person
 
         !current.acting?
       end
@@ -92,7 +93,7 @@ module WikidataPositionHistory
     # Does the 'replaces' match the previous item in the list?
     class WrongPredecessor < Check
       def problem?
-        earliest_holder? && !!predecessor && (earlier.item != predecessor)
+        earlier_holder? && !!predecessor_qlink && (earlier.officeholder.qlink != predecessor_qlink)
       end
 
       def headline
@@ -100,14 +101,44 @@ module WikidataPositionHistory
       end
 
       def possible_explanation
-        "#{current.item} has a {{P|1365}} of #{predecessor}, but follows #{earlier.item} here"
+        "#{current.officeholder.qlink} has a {{P|1365}} of #{predecessor_qlink}, but follows #{earlier.officeholder.qlink} here"
+      end
+    end
+
+    # Is there a 'replaces' but no previous item in the list?
+    class MissingPredecessor < Check
+      def problem?
+        predecessor_qlink && !earlier_holder?
+      end
+
+      def headline
+        'Inconsistent predecessor'
+      end
+
+      def possible_explanation
+        "#{current.officeholder.qlink} has a {{P|1365}} of #{predecessor_qlink}, but does not follow anyone here"
       end
     end
 
     # Does the 'replaced by' match the next item in the list?
     class WrongSuccessor < Check
       def problem?
-        latest_holder? && !!successor && (later.item != successor)
+        later_holder? && !!successor_qlink && (later.officeholder.qlink != successor_qlink)
+      end
+
+      def headline
+        'Inconsistent successor'
+      end
+
+      def possible_explanation
+        "#{current.officeholder.qlink} has a {{P|1366}} of #{successor_qlink}, but is followed by #{later.officeholder.qlink} here"
+      end
+    end
+
+    # Is there a 'replaced by' but no next item in the list?
+    class MissingSuccessor < Check
+      def problem?
+        successor_qlink && !later_holder?
       end
 
       def headline
@@ -115,7 +146,7 @@ module WikidataPositionHistory
       end
 
       def possible_explanation
-        "#{current.item} has a {{P|1366}} of #{successor}, but is followed by #{later.item} here"
+        "#{current.officeholder.qlink} has a {{P|1366}} of #{successor_qlink}, but is not followed by anyone here"
       end
     end
 
@@ -137,7 +168,8 @@ module WikidataPositionHistory
       end
 
       def possible_explanation
-        "#{current.item} has a {{P|582}} of #{current.end_date}, which #{overlap_explanation} the {{P|580}} of #{later.start_date} for #{later.item}"
+        format('%s has a {{P|582}} of %s, which %s the {{P|580}} of %s for %s',
+               current.officeholder.qlink, current.end_date, overlap_explanation, later.start_date, later.officeholder.qlink)
       end
 
       protected

data/lib/wikidata_position_history/output_row.rb

@@ -0,0 +1,143 @@
+# frozen_string_literal: true
+
+module WikidataPositionHistory
+  # simplified version of a WikidataPositionHistory::Check
+  Warning = Struct.new(:headline, :explanation)
+
+  class OutputRow
+    # Date for a single mandate row, to be passed to the report template
+    class Mandate
+      CHECKS = [Check::MissingFields, Check::Overlap,
+                Check::WrongPredecessor, Check::MissingPredecessor,
+                Check::WrongSuccessor, Check::MissingSuccessor].freeze
+
+      def initialize(later, current, earlier)
+        @later = later
+        @current = current
+        @earlier = earlier
+      end
+
+      def ordinal_string
+        ordinal = current.ordinal or return ''
+        "#{ordinal}."
+      end
+
+      def officeholder
+        current.officeholder
+      end
+
+      def dates
+        dates = [current.start_date, current.end_date]
+        return '' if dates.compact.empty?
+
+        dates.join(' – ')
+      end
+
+      def acting?
+        current.acting?
+      end
+
+      def warnings
+        CHECKS.map { |klass| klass.new(later, current, earlier) }.select(&:problem?)
+      end
+
+      private
+
+      attr_reader :later, :current, :earlier
+    end
+
+    # Base class for the Inception/Abolition date rows
+    class PositionDate
+      def initialize(metadata)
+        @metadata = metadata
+      end
+
+      def date
+        return if dates.empty?
+
+        dates.join(' / ')
+      end
+
+      private
+
+      attr_reader :metadata
+
+      def position_id
+        metadata.position.id
+      end
+    end
+
+    # Data for the Inception date of the position
+    class Inception < PositionDate
+      def warnings
+        count = dates.count
+        return [] if count == 1
+        return [Warning.new('Missing field', "{{PositionHolderHistory/warning_no_inception_date|item=#{position_id}}}")] if count.zero?
+
+        [Warning.new('Multiple values', "{{PositionHolderHistory/warning_multiple_inception_dates|item=#{position_id}}}")]
+      end
+
+      private
+
+      def dates
+        metadata.inception_dates
+      end
+    end
+
+    # Data for the Abolition date of the position
+    class Abolition < PositionDate
+      def warnings
+        return [] unless dates.count > 1
+
+        [Warning.new('Multiple values', "{{PositionHolderHistory/warning_multiple_abolition_dates|item=#{position_id}}}")]
+      end
+
+      private
+
+      def dates
+        metadata.abolition_dates
+      end
+    end
+
+    # Data for related position: e.g. Successor/Predecessor
+    class RelatedPosition
+      def initialize(metadata)
+        @metadata = metadata
+      end
+
+      def position
+        return if implied_list.empty?
+
+        (implied_list.direct.map(&:qblink) + implied_list.indirect_only.map(&:qblink_i)).join(', ')
+      end
+
+      def warnings
+        implied_list.indirect_only.map do |from|
+          Warning.new('Indirect only', "{{PositionHolderHistory/#{indirect_warning_template}|from=#{from.id}|to=#{metadata.position.id}}}")
+        end
+      end
+
+      private
+
+      attr_reader :metadata
+
+      def indirect_warning_template
+        format('warning_indirect_%s', self.class.name.split('::').last.downcase)
+      end
+    end
+
+    # Data for the position that comes after this one
+    class Successor < RelatedPosition
+      def implied_list
+        metadata.replaced_by_combined
+      end
+    end
+
+    # Data for the position that came before this one
+    class Predecessor < RelatedPosition
+      def implied_list
+        metadata.replaces_combined
+      end
+    end
+  end
+end

data/lib/wikidata_position_history/report.rb

@@ -1,83 +1,61 @@
 # frozen_string_literal: true
 
 module WikidataPositionHistory
-  # Date for a single mandate row, to be passed to the report template
-  class MandateData
-    CHECKS = [Check::MissingFields, Check::WrongPredecessor, Check::WrongSuccessor, Check::Overlap].freeze
-
-    def initialize(later, current, earlier)
-      @later = later
-      @current = current
-      @earlier = earlier
+  # A list made up of both direct and indirect claims, where we
+  # can tell which came from which, when required
+  class ImpliedList
+    def initialize(direct, indirect)
+      @direct = direct
+      @indirect = indirect
     end
 
-    def ordinal_string
-      ordinal = current.ordinal or return ''
-      "#{ordinal}."
+    def empty?
+      all.empty?
     end
 
-    def person
-      current.item
+    def all
+      direct | indirect
     end
 
-    def dates
-      dates = [current.start_date, current.end_date]
-      return '' if dates.compact.empty?
-
-      dates.join(' – ')
+    def both
+      direct & indirect
     end
 
-    def acting?
-      current.acting?
+    def direct_only
+      direct - indirect
     end
 
-    def warnings
-      CHECKS.map { |klass| klass.new(later, current, earlier) }.select(&:problem?)
+    def indirect_only
+      indirect - direct
     end
 
-    private
-
-    attr_reader :later, :current, :earlier
+    attr_reader :direct, :indirect
   end
 
   # Data about the position itself, to be passed to the report template
   class Metadata
-    # simplified version of a WikidataPositionHistory::Check
-    Warning = Struct.new(:headline, :explanation)
-
     def initialize(rows)
       @rows = rows
     end
 
-    def item
+    def position
       rows.map(&:item).first
     end
 
-    def inception_date
-      return if inception_dates.empty?
-
-      inception_dates.join(' / ')
+    def predecessor
+      @predecessor ||= OutputRow::Predecessor.new(self)
     end
 
-    def inception_warning
-      count = inception_dates.count
-
-      return if count == 1
-      return Warning.new('Missing field', "#{item_qlink} is missing {{P|571}}") if count.zero?
-
-      Warning.new('Multiple values', "#{item_qlink} has more than one {{P|571}}")
+    def successor
+      @successor ||= OutputRow::Successor.new(self)
     end
 
-    def abolition_date
-      return if abolition_dates.empty?
-
-      abolition_dates.join(' / ')
+    def inception
+      @inception ||= OutputRow::Inception.new(self)
     end
 
-    def abolition_warning
-      return unless abolition_dates.count > 1
-
-      Warning.new('Multiple values', "#{item_qlink} has more than one {{P|576}}")
+    def abolition
+      @abolition ||= OutputRow::Abolition.new(self)
     end
 
     def position?
@@ -85,9 +63,27 @@ module WikidataPositionHistory
       rows.map(&:position?).first
     end
 
-    private
+    def legislator?
+      # this should be the same everywhere
+      rows.map(&:legislator?).first
+    end
 
-    attr_reader :rows
+    def constituency?
+      # this should be the same everywhere
+      rows.map(&:constituency?).first
+    end
+
+    def representative_count
+      rows.map(&:representative_count).max
+    end
+
+    def replaces_combined
+      @replaces_combined ||= ImpliedList.new(uniq_by_id(:replaces), uniq_by_id(:derived_replaces))
+    end
+
+    def replaced_by_combined
+      @replaced_by_combined ||= ImpliedList.new(uniq_by_id(:replaced_by), uniq_by_id(:derived_replaced_by))
+    end
 
     def inception_dates
       rows.map(&:inception_date).compact.uniq(&:to_s).sort
@@ -97,8 +93,54 @@ module WikidataPositionHistory
       rows.map(&:abolition_date).compact.uniq(&:to_s).sort
     end
 
-    def item_qlink
-      item.qlink
+    private
+
+    attr_reader :rows
+
+    def uniq_by_id(method)
+      rows.map(&method).compact.uniq(&:id).sort_by(&:id)
+    end
+  end
+
+  # Construct the correct ReportConfig based on the position metadata
+  class ReportConfigFactory
+    def self.config(metadata)
+      return ReportConfig::Constituency.new if metadata.constituency?
+
+      ReportConfig::Position.new
+    end
+
+    private
+
+    attr_reader :metadata
+  end
+
+  # Encapsulates the different configuration for each type of position
+  module ReportConfig
+    # Configuration for 'default' single-holder position
+    class Position
+      def mandates_query
+        SPARQL::MandatesQuery
+      end
+
+      def biodata_query
+        SPARQL::BioQuery
+      end
+    end
+
+    # Configuration for representatives of a single-member constituency
+    class Constituency
+      def mandates_query
+        SPARQL::ConstituencyMandatesQuery
+      end
+
+      def biodata_query
+        SPARQL::ConstituencyBioQuery
+      end
+
+      def multimember_error_template
+        "\n{{PositionHolderHistory/error_multimember}}\n"
+      end
     end
   end
 
@@ -112,24 +154,11 @@ module WikidataPositionHistory
     attr_reader :position_id, :template_class
 
     def wikitext
+      return legislator_template if metadata.legislator?
+      return config.multimember_error_template if metadata.constituency? && (metadata.representative_count != 1)
       return no_items_output if mandates.empty?
 
-      output
-    end
-
-    def header
-      "== {{Q|#{position_id}}} officeholders #{position_dates} =="
-    end
-
-    def position_dates
-      dates = [metadata.inception_date, metadata.abolition_date]
-      return '' if dates.compact.empty?
-
-      format('(%s)', dates.join(' – '))
-    end
-
-    def wikitext_with_header
-      [header, wikitext].join("\n")
+      template_class.new(template_params).output
     end
 
     def template_params
@@ -147,7 +176,7 @@ module WikidataPositionHistory
     end
 
     def biodata
-      @biodata ||= SPARQL::BioQuery.new(position_id).results_as(BioRow)
+      @biodata ||= biodata_sparql.results_as(BioRow)
     end
 
     def biodata_for(officeholder)
@@ -158,8 +187,16 @@ module WikidataPositionHistory
       [nil, mandates, nil].flatten(1)
     end
 
+    def config
+      @config ||= ReportConfigFactory.config(metadata)
+    end
+
     def sparql
-      @sparql ||= SPARQL::MandatesQuery.new(position_id)
+      @sparql ||= config.mandates_query.new(position_id)
+    end
+
+    def biodata_sparql
+      config.biodata_query.new(position_id)
     end
 
     def mandates
@@ -170,14 +207,14 @@ module WikidataPositionHistory
       "\n{{PositionHolderHistory/error_no_holders|id=#{position_id}}}\n"
     end
 
-    def output
-      template_class.new(template_params).output
+    def legislator_template
+      "\n{{PositionHolderHistory/error_legislator|id=#{position_id}}}\n"
     end
 
     def table_rows
       padded_mandates.each_cons(3).map do |later, current, earlier|
         {
-          mandate: MandateData.new(later, current, earlier),
+          mandate: OutputRow::Mandate.new(later, current, earlier),
           bio:     biodata_for(current.officeholder),
         }
       end

data/lib/wikidata_position_history/template.rb

@@ -22,29 +22,59 @@ module WikidataPositionHistory
     def template_text
       <<~ERB
         {| class="wikitable" style="text-align: center; border: none;"
-        <% if metadata.abolition_date -%>
+        <% 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;" | \
-        <% [metadata.abolition_warning].compact.each do |warning| -%>
+        | 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.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>\
         <% end %>
         <% end -%>
+        <% if metadata.successor.position -%>
+        |-
+        | 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.successor.position %>
+        | style=" border: none; background: #fff; text-align: left;" | \
+        <% metadata.successor.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>\
+        <% end %>
+        <% end -%>
+        <% if metadata.successor.position || 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 %>
         | 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.person %></span> <%= mandate.dates %>
+        | 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 %>
         | 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>\
         <% end %>
         <% end -%>
-        <% if metadata.inception_date -%>
+        <% if metadata.successor.position || 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="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.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>\
+        <% end %>
+        <% end -%>
+        <% if metadata.predecessor.position -%>
         |-
-        | 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;" | '''Replaces''':
+        | style="border: none; background: #fff; text-align: left;" | <%= metadata.predecessor.position %>
         | style="padding:0.5em 2em 0.5em 1em; border: none; background: #fff; text-align: left;" | \
-        <% [metadata.inception_warning].compact.each do |warning| -%>
+        <% metadata.predecessor.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>\
         <% end %>
         <% end -%>

data/lib/wikidata_position_history/version.rb

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

data/wikidata_position_history.gemspec

@@ -36,5 +36,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop-performance', '~> 1.8.0'
   spec.add_development_dependency 'rubocop-rspec', '~> 1.43.2'
   spec.add_development_dependency 'warning', '~> 1.1'
-  spec.add_development_dependency 'webmock', '~> 3.8.3'
+  spec.add_development_dependency 'webmock', '~> 3.9.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wikidata_position_history
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Tony Bowden
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-08 00:00:00.000000000 Z
+date: 2020-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mediawiki-replaceable-content
@@ -171,14 +171,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.3
+        version: 3.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.3
+        version: 3.9.1
 description:
 email:
 - tony@tmtm.com
@@ -210,6 +210,7 @@ files:
 - lib/sparql/position_query.rb
 - lib/wikidata_position_history.rb
 - lib/wikidata_position_history/checks.rb
+- lib/wikidata_position_history/output_row.rb
 - lib/wikidata_position_history/report.rb
 - lib/wikidata_position_history/template.rb
 - lib/wikidata_position_history/version.rb