wikidata_position_history 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e79781ac90a9b99e18013cb11a56de58959f5d91aaef2cebe888f73f54205e2
-  data.tar.gz: c43cdea3f569a532eda7df1141e6a6017eb881a127571ca0ee289e67d80f0f1a
+  metadata.gz: 2d53ac2920ebe5b13817ab9aa31d32150cc24d7896362097bcbc18d17f93bebd
+  data.tar.gz: d7b98d022698cc33738b6f11f8aa3d5c2b8408f79b57fd459179fbac2ec3df08
 SHA512:
-  metadata.gz: 00b3260f1ebcaa8ad0037459e97460297ed9c2dfb3e373355d551c043b2ac58759bf1f38437977a65b623bfa45631b8f4521a8207638d3a3490d7e7db18191c4
-  data.tar.gz: 4a37942a4d5bcefd9694bed153d3e39692d8b78c96f3256cc9046e64d8ce5ba75a99ea25a599b901508ce42b1852deeb0b6ada2eb959a737d02be9142a31fd2e
+  metadata.gz: 8e2cbe1a3e7772a038d566a0ddacd27ededf3e2ffd36a9ebea7bf1fa98af411a8ded14ec994a300d5e2c8ef2f194c5f49a7a6b72f5838d87e350e12035390db9
+  data.tar.gz: 946c5ae13a66b4fde102cd6e6c18af9855b96da0840979211ba1b8c3f85b4dafd15dbb4b8978c220e1a3236937707df59c6faf3ab652bdaf4a8e1c891765eadc

data/.rubocop.yml

@@ -1,3 +1,7 @@
+require:
+  - rubocop-performance
+  - rubocop-rspec
+
 AllCops:
   Exclude:
     - 'Vagrantfile'
@@ -29,6 +33,13 @@ Lint/AssignmentInCondition:
 Naming/ClassAndModuleCamelCase:
   Enabled: false
 
+RSpec/DescribedClass:
+  Enabled: false
+
+# TODO: remove this?
+RSpec/MultipleExpectations:
+  Max: 2
+
 Style/CollectionMethods:
   Enabled: true
 
@@ -52,3 +63,6 @@ Style/TrailingCommaInHashLiteral:
 
 Style/TrailingCommaInArrayLiteral:
   EnforcedStyleForMultiline: no_comma
+
+Layout/ClassStructure:
+  Enabled: true

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+# [1.4.2] 2020-09-05
+
+## Fixes
+
+* Bring back the warnings when start or end dates are missing.
+
 # [1.4.1] 2020-09-04
 
 ## Fixes

data/Rakefile

@@ -8,7 +8,7 @@ require 'rubocop/rake_task'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'test'
   t.libs << 'lib'
-  t.test_files = FileList['test/**/*_test.rb']
+  t.test_files = FileList['test/**/*_{spec,test}.rb']
 end
 
 desc 'Run rubocop'

data/lib/sparql/mandates.rb

@@ -63,10 +63,14 @@ module WikidataPositionHistory
     end
 
     def start_date
+      return if start_date_raw.empty?
+
       QueryService::WikidataDate.new(start_date_raw, start_date_precision)
     end
 
     def end_date
+      return if end_date_raw.empty?
+
       QueryService::WikidataDate.new(end_date_raw, end_date_precision)
     end
 

data/lib/wikidata_position_history.rb

@@ -22,6 +22,19 @@ module WikidataPositionHistory
     WIKI_USERNAME = ENV['WIKI_USERNAME']
     WIKI_PASSWORD = ENV['WIKI_PASSWORD']
 
+    NO_ID_ERROR = <<~WIKITEXT
+      '''#{WIKI_TEMPLATE_NAME} Error''': You must pass the <code>id</code>
+      parameter to the <code>#{WIKI_TEMPLATE_NAME}</code> template; e.g.
+      <nowiki>{{#{WIKI_TEMPLATE_NAME}|id=Q14211}}</nowiki>
+    WIKITEXT
+
+    MALFORMED_ID_ERROR = <<~WIKITEXT
+      '''#{WIKI_TEMPLATE_NAME} Error''': The <code>id</code> parameter was
+      malformed; it should be Q followed by a number of digits, e.g. as in:
+
+      <nowiki>{{#{WIKI_TEMPLATE_NAME}|id=Q14211}}</nowiki>
+    WIKITEXT
+
     def initialize(mediawiki_site:, page_title:)
       @mediawiki_site = mediawiki_site
       @page_title = page_title.tr('_', ' ')
@@ -33,7 +46,7 @@ module WikidataPositionHistory
 
     def new_content
       return [NO_ID_ERROR, 'The id parameter was missing'] if position_id.empty?
-      return [MALFORMED_ID_ERROR, 'The id parameter was malformed'] unless position_id =~ /^Q\d+$/
+      return [MALFORMED_ID_ERROR, 'The id parameter was malformed'] unless position_id[/^Q\d+$/]
 
       [WikidataPositionHistory::Report.new(position_id).wikitext, "Successfully updated holders of #{position_id}"]
     end
@@ -42,19 +55,6 @@ module WikidataPositionHistory
 
     attr_reader :mediawiki_site, :page_title
 
-    NO_ID_ERROR = <<~EOERROR
-      '''#{WIKI_TEMPLATE_NAME} Error''': You must pass the <code>id</code>
-      parameter to the <code>#{WIKI_TEMPLATE_NAME}</code> template; e.g.
-      <nowiki>{{#{WIKI_TEMPLATE_NAME}|id=Q14211}}</nowiki>
-    EOERROR
-
-    MALFORMED_ID_ERROR = <<~EOERROR
-      '''#{WIKI_TEMPLATE_NAME} Error''': The <code>id</code> parameter was
-      malformed; it should be Q followed by a number of digits, e.g. as in:
-
-      <nowiki>{{#{WIKI_TEMPLATE_NAME}|id=Q14211}}</nowiki>
-    EOERROR
-
     def position_id
       return id_param unless id_param.empty?
 

data/lib/wikidata_position_history/checks.rb

@@ -124,9 +124,7 @@ module WikidataPositionHistory
       def problem?
         return false unless later
 
-        ends = current.end_date
-        return false if ends.empty?
-
+        ends = current.end_date or return false
         ends > later.start_date
       rescue ArgumentError
         true

data/lib/wikidata_position_history/report.rb

@@ -3,6 +3,8 @@
 module WikidataPositionHistory
   # Date for a single mandate row, to be passed to the report template
   class MandateData
+    CHECKS = [Check::MissingFields, Check::WrongPredecessor, Check::WrongSuccessor, Check::Overlap].freeze
+
     def initialize(later, current, earlier)
       @later = later
       @current = current
@@ -20,8 +22,7 @@ module WikidataPositionHistory
 
     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?
+      return '' if dates.compact.empty?
 
       dates.join(' – ')
     end
@@ -36,8 +37,6 @@ module WikidataPositionHistory
 
     private
 
-    CHECKS = [Check::MissingFields, Check::WrongPredecessor, Check::WrongSuccessor, Check::Overlap].freeze
-
     attr_reader :later, :current, :earlier
   end
 

data/lib/wikidata_position_history/version.rb

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

data/wikidata_position_history.gemspec

@@ -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-replaceable-content', '0.2.1'
+  spec.add_runtime_dependency 'mediawiki-replaceable-content', '0.2.2'
   spec.add_runtime_dependency 'rest-client', '~> 2.0'
 
   spec.add_development_dependency 'bundler', '~> 2.1'
@@ -33,6 +33,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'reek', '~> 6.0'
   spec.add_development_dependency 'rubocop', '~> 0.89'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.8.0'
+  spec.add_development_dependency 'rubocop-rspec', '~> 1.43.2'
   spec.add_development_dependency 'warning', '~> 1.1'
-  spec.add_development_dependency 'webmock', '~> 3.0.0'
+  spec.add_development_dependency 'webmock', '~> 3.8.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wikidata_position_history
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Tony Bowden
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-04 00:00:00.000000000 Z
+date: 2020-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mediawiki-replaceable-content
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +123,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.89'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.43.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.43.2
 - !ruby/object:Gem::Dependency
   name: warning
   requirement: !ruby/object:Gem::Requirement
@@ -143,14 +171,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.8.3
 description:
 email:
 - tony@tmtm.com