diff --git a/README.adoc b/README.adoc index d5c9baf..160b342 100644 --- a/README.adoc +++ b/README.adoc @@ -68,7 +68,7 @@ item = hit_collection[0].fetch [source,ruby] ---- item.to_xml -=> " +=> " 2023-07-18 XMPP Extension Protocols ... @@ -78,7 +78,7 @@ With argument `bibdata: true` it outputs XML wrapped by `bibdata` element and ad [source,ruby] ---- item.to_xml bibdata: true -=> " +=> " 2023-07-18 XMPP Extension Protocols ... diff --git a/lib/relaton_xsf/hash_converter.rb b/lib/relaton_xsf/hash_converter.rb index b28c719..5dfb0d0 100644 --- a/lib/relaton_xsf/hash_converter.rb +++ b/lib/relaton_xsf/hash_converter.rb @@ -1,11 +1,11 @@ module RelatonXsf - class HashConverter < RelatonBib::HashConverter - class << self - # @param item_hash [Hash] - # @return [RelatonBib::BibliographicItem] - def bib_item(item_hash) - BibliographicItem.new(**item_hash) - end + module HashConverter + include RelatonBib::HashConverter + extend self + # @param item_hash [Hash] + # @return [RelatonBib::BibliographicItem] + def bib_item(item_hash) + BibliographicItem.new(**item_hash) end end end diff --git a/lib/relaton_xsf/version.rb b/lib/relaton_xsf/version.rb index c82c029..fe5ad88 100644 --- a/lib/relaton_xsf/version.rb +++ b/lib/relaton_xsf/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module RelatonXsf - VERSION = "1.16.2" + VERSION = "1.17.0" end diff --git a/relaton_xsf.gemspec b/relaton_xsf.gemspec index f78cce0..a2e044d 100644 --- a/relaton_xsf.gemspec +++ b/relaton_xsf.gemspec @@ -37,7 +37,7 @@ Gem::Specification.new do |spec| # spec.add_dependency "example-gem", "~> 1.0" spec.add_dependency "mechanize", "~> 2.8.0" - spec.add_dependency "relaton-bib", "~> 1.16.0" + spec.add_dependency "relaton-bib", "~> 1.17.0" spec.add_dependency "relaton-index", "~> 0.2.0" # For more information and examples about making a new gem, check out our diff --git a/spec/fixtures/bibdata.xml b/spec/fixtures/bibdata.xml index abc8315..03988be 100644 --- a/spec/fixtures/bibdata.xml +++ b/spec/fixtures/bibdata.xml @@ -1,5 +1,5 @@ - - 2023-07-18 + + 2023-11-08 XMPP Extension Protocols http://xmpp.org/extensions/xep-0001.html XEP 0001 @@ -14,7 +14,7 @@ Peter Saint-Andre - xsf@stpeter.im + stpeter@stpeter.im diff --git a/spec/vcr_cassettes/get_successful.yml b/spec/vcr_cassettes/get_successful.yml index 3a06e57..05536fa 100644 --- a/spec/vcr_cassettes/get_successful.yml +++ b/spec/vcr_cassettes/get_successful.yml @@ -29,7 +29,7 @@ http_interactions: Content-Type: - application/zip Etag: - - W/"6792177417958d3e6dfe62260c8bf3d7338d3cdc8375fab4222865db7259eea2" + - W/"5beece639c4387e36f56895c602a74e5859c59ce8bc23005839abe468cfb64bb" Strict-Transport-Security: - max-age=31536000 X-Content-Type-Options: @@ -39,21 +39,21 @@ http_interactions: X-Xss-Protection: - 1; mode=block X-Github-Request-Id: - - 1A24:6079:23771:2B760:65303A89 + - 244C:876E:214A19:27FE40:655F9424 Accept-Ranges: - bytes Date: - - Wed, 18 Oct 2023 20:05:29 GMT + - Thu, 23 Nov 2023 18:04:21 GMT Via: - 1.1 varnish X-Served-By: - - cache-atl18450-ATL + - cache-pdk-kpdk1780146-PDK X-Cache: - MISS X-Cache-Hits: - '0' X-Timer: - - S1697659530.537318,VS0,VE94 + - S1700762662.607814,VS0,VE93 Vary: - Authorization,Accept-Encoding,Origin Access-Control-Allow-Origin: @@ -61,16 +61,16 @@ http_interactions: Cross-Origin-Resource-Policy: - cross-origin X-Fastly-Request-Id: - - 3de5960e5a95d1c84d21d21cd4199e5f35736866 + - 19f0a4bbf413e3981368d007016433a412566ffb Expires: - - Wed, 18 Oct 2023 20:10:29 GMT + - Thu, 23 Nov 2023 18:09:21 GMT Source-Age: - '0' body: encoding: UTF-8 base64_string: | - UEsDBBQAAAAIADByUlft+42C+ggAADhTAAANABwAaW5kZXgtdjEueWFtbFVU - CQAD++gvZfvoL2V1eAsAAQTpAwAABH8AAABt2LsKLgYVhNE+T3Fe4OiZmf3f + UEsDBBQAAAAIADZyd1ft+42C+ggAADhTAAANABwAaW5kZXgtdjEueWFtbFVU + CQADCF9fZQhfX2V1eAsAAQTpAwAABH8AAABt2LsKLgYVhNE+T3Fe4OiZmf3f 0gmmFMTKNpAIgoKIhb69Bjtdu9xM93Xr69ev33398v2ff/r+yx9/+P2Xb9++ 5bsvX77/05//8vP3X3768R8//vqfP//t6y/vX/3rx7/+5X+29bbazttpe96e tg9vH9o+vX1q+/L2pe3b27e2H28/2OYbt/mmrbtF3eJuUbe4W9Qt7hZ1i7tF @@ -121,10 +121,10 @@ http_interactions: S85ecvKSs5ecvOTsJScvOXvJyUvOXnLykrOXnLzk7CUnLzl7yclLzl5y8pKz l5y85OwlJy85e8nJS85ecvKSs5ecvOTsJScvOXvJyUvOXnLykrOXnLzk7CUn Lzl7yclLzl5y8pKzl5y85OwlJy85e8nJS85ecvKSs5ecvOTsJScvOXvJwUv+ - 8MNvfvu7H7D++88//vTXn/9v/8//HNa/vP+7/TdQSwECHgMUAAAACAAwclJX + 8MNvfvu7H7D++88//vTXn/9v/8//HNa/vP+7/TdQSwECHgMUAAAACAA2cndX 7fuNgvoIAAA4UwAADQAYAAAAAAABAAAApIEAAAAAaW5kZXgtdjEueWFtbFVU - BQAD++gvZXV4CwABBOkDAAAEfwAAAFBLBQYAAAAAAQABAFMAAABBCQAAAAA= - recorded_at: Wed, 18 Oct 2023 20:05:29 GMT + BQADCF9fZXV4CwABBOkDAAAEfwAAAFBLBQYAAAAAAQABAFMAAABBCQAAAAA= + recorded_at: Thu, 23 Nov 2023 18:04:21 GMT - request: method: get uri: https://raw.githubusercontent.com/relaton/relaton-data-xsf/main/data/xep-0001.yaml @@ -137,13 +137,11 @@ http_interactions: Accept: - "*/*" User-Agent: - - Mechanize/2.8.5 Ruby/3.2.0p0 (http://github.com/sparklemotion/mechanize/) + - Mechanize/2.9.1 Ruby/3.2.0p0 (http://github.com/sparklemotion/mechanize/) Accept-Charset: - ISO-8859-1,utf-8;q=0.7,*;q=0.7 Accept-Language: - en-us,en;q=0.5 - Host: - - raw.githubusercontent.com Connection: - keep-alive Keep-Alive: @@ -156,7 +154,7 @@ http_interactions: Connection: - keep-alive Content-Length: - - '537' + - '539' Cache-Control: - max-age=300 Content-Security-Policy: @@ -164,7 +162,7 @@ http_interactions: Content-Type: - text/plain; charset=utf-8 Etag: - - W/"27dc683d3d8c9a20244f27b316a437710673a1c4b7dc849caee7c7b4d8ed978e" + - W/"cbb1aee688c63859d3b30541cfcbe9f40676dcea8a7a8012f4fb504f2108a787" Strict-Transport-Security: - max-age=31536000 X-Content-Type-Options: @@ -174,23 +172,23 @@ http_interactions: X-Xss-Protection: - 1; mode=block X-Github-Request-Id: - - C3A4:2A70:261D6:2E175:65303A89 + - C53E:07C8:1CBEFD:237238:655F9424 Content-Encoding: - gzip Accept-Ranges: - bytes Date: - - Wed, 18 Oct 2023 20:05:29 GMT + - Thu, 23 Nov 2023 18:04:21 GMT Via: - 1.1 varnish X-Served-By: - - cache-atl18460-ATL + - cache-pdk-kpdk1780115-PDK X-Cache: - MISS X-Cache-Hits: - '0' X-Timer: - - S1697659530.721464,VS0,VE86 + - S1700762662.808874,VS0,VE109 Vary: - Authorization,Accept-Encoding,Origin Access-Control-Allow-Origin: @@ -198,25 +196,25 @@ http_interactions: Cross-Origin-Resource-Policy: - cross-origin X-Fastly-Request-Id: - - fedd41aa2bd80a8609e052d4951633f16aa13045 + - 66d8de5f0a8549b22837ad4e9324aeeae87a2695 Expires: - - Wed, 18 Oct 2023 20:10:29 GMT + - Thu, 23 Nov 2023 18:09:21 GMT Source-Age: - '0' body: encoding: UTF-8 base64_string: | - H4sIAAAAAAAAA81VuY7bMBDt9RXsXEk+sEWgykG8qbKA4G22C2hq1mKWF4Yj - wfv3GUqyLQc2AgNGEDUi53hzPGImz/MsqgaszDvAqL0rRbcsVsVTputSvD1X - i8VimZEmA2WWC+UdgSPWvFSVeD7wJTmJCj155U3MhDDS7Vu5Z3shcgGOf1Gh - DjQIfkhKonePVjIQwYHmwUjtMqPdx0WQhiiU8/nBhlB43M/hGC/ODxDylFrR - kDUMR58BShFRZeOJpKsl1lntFVfCqGM9oi/o6MACPgfUVuInJ4MtnE3zK6ZR - +XSRTjUeE7hr7Q5wYl9L6ls1eIV2Z3RsoGbfTpqWRbPVYrXMF1/y1dMsS7Wi - 3rXkMTkFJoE5YGMhnLQwnITY6w7c8dI3D6bq1Ndp28/Svv3HTztNWppSVFMk - poGg/jkq49T/xERVTKR/iRRbvMzthPLKLFP+1dUI2W2wCZTyNhgguIFXsQrv - RU3eUtGgYamVmjtyiO/rSCEBFtqyDr0ZX/BApGwpMf7PKNrcS9HmIRR9Q12z - c/0Qfjayg7sQr3NTM8y6AWN8YBxfcNT/gKDtvQRtH0LQC+hfgA+hZytNaO4A - vM4OJhS71h+Fa2/TgtD1g/Fy+p2D9UGOa2JcEhFQQzzPUpuWBI/jYRldlPL2 - +n0c0H9WcMr+vIMmW+jqHuJnMw71WZroszTmhwzwXWW/ATKUo88zBwAA - recorded_at: Wed, 18 Oct 2023 20:05:29 GMT + H4sIAAAAAAAAA81VS4vbMBC+61folpOcBy0Un1Ka7akLJnvZW1Hk2VhdvRjJ + JvvvO7KdxCkJNBBofbE0j280+sR8QggWVQNWig4wau9K3i2LVfGZ6brkr0/V + YrFYsqSTgZIJrrxL4BJ5nquKPx1ok5N4hT555U1knBvp9q3cUzzngoOjX1So + QxoMP2TKpjePVhJQgkOaByO1Y0a794siTUqhnM8PNoTC434Ox3pxfoAg8tGK + JllDcOkjQMkjKjauknS1xJrVXlEnhDr2w/uGjglkoHVAbSV+0GGwhXOouBIa + lc8b6VTjMYO71u4AJ/G1TP1VDVmh3RkdG6gpt5OmJdNstVgtxeKLWH2asdwr + 6l2bPOakQCQQBxTMuZMWhhXne92BO276y4OpO9/r6dZOtksqzpE9JcdPO520 + NCWvpuhETYL65+iM0/xTnar4+0qxxcvznlBeiPkkvroagd0Gm0Apb4OBBDfw + KnLhvag5W6o0eMhqpTb5DYUMth7/hbbkR2/Glz0QLNuUX8I/pW5zL3Wbh1D3 + DXVNyfVDeNvIDu5CvM5ZTTDrBozxgXB8QVX/U9K295K2fQhpz6B/AT6Esq00 + obkD8DpjmFHsWr8Xrr1NFULXD9bL6Xku1hc5yswoMhFQQzzPYptFhsb5IGYX + rby+fB8H/J8dnE5/1rCJil3VMXpKoyjMsiLMskwMJ8A3xX4DtfMnX3MHAAA= + recorded_at: Thu, 23 Nov 2023 18:04:21 GMT recorded_with: VCR 6.2.0