wikidata_position_history 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc98f35825bd450d052eaf0bbb84934db297933bce312b88fd8b545474b742bf
-  data.tar.gz: 663abb5df3df62744eebbdeaea9ce2e63bf90aeff5335bf2406ae66306dd7608
+  metadata.gz: d5c2ddb3cb683a9510a52f729a3d49afbf98eddd62b45550fd836b69902dbdb9
+  data.tar.gz: e3c99ce76017a543011b0cd8f10f1d0858b27678a5f878a44076f74d82070c71
 SHA512:
-  metadata.gz: d06f8f44b1b84107e9bed22f158479f2be66569511ee1f9dea33ceaa788a9cff118b15e3e0960723cc943a290f832c6442f5c8c8659fb275002449e57c90d285
-  data.tar.gz: edae0f0fc3223778d655546c873792f81da0f514c50be44e27a192717df11c2672eedc251e2cf210ab4e623cdd0c5a232b6e65671c7cc9b2a356a1498ed3426f
+  metadata.gz: 1b97796606a4d6877705a058e17c4b1f112fc9c0621054a479492c3cc9cc5f20477fb9842c54641f6fe79d3f78e205f5433944e2ac598cfe162ca7a5ea155b9c
+  data.tar.gz: 0a5c78cb1e497494fd35102ace5edfac6942d1cbb958d74ec502b36ca70c06503045e7693a4c8423730f3c5d9c0ff371b18a1c504fc9cc8807afc5389e61670b

data/CHANGELOG.md

@@ -1,20 +1,52 @@
 # 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
+## 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 +54,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 +71,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

@@ -54,7 +54,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 +105,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/mandates_query.rb

@@ -21,7 +21,7 @@ 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

data/lib/sparql/position_query.rb

@@ -8,10 +8,12 @@ module WikidataPositionHistory
         <<~SPARQL
           # position-metadata
 
-          SELECT DISTINCT ?item ?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 { 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)
             OPTIONAL { ?item p:P571 [ a wikibase:BestRank ;
               psv:P571 [ wikibase:timeValue ?inception; wikibase:timePrecision ?inception_precision ]
             ] }
@@ -24,7 +26,7 @@ module WikidataPositionHistory
       end
 
       def sparql_args
-        [itemid, itemid]
+        [itemid] * 3
       end
     end
   end
@@ -55,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/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/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
@@ -85,6 +87,11 @@ module WikidataPositionHistory
       rows.map(&:position?).first
     end
 
+    def legislator?
+      # this should be the same everywhere
+      rows.map(&:legislator?).first
+    end
+
     private
 
     attr_reader :rows
@@ -112,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
@@ -170,8 +178,8 @@ 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

data/lib/wikidata_position_history/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wikidata_position_history
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.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-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mediawiki-replaceable-content