wikidata_position_history 1.6.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6133f77b6d65f7decf2dcac481ff36a661a136fb79aff442677669801248437
-  data.tar.gz: dccd3b0a0ed29d89c945756c9efa30e8c02f1c912b4402bec1a45a1c45d81e88
+  metadata.gz: 4e59634d8233371767e5a151e60d8bb5f3c8f5703302654c59f5db407faea4a4
+  data.tar.gz: 763b5794f41ad395b045fedfb7b132fc6139698e3514df0caf96a47bd5d224d2
 SHA512:
-  metadata.gz: 0112ca4aae8b9631d86bbf1c2cca5120808e9eb1bb207008e8ba8d221ec0c0c2d16e5f22ec0c59fe9454839c04fcd32bd71f67d1e1793e0d8c053b9d2f1d1471
-  data.tar.gz: 8fd03fc79a37459686524927ba536ab770c22ac4c8d948fde53be1eafba155a3a0f2b072cd8ab8142867e0f57a8138ac62c1535d54bf5330e987bbfc7a2a553e
+  metadata.gz: 8ad33ca550ad0a5a83ffd42bc03ce8de8df93f77b932ec8ae74d21c528160e8b47d55ff8569641d34801e7f181f0b3b9c856e2d27f5aef91914d73522e5e63de
+  data.tar.gz: 7dba23307f13045710a4bc3b7c0869e024fcf206b023e9740c3c8c5366ea7aa260a1dcc342cf7c0875ed1b635c2bc3b96e350720e32c01e35051b1bc1d37e747

data/CHANGELOG.md

@@ -1,12 +1,98 @@
 # Changelog
 
+# [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
+
+* 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
+
+* 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.
+
 # [1.6.0] 2020-09-07
 
 ## Enhancements
 
 * 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.)
 
@@ -23,7 +109,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/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_data.rb → bio_query.rb}

@@ -7,7 +7,7 @@ module WikidataPositionHistory
     # This is distinct from the mandate query itself to avoid complex
     # GROUP BY scenarios where people have multiple values for
     # biographical properties.
-    class BioData < ItemQuery
+    class BioQuery < ItemQuery
       def raw_sparql
         <<~SPARQL
           # holder-biodata
@@ -24,13 +24,9 @@ module WikidataPositionHistory
   end
 
   # Represents a single row returned from the Position query
-  class BioData
-    def initialize(row)
-      @row = row
-    end
-
+  class BioRow < SPARQL::QueryRow
     def person
-      QueryService::WikidataItem.new(row.dig(:item, :value))
+      item_from(:item)
     end
 
     def image_title
@@ -47,10 +43,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
@@ -23,12 +23,45 @@ module WikidataPositionHistory
       attr_reader :itemid
 
       def sparql
-        raw_sparql % itemid
+        raw_sparql % sparql_args
+      end
+
+      def sparql_args
+        itemid
       end
 
       def json
         @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.rb → mandates_query.rb}

@@ -3,7 +3,7 @@
 module WikidataPositionHistory
   module SPARQL
     # SPARQL for fetching all officeholdings of a position
-    class Mandates < ItemQuery
+    class MandatesQuery < ItemQuery
       def raw_sparql
         <<~SPARQL
           # position-mandates
@@ -21,24 +21,20 @@ 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 Mandate
-    def initialize(row)
-      @row = row
-    end
-
+  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
@@ -46,14 +42,17 @@ module WikidataPositionHistory
       officeholder.qlink
     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 +62,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

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+module WikidataPositionHistory
+  module SPARQL
+    # SPARQL for fetching metadata about a position
+    class PositionQuery < ItemQuery
+      def raw_sparql
+        <<~SPARQL
+          # position-metadata
+
+          SELECT DISTINCT ?item ?inception ?inception_precision ?abolition ?abolition_precision
+                          ?replaces ?replacedBy ?derivedReplaces ?derivedReplacedBy
+                          ?isPosition ?isLegislator
+          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)
+            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 ]
+            ] }
+            OPTIONAL { ?item wdt:P1365 ?replaces }
+            OPTIONAL { ?item wdt:P1366 ?replacedBy }
+            OPTIONAL { ?derivedReplaces wdt:P1366 ?item }
+            OPTIONAL { ?derivedReplacedBy wdt:P1365 ?item }
+          }
+        SPARQL
+      end
+
+      def sparql_args
+        [itemid] * 3
+      end
+    end
+  end
+
+  # Represents a single row returned from the Position query
+  class PositionRow < SPARQL::QueryRow
+    def item
+      item_from(:item)
+    end
+
+    def inception_date
+      date_from(:inception, :inception_precision)
+    end
+
+    def abolition_date
+      date_from(:abolition, :abolition_precision)
+    end
+
+    def replaces
+      item_from(:replaces)
+    end
+
+    def replaced_by
+      item_from(:replacedBy)
+    end
+
+    def derived_replaces
+      item_from(:derivedReplaces)
+    end
+
+    def derived_replaced_by
+      item_from(:derivedReplacedBy)
+    end
+
+    def position?
+      raw(:isPosition) == 'true'
+    end
+
+    def legislator?
+      raw(:isLegislator) == 'true'
+    end
+  end
+end

data/lib/wikidata_position_history.rb

@@ -2,11 +2,12 @@
 
 require 'query_service'
 require 'sparql/item_query'
-require 'sparql/position_data'
-require 'sparql/bio_data'
-require 'sparql/mandates'
+require 'sparql/position_query'
+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

@@ -25,11 +25,11 @@ module WikidataPositionHistory
       current.prev
     end
 
-    def latest_holder?
+    def later_holder?
       !!later
     end
 
-    def earliest_holder?
+    def earlier_holder?
       !!earlier
     end
   end
@@ -92,7 +92,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 && (earlier.item != predecessor)
       end
 
       def headline
@@ -104,10 +104,25 @@ module WikidataPositionHistory
       end
     end
 
+    # Is there a 'replaces' but no previous item in the list?
+    class MissingPredecessor < Check
+      def problem?
+        predecessor && !earlier_holder?
+      end
+
+      def headline
+        'Inconsistent predecessor'
+      end
+
+      def possible_explanation
+        "#{current.item} has a {{P|1365}} of #{predecessor}, 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 && (later.item != successor)
       end
 
       def headline
@@ -119,6 +134,21 @@ module WikidataPositionHistory
       end
     end
 
+    # Is there a 'replaced by' but no next item in the list?
+    class MissingSuccessor < Check
+      def problem?
+        successor && !later_holder?
+      end
+
+      def headline
+        'Inconsistent successor'
+      end
+
+      def possible_explanation
+        "#{current.item} has a {{P|1366}} of #{successor}, but is not followed by anyone here"
+      end
+    end
+
     # Does the end date overlap with the successor's start date?
     class Overlap < Check
       def problem?

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 person
+        current.item
+      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,43 +1,96 @@
 # 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
+  # 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 initialize(later, current, earlier)
-      @later = later
-      @current = current
-      @earlier = earlier
+    def empty?
+      all.empty?
     end
 
-    def ordinal_string
-      ordinal = current.ordinal or return ''
-      "#{ordinal}."
+    def all
+      direct | indirect
     end
 
-    def person
-      current.item
+    def both
+      direct & indirect
     end
 
-    def dates
-      dates = [current.start_date, current.end_date]
-      return '' if dates.compact.empty?
+    def direct_only
+      direct - indirect
+    end
+
+    def indirect_only
+      indirect - direct
+    end
+
+    attr_reader :direct, :indirect
+  end
+
+  # Data about the position itself, to be passed to the report template
+  class Metadata
+    def initialize(rows)
+      @rows = rows
+    end
+
+    def position
+      rows.map(&:item).first
+    end
+
+    def predecessor
+      @predecessor ||= OutputRow::Predecessor.new(self)
+    end
+
+    def successor
+      @successor ||= OutputRow::Successor.new(self)
+    end
 
-      dates.join(' – ')
+    def inception
+      @inception ||= OutputRow::Inception.new(self)
     end
 
-    def acting?
-      current.acting?
+    def abolition
+      @abolition ||= OutputRow::Abolition.new(self)
     end
 
-    def warnings
-      CHECKS.map { |klass| klass.new(later, current, earlier) }.select(&:problem?)
+    def position?
+      # this should be the same everywhere
+      rows.map(&:position?).first
+    end
+
+    def legislator?
+      # this should be the same everywhere
+      rows.map(&:legislator?).first
+    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
+    end
+
+    def abolition_dates
+      rows.map(&:abolition_date).compact.uniq(&:to_s).sort
     end
 
     private
 
-    attr_reader :later, :current, :earlier
+    attr_reader :rows
+
+    def uniq_by_id(method)
+      rows.map(&method).compact.uniq(&:id).sort_by(&:id)
+    end
   end
 
   # The entire wikitext generated for this report
@@ -50,9 +103,10 @@ module WikidataPositionHistory
     attr_reader :position_id, :template_class
 
     def wikitext
+      return legislator_template if metadata.legislator?
       return no_items_output if mandates.empty?
 
-      output
+      template_class.new(template_params).output
     end
 
     def header
@@ -60,7 +114,7 @@ module WikidataPositionHistory
     end
 
     def position_dates
-      dates = [metadata.inception_date, metadata.abolition_date]
+      dates = [metadata.inception.date, metadata.abolition.date]
       return '' if dates.compact.empty?
 
       format('(%s)', dates.join(' – '))
@@ -81,13 +135,11 @@ module WikidataPositionHistory
     private
 
     def metadata
-      # TODO: we might get more than one response, if a position has
-      # multiple dates
-      @metadata ||= SPARQL::PositionData.new(position_id).results_as(PositionData).first
+      @metadata ||= Metadata.new(SPARQL::PositionQuery.new(position_id).results_as(PositionRow))
     end
 
     def biodata
-      @biodata ||= SPARQL::BioData.new(position_id).results_as(BioData)
+      @biodata ||= SPARQL::BioQuery.new(position_id).results_as(BioRow)
     end
 
     def biodata_for(officeholder)
@@ -99,25 +151,25 @@ module WikidataPositionHistory
     end
 
     def sparql
-      @sparql ||= SPARQL::Mandates.new(position_id)
+      @sparql ||= SPARQL::MandatesQuery.new(position_id)
     end
 
     def mandates
-      @mandates ||= sparql.results_as(Mandate)
+      @mandates ||= sparql.results_as(MandateRow)
     end
 
     def no_items_output
       "\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,10 +22,28 @@ 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;" | 
+        | 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| -%>
         |-
@@ -37,10 +55,28 @@ 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.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 %>
-        | 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;" | '''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.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.6.0'
+  VERSION = '1.11.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.6.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Tony Bowden
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-07 00:00:00.000000000 Z
+date: 2020-09-14 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
@@ -204,12 +204,13 @@ files:
 - exe/position-history-for-item
 - exe/update_wikidata_page
 - lib/query_service.rb
-- lib/sparql/bio_data.rb
+- lib/sparql/bio_query.rb
 - lib/sparql/item_query.rb
-- lib/sparql/mandates.rb
-- lib/sparql/position_data.rb
+- lib/sparql/mandates_query.rb
+- 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

data/lib/sparql/position_data.rb

@@ -1,66 +0,0 @@
-# frozen_string_literal: true
-
-module WikidataPositionHistory
-  module SPARQL
-    # SPARQL for fetching metadata about a position
-    class PositionData < ItemQuery
-      def raw_sparql
-        <<~SPARQL
-          # position-metadata
-
-          SELECT DISTINCT ?inception ?inception_precision ?abolition ?abolition_precision ?isPosition
-          WHERE {
-            VALUES ?item { wd:%s }
-            BIND(EXISTS { ?item wdt:P279+ wd:Q4164871  } as ?isPosition)
-            OPTIONAL { ?item p:P571/psv:P571 [ wikibase:timeValue ?inception; wikibase:timePrecision ?inception_precision ] }
-            OPTIONAL { ?item p:P576/psv:P576 [ wikibase:timeValue ?abolition; wikibase:timePrecision ?abolition_precision ] }
-            SERVICE wikibase:label { bd:serviceParam wikibase:language "[AUTO_LANGUAGE],en". }
-          }
-        SPARQL
-      end
-    end
-  end
-
-  # Represents a single row returned from the Position query
-  class PositionData
-    def initialize(row)
-      @row = row
-    end
-
-    def inception_date
-      return if inception_date_raw.empty?
-
-      QueryService::WikidataDate.new(inception_date_raw, inception_date_precision)
-    end
-
-    def abolition_date
-      return if abolition_date_raw.empty?
-
-      QueryService::WikidataDate.new(abolition_date_raw, abolition_date_precision)
-    end
-
-    def position?
-      row.dig(:isPosition, :value) == 'true'
-    end
-
-    private
-
-    attr_reader :row
-
-    def inception_date_raw
-      row.dig(:inception, :value).to_s[0..9]
-    end
-
-    def abolition_date_raw
-      row.dig(:abolition, :value).to_s[0..9]
-    end
-
-    def inception_date_precision
-      row.dig(:inception_precision, :value)
-    end
-
-    def abolition_date_precision
-      row.dig(:abolition_precision, :value)
-    end
-  end
-end