relaton-ieee 1.10.1 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22f50c0f1e9e83d204ee448b8d107f47d6cf4d7679958c924a7bdd90f95926e0
-  data.tar.gz: a9d6a839d5d32583e16ad6e19e712165e920d6fda2d7f0fb62c80dee037e1aa7
+  metadata.gz: 844ccdbd633679401dc6ba625b42a18560574ef009341814c7fb2508903e5e5c
+  data.tar.gz: 2f49faa1f4a7e2b41f169a7385fd59e930112f2716bc8e7dc750cce42a21f003
 SHA512:
-  metadata.gz: 2673c4dc352e3a3bdd1ee47aa5898d1eedb0eb3b363622f029caf4a34482c1fe681281f57481652a03b07af5b9daa611e25c4ee180f8bd43db6ea4eee14bdf8a
-  data.tar.gz: 62e9c7bf873f1f7942ca1acd0cbe2cb83a8c1928f1881269045d154b820f44cc19c03830afc30fd10bc6987c30944414c496bc0b9258602add729c74c0d8fdeb
+  metadata.gz: e6fab839b40e4941fc38167e2e282b2d446489a4c30a359c988aa18407cc1dd2f508b3bb8ae8bf05dbc4c7c8975de1cd047e9ae9f56e836bdd7759deea9e2244
+  data.tar.gz: 0656d69a5562a394252c6a2b504642b6c046b850243760195ab6ab5f81a5c996cfc344b222b867d398287e0cf6b8e15967b0bd53c81efcbfab68f451e5fa64f0

data/.github/workflows/rake.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '3.0', '2.7', '2.6', '2.5' ]
+        ruby: [ '3.0', '2.7', '2.6' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ false ]
     steps:
@@ -24,10 +24,6 @@ jobs:
         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 }}

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/scrapper.rb

@@ -19,6 +19,7 @@ module RelatonIeee
           script: ["Latn"],
           date: fetch_date(doc),
           committee: fetch_committee(doc),
+          place: ["Piscataway, NJ, USA"],
         )
       end
       # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
@@ -75,10 +76,19 @@ module RelatonIeee
 
       # @param doc [Nokogiri::HTML::Document]
       # @return [Array<RelatonBib::ContributionInfo>]
-      def fetch_contributor(doc)
+      def fetch_contributor(doc) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+        address = RelatonBib::Address.new(
+          street: ["445 Hoes Lane"], postcode: "08854-4141", city: "Piscataway",
+          state: "NJ", country: "USA"
+        )
+        org = RelatonBib::Organization.new(
+          name: "Institute of Electrical and Electronics Engineers",
+          abbreviation: "IEEE", contact: [address]
+        )
+        contrib = RelatonBib::ContributionInfo.new(entity: org, role: [type: "publisher"])
         doc.xpath("//dd[@id='stnd-staff-liaison']/text()").map do |name|
           person_contrib(name.text.strip)
-        end
+        end << contrib
       end
 
       # @param name [String]

data/lib/relaton_ieee/version.rb

@@ -1,3 +1,3 @@
 module RelatonIeee
-  VERSION = "1.10.1".freeze
+  VERSION = "1.11.1".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'"
 
@@ -38,6 +38,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock"
 
   spec.add_dependency "faraday", "~> 1.1"
-  spec.add_dependency "relaton-bib", "~> 1.10.1"
+  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.1
+  version: 1.11.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-08 00:00:00.000000000 Z
+date: 2022-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -100,14 +100,14 @@ dependencies:
     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:
   - - ">="