relaton-ieee 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b9712be210c320461271c9271cea901d24b5c5988beea4708ac074e42c02814
-  data.tar.gz: b4438ca4aa0097d8fafe1e87884ddda1fd44b92eb3ad3661064f7078974d414f
+  metadata.gz: 26b97a44379b5aec10066301f3fb0c41c2fead4117a42d1142a24d6c6b524854
+  data.tar.gz: e35e4ddf09d1f8d70c12a191fd9435166dc33fd31bfb446816befed9ee617574
 SHA512:
-  metadata.gz: fc3595268bd4b0f45c10041e2ff17feb2e1bd56b327f527f9602aef84a8082141433ed0b1048cb7cf104250da9dcc734ce04250437ea6b0104e3e862f64c4d67
-  data.tar.gz: f110efe4119d5721df536ef066c146dae9bc75ca6205af2171cdd310e8d5c9a336960fcde6f71e4391ca2ba300c2c53c403716d563c4848d6ae9c258152b250c
+  metadata.gz: 88017c27ee3d56b1bee97059f6524c9c3264fe6f0fc79208da003ad13ad57ee386bc7e15812a5a56615ea209d6cc144af6abc0142fb76aae03c9eff22e6cafa6
+  data.tar.gz: 2855561c0a523670ab89da09599144c287cdaea316030f565fa25d89fe65278d41642385322e5aad7573c1d64ec86ef7ae104c494f49126dd14a0a4427e098f3

data/grammars/biblio.rng

@@ -209,9 +209,6 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="uri"/>
-      </zeroOrMore>
     </element>
   </define>
   <define name="fullname">
@@ -680,6 +677,9 @@
     <zeroOrMore>
       <ref name="extent"/>
     </zeroOrMore>
+    <optional>
+      <ref name="bibliographic_size"/>
+    </optional>
     <zeroOrMore>
       <ref name="accesslocation"/>
     </zeroOrMore>
@@ -828,6 +828,11 @@
       <optional>
         <attribute name="scope"/>
       </optional>
+      <optional>
+        <attribute name="primary">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <text/>
     </element>
   </define>
@@ -920,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_parser.rb

@@ -114,7 +114,7 @@ module RelatonIeee
     # @return [Array<RelatonBib::DocumentIdentifier>]
     #
     def parse_docid
-      ids = [{ id: pubid.to_s, type: "IEEE" }]
+      ids = [{ id: pubid.to_s, type: "IEEE", primary: true }]
       isbn = doc.at("./publicationinfo/isbn")
       ids << { id: isbn.text, type: "ISBN" } if isbn
       doi = doc.at("./volume/article/articleinfo/articledoi")

data/lib/relaton_ieee/hit_collection.rb

@@ -21,10 +21,7 @@ module RelatonIeee
       resp = Faraday.post url, { action: "ieee_cloudsearch", q: query }
       json = JSON.parse resp.body
       html = Nokogiri::HTML json["html"]
-      # @array = json["results"]["hits"]["hit"].reduce([]) do |s, hit|
       @array = html.xpath("//h4/a").reduce([]) do |s, hit|
-        # fields = hit["fields"]
-        # ref = html.at("//h4/a[@href='#{fields['doc_id_l']}']").text.strip
         ref = hit.text.strip
         /^(?:\w+\s)?(?<code2>[A-Z\d.]+)(?:-(?<year>\d{4}))?/ =~ ref
         next s unless code2 && code1 =~ %r{^#{code2}}

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
@@ -38,7 +39,7 @@ module RelatonIeee
       # @param ref [String]
       # @return [Array<RelatonBib::DocumentIdentifier>]
       def fetch_docid(ref)
-        [RelatonBib::DocumentIdentifier.new(id: ref, type: "IEEE")]
+        [RelatonBib::DocumentIdentifier.new(id: ref, type: "IEEE", primary: true)]
       end
 
       # @param url [String]
@@ -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.0".freeze
+  VERSION = "1.11.0".freeze
 end

data/relaton_ieee.gemspec

@@ -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.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.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-30 00:00:00.000000000 Z
+date: 2022-04-10 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.0
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement