wikidata_position_history 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6133f77b6d65f7decf2dcac481ff36a661a136fb79aff442677669801248437
-  data.tar.gz: dccd3b0a0ed29d89c945756c9efa30e8c02f1c912b4402bec1a45a1c45d81e88
+  metadata.gz: dc98f35825bd450d052eaf0bbb84934db297933bce312b88fd8b545474b742bf
+  data.tar.gz: 663abb5df3df62744eebbdeaea9ce2e63bf90aeff5335bf2406ae66306dd7608
 SHA512:
-  metadata.gz: 0112ca4aae8b9631d86bbf1c2cca5120808e9eb1bb207008e8ba8d221ec0c0c2d16e5f22ec0c59fe9454839c04fcd32bd71f67d1e1793e0d8c053b9d2f1d1471
-  data.tar.gz: 8fd03fc79a37459686524927ba536ab770c22ac4c8d948fde53be1eafba155a3a0f2b072cd8ab8142867e0f57a8138ac62c1535d54bf5330e987bbfc7a2a553e
+  metadata.gz: d06f8f44b1b84107e9bed22f158479f2be66569511ee1f9dea33ceaa788a9cff118b15e3e0960723cc943a290f832c6442f5c8c8659fb275002449e57c90d285
+  data.tar.gz: edae0f0fc3223778d655546c873792f81da0f514c50be44e27a192717df11c2672eedc251e2cf210ab4e623cdd0c5a232b6e65671c7cc9b2a356a1498ed3426f

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+# [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

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
@@ -28,7 +28,7 @@ module WikidataPositionHistory
   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,30 +3,42 @@
 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
           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)
+            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, itemid]
+      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?
 

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/report.rb

@@ -40,6 +40,68 @@ 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
+
+    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)
@@ -81,13 +143,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,11 +159,11 @@ 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

data/lib/wikidata_position_history/template.rb

@@ -25,7 +25,10 @@ module WikidataPositionHistory
         <% 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;" | 
+        | 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| -%>
         |-
@@ -40,7 +43,10 @@ module WikidataPositionHistory
         <% 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;" | 
+        | 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 -%>
         |}
 

data/lib/wikidata_position_history/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WikidataPositionHistory
-  VERSION = '1.6.0'
+  VERSION = '1.7.0'
 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.7.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-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mediawiki-replaceable-content
@@ -204,10 +204,10 @@ 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