wikidata_position_history 1.4.2 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d53ac2920ebe5b13817ab9aa31d32150cc24d7896362097bcbc18d17f93bebd
-  data.tar.gz: d7b98d022698cc33738b6f11f8aa3d5c2b8408f79b57fd459179fbac2ec3df08
+  metadata.gz: d5c2ddb3cb683a9510a52f729a3d49afbf98eddd62b45550fd836b69902dbdb9
+  data.tar.gz: e3c99ce76017a543011b0cd8f10f1d0858b27678a5f878a44076f74d82070c71
 SHA512:
-  metadata.gz: 8e2cbe1a3e7772a038d566a0ddacd27ededf3e2ffd36a9ebea7bf1fa98af411a8ded14ec994a300d5e2c8ef2f194c5f49a7a6b72f5838d87e350e12035390db9
-  data.tar.gz: 946c5ae13a66b4fde102cd6e6c18af9855b96da0840979211ba1b8c3f85b4dafd15dbb4b8978c220e1a3236937707df59c6faf3ab652bdaf4a8e1c891765eadc
+  metadata.gz: 1b97796606a4d6877705a058e17c4b1f112fc9c0621054a479492c3cc9cc5f20477fb9842c54641f6fe79d3f78e205f5433944e2ac598cfe162ca7a5ea155b9c
+  data.tar.gz: 0a5c78cb1e497494fd35102ace5edfac6942d1cbb958d74ec502b36ca70c06503045e7693a4c8423730f3c5d9c0ff371b18a1c504fc9cc8807afc5389e61670b

data/CHANGELOG.md

@@ -1,5 +1,84 @@
 # Changelog
 
+# [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
+  behaviour may not be particularly sensible. Later evolutions of this
+  feature will hopefully handle that better.)
+
+## Fixes
+
+* Previously, any warnings would be displayed at the bottom of the page,
+  which was fine if this table was the only thing on the page, but would
+  be slightly odd if there was other discussion after it. Now the
+  footnotes are explicitly displayed immediately after the table.
+
+# [1.5.0] 2020-09-06
+
+## Enhancements
+
+* 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
+  "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"
+
+## Fixes
+
+* No longer blows up when a P39 has a start date, but no end date
+
 # [1.4.2] 2020-09-05
 
 ## Fixes

data/lib/query_service.rb

@@ -54,6 +54,8 @@ module QueryService
   class WikidataDate
     include Comparable
 
+    DATELEN = { '11' => 10, '10' => 7, '9' => 4, '8' => 4, '7' => 2 }.freeze
+
     def initialize(str, precision)
       @str = str
       @raw_precision = precision.to_s
@@ -66,12 +68,7 @@ module QueryService
     end
 
     def to_s
-      return str if precision == '11'
-      return str[0..6] if precision == '10'
-      return str[0..3] if precision == '9'
-
-      warn "Cannot handle precision #{precision} for #{str}"
-      str
+      precisioned_string.delete_prefix('0')
     end
 
     def empty?
@@ -99,5 +96,19 @@ module QueryService
     def parts
       to_s.split('-')
     end
+
+    def truncated_string
+      return str[0...DATELEN[precision]] if DATELEN.key?(precision)
+
+      warn "Cannot handle precision #{precision} for #{str}"
+      str
+    end
+
+    def precisioned_string
+      return "#{truncated_string}. century" if precision == '7'
+      return "#{truncated_string}s" if precision == '8'
+
+      truncated_string
+    end
   end
 end

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,7 +24,7 @@ module WikidataPositionHistory
   end
 
   # Represents a single row returned from the Position query
-  class BioData
+  class BioRow
     def initialize(row)
       @row = row
     end

data/lib/sparql/item_query.rb

@@ -23,7 +23,11 @@ module WikidataPositionHistory
       attr_reader :itemid
 
       def sparql
-        raw_sparql % itemid
+        raw_sparql % sparql_args
+      end
+
+      def sparql_args
+        itemid
       end
 
       def json

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,14 +21,14 @@ 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
+  class MandateRow
     def initialize(row)
       @row = row
     end

data/lib/sparql/{position_data.rb → position_query.rb}

@@ -3,35 +3,53 @@
 module WikidataPositionHistory
   module SPARQL
     # SPARQL for fetching metadata about a position
-    class PositionData < ItemQuery
+    class PositionQuery < ItemQuery
       def raw_sparql
         <<~SPARQL
           # position-metadata
 
-          SELECT DISTINCT ?inception ?inception_precision ?abolition ?abolition_precision ?isPosition
+          SELECT DISTINCT ?item ?inception ?inception_precision ?abolition ?abolition_precision 
+                          ?isPosition ?isLegislator
           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 ] }
+            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 ]
+            ] }
             SERVICE wikibase:label { bd:serviceParam wikibase:language "[AUTO_LANGUAGE],en". }
           }
         SPARQL
       end
+
+      def sparql_args
+        [itemid] * 3
+      end
     end
   end
 
   # Represents a single row returned from the Position query
-  class PositionData
+  class PositionRow
     def initialize(row)
       @row = row
     end
 
+    def item
+      QueryService::WikidataItem.new(row.dig(:item, :value))
+    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
 
@@ -39,6 +57,10 @@ module WikidataPositionHistory
       row.dig(:isPosition, :value) == 'true'
     end
 
+    def legislator?
+      row.dig(:isLegislator, :value) == 'true'
+    end
+
     private
 
     attr_reader :row

data/lib/wikidata_position_history.rb

@@ -2,9 +2,9 @@
 
 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/report'

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,13 +134,30 @@ 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?
         return false unless later
 
+        next_starts = later.start_date or return false
         ends = current.end_date or return false
-        ends > later.start_date
+
+        ends > next_starts
       rescue ArgumentError
         true
       end

data/lib/wikidata_position_history/report.rb

@@ -3,7 +3,9 @@
 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
+    CHECKS = [Check::MissingFields, Check::Overlap,
+              Check::WrongPredecessor, Check::MissingPredecessor,
+              Check::WrongSuccessor, Check::MissingSuccessor].freeze
 
     def initialize(later, current, earlier)
       @later = later
@@ -40,6 +42,73 @@ module WikidataPositionHistory
     attr_reader :later, :current, :earlier
   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
+      rows.map(&:item).first
+    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}}")
+    end
+
+    def abolition_date
+      return if abolition_dates.empty?
+
+      abolition_dates.join(' / ')
+    end
+
+    def abolition_warning
+      return unless abolition_dates.count > 1
+
+      Warning.new('Multiple values', "#{item_qlink} has more than one {{P|576}}")
+    end
+
+    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
+
+    private
+
+    attr_reader :rows
+
+    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
+
+    def item_qlink
+      item.qlink
+    end
+  end
+
   # The entire wikitext generated for this report
   class Report
     def initialize(position_id, template_class = ReportTemplate)
@@ -50,9 +119,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
@@ -70,16 +140,22 @@ module WikidataPositionHistory
       [header, wikitext].join("\n")
     end
 
+    def template_params
+      {
+        metadata:   metadata,
+        table_rows: table_rows,
+        sparql_url: sparql.wdqs_url,
+      }
+    end
+
     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)
@@ -91,26 +167,19 @@ 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
-    end
-
-    def template_params
-      {
-        table_rows: table_rows,
-        sparql_url: sparql.wdqs_url,
-      }
+    def legislator_template
+      "\n{{PositionHolderHistory/error_legislator|id=#{position_id}}}\n"
     end
 
     def table_rows

data/lib/wikidata_position_history/template.rb

@@ -16,22 +16,44 @@ module WikidataPositionHistory
     attr_reader :data
 
     def template
-      @template ||= ERB.new(template_text)
+      @template ||= ERB.new(template_text, nil, '-')
     end
 
     def template_text
       <<~ERB
         {| class="wikitable" style="text-align: center; border: none;"
-        <% table_rows.map(&:values).each do |mandate, bio| %>|-
+        <% 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| -%>
+        <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 -%>
+        <% 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 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 %>|}
+        | 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 -%>
+        |-
+        | 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;" | \
+        <% [metadata.inception_warning].compact.each do |warning| -%>
+        <span style="display: block">[[File:Pictogram voting comment.svg|15px|link=]]&nbsp;<span style="color: #d33; font-weight: bold; vertical-align: middle;"><%= warning.headline %></span>&nbsp;<ref><%= warning.explanation %></ref></span>\
+        <% end %>
+        <% end -%>
+        |}
 
         <div style="margin-bottom:5px; border-bottom:3px solid #2f74d0; font-size:8pt">
           <div style="float:right">[<%= sparql_url %> WDQS]</div>
         </div>
+        {{reflist}}
       ERB
     end
   end

data/lib/wikidata_position_history/version.rb

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

data/wikidata_position_history.gemspec

@@ -11,8 +11,8 @@ Gem::Specification.new do |spec|
   spec.authors               = ['Tony Bowden', 'Mark Longair']
   spec.email                 = ['tony@tmtm.com']
 
-  spec.summary  = 'Generates a wikitext history of a holders of a position in Wikidata'
-  spec.homepage = 'https://github.com/everypolitician/wikidata-position-history/'
+  spec.summary  = 'Generates a table of historic holders of a Wikidata position'
+  spec.homepage = 'https://github.com/tmtmtmtm/wikidata-position-history/'
   spec.license  = 'MIT'
 
   spec.metadata['allowed_push_host'] = 'https://rubygems.org'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wikidata_position_history
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.8.0
 platform: ruby
 authors:
 - Tony Bowden
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-05 00:00:00.000000000 Z
+date: 2020-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mediawiki-replaceable-content
@@ -204,17 +204,17 @@ 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/report.rb
 - lib/wikidata_position_history/template.rb
 - lib/wikidata_position_history/version.rb
 - wikidata_position_history.gemspec
-homepage: https://github.com/everypolitician/wikidata-position-history/
+homepage: https://github.com/tmtmtmtm/wikidata-position-history/
 licenses:
 - MIT
 metadata:
@@ -238,5 +238,5 @@ rubyforge_project:
 rubygems_version: 2.7.6.2
 signing_key:
 specification_version: 4
-summary: Generates a wikitext history of a holders of a position in Wikidata
+summary: Generates a table of historic holders of a Wikidata position
 test_files: []