wikidata_position_history 1.11.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e59634d8233371767e5a151e60d8bb5f3c8f5703302654c59f5db407faea4a4
-  data.tar.gz: 763b5794f41ad395b045fedfb7b132fc6139698e3514df0caf96a47bd5d224d2
+  metadata.gz: 52e5490ed1d01167632b8adc9cb5d9a37912a5accad858b5d2ada5aaa43522ff
+  data.tar.gz: ab39a9aed506e9c77834ed7a7fdc6a9a06006eaee84f14ee9fb0c71eb069c5a8
 SHA512:
-  metadata.gz: 8ad33ca550ad0a5a83ffd42bc03ce8de8df93f77b932ec8ae74d21c528160e8b47d55ff8569641d34801e7f181f0b3b9c856e2d27f5aef91914d73522e5e63de
-  data.tar.gz: 7dba23307f13045710a4bc3b7c0869e024fcf206b023e9740c3c8c5366ea7aa260a1dcc342cf7c0875ed1b635c2bc3b96e350720e32c01e35051b1bc1d37e747
+  metadata.gz: e7aae1fb45f43c0ba961d878de171e4150194514dc406e0059a8c9bc2544ce2e9549d4e9e07c5da6b7ccfe8a6aec534735c1f645fb026a5eb04512b4cee7f9cb
+  data.tar.gz: 797ab543a4a0ee636ed833a1f200c266ebed7b60872084b6f9b0156b11920dc619c15d4bc19b8326ca747c9f5585df4a81be7b23c5fbdd07a177e3ded1f3f702

data/CHANGELOG.md

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

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/sparql/bio_query.rb

@@ -21,6 +21,22 @@ module WikidataPositionHistory
         SPARQL
       end
     end
+
+    # 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

data/lib/sparql/mandates_query.rb

@@ -25,6 +25,30 @@ module WikidataPositionHistory
         SPARQL
       end
     end
+
+    # 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 ?prev ?next ?nature
+          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|pq:P155 ?prev }
+            OPTIONAL { ?posn pq:P1366|pq:P156 ?next }
+            OPTIONAL { ?posn pq:P1545 ?ordinal }
+            OPTIONAL { ?posn pq:P5102 ?nature }
+          }
+          ORDER BY DESC(?start_date) ?item
+        SPARQL
+      end
+    end
   end
 
   # Represents a single row returned from the Mandates query
@@ -37,11 +61,6 @@ module WikidataPositionHistory
       item_from(:item)
     end
 
-    # TODO: rename or remove. 'item' is meaningless/ambiguous
-    def item
-      officeholder.qlink
-    end
-
     # TODO: switch to item_from
     def prev
       QueryService::WikidataItem.new(row.dig(:prev, :value)).qlink

data/lib/sparql/position_query.rb

@@ -11,10 +11,13 @@ module WikidataPositionHistory
           SELECT DISTINCT ?item ?inception ?inception_precision ?abolition ?abolition_precision
                           ?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 ]
             ] }
@@ -25,12 +28,16 @@ module WikidataPositionHistory
             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
@@ -72,5 +79,17 @@ module WikidataPositionHistory
     def legislator?
       raw(:isLegislator) == 'true'
     end
+
+    def constituency?
+      raw(:isConstituency) == 'true'
+    end
+
+    def legislature
+      item_from(:legislature)
+    end
+
+    def representative_count
+      raw(:representative_count).to_i
+    end
   end
 end

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

@@ -22,8 +22,8 @@ module WikidataPositionHistory
         "#{ordinal}."
       end
 
-      def person
-        current.item
+      def officeholder
+        current.officeholder
       end
 
       def dates

data/lib/wikidata_position_history/report.rb

@@ -68,6 +68,15 @@ module WikidataPositionHistory
       rows.map(&:legislator?).first
     end
 
+    def constituency?
+      # this should be the same everywhere
+      rows.map(&:constituency?).first
+    end
+
+    def representative_count
+      rows.map(&:representative_count).max
+    end
+
     def replaces_combined
       @replaces_combined ||= ImpliedList.new(uniq_by_id(:replaces), uniq_by_id(:derived_replaces))
     end
@@ -93,6 +102,48 @@ module WikidataPositionHistory
     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
+
   # The entire wikitext generated for this report
   class Report
     def initialize(position_id, template_class = ReportTemplate)
@@ -104,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,
@@ -139,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)
@@ -150,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

data/lib/wikidata_position_history/template.rb

@@ -49,7 +49,7 @@ 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 %>
         | 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>\

data/lib/wikidata_position_history/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wikidata_position_history
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Tony Bowden
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-14 00:00:00.000000000 Z
+date: 2020-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mediawiki-replaceable-content