relaton-bib 1.9.22 → 1.9.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d003dbfecade683b1474dfc3923c2210997574d956f3c96ef0b7b0f113100d66
-  data.tar.gz: 6829735611e2ad3807ecb8014b6dddc115f8a2b8799328a11a7b7a229174a49c
+  metadata.gz: 69ae43ef45d31008eb5fcfb3939335a6ecb7731a198c7fb944ff671a018180c2
+  data.tar.gz: 82154362500a3a1476efd7415ccc37e2a9f8a878b889b2562b51024f8d691884
 SHA512:
-  metadata.gz: fbb7e6611505b14b7b321893dd4c1941e91b0d52cd2de4ea4f6fe083e1e2378c6f8c34a6fe3c39bb9d028ee81e5548ba435a893483c6e42e16f01030dd230eaa
-  data.tar.gz: 01aef015aefc3a321442118ccafd9ae310e9fccab9f57bce7d4e3e2c8c0abf70b9b5d4a1ad3877866daabc2054f572fec72be93311e7d66446c77f119b4ce781
+  metadata.gz: d151df39d087c6dfd66d50eeede28c8b14c3d4551197122f955000611f958fe89b7caa36c05730b77f34e5729ed4838d3d1cb52f85f53169babf624c5ac56c38
+  data.tar.gz: 2f0a0f3bf334cd1204eaafe55d90ce4825f6eeed884730f44ae4956ecb43a6bca9356bb27af473b421fb4a4a4ab4ad565721c0ced92f0e7b5b40b5b4a0104a49

data/lib/relaton_bib/bibliographic_item.rb

@@ -330,15 +330,16 @@ module RelatonBib
     # Render BibXML (RFC)
     #
     # @param [Nokogiri::XML::Builder, nil] builder
+    # @param [Boolean] include_keywords (false)
     #
     # @return [String, Nokogiri::XML::Builder::NodeBuilder] XML
     #
-    def to_bibxml(builder = nil)
+    def to_bibxml(builder = nil, include_keywords: false)
       if builder
-        render_bibxml builder
+        render_bibxml builder, include_keywords
       else
         Nokogiri::XML::Builder.new(encoding: "UTF-8") do |xml|
-          render_bibxml xml
+          render_bibxml xml, include_keywords
         end.doc.root.to_xml
       end
     end
@@ -764,14 +765,15 @@ module RelatonBib
     # Render BibXML (RFC, BCP)
     #
     # @param [Nokogiri::XML::Builder] builder
+    # @param [Boolean] include_bibdata
     #
-    def render_bibxml(builder)
+    def render_bibxml(builder, include_keywords)
       target = link.detect { |l| l.type.casecmp("src").zero? } ||
         link.detect { |l| l.type.casecmp("doi").zero? }
       bxml = if docnumber&.match(/^BCP/) || docidentifier[0].id.include?("BCP")
-               render_bibxml_refgroup(builder)
+               render_bibxml_refgroup(builder, include_keywords)
              else
-               render_bibxml_ref(builder)
+               render_bibxml_ref(builder, include_keywords)
              end
       bxml[:target] = target.content.to_s if target
     end
@@ -780,11 +782,12 @@ module RelatonBib
     # Render BibXML (BCP)
     #
     # @param [Nokogiri::XML::Builder] builder
+    # @param [Boolean] include_keywords
     #
-    def render_bibxml_refgroup(builder)
+    def render_bibxml_refgroup(builder, include_keywords)
       builder.referencegroup(**ref_attrs) do |b|
         relation.each do |r|
-          r.bibitem.to_bibxml(b) if r.type == "includes"
+          r.bibitem.to_bibxml(b, include_keywords: include_keywords) if r.type == "includes"
         end
       end
     end
@@ -793,18 +796,19 @@ module RelatonBib
     # Render BibXML (RFC)
     #
     # @param [Nokogiri::XML::Builder] builder
+    # @param [Boolean] include_keywords
     #
-    def render_bibxml_ref(builder)
+    def render_bibxml_ref(builder, include_keywords)
       builder.reference(**ref_attrs) do |xml|
         xml.front do
           xml.title title[0].title.content if title.any?
-          render_seriesinfo xml
           render_authors xml
           render_date xml
           render_workgroup xml
-          render_keyword xml
+          render_keyword xml if include_keywords
           render_abstract xml
         end
+        render_seriesinfo xml
       end
     end
 
@@ -849,8 +853,11 @@ module RelatonBib
       elm[:year] = y if y
       m = dt.on(:month) || dt.from(:month) || dt.to(:month)
       elm[:month] = Date::MONTHNAMES[m] if m
+      # rfcs = %w[RFC BCP FYI STD]
+      # unless rfcs.include?(doctype) && docidentifier.detect { |di| rfcs.include? di.type }
       d = dt.on(:day) || dt.from(:day) || dt.to(:day)
       elm[:day] = d if d
+      # end
     end
 
     # @param [Nokogiri::XML::Builder] builder
@@ -942,10 +949,10 @@ module RelatonBib
     # @param [Nokogiri::XML::Builder] builder
     # @param [RelatonBib::Organization] org
     def render_organization(builder, org)
-      return unless org
+      # return unless org
 
-      ab = org.abbreviation&.content
-      on = org.name.first&.content
+      ab = org&.abbreviation&.content
+      on = org&.name&.first&.content
       orgname = if BibXMLParser::ORGNAMES.key?(ab) then ab
                 else BibXMLParser::ORGNAMES.key(on) || on || ab
                 end

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.9.22".freeze
+  VERSION = "1.9.23".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.9.22
+  version: 1.9.23
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-20 00:00:00.000000000 Z
+date: 2022-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug