iso-bib-item 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fa989f9c13fbb68e055a71c3e69b85c1aaaa2659ab20065bd3b07ac24154e47
-  data.tar.gz: 953d20175ece7b483a185dbd48028f03f99dafd39fa0d7467e7feebe202c5aa6
+  metadata.gz: '005497c6ee099cac8fce79fcbf9af9c67860ba38ac5873f1b580cc71cb3c4ef5'
+  data.tar.gz: 1041b3b192fb759e031ea28bccca0f035733c4b4074f6098d21d2834ce652b24
 SHA512:
-  metadata.gz: ca6ac6fc0f254f5932c4c2a1704e628e7aeab626804def141c900d9d778b195683c261074ac2ecd3652fef5ea394f82f2476f8c2d866b6ddb6aa54cc807def9d
-  data.tar.gz: e984e55d216273d9b5db76e71135e33b02ea04e9cef07a5ac9651f0a326dc1646b0e6bcec4313f7bc59bd90deac41de5ea8053bda957266f4f93d8db6c65e47f
+  metadata.gz: 66a54aa8817aab27644a0f153ead6c69cfd84a422804aaa6ed5355ef5e41b0ff46b1664f43dd62302a5ce236174d966cab6a7f43030bbb5df5a373c64fe1e885
+  data.tar.gz: 9223a95713fc750f966de70aa33689f1e9721311c863bd4a9e4590cc5e16acedf48621d702fd851145ebff13d8556edea69b8e6572cc3867c5c73650c8031217

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    iso-bib-item (0.1.11)
+    iso-bib-item (0.2.1)
       isoics (~> 0.1.6)
       nokogiri (~> 1.8.4)
       ruby_deep_clone (~> 0.8.0)

data/lib/iso_bib_item/from_xml.rb

@@ -42,8 +42,8 @@ module IsoBibItem
         when 1
           intro, main, part = nil, titl[0], nil
         when 2
-          if /^(Part|Partie) \d+:/.match? titles[1]
-            intro, main, part = nil, titl[0], titles[1]
+          if /^(Part|Partie) \d+:/.match? titl[1]
+            intro, main, part = nil, titl[0], titl[1]
           else
             intro, main, part = titl[0], titl[1], nil
           end
@@ -92,16 +92,17 @@ module IsoBibItem
     # @TODO Organization doesn't recreated
     def fetch_workgroup(doc)
       eg = doc.at('/bibitem/editorialgroup')
-      tc = eg.at('technical_committee')
-      sc = eg.at('subcommittee')
-      scom = sc && iso_subgroup(cs)
-      wg   = eg.at('workgroup')
-      wgrp = wg && iso_subgroup(wg)
+      tc = eg&.at('technical_committee')
+      sc = eg&.at('subcommittee')
+      scom = iso_subgroup(sc)
+      wg   = eg&.at('workgroup')
+      wgrp = iso_subgroup(wg)
       IsoProjectGroup.new(technical_committee: iso_subgroup(tc),
                           subcommittee: scom, workgroup: wgrp)
     end
 
     def iso_subgroup(com)
+      return nil if com.nil?
       IsoSubgroup.new(name: com.text, type: com[:type],
                       number: com[:number].to_i)
     end
@@ -114,11 +115,11 @@ module IsoBibItem
     end
 
     def fetch_copyright(doc)
-      cp     = doc.at('/bibitem/copyright')
-      org    = cp.at('owner/organization')
-      name   = org.at('name').text
-      abbr   = org.at('abbreviation').text
-      url    = org.at('uri')&.text
+      cp     = doc.at('/bibitem/copyright') || return
+      org    = cp&.at('owner/organization')
+      name   = org&.at('name').text
+      abbr   = org&.at('abbreviation')&.text
+      url    = org&.at('uri')&.text
       entity = Organization.new(name: name, abbreviation: abbr, url: url)
       from   = cp.at('from').text
       to     = cp.at('to')&.text

data/lib/iso_bib_item/iso_bibliographic_item.rb

@@ -270,7 +270,7 @@ module IsoBibItem
         status.to_xml builder
         copyright&.to_xml builder
         relations.each { |r| r.to_xml builder }
-        workgroup.to_xml builder
+        workgroup&.to_xml builder
         if opts[:note]
           builder.note("ISO DATE: #{opts[:note]}", format: 'text/plain')
         end

data/lib/iso_bib_item/iso_project_group.rb

@@ -37,8 +37,9 @@ module IsoBibItem
 
     # @param builder [Nokogiri::XML::Builder]
     def to_xml(builder)
+      return unless technical_committee || subcommittee || workgroup || secretariat
       builder.editorialgroup do
-        builder.technical_committee { technical_committee.to_xml builder }
+        builder.technical_committee { technical_committee.to_xml builder } if technical_committee
         builder.subcommittee { subcommittee.to_xml builder } if subcommittee
         builder.workgroup { workgroup.to_xml builder } if workgroup
         builder.secretariat secretariat if secretariat

data/lib/iso_bib_item/localized_string.rb

@@ -30,6 +30,7 @@ module IsoBibItem
 
     # @param builder [Nokogiri::XML::Builder]
     def to_xml(builder)
+      return unless content
       builder.parent['language'] = language.join(',') if language.any?
       builder.parent['script']   = script.join(',') if script.any?
       builder.text content

data/lib/iso_bib_item/organization.rb

@@ -54,9 +54,7 @@ module IsoBibItem
     def to_xml(builder)
       builder.organization do
         builder.name { |b| name.to_xml b }
-        # unless abbreviati.content.nil? || abbreviation.content.empty?
-        builder.abbreviation { |a| abbreviation.to_xml a }
-        # end
+        builder.abbreviation { |a| abbreviation.to_xml a } if abbreviation&.to_s
         builder.uri uri.to_s if uri
         identifiers.each { |identifier| identifier.to_xml builder }
         super

data/lib/iso_bib_item/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: false
 
 module IsoBibItem
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iso-bib-item
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ribose Inc.