relaton-doi 1.14.3 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c74297f60135d99153e2e5f7f3c4a1acb3945b43fbcc26868bf900b2e9ec3c0
-  data.tar.gz: 6c241a6fc93c87a1751bde8772752c859ee9a000c04729ddc3910386c4827d66
+  metadata.gz: 36fbec3dfe6ed0635449ed79967ab8f78e8ea10569de97b144926de8ea64b330
+  data.tar.gz: 766e94778c9a4a5d4a5a949d3329409604a1d4fe87079f31c1ce71280049c33c
 SHA512:
-  metadata.gz: 74ef5db4deb7ff21ba09e5caa2e98c051549e81fa6d0ea1249787767d19d3cb10af911e1c51a11d6cf965fc856e2cdd7d6538b0eea19200bc43782f707550521
-  data.tar.gz: 7b13cd9e6f765f3f0e2fff5c703ae24c9b4c3b98c96a2138b46cb0a969ee64431390a5551696c2a5a2b00b1581b3910988ef3ee40da3a7ad6527174e1660bfc0
+  metadata.gz: 7921e6e71d1526bc2d26240616200ad832a0e228772336764a0ac9484de5427382141c89dc8718a30f12819696304746dc5ddfe060719a034a73fcf0d4f6c6a6
+  data.tar.gz: fdb1f361f3b6cd14bb07401fc3594de0222c4d1d76fcac1f216198075b4827d35d317af30d7f3d372896a163b8fb32335d96ec90931b1eb6cd4cd85c970d4206

data/.github/workflows/rake.yml

@@ -5,6 +5,7 @@ name: rake
 on:
   push:
     branches: [ master, main ]
+    tags: [ v* ]
   pull_request:
 
 jobs:

data/.github/workflows/release.yml

@@ -7,11 +7,13 @@ on:
     inputs:
       next_version:
         description: |
-          Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
+          Next release version. Possible values: x.y.z, major, minor, patch (or pre|rc|etc).
+          Also, you can pass 'skip' to skip 'git tag' and do 'gem push' for the current version
         required: true
         default: 'skip'
-  push:
-    tags: [ v* ]
+  repository_dispatch:
+    types: [ do-release ]
+
 
 jobs:
   release:

data/.gitignore

@@ -6,6 +6,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+/vendor/
 
 # rspec failure tracking
 .rspec_status

data/.rubocop.yml

@@ -7,6 +7,6 @@ require: rubocop-rails
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7
 Rails:
   Enabled: false

data/Gemfile

@@ -5,10 +5,13 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in relaton-doi.gemspec
 gemspec
 
+gem "debug"
+gem "equivalent-xml", "~> 0.6"
 gem "rake", "~> 13.0"
-
 gem "rspec", "~> 3.0"
-
 gem "rubocop", "~> 1.7"
-
-gem "debug"
+gem "rubocop-performance"
+gem "rubocop-rails"
+gem "simplecov"
+gem "vcr"
+gem "webmock"

data/lib/relaton_doi/parser.rb

@@ -376,10 +376,7 @@ module RelatonDoi
       has_editors = contribs.any? { |c| c.role&.any? { |r| r.type == "editor" } }
       return [] if has_authors && has_editors
 
-      item = fetch_parent
-      authors = create_authors_editors(has_authors, "author", item)
-      editors = create_authors_editors(has_editors, "editor", item)
-      authors + editors
+      create_authors_editors(has_authors, "author")
     end
 
     #
@@ -387,12 +384,14 @@ module RelatonDoi
     #
     # @return [Hash, nil] parent item
     #
-    def fetch_parent # rubocop:disable Metrics/AbcSize
-      query = [@src["container-title"][0], fetch_year].compact.join "+"
-      filter = "type:#{%w[book book-set edited-book monograph reference-book].join ',type:'}"
-      resp = Faraday.get "https://api.crossref.org/works?query=#{query}&filter=#{filter}"
-      json = JSON.parse resp.body
-      json["message"]["items"].detect { |i| i["title"].include? @src["container-title"][0] }
+    def parent_item # rubocop:disable Metrics/AbcSize
+      @parent_item ||= begin
+        query = [@src["container-title"][0], fetch_year].compact.join "+"
+        filter = "type:#{%w[book book-set edited-book monograph reference-book].join ',type:'}"
+        resp = Faraday.get "https://api.crossref.org/works?query=#{query}&filter=#{filter}"
+        json = JSON.parse resp.body
+        json["message"]["items"].detect { |i| i["title"].include? @src["container-title"][0] }
+      end
     end
 
     #
@@ -400,14 +399,13 @@ module RelatonDoi
     #
     # @param [Boolean] has true if authors or editors are present in the book part
     # @param [String] type "author" or "editor"
-    # @param [Hash, nil] item parent item
     #
     # @return [Array<RelatonBib::ContributionInfo>] authors or editors
     #
-    def create_authors_editors(has, type, item)
-      return [] if has || !item
+    def create_authors_editors(has, type)
+      return [] if has || !parent_item
 
-      RelatonBib.array(item[type]).map { |a| contributor(create_person(a), type) }
+      RelatonBib.array(parent_item[type]).map { |a| contributor(create_person(a), type) }
     end
 
     #
@@ -705,40 +703,12 @@ module RelatonDoi
       return [] unless @src["container-title"] && types.include?(@src["type"])
 
       @src["container-title"].map do |ct|
-        contrib = included_in_editors(ct)
+        contrib = create_authors_editors false, "editor"
         bib = RelatonBib::BibliographicItem.new(title: [content: ct], contributor: contrib)
         RelatonBib::DocumentRelation.new(type: "includedIn", bibitem: bib)
       end
     end
 
-    #
-    # Fetch included in editors.
-    #
-    # @param [String] title container-title
-    #
-    # @return [Array<RelatonBib::ContributionInfo>] The editors contribution info.
-    #
-    def included_in_editors(title)
-      item = fetch_included_in title
-      return [] unless item
-
-      item["editor"].map { |e| contributor(create_person(e), "editor") }
-    end
-
-    #
-    # Fetch included in relation.
-    #
-    # @param [String] title container-title
-    #
-    # @return [Hash] The included in relation item.
-    #
-    def fetch_included_in(title)
-      query = CGI.escape [title, @src["publisher"], @src["publisher-location"], fetch_year].join(", ")
-      resp = Faraday.get %{http://api.crossref.org/works?query.bibliographic="#{query}"&rows=10&filter=type:book}
-      json = JSON.parse resp.body
-      json["message"]["items"].detect { |i| i["title"].include?(title) && i["editor"] }
-    end
-
     #
     # Fetch year from the source hash.
     #

data/lib/relaton_doi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RelatonDoi
-  VERSION = "1.14.3"
+  VERSION = "1.16.0"
 end

data/relaton-doi.gemspec

@@ -8,13 +8,13 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Ribose Inc."]
   spec.email         = ["open.source@ribose.com"]
 
-  spec.summary       = "RelatonDOI: retrieve Standards for bibliographic "\
+  spec.summary       = "RelatonDOI: retrieve Standards for bibliographic " \
                        "using DOI through Crossrefand provide Relaton object."
-  spec.description   = "RelatonDOI: retrieve Standards for bibliographic "\
+  spec.description   = "RelatonDOI: retrieve Standards for bibliographic " \
                        "using DOI through Crossrefand provide Relaton object."
   spec.homepage      = "https://github.com/relaton/relaton-doi"
   spec.license       = "BSD-2-Clause"
-  spec.required_ruby_version = ">= 2.5.0"
+  spec.required_ruby_version = ">= 2.7.0"
 
   # spec.metadata["allowed_push_host"] = "TODO: Set to 'https://mygemserver.com'"
 
@@ -33,21 +33,14 @@ Gem::Specification.new do |spec|
 
   # Uncomment to register a new dependency of your gem
   # spec.add_dependency "example-gem", "~> 1.0"
-  spec.add_development_dependency "equivalent-xml", "~> 0.6"
-  # spec.add_development_dependency "ruby-jing"
-  spec.add_development_dependency "rubocop-performance"
-  spec.add_development_dependency "rubocop-rails"
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "vcr"
-  spec.add_development_dependency "webmock"
-
-  spec.add_dependency "relaton-bib", "~> 1.14.3"
-  spec.add_dependency "relaton-bipm", "~> 1.14.0"
-  spec.add_dependency "relaton-ieee", "~> 1.14.0"
-  spec.add_dependency "relaton-ietf", "~> 1.14.0"
-  spec.add_dependency "relaton-nist", "~> 1.14.0"
+
+  spec.add_dependency "relaton-bib", "~> 1.16.0"
+  spec.add_dependency "relaton-bipm", "~> 1.16.0"
+  spec.add_dependency "relaton-ieee", "~> 1.16.0"
+  spec.add_dependency "relaton-ietf", "~> 1.16.0"
+  spec.add_dependency "relaton-nist", "~> 1.16.0"
   # spec.add_dependency "relaton-w3c", "~> 1.10.0"
-  spec.add_dependency "serrano", "~> 1.0.0"
+  spec.add_dependency "serrano", "~> 1.4.0"
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html

metadata

@@ -1,183 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: relaton-doi
 version: !ruby/object:Gem::Version
-  version: 1.14.3
+  version: 1.16.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-17 00:00:00.000000000 Z
+date: 2023-09-03 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: equivalent-xml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: relaton-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.3
+        version: 1.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.3
+        version: 1.16.0
 - !ruby/object:Gem::Dependency
   name: relaton-bipm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.16.0
 - !ruby/object:Gem::Dependency
   name: relaton-ieee
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.16.0
 - !ruby/object:Gem::Dependency
   name: relaton-ietf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.16.0
 - !ruby/object:Gem::Dependency
   name: relaton-nist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.16.0
 - !ruby/object:Gem::Dependency
   name: serrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.4.0
 description: 'RelatonDOI: retrieve Standards for bibliographic using DOI through Crossrefand
   provide Relaton object.'
 email:
@@ -217,14 +133,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: 'RelatonDOI: retrieve Standards for bibliographic using DOI through Crossrefand