relaton-ieee 1.10.2 → 1.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a35522930cd851601adc284248bf03db8ad66d9eaee8683ae2fbd2539340cc1f
-  data.tar.gz: ada9379a255bfcceaa3fb92c1a3d2f36a3ab45f98b785d4dc44be8488fc5c146
+  metadata.gz: 1800d96213b4f4cbf64e1bf47a8732ec74106abcb258d5fec1c1e6256020798d
+  data.tar.gz: cc66f85a0cab494810427d1e3f4b000917ce92bb1a3de36ecdb8b522deab5a7e
 SHA512:
-  metadata.gz: 64add1f8b7621229905e0ef258e7d3d39f96d3e343f5ea5cd3f136d7902bef2fbd89b6861c2f846568d323216f2459ab749d619645d272eb71f41fe391e973d1
-  data.tar.gz: 6465731a9e67433a501b851dbc75203841eb6661852ecb80001c18a59f38a192b9142056d85f8eaee9964e9e9852e2410dd76a0286f3888fd54f61bd69ced886
+  metadata.gz: 8d49794139d3fc000d8fa2ca1a6c546e7d8ee4a2d92a1362637853bb8ca8c018fe6a60fcf2fabf8892fa77a2b3845d4968dedcfd47692a44a9fb646f3fa3cac7
+  data.tar.gz: 27b007e4586be65492e9579ae9bbe18036211420a20b9469ebc7456d158e97b1252c9224ae6aa264ad349c115e7cf8bc7a805423d68b72e2bbea8a4ac2fd79e9

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/grammars/biblio.rng

@@ -677,6 +677,9 @@
     <zeroOrMore>
       <ref name="extent"/>
     </zeroOrMore>
+    <optional>
+      <ref name="bibliographic_size"/>
+    </optional>
     <zeroOrMore>
       <ref name="accesslocation"/>
     </zeroOrMore>
@@ -922,9 +925,29 @@
       <text/>
     </element>
   </define>
+  <define name="sizevalue">
+    <element name="value">
+      <attribute name="type"/>
+      <text/>
+    </element>
+  </define>
+  <define name="bibliographic_size">
+    <element name="size">
+      <oneOrMore>
+        <ref name="sizevalue"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="extent">
     <element name="extent">
-      <ref name="BibItemLocality"/>
+      <choice>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="localityStack"/>
+        </zeroOrMore>
+      </choice>
     </element>
   </define>
   <define name="series">

data/grammars/isodoc.rng

@@ -152,9 +152,7 @@
             <data type="boolean"/>
           </attribute>
         </optional>
-        <oneOrMore>
-          <ref name="PureTextElement"/>
-        </oneOrMore>
+        <ref name="XrefBody"/>
       </element>
     </define>
     <define name="erefType">
@@ -188,6 +186,42 @@
         <ref name="PureTextElement"/>
       </oneOrMore>
     </define>
+    <define name="localityStack">
+      <element name="localityStack">
+        <optional>
+          <attribute name="connective">
+            <choice>
+              <value>and</value>
+              <value>or</value>
+              <value>from</value>
+              <value>to</value>
+              <value/>
+            </choice>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="sourceLocalityStack">
+      <element name="sourceLocalityStack">
+        <optional>
+          <attribute name="connective">
+            <choice>
+              <value>and</value>
+              <value>or</value>
+              <value>from</value>
+              <value>to</value>
+              <value/>
+            </choice>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="sourceLocality"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="ul">
       <element name="ul">
         <attribute name="id">
@@ -1098,6 +1132,16 @@
     </define>
   </include>
   <!-- end overrides -->
+  <define name="image" combine="choice">
+    <element name="svg">
+      <oneOrMore>
+        <choice>
+          <text/>
+          <ref name="AnyElement"/>
+        </choice>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="MultilingualRenderingType">
     <choice>
       <value>common</value>
@@ -2631,4 +2675,30 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="XrefBody">
+    <zeroOrMore>
+      <ref name="XrefTarget"/>
+    </zeroOrMore>
+    <oneOrMore>
+      <ref name="PureTextElement"/>
+    </oneOrMore>
+  </define>
+  <define name="XrefTarget">
+    <element name="location">
+      <attribute name="target">
+        <data type="string">
+          <param name="pattern">\i\c*|\c+#\c+</param>
+        </data>
+      </attribute>
+      <attribute name="connective">
+        <choice>
+          <value>and</value>
+          <value>or</value>
+          <value>from</value>
+          <value>to</value>
+          <value/>
+        </choice>
+      </attribute>
+    </element>
+  </define>
 </grammar>

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/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.10.2".freeze
+  VERSION = "1.11.2".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 "relaton-bib", "~> 1.10.1"
+  spec.add_dependency "faraday", "~> 2.2"
+  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.10.2
+  version: 1.11.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-11 00:00:00.000000000 Z
+date: 2022-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: relaton-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   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:
   - - ">="