wikidata_position_history 1.9.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a2bc5a49d34a368363b7e92ec9e1b0d08b141d96babd15eccf2913d99e9b7b0
-  data.tar.gz: 87594145f811917672fd4772722e086907d508479d73b43bfb21a0aac24e5d27
+  metadata.gz: 8f9b65df015932c64b9995789de132f401400b8641fe6da6d34529ee08a897f7
+  data.tar.gz: 8eb66f80771e638a76e477db20e48c20cf10aa69843e20660c49a995e7040126
 SHA512:
-  metadata.gz: 6eb361e602c3a34c97bd8b584b4029135d9bb8e14c1f99b2ed513ce049f8df780c9b09ac31941c31a7ebea544d0a6cc0065cb2210bc4af4448de66cfb40800c0
-  data.tar.gz: 1b07fb333e1f13d25985420ec6700f2b0dc81dc98a5c4a762713bcf8426c532b48e28f6d80646d7c5ea85692f63e921748a603708e4d9e7286f254bc8c665e21
+  metadata.gz: 84464bf1eb62fad5dfe9287baa7988ed1e27024b3dce9ceefd1b2a74a79b7ea4fe472151c9b04bc10ed8bba846694553e929ce6f0bd316cff86aee4f09806ec4
+  data.tar.gz: 1b8813db12384488d4719a6858fa31b3dd69b9692b2df9c62c4d861a7c46ab533715fc374bd5b7fd2441b07108257cd782369175318e89afdbb7f5cdea106945

data/CHANGELOG.md

@@ -1,5 +1,75 @@
 # Changelog
 
+# [2.2.0] 2020-09-18
+
+## Enhancements
+
+* Every position came into existence at _some_ point, and so should have
+  a P571 inception date. If that's missing, a warning will now be
+  displayed.
+
+## Improvements
+
+* When a position has more than one successor or prdecessor, those will
+  now be displayed as a proper Mediawiki list, rather than one long line
+  of text. As these are in a table cell, this should stop those growing
+  unnecessarily wide, and should generally make everything look a little
+  nicer.
+
+# [2.1.0] 2020-09-16
+
+## Enhancements
+
+* 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
+
+* `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

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

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

@@ -25,35 +25,60 @@ module WikidataPositionHistory
         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 ?party ?prev ?next ?term
+          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 ?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
+      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))
+      item_from(:item)
     end
 
-    # TODO: rename or remove. 'item' is meaningless/ambiguous
-    def item
-      officeholder.qlink
+    def party
+      item_from(:party)
     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 +88,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]
-    end
-
-    def end_date_raw
-      row.dig(:end_date, :value).to_s[0..9]
-    end
-
-    def start_date_precision
-      row.dig(:start_precision, :value)
+      date_from(:end_date, :end_precision)
     end
-
-    def end_date_precision
-      row.dig(:end_precision, :value)
-    end
-
-    private
-
-    attr_reader :row
   end
 end

data/lib/sparql/position_query.rb

@@ -9,12 +9,15 @@ module WikidataPositionHistory
           # position-metadata
 
           SELECT DISTINCT ?item ?inception ?inception_precision ?abolition ?abolition_precision
-                          ?replaces ?replacedBy
+                          ?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: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 ]
             ] }
@@ -23,84 +26,70 @@ module WikidataPositionHistory
             ] }
             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] * 3
+        [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?
-
-      QueryService::WikidataDate.new(abolition_date_raw, abolition_date_precision)
+      date_from(:abolition, :abolition_precision)
     end
 
     def replaces
-      return if replaces_raw.to_s.empty?
-
-      QueryService::WikidataItem.new(replaces_raw)
+      item_from(:replaces)
     end
 
     def replaced_by
-      return if replaced_by_raw.to_s.empty?
-
-      QueryService::WikidataItem.new(replaced_by_raw)
+      item_from(:replacedBy)
     end
 
-    def position?
-      row.dig(:isPosition, :value) == 'true'
-    end
-
-    def legislator?
-      row.dig(:isLegislator, :value) == 'true'
+    def derived_replaces
+      item_from(:derivedReplaces)
     end
 
-    private
-
-    attr_reader :row
-
-    def replaces_raw
-      row.dig(:replaces, :value)
+    def derived_replaced_by
+      item_from(:derivedReplacedBy)
     end
 
-    def replaced_by_raw
-      row.dig(:replacedBy, :value)
+    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,11 +17,12 @@ 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
 
@@ -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?
-        earlier_holder? && !!predecessor && (earlier.item != predecessor)
+        earlier_holder? && !!predecessor_qlink && (earlier.officeholder.qlink != predecessor_qlink)
       end
 
       def headline
@@ -100,14 +101,14 @@ 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 && !earlier_holder?
+        predecessor_qlink && !earlier_holder?
       end
 
       def headline
@@ -115,14 +116,14 @@ module WikidataPositionHistory
       end
 
       def possible_explanation
-        "#{current.item} has a {{P|1365}} of #{predecessor}, but does not follow anyone here"
+        "#{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?
-        later_holder? && !!successor && (later.item != successor)
+        later_holder? && !!successor_qlink && (later.officeholder.qlink != successor_qlink)
       end
 
       def headline
@@ -130,14 +131,14 @@ 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 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 && !later_holder?
+        successor_qlink && !later_holder?
       end
 
       def headline
@@ -145,7 +146,7 @@ module WikidataPositionHistory
       end
 
       def possible_explanation
-        "#{current.item} has a {{P|1366}} of #{successor}, but is not followed by anyone here"
+        "#{current.officeholder.qlink} has a {{P|1366}} of #{successor_qlink}, but is not followed by anyone here"
       end
     end
 
@@ -167,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,150 @@
+# 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 party
+        current.party
+      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?
+
+        list = (implied_list.direct.map(&:qblink) + implied_list.indirect_only.map(&:qblink_i))
+        return list.first if list.count == 1
+
+        list.map { |item| "\n* #{item}" }.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,97 +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::Overlap,
-              Check::WrongPredecessor, Check::MissingPredecessor,
-              Check::WrongSuccessor, Check::MissingSuccessor].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 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(', ')
+    def predecessor
+      @predecessor ||= OutputRow::Predecessor.new(self)
     end
 
-    def inception_date
-      return if inception_dates.empty?
-
-      inception_dates.join(' / ')
-    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?
@@ -104,16 +68,21 @@ module WikidataPositionHistory
       rows.map(&:legislator?).first
     end
 
-    private
+    def constituency?
+      # this should be the same everywhere
+      rows.map(&:constituency?).first
+    end
 
-    attr_reader :rows
+    def representative_count
+      rows.map(&:representative_count).max
+    end
 
-    def replaces_list
-      rows.map(&:replaces).compact.uniq(&:id).sort_by(&:id)
+    def replaces_combined
+      @replaces_combined ||= ImpliedList.new(uniq_by_id(:replaces), uniq_by_id(:derived_replaces))
     end
 
-    def replaced_by_list
-      rows.map(&:replaced_by).compact.uniq(&:id).sort_by(&:id)
+    def replaced_by_combined
+      @replaced_by_combined ||= ImpliedList.new(uniq_by_id(:replaced_by), uniq_by_id(:derived_replaced_by))
     end
 
     def inception_dates
@@ -124,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
 
@@ -140,26 +155,12 @@ module WikidataPositionHistory
 
     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?
 
       template_class.new(template_params).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")
-    end
-
     def template_params
       {
         metadata:   metadata,
@@ -175,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)
@@ -186,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
@@ -205,7 +214,7 @@ module WikidataPositionHistory
     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,22 +22,25 @@ module WikidataPositionHistory
     def template_text
       <<~ERB
         {| class="wikitable" style="text-align: center; border: none;"
-        <% if metadata.abolition_date -%>
+        <% if metadata.abolition.date -%>
         |-
         | 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.date %>
         | style="border: none; background: #fff; text-align: left;" | \
-        <% [metadata.abolition_warning].compact.each do |warning| -%>
+        <% 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.replaced_by -%>
+        <% 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.replaced_by %>
-        | style=" border: none; background: #fff; text-align: left;" |
+        | colspan="2" style="border: none; background: #fff; font-size: 1.15em; vertical-align: baseline; text-align: right;" | '''Replaced by''':
+        | style=" border: none; background: #fff; vertical-align: baseline; 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.replaced_by || metadata.abolition_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;
@@ -46,31 +49,37 @@ 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.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 %>
+        <% 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>\
         <% end %>
         <% end -%>
-        <% if metadata.replaced_by || metadata.abolition_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 -%>
+        <% if metadata.inception.date || metadata.inception.warnings.any? -%>
         |-
         | 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="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| -%>
+        <% 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.replaces -%>
+        <% if metadata.predecessor.position -%>
         |-
         | 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;" |
+        | 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.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.9.0'
+  VERSION = '2.2.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.9.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Tony Bowden
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-11 00:00:00.000000000 Z
+date: 2020-09-18 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