wikidata_position_history 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ef4815c74d73d50bd3d74a70af9d9b47177d5f3c00e35748892cad201150bed
-  data.tar.gz: fdd1e8b5fa7fe220da78daabdcdc016e8ee729c57648103bbc384860e2ef0ce6
+  metadata.gz: 1e79781ac90a9b99e18013cb11a56de58959f5d91aaef2cebe888f73f54205e2
+  data.tar.gz: c43cdea3f569a532eda7df1141e6a6017eb881a127571ca0ee289e67d80f0f1a
 SHA512:
-  metadata.gz: fe138774ce37cf9258c7f11bfc3bc95cbaafa3811507a2b963d006d1e5982e9257ce754ea46fe47fe7e3eabb95520ae534549badcc6a7c8335ee3ff4368cef82
-  data.tar.gz: 2e266bd52f9bef2e8736bcf566c1ec5e4b7ad10a90f13d4a31f6613411797ff01e4a528263db3b15cce573de10c4c41eb36ea46838f7d16c30748a3a58585564
+  metadata.gz: 00b3260f1ebcaa8ad0037459e97460297ed9c2dfb3e373355d551c043b2ac58759bf1f38437977a65b623bfa45631b8f4521a8207638d3a3490d7e7db18191c4
+  data.tar.gz: 4a37942a4d5bcefd9694bed153d3e39692d8b78c96f3256cc9046e64d8ce5ba75a99ea25a599b901508ce42b1852deeb0b6ada2eb959a737d02be9142a31fd2e

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+# [1.4.1] 2020-09-04
+
+## Fixes
+
+* Work around template deployment issue.
+
 # [1.4.0] 2020-09-04
 
 ## Enhancements

data/lib/wikidata_position_history.rb

@@ -6,6 +6,7 @@ require 'sparql/position_data'
 require 'sparql/bio_data'
 require 'sparql/mandates'
 require 'wikidata_position_history/checks'
+require 'wikidata_position_history/template'
 require 'wikidata_position_history/report'
 require 'wikidata_position_history/version'
 

data/lib/wikidata_position_history/report.rb

@@ -41,38 +41,14 @@ module WikidataPositionHistory
     attr_reader :later, :current, :earlier
   end
 
-  # Interface to the ERB Template for the output
-  class ReportTemplate
-    def initialize(file, data)
-      @file = file
-      @data = data
-    end
-
-    def output
-      template.result_with_hash(data)
-    end
-
-    private
-
-    def template_path
-      Pathname.new(file)
-    end
-
-    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(position_id, template_file = 'report.erb')
+    def initialize(position_id, template_class = ReportTemplate)
       @position_id = position_id
-      @template_file = template_file
+      @template_class = template_class
     end
 
-    attr_reader :position_id, :template_file
+    attr_reader :position_id, :template_class
 
     def wikitext
       return no_items_output if mandates.empty?
@@ -128,7 +104,7 @@ module WikidataPositionHistory
     end
 
     def output
-      ReportTemplate.new(template_file, template_params).output
+      template_class.new(template_params).output
     end
 
     def template_params

data/lib/wikidata_position_history/template.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module WikidataPositionHistory
+  # Interface to the ERB Template for the output
+  class ReportTemplate
+    def initialize(data)
+      @data = data
+    end
+
+    def output
+      template.result_with_hash(data)
+    end
+
+    private
+
+    attr_reader :data
+
+    def template
+      @template ||= ERB.new(template_text)
+    end
+
+    def template_text
+      <<~ERB
+        {| 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>
+      ERB
+    end
+  end
+end

data/lib/wikidata_position_history/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wikidata_position_history
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Tony Bowden
@@ -183,8 +183,8 @@ files:
 - lib/wikidata_position_history.rb
 - lib/wikidata_position_history/checks.rb
 - lib/wikidata_position_history/report.rb
+- lib/wikidata_position_history/template.rb
 - lib/wikidata_position_history/version.rb
-- report.erb
 - wikidata_position_history.gemspec
 homepage: https://github.com/everypolitician/wikidata-position-history/
 licenses:

data/report.erb

@@ -1,11 +0,0 @@
-{| 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>