wikidata_position_history 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 43e80159fad0253e687e1dc8d52318079bdc2bf5
-  data.tar.gz: 26974422ae9f8584c6907d8531b63eeccee42231
+SHA256:
+  metadata.gz: '018cdd5d51eee83b0738a0b84f32d92259bf4665fe25894b2d005f308c033466'
+  data.tar.gz: bf630179eacfe1e68b88dacd268ae4c1e35efdabfc0149963338cf9de3a20567
 SHA512:
-  metadata.gz: c1a7fb0eb3c293884452995d44dd7371ace248f48f676c15e64f87e1ed8604eedf0a8df53599186a5c978f8b93cafcd0d0f1282c8592296288d3ef5d7bfbf22f
-  data.tar.gz: 3dc935ea7ad2f67e9c1c8a4ca520a8a129fd05f2b78cb27d22f81e397fff81fcb311f543aa75949d824f5e565c25fdcce18bf478b9a7e3846110f4264036b1d2
+  metadata.gz: cb6dd44e9a746bf425a5ef8199d7bd10891ea887d3f61dab6fff676ecdb21ceec19da22ac585c0ac3c61d70a4deeb26c5fd1f602ab45d49aaa6595ca4aa0dccd
+  data.tar.gz: 583747329e14ed0f7292c5f7e71e1e4bafe63ca83dd028786449fa582af0b68880e90287e1028b249eeef28f125f54d3b7ae0d6940048cc122901f57b52e2aa5

data/.github/workflows/ruby.yml

@@ -0,0 +1,33 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@ec106b438a1ff6ff109590de34ddc62c540232e0
+      with:
+        ruby-version: 2.5
+    - name: Install dependencies
+      run: bundle install
+    - name: Run tests
+      run: bundle exec rake

data/.rubocop.yml

@@ -2,7 +2,7 @@ AllCops:
   Exclude:
     - 'Vagrantfile'
     - 'vendor/**/*'
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
   NewCops: enable
 
 Metrics/AbcSize:

data/.travis.yml

@@ -1,6 +1,3 @@
-sudo: false
 language: ruby
-rvm:
-  - 2.3.3
+rvm: 2.4
 cache: bundler
-before_install: gem install bundler -v 1.15.4

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+# [1.3.4] - 2020-09-01
+
+## Fixes
+
+* Update to latest version of mediawiki-replaceable-content to include
+  upstream bug fix.
+
+# [1.3.3] - 2020-08-29
+
+## Enhancements
+
+* Include link to Wikidata Query Service showing the SPARQL used to
+  generate the list.
+
 # [1.3.2] - 2020-08-29
 
 ## Fixes

data/exe/update_wikidata_page

@@ -17,7 +17,7 @@ if ARGV.first.start_with?('http')
     page_title:     uri.path.gsub('/wiki/', ''), # with 2.5.1 we could use delete_prefix
   }
 else
-  options = URI.decode_www_form(ARGV.first).map { |k, v| [k.to_sym, v] }.to_h
+  options = URI.decode_www_form(ARGV.first).transform_keys(&:to_sym)
 end
 
 warn "Running with options: #{options.inspect}" if ENV.key?('DEBUG')

data/lib/sparql/item_query.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'erb'
+
 module WikidataPositionHistory
   module SPARQL
     # Turn raw SPARQL into result objects
@@ -12,6 +14,10 @@ module WikidataPositionHistory
         json.map { |result| klass.new(result) }
       end
 
+      def wdqs_url
+        "https://query.wikidata.org/##{ERB::Util.url_encode(sparql)}"
+      end
+
       private
 
       attr_reader :itemid

data/lib/wikidata_position_history/report.rb

@@ -85,7 +85,7 @@ module WikidataPositionHistory
     def wikitext
       return no_items_output if mandates.empty?
 
-      [table_header, table_rows, table_footer].compact.join("\n")
+      [table_header, table_rows, table_footer, wdqs_section].compact.join("\n")
     end
 
     def header
@@ -115,8 +115,12 @@ module WikidataPositionHistory
       [nil, mandates, nil].flatten(1)
     end
 
+    def sparql
+      @sparql ||= SPARQL::Mandates.new(subject_item_id)
+    end
+
     def mandates
-      @mandates ||= SPARQL::Mandates.new(subject_item_id).results_as(Mandate)
+      @mandates ||= sparql.results_as(Mandate)
     end
 
     def no_items_output
@@ -131,6 +135,18 @@ module WikidataPositionHistory
       "|}\n"
     end
 
+    def wdqs_section
+      wdqs_div % sparql.wdqs_url
+    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
+    end
+
     def table_rows
       padded_mandates.each_cons(3).map do |later, current, earlier|
         MandateReport.new(later, current, earlier).output

data/lib/wikidata_position_history/version.rb

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

data/wikidata_position_history.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'wikidata_position_history/version'
 
 Gem::Specification.new do |spec|
-  spec.required_ruby_version = '>= 2.4.0'
+  spec.required_ruby_version = '>= 2.5.0'
   spec.name                  = 'wikidata_position_history'
   spec.version               = WikidataPositionHistory::VERSION
   spec.authors               = ['Tony Bowden', 'Mark Longair']
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'mediawiki-page-replaceable_content', '0.1.3'
+  spec.add_runtime_dependency 'mediawiki-replaceable-content', '0.2.1'
   spec.add_runtime_dependency 'rest-client', '~> 2.0'
 
   spec.add_development_dependency 'bundler', '~> 2.1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wikidata_position_history
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Tony Bowden
@@ -9,22 +9,22 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-29 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: mediawiki-page-replaceable_content
+  name: mediawiki-replaceable-content
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -160,6 +160,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".reek.yml"
 - ".rubocop.yml"
@@ -196,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -204,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.14.1
+rubygems_version: 2.7.6.2
 signing_key:
 specification_version: 4
 summary: Generates a wikitext history of a holders of a position in Wikidata