wikidata_position_history 1.3.4 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '018cdd5d51eee83b0738a0b84f32d92259bf4665fe25894b2d005f308c033466'
-  data.tar.gz: bf630179eacfe1e68b88dacd268ae4c1e35efdabfc0149963338cf9de3a20567
+  metadata.gz: 0ef4815c74d73d50bd3d74a70af9d9b47177d5f3c00e35748892cad201150bed
+  data.tar.gz: fdd1e8b5fa7fe220da78daabdcdc016e8ee729c57648103bbc384860e2ef0ce6
 SHA512:
-  metadata.gz: cb6dd44e9a746bf425a5ef8199d7bd10891ea887d3f61dab6fff676ecdb21ceec19da22ac585c0ac3c61d70a4deeb26c5fd1f602ab45d49aaa6595ca4aa0dccd
-  data.tar.gz: 583747329e14ed0f7292c5f7e71e1e4bafe63ca83dd028786449fa582af0b68880e90287e1028b249eeef28f125f54d3b7ae0d6940048cc122901f57b52e2aa5
+  metadata.gz: fe138774ce37cf9258c7f11bfc3bc95cbaafa3811507a2b963d006d1e5982e9257ce754ea46fe47fe7e3eabb95520ae534549badcc6a7c8335ee3ff4368cef82
+  data.tar.gz: 2e266bd52f9bef2e8736bcf566c1ec5e4b7ad10a90f13d4a31f6613411797ff01e4a528263db3b15cce573de10c4c41eb36ea46838f7d16c30748a3a58585564

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+# [1.4.0] 2020-09-04
+
+## Enhancements
+
+* Add an image column.
+* Improve the warning for inconsistent successor/predecessor values.
+
 # [1.3.4] - 2020-09-01
 
 ## Fixes

data/lib/sparql/bio_data.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module WikidataPositionHistory
+  module SPARQL
+    # SPARQL for fetching biographical about all holders of a position
+    #
+    # 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
+      def raw_sparql
+        <<~SPARQL
+          # holder-biodata
+
+          SELECT DISTINCT ?item ?image
+          WHERE {
+            ?item wdt:P31 wd:Q5 ; p:P39/ps:P39 wd:%s .
+            OPTIONAL { ?item wdt:P18 ?image }
+          }
+          ORDER BY ?item
+        SPARQL
+      end
+    end
+  end
+
+  # Represents a single row returned from the Position query
+  class BioData
+    def initialize(row)
+      @row = row
+    end
+
+    def person
+      QueryService::WikidataItem.new(row.dig(:item, :value))
+    end
+
+    def image_title
+      return if image_url.to_s.empty?
+
+      image_url.split('/').last
+    end
+
+    def image_link(size = 75)
+      return '' unless image_title
+
+      "[[File:#{image_title}|#{size}px]]"
+    end
+
+    private
+
+    attr_reader :row
+
+    def image_url
+      row.dig(:image, :value)
+    end
+  end
+end

data/lib/sparql/mandates.rb

@@ -7,6 +7,7 @@ module WikidataPositionHistory
       def raw_sparql
         <<~SPARQL
           # position-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 .
@@ -19,7 +20,6 @@ module WikidataPositionHistory
             OPTIONAL { ?posn pq:P1366|pq:P156 ?next }
             OPTIONAL { ?posn pq:P1545 ?ordinal }
             OPTIONAL { ?posn pq:P5102 ?nature }
-            OPTIONAL { ?posn pq:P5102 ?nature }
           }
           ORDER BY DESC(?start_date)
         SPARQL
@@ -37,8 +37,13 @@ module WikidataPositionHistory
       row.dig(:ordinal, :value)
     end
 
+    def officeholder
+      QueryService::WikidataItem.new(row.dig(:item, :value))
+    end
+
+    # TODO: rename or remove. 'item' is meaningless/ambiguous
     def item
-      QueryService::WikidataItem.new(row.dig(:item, :value)).qlink
+      officeholder.qlink
     end
 
     def prev

data/lib/wikidata_position_history.rb

@@ -3,6 +3,7 @@
 require 'query_service'
 require 'sparql/item_query'
 require 'sparql/position_data'
+require 'sparql/bio_data'
 require 'sparql/mandates'
 require 'wikidata_position_history/checks'
 require 'wikidata_position_history/report'

data/lib/wikidata_position_history/checks.rb

@@ -100,7 +100,7 @@ module WikidataPositionHistory
       end
 
       def possible_explanation
-        "#{current.item} has a {{P|1365}} of #{predecessor}, which differs from #{earlier.item}"
+        "#{current.item} has a {{P|1365}} of #{predecessor}, but follows #{earlier.item} here"
       end
     end
 
@@ -115,7 +115,7 @@ module WikidataPositionHistory
       end
 
       def possible_explanation
-        "#{current.item} has a {{P|1366}} of #{successor}, which differs from #{later.item}"
+        "#{current.item} has a {{P|1366}} of #{successor}, but is followed by #{later.item} here"
       end
     end
 

data/lib/wikidata_position_history/report.rb

@@ -1,95 +1,87 @@
 # frozen_string_literal: true
 
 module WikidataPositionHistory
-  # A single output row of Wikitext for an officeholding
-  class MandateReport
+  # Date for a single mandate row, to be passed to the report template
+  class MandateData
     def initialize(later, current, earlier)
       @later = later
       @current = current
       @earlier = earlier
     end
 
-    def output
-      [row_start, ordinal_cell, member_cell, warnings_cell].join("\n")
+    def ordinal_string
+      ordinal = current.ordinal or return ''
+      "#{ordinal}."
     end
 
-    private
-
-    CHECKS = [Check::MissingFields, Check::WrongPredecessor, Check::WrongSuccessor, Check::Overlap].freeze
-
-    WARNING_LAYOUT = [
-      '<span style="display: block">[[File:Pictogram voting comment.svg|15px|link=]]&nbsp;',
-      '<span style="color: #d33; font-weight: bold; vertical-align: middle;">%s</span>&nbsp;',
-      '<ref>%s</ref></span>'
-    ].join
+    def person
+      current.item
+    end
 
-    attr_reader :later, :current, :earlier
+    def dates
+      dates = [current.start_date, current.end_date]
+      # compact doesn't work here, even if we add #nil? to WikidataDate
+      return '' if dates.reject(&:empty?).empty?
 
-    def row_start
-      '|-'
+      dates.join(' – ')
     end
 
-    def ordinal_cell
-      %(| style="padding:0.5em 2em" | #{ordinal_string})
+    def acting?
+      current.acting?
     end
 
-    def ordinal_string
-      ordinal = current.ordinal or return ''
-      ordinal.concat('.')
+    def warnings
+      CHECKS.map { |klass| klass.new(later, current, earlier) }.select(&:problem?)
     end
 
-    def member_style
-      return 'font-size: 1.25em; display: block; font-style: italic;' if current.acting?
+    private
 
-      'font-size: 1.5em; display: block;'
-    end
+    CHECKS = [Check::MissingFields, Check::WrongPredecessor, Check::WrongSuccessor, Check::Overlap].freeze
 
-    def member_cell
-      format('| style="padding:0.5em 2em" | <span style="%s">%s</span> %s',
-             member_style, membership_person, membership_dates)
-    end
+    attr_reader :later, :current, :earlier
+  end
 
-    def warnings_cell
-      format('| style="padding:0.5em 2em 0.5em 1em; border: none; background: #fff; text-align: left;" | %s',
-             combined_warnings)
+  # Interface to the ERB Template for the output
+  class ReportTemplate
+    def initialize(file, data)
+      @file = file
+      @data = data
     end
 
-    def combined_warnings
-      CHECKS.map do |check_class|
-        check = check_class.new(later, current, earlier)
-        format(WARNING_LAYOUT, check.headline, check.explanation) if check.problem?
-      end.join
+    def output
+      template.result_with_hash(data)
     end
 
-    def membership_person
-      current.item
-    end
+    private
 
-    def membership_dates
-      dates = [current.start_date, current.end_date]
-      # compact doesn't work here, even if we add #nil? to WikidataDate
-      return '' if dates.reject(&:empty?).empty?
+    def template_path
+      Pathname.new(file)
+    end
 
-      dates.join(' – ')
+    def template
+      @template ||= ERB.new(template_path.read)
     end
+
+    attr_reader :file, :data
   end
 
   # The entire wikitext generated for this report
   class Report
-    def initialize(subject_item_id)
-      @subject_item_id = subject_item_id
+    def initialize(position_id, template_file = 'report.erb')
+      @position_id = position_id
+      @template_file = template_file
     end
 
-    attr_reader :subject_item_id
+    attr_reader :position_id, :template_file
 
     def wikitext
       return no_items_output if mandates.empty?
 
-      [table_header, table_rows, table_footer, wdqs_section].compact.join("\n")
+      output
     end
 
     def header
-      "== {{Q|#{subject_item_id}}} officeholders #{position_dates} =="
+      "== {{Q|#{position_id}}} officeholders #{position_dates} =="
     end
 
     def position_dates
@@ -108,7 +100,15 @@ module WikidataPositionHistory
     def metadata
       # TODO: we might get more than one response, if a position has
       # multiple dates
-      @metadata ||= SPARQL::PositionData.new(subject_item_id).results_as(PositionData).first
+      @metadata ||= SPARQL::PositionData.new(position_id).results_as(PositionData).first
+    end
+
+    def biodata
+      @biodata ||= SPARQL::BioData.new(position_id).results_as(BioData)
+    end
+
+    def biodata_for(officeholder)
+      biodata.select { |bio| bio.person.id == officeholder.id }
     end
 
     def padded_mandates
@@ -116,7 +116,7 @@ module WikidataPositionHistory
     end
 
     def sparql
-      @sparql ||= SPARQL::Mandates.new(subject_item_id)
+      @sparql ||= SPARQL::Mandates.new(position_id)
     end
 
     def mandates
@@ -124,32 +124,26 @@ module WikidataPositionHistory
     end
 
     def no_items_output
-      "\n{{PositionHolderHistory/error_no_holders|id=#{subject_item_id}}}\n"
+      "\n{{PositionHolderHistory/error_no_holders|id=#{position_id}}}\n"
     end
 
-    def table_header
-      '{| class="wikitable" style="text-align: center; border: none;"'
-    end
-
-    def table_footer
-      "|}\n"
-    end
-
-    def wdqs_section
-      wdqs_div % sparql.wdqs_url
+    def output
+      ReportTemplate.new(template_file, template_params).output
     end
 
-    def wdqs_div
-      <<~HTML
-        <div style="margin-bottom:5px; border-bottom:3px solid #2f74d0; font-size:8pt">
-          <div style="float:right">[%s WDQS]</div>
-        </div>
-      HTML
+    def template_params
+      {
+        table_rows: table_rows,
+        sparql_url: sparql.wdqs_url,
+      }
     end
 
     def table_rows
       padded_mandates.each_cons(3).map do |later, current, earlier|
-        MandateReport.new(later, current, earlier).output
+        {
+          mandate: MandateData.new(later, current, earlier),
+          bio:     biodata_for(current.officeholder),
+        }
       end
     end
   end

data/lib/wikidata_position_history/version.rb

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

data/report.erb

@@ -0,0 +1,11 @@
+{| class="wikitable" style="text-align: center; border: none;"
+<% 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 %>|}
+
+<div style="margin-bottom:5px; border-bottom:3px solid #2f74d0; font-size:8pt">
+  <div style="float:right">[<%= sparql_url %> WDQS]</div>
+</div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wikidata_position_history
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.4.0
 platform: ruby
 authors:
 - Tony Bowden
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-01 00:00:00.000000000 Z
+date: 2020-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mediawiki-replaceable-content
@@ -176,6 +176,7 @@ files:
 - exe/position-history-for-item
 - exe/update_wikidata_page
 - lib/query_service.rb
+- lib/sparql/bio_data.rb
 - lib/sparql/item_query.rb
 - lib/sparql/mandates.rb
 - lib/sparql/position_data.rb
@@ -183,6 +184,7 @@ files:
 - lib/wikidata_position_history/checks.rb
 - lib/wikidata_position_history/report.rb
 - lib/wikidata_position_history/version.rb
+- report.erb
 - wikidata_position_history.gemspec
 homepage: https://github.com/everypolitician/wikidata-position-history/
 licenses: