wikidata_position_history 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a2bc5a49d34a368363b7e92ec9e1b0d08b141d96babd15eccf2913d99e9b7b0
-  data.tar.gz: 87594145f811917672fd4772722e086907d508479d73b43bfb21a0aac24e5d27
+  metadata.gz: d45377b5ba871d76f191e7dafe516f308c4f1b17f166b19d0658ee15fff98745
+  data.tar.gz: ede75c366b3cf99a417ab402f5151880a477b3aa1fc10ff0d4261fb7b7fc0d44
 SHA512:
-  metadata.gz: 6eb361e602c3a34c97bd8b584b4029135d9bb8e14c1f99b2ed513ce049f8df780c9b09ac31941c31a7ebea544d0a6cc0065cb2210bc4af4448de66cfb40800c0
-  data.tar.gz: 1b07fb333e1f13d25985420ec6700f2b0dc81dc98a5c4a762713bcf8426c532b48e28f6d80646d7c5ea85692f63e921748a603708e4d9e7286f254bc8c665e21
+  metadata.gz: 141397d38a5a771e8b2cb159bcd8db327d50f157ba93539b09bb08ff23a64a60e6aa4bdac2bf1a45bdd65dc2f8d343e1a4737a89fc939eafe7ed25e7473562ff
+  data.tar.gz: 0a3cb133222f05d0ff46dd7810a62a72f3b19ca1f7431bf265752867b916b8ef176f04e11b65a50d2b6ed8d04ba20dc3ecf6fe73cd5fb24caf98737f401b685b

data/CHANGELOG.md

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

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,10 @@ module QueryService
       "{{Q|#{id}}}" if id
     end
 
+    def qlink_i
+      "''{{Q|#{id}}}''" if id
+    end
+
     private
 
     attr_reader :url

data/lib/sparql/bio_query.rb

@@ -24,13 +24,9 @@ module WikidataPositionHistory
   end
 
   # Represents a single row returned from the Position query
-  class BioRow
-    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
@@ -34,5 +34,34 @@ module WikidataPositionHistory
         @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_query.rb

@@ -28,17 +28,13 @@ module WikidataPositionHistory
   end
 
   # Represents a single row returned from the Mandates query
-  class MandateRow
-    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

@@ -9,7 +9,7 @@ module WikidataPositionHistory
           # position-metadata
 
           SELECT DISTINCT ?item ?inception ?inception_precision ?abolition ?abolition_precision
-                          ?replaces ?replacedBy
+                          ?replaces ?replacedBy ?derivedReplaces ?derivedReplacedBy
                           ?isPosition ?isLegislator
           WHERE {
             VALUES ?item { wd:%s }
@@ -23,6 +23,8 @@ module WikidataPositionHistory
             ] }
             OPTIONAL { ?item wdt:P1365 ?replaces }
             OPTIONAL { ?item wdt:P1366 ?replacedBy }
+            OPTIONAL { ?derivedReplaces wdt:P1366 ?item }
+            OPTIONAL { ?derivedReplacedBy wdt:P1365 ?item }
           }
         SPARQL
       end
@@ -34,73 +36,41 @@ module WikidataPositionHistory
   end
 
   # Represents a single row returned from the Position query
-  class PositionRow
-    def initialize(row)
-      @row = row
-    end
-
+  class PositionRow < SPARQL::QueryRow
     def item
-      QueryService::WikidataItem.new(row.dig(:item, :value))
+      item_from(:item)
     end
 
     def inception_date
-      return if inception_date_raw.empty?
-
-      QueryService::WikidataDate.new(inception_date_raw, inception_date_precision)
+      date_from(:inception, :inception_precision)
     end
 
     def abolition_date
-      return if abolition_date_raw.empty?
-
-      QueryService::WikidataDate.new(abolition_date_raw, abolition_date_precision)
+      date_from(:abolition, :abolition_precision)
     end
 
     def replaces
-      return if replaces_raw.to_s.empty?
-
-      QueryService::WikidataItem.new(replaces_raw)
+      item_from(:replaces)
     end
 
     def replaced_by
-      return if replaced_by_raw.to_s.empty?
-
-      QueryService::WikidataItem.new(replaced_by_raw)
-    end
-
-    def position?
-      row.dig(:isPosition, :value) == 'true'
-    end
-
-    def legislator?
-      row.dig(:isLegislator, :value) == 'true'
-    end
-
-    private
-
-    attr_reader :row
-
-    def replaces_raw
-      row.dig(:replaces, :value)
-    end
-
-    def replaced_by_raw
-      row.dig(:replacedBy, :value)
+      item_from(:replacedBy)
     end
 
-    def inception_date_raw
-      row.dig(:inception, :value).to_s[0..9]
+    def derived_replaces
+      item_from(:derivedReplaces)
     end
 
-    def abolition_date_raw
-      row.dig(:abolition, :value).to_s[0..9]
+    def derived_replaced_by
+      item_from(:derivedReplacedBy)
     end
 
-    def inception_date_precision
-      row.dig(:inception_precision, :value)
+    def position?
+      raw(:isPosition) == 'true'
     end
 
-    def abolition_date_precision
-      row.dig(:abolition_precision, :value)
+    def legislator?
+      raw(:isLegislator) == 'true'
     end
   end
 end

data/lib/wikidata_position_history.rb

@@ -7,6 +7,7 @@ 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/output_row.rb

@@ -0,0 +1,144 @@
+# 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 qlink
+        metadata.position.qlink
+      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', "#{qlink} is missing {{P|571}}")] if count.zero?
+
+        [Warning.new('Multiple values', "#{qlink} has more than one {{P|571}}")]
+      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', "#{qlink} has more than one {{P|576}}")]
+      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(&:qlink) + implied_list.indirect_only.map(&:qlink_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,97 +1,61 @@
 # 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::Overlap,
-              Check::WrongPredecessor, Check::MissingPredecessor,
-              Check::WrongSuccessor, Check::MissingSuccessor].freeze
-
-    def initialize(later, current, earlier)
-      @later = later
-      @current = current
-      @earlier = earlier
+  # 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 ordinal_string
-      ordinal = current.ordinal or return ''
-      "#{ordinal}."
+    def empty?
+      all.empty?
     end
 
-    def person
-      current.item
+    def all
+      direct | indirect
     end
 
-    def dates
-      dates = [current.start_date, current.end_date]
-      return '' if dates.compact.empty?
-
-      dates.join(' – ')
+    def both
+      direct & indirect
     end
 
-    def acting?
-      current.acting?
+    def direct_only
+      direct - indirect
     end
 
-    def warnings
-      CHECKS.map { |klass| klass.new(later, current, earlier) }.select(&:problem?)
+    def indirect_only
+      indirect - direct
     end
 
-    private
-
-    attr_reader :later, :current, :earlier
+    attr_reader :direct, :indirect
   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
+    def position
       rows.map(&:item).first
     end
 
-    def replaces
-      return if replaces_list.empty?
-
-      replaces_list.map(&:qlink).join(', ')
+    def predecessor
+      @predecessor ||= OutputRow::Predecessor.new(self)
     end
 
-    def replaced_by
-      return if replaced_by_list.empty?
-
-      replaced_by_list.map(&:qlink).join(', ')
+    def successor
+      @successor ||= OutputRow::Successor.new(self)
     end
 
-    def inception_date
-      return if inception_dates.empty?
-
-      inception_dates.join(' / ')
+    def inception
+      @inception ||= OutputRow::Inception.new(self)
     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}}")
+    def abolition
+      @abolition ||= OutputRow::Abolition.new(self)
     end
 
     def position?
@@ -104,16 +68,12 @@ module WikidataPositionHistory
       rows.map(&:legislator?).first
     end
 
-    private
-
-    attr_reader :rows
-
-    def replaces_list
-      rows.map(&:replaces).compact.uniq(&:id).sort_by(&:id)
+    def replaces_combined
+      @replaces_combined ||= ImpliedList.new(uniq_by_id(:replaces), uniq_by_id(:derived_replaces))
     end
 
-    def replaced_by_list
-      rows.map(&:replaced_by).compact.uniq(&:id).sort_by(&:id)
+    def replaced_by_combined
+      @replaced_by_combined ||= ImpliedList.new(uniq_by_id(:replaced_by), uniq_by_id(:derived_replaced_by))
     end
 
     def inception_dates
@@ -124,8 +84,12 @@ module WikidataPositionHistory
       rows.map(&:abolition_date).compact.uniq(&:to_s).sort
     end
 
-    def item_qlink
-      item.qlink
+    private
+
+    attr_reader :rows
+
+    def uniq_by_id(method)
+      rows.map(&method).compact.uniq(&:id).sort_by(&:id)
     end
   end
 
@@ -150,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(' – '))
@@ -205,7 +169,7 @@ module WikidataPositionHistory
     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,22 +22,25 @@ module WikidataPositionHistory
     def template_text
       <<~ERB
         {| class="wikitable" style="text-align: center; border: none;"
-        <% if metadata.abolition_date -%>
+        <% if metadata.abolition.date -%>
         |-
         | 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.date %>
         | style="border: none; background: #fff; text-align: left;" | \
-        <% [metadata.abolition_warning].compact.each do |warning| -%>
+        <% 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.replaced_by -%>
+        <% 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.replaced_by %>
-        | style=" border: none; background: #fff; text-align: left;" |
+        | 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.replaced_by || metadata.abolition_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;
@@ -52,25 +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.replaced_by || metadata.abolition_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 -%>
+        <% 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="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_warning].compact.each do |warning| -%>
+        <% 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.replaces -%>
+        <% if metadata.predecessor.position -%>
         |-
         | colspan="2" style=" border: none; background: #fff; font-size: 1.15em; text-align: right;" | '''Replaces''':
-        | style="border: none; background: #fff; text-align: left;" | <%= metadata.replaces %>
-        | style="padding:0.5em 2em 0.5em 1em; border: none; background: #fff; text-align: left;" |
+        | 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.9.0'
+  VERSION = '1.10.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wikidata_position_history
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Tony Bowden
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-11 00:00:00.000000000 Z
+date: 2020-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mediawiki-replaceable-content
@@ -210,6 +210,7 @@ files:
 - 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