relaton-ieee 1.11.0 → 1.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26b97a44379b5aec10066301f3fb0c41c2fead4117a42d1142a24d6c6b524854
-  data.tar.gz: e35e4ddf09d1f8d70c12a191fd9435166dc33fd31bfb446816befed9ee617574
+  metadata.gz: 205eda20b73d53acb35dc384d63032fffb8766e35d0589d71b2b9a178f695e8b
+  data.tar.gz: 73f78d3e92cc774dccb04358cd69729ad55ddb8b4b000126a30ebe372de52233
 SHA512:
-  metadata.gz: 88017c27ee3d56b1bee97059f6524c9c3264fe6f0fc79208da003ad13ad57ee386bc7e15812a5a56615ea209d6cc144af6abc0142fb76aae03c9eff22e6cafa6
-  data.tar.gz: 2855561c0a523670ab89da09599144c287cdaea316030f565fa25d89fe65278d41642385322e5aad7573c1d64ec86ef7ae104c494f49126dd14a0a4427e098f3
+  metadata.gz: d18696607cb50fbac2a1ed2b9110c1e25832373dce9e8f50672aef215c8d62c4c7380dc76ed6b14c792364fb286d304c6a6c898cdfbb741614e7dbda301d17c1
+  data.tar.gz: 1c6550e0cb2f14cff7e5f160d4f1cd1bfafb5719d2878e79fca7a13f209c91d431d9f38b8a0d95b9928dd94716fd0d73d1a261949ca0c66fee716dd189748a46

data/.github/workflows/rake.yml

@@ -10,27 +10,4 @@ on:
 
 jobs:
   rake:
-    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '3.0', '2.7', '2.6', '2.5' ]
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
-        experimental: [ false ]
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: true
-
-      # https://github.com/ruby-debug/debase/issues/89#issuecomment-686827382
-      - if: matrix.os == 'macos-latest' && matrix.ruby == '2.5'
-        run: echo BUNDLE_BUILD__DEBASE="--with-cflags=\"-Wno-error=implicit-function-declaration\"" >> $GITHUB_ENV
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-
-      - run: bundle exec rake
+    uses: relaton/support/.github/workflows/rake.yml@master

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.6
 Rails:
   Enabled: false

data/lib/relaton_ieee/data_fetcher.rb

@@ -96,7 +96,7 @@ module RelatonIeee
         warn "Empty file: #{filename}"
         return
       end
-      stdid = doc.at("./publicationinfo/standard_id").text
+      stdid = doc.at("./publicationinfo/standard_id")&.text
       if stdid == "0"
         # nt = doc&.at("./normtitle")&.text
         # ntid = @normtitles.index nt
@@ -196,11 +196,12 @@ module RelatonIeee
     #
     # @return [RelatonBib::DocumentRelation]
     #
-    def create_relation(type, fref)
+    def create_relation(type, fref) # rubocop:disable Metrics/MethodLength
       return if RELATION_TYPES[type] == false
 
       fr = RelatonBib::FormattedRef.new(content: fref)
-      bib = IeeeBibliographicItem.new formattedref: fr
+      docid = RelatonBib::DocumentIdentifier.new(type: "IEEE", id: fref, primary: true)
+      bib = IeeeBibliographicItem.new formattedref: fr, docid: [docid]
       desc = RELATION_TYPES[type][:description]
       description = desc && RelatonBib::FormattedString.new(content: desc, language: "en", script: "Latn")
       RelatonBib::DocumentRelation.new(

data/lib/relaton_ieee/data_parser.rb

@@ -190,7 +190,7 @@ module RelatonIeee
     # @return [Array<RelatonBib::FormattedString>]
     #
     def parse_abstract
-      doc.xpath("./volume/article/articleinfo/abstract").map do |a|
+      doc.xpath("./volume/article/articleinfo/abstract")[0...1].map do |a|
         RelatonBib::FormattedString.new(
           content: a.text, language: "en", script: "Latn",
         )

data/lib/relaton_ieee/hit_collection.rb

@@ -20,13 +20,22 @@ module RelatonIeee
       query = reference.gsub("/", " ")
       resp = Faraday.post url, { action: "ieee_cloudsearch", q: query }
       json = JSON.parse resp.body
-      html = Nokogiri::HTML json["html"]
-      @array = html.xpath("//h4/a").reduce([]) do |s, hit|
-        ref = hit.text.strip
-        /^(?:\w+\s)?(?<code2>[A-Z\d.]+)(?:-(?<year>\d{4}))?/ =~ ref
+      # html = Nokogiri::HTML json["html"]
+      # @array = html.xpath("//h4/a").reduce([]) do |s, hit|
+      @array = json["results"]["hits"]["hit"].reduce([]) do |s, hit|
+        flds = hit["fields"]
+        # ref = hit.text.strip
+        # /^(?:\w+\s)?(?<code2>[A-Z\d.]+)(?:-(?<year>\d{4}))?/ =~ ref
+        /^(?:\w+\s)?(?<code2>[A-Z\d.]+)(?:-(?<year>\d{4}))?/ =~ flds["meta_designation_l"]
         next s unless code2 && code1 =~ %r{^#{code2}}
 
-        hit_data = { ref: ref, year: year.to_i, url: hit[:href] }
+        hit_data = {
+          ref: flds["meta_designation_l"],
+          # title: flds["meta_title_t"],
+          # abstract: flds["meta_description_l"],
+          year: year.to_i,
+          url: flds["doc_id_l"],
+        }
         s << Hit.new(hit_data, self)
       end.sort_by { |h| h.hit[:year].to_s + h.hit[:url] }.reverse
     end

data/lib/relaton_ieee/version.rb

@@ -1,3 +1,3 @@
 module RelatonIeee
-  VERSION = "1.11.0".freeze
+  VERSION = "1.11.3".freeze
 end

data/relaton_ieee.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
                        "use using the IeeeBibliographicItem model"
   spec.homepage      = "https://github.com/relaton/relaton-ieee"
   spec.license       = "BSD-2-Clause"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
 
   # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
 
@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "faraday", "~> 1.1"
+  spec.add_dependency "faraday", "~> 1.0"
   spec.add_dependency "relaton-bib", "~> 1.11.0"
   spec.add_dependency "rubyzip", "~> 2.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ieee
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.11.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-10 00:00:00.000000000 Z
+date: 2022-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: relaton-bib
   requirement: !ruby/object:Gem::Requirement
@@ -176,7 +176,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="