wikidata_position_history 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cc474575654a299ceef536c692402288d072d7caf3d9bd62de17d9027bcd287
-  data.tar.gz: 2e6324cc0e272b5b747d65eab1aaa32f1c621a6e672487312f616afd9449d374
+  metadata.gz: d6133f77b6d65f7decf2dcac481ff36a661a136fb79aff442677669801248437
+  data.tar.gz: dccd3b0a0ed29d89c945756c9efa30e8c02f1c912b4402bec1a45a1c45d81e88
 SHA512:
-  metadata.gz: 709a0916f16fd2a890df7ae3e2873968a23f0640945cf756785eb59bf8d7589b578fb2bd51e6263b36de729e20ea2a200cfcd9731ee6957a2e539169cacb0cbf
-  data.tar.gz: 3dbe5d81f0fe77f6487ce0109b91205d3b4361e13c70b48f93464ea4a323d06f3c07b70ea263e4817592cedf1b632e10b10be832dd03a92114f59505b53dae5a
+  metadata.gz: 0112ca4aae8b9631d86bbf1c2cca5120808e9eb1bb207008e8ba8d221ec0c0c2d16e5f22ec0c59fe9454839c04fcd32bd71f67d1e1793e0d8c053b9d2f1d1471
+  data.tar.gz: 8fd03fc79a37459686524927ba536ab770c22ac4c8d948fde53be1eafba155a3a0f2b072cd8ab8142867e0f57a8138ac62c1535d54bf5330e987bbfc7a2a553e

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+# [1.6.0] 2020-09-07
+
+## Enhancements
+
+* 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
+  behaviour may not be particularly sensible. Later evolutions of this
+  feature will hopefully handle that better.)
+
+## Fixes
+
+* Previously, any warnings would be displayed at the bottom of the page,
+  which was fine if this table was the only thing on the page, but would
+  be slightly odd if there was other discussion after it. Now the
+  footnotes are explicitly displayed immediately after the table.
+
 # [1.5.0] 2020-09-06
 
 ## Enhancements

data/lib/sparql/position_data.rb

@@ -28,10 +28,14 @@ module WikidataPositionHistory
     end
 
     def inception_date
+      return if inception_date_raw.empty?
+
       QueryService::WikidataDate.new(inception_date_raw, inception_date_precision)
     end
 
     def abolition_date
+      return if abolition_date_raw.empty?
+
       QueryService::WikidataDate.new(abolition_date_raw, abolition_date_precision)
     end
 

data/lib/wikidata_position_history/report.rb

@@ -70,6 +70,14 @@ module WikidataPositionHistory
       [header, wikitext].join("\n")
     end
 
+    def template_params
+      {
+        metadata:   metadata,
+        table_rows: table_rows,
+        sparql_url: sparql.wdqs_url,
+      }
+    end
+
     private
 
     def metadata
@@ -106,13 +114,6 @@ module WikidataPositionHistory
       template_class.new(template_params).output
     end
 
-    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|
         {

data/lib/wikidata_position_history/template.rb

@@ -16,22 +16,38 @@ module WikidataPositionHistory
     attr_reader :data
 
     def template
-      @template ||= ERB.new(template_text)
+      @template ||= ERB.new(template_text, nil, '-')
     end
 
     def template_text
       <<~ERB
         {| class="wikitable" style="text-align: center; border: none;"
-        <% table_rows.map(&:values).each do |mandate, bio| %>|-
+        <% 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;" | 
+        <% end -%>
+        <% 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 %>|}
+        | 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 -%>
+        <% 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;" | 
+        <% end -%>
+        |}
 
         <div style="margin-bottom:5px; border-bottom:3px solid #2f74d0; font-size:8pt">
           <div style="float:right">[<%= sparql_url %> WDQS]</div>
         </div>
+        {{reflist}}
       ERB
     end
   end

data/lib/wikidata_position_history/version.rb

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

metadata

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