iso-bib-item 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ae2b39dbf95400893806d73fb3f395b51d365bc4c8fe97c6f07794e0faa993b
-  data.tar.gz: 77d3006345ebec0522b6594b184893784ed448df28e0cb591ca0334c330b9351
+  metadata.gz: ca79f41d3ca54902184130b6a7412f2fa789f980b02e11fa971f53c09b2198d8
+  data.tar.gz: b7200cc75fe060f999f1bb45b75e88b2fdc9e8b7a53681d18809cecfc2006f96
 SHA512:
-  metadata.gz: e2c57e2c286f7bb66cdf797e66ad27620f8796a04e505d0105c59097d12df39c83f66bbeb21e97d3a5fd25310e63be860fe9d544dfb35b3edf21d7a878971176
-  data.tar.gz: 64458e12f087b7ec84d23bc5fe5363f75b8b6e070cfc2cff0c5a246a2c9920d254ec9eabc8066da5f3039c090f9040afef369bfe25da8a0d8be40c0cc916c488
+  metadata.gz: 4f77ce607e22d5ae4f3077b8197e6a44086ebeeeb490049be2781f52025e0bbcc2af87d05f9c11e32a372798633d85fc7d9ddcd80b481471f941296157983f89
+  data.tar.gz: 6ce0d5f2ec69c816ecb3df5bb658e01747ec000c7bc2c16280e0c42623510f45c55252330639e088dd4b28a1c93c89b283190ad3d31019cde22c1db83c3f26b4

data/Gemfile.lock

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

data/lib/iso_bib_item/bibliographic_date.rb

@@ -49,7 +49,7 @@ module IsoBibItem
     # @params date [String] 'yyyy' or 'yyyy-mm'
     def parse_date(date)
       return unless date
-      if date =~ /\d{4}/
+      if date =~ /^\d{4}$/
         Time.strptime date, '%Y'
       else
         Time.strptime date, '%Y-%m'

data/lib/iso_bib_item/contribution_info.rb

@@ -15,9 +15,9 @@ module IsoBibItem
     # @param type [String] allowed types "author", "editor",
     #   "cartographer", "publisher"
     # @param description [Array<String>]
-    def initialize(type, description = [])
-      @type = type
-      @description = description.map { |d| FormattedString.new d }
+    def initialize(*args)
+      @type = args.fetch 0
+      @description = args.fetch(1, []).map { |d| FormattedString.new content: d, type: nil }
     end
 
     def to_xml(builder)
@@ -44,7 +44,7 @@ module IsoBibItem
     # @param role [Array<String>]
     def initialize(entity:, role: ['publisher'])
       @entity = entity
-      @role   = role.map { |r| ContributorRole.new(r) }
+      @role   = role.map { |r| ContributorRole.new(*r) }
     end
 
     def to_xml(builder)

data/lib/iso_bib_item/document_relation_collection.rb

@@ -49,6 +49,13 @@ module IsoBibItem
       @reference_from = reference_from
       @reference_to   = reference_to
     end
+
+    def to_xml(builder)
+      builder.locality(type: type) do
+        builder.referenceFrom { reference_from.to_xml(builder) }
+        builder.referenceTo reference_to if reference_to
+      end
+    end
   end
 
   # Documett relation
@@ -79,11 +86,14 @@ module IsoBibItem
     # @param builder [Nokogiri::XML::Builder]
     def to_xml(builder)
       builder.relation(type: type) do
-        if @bibitem.nil? 
+        if @bibitem.nil?
           builder.bibitem do
             builder.formattedref identifier
             # builder.docidentifier identifier
           end
+          bib_locality.each do |l|
+            l.to_xml builder
+          end
         else
           @bibitem.to_xml(builder, {})
         end

data/lib/iso_bib_item/formatted_string.rb

@@ -14,13 +14,13 @@ module IsoBibItem
     # @param type [String] the format type, default "plain"
     #   available types "plain", "html", "dockbook", "tei", "asciidoc",
     #   "markdown", "isodoc"
-    def initialize(content:, language:, script:, type: 'plain')
+    def initialize(content:, language: nil, script: nil, type: 'plain')
       super(content, language, script)
       @type = type
     end
 
     def to_xml(builder)
-      builder.parent['format'] = type
+      builder.parent["format"] = type if type
       super
     end
   end

data/lib/iso_bib_item/iso_bibliographic_item.rb

@@ -121,7 +121,7 @@ module IsoBibItem
 
   # Bibliographic item.
   class IsoBibliographicItem < BibliographicItem
-    # @return [IsoBibItem::IsoDocumentId]
+    # @return [Array<IsoBibItem::IsoDocumentId>]
     attr_reader :docidentifier
 
     # @return [String]
@@ -241,7 +241,7 @@ module IsoBibItem
     def shortref(identifier, **opts)
       pubdate = dates.select { |d| d.type == "published" }
       year = if opts[:no_year] || pubdate.empty? then ""
-             else ':' + pubdate&.first&.on&.year&.to_s
+             else ":" + pubdate&.first&.on&.year&.to_s
              end
       year += ": All Parts" if opts[:all_parts] || @all_parts
 
@@ -268,11 +268,11 @@ module IsoBibItem
     private
 
     # @return [Array<IsoBibItem::ContributionInfo>]
-    def publishers
-      @contributors.select do |c|
-        c.role.select { |r| r.type == 'publisher' }.any?
-      end
-    end
+    # def publishers
+    #   @contributors.select do |c|
+    #     c.role.select { |r| r.type == 'publisher' }.any?
+    #   end
+    # end
 
     def makeid(id, attribute, delim = '')
       return nil if attribute && !@id_attribute
@@ -298,13 +298,7 @@ module IsoBibItem
         builder.fetched fetched
         title.each { |t| t.to_xml builder }
         link.each { |s| s.to_xml builder }
-        # docidentifier.to_xml builder
-        @docidentifier.each do |i|
-          attrs = {}
-          attrs[:type] = i.type if i.type
-          # builder.docidentifier shortref(i, opts.merge(no_year: true)), **attrs
-          builder.docidentifier i.id, **attrs
-        end
+        docidentifier.each { |i| i.to_xml builder }
         dates.each { |d| d.to_xml builder, opts }
         contributors.each do |c|
           builder.contributor do

data/lib/iso_bib_item/organization.rb

@@ -47,11 +47,11 @@ module IsoBibItem
     # @param abbreviation [String]
     # @param url [String]
     # @TODO identifier
-    def initialize(name:, abbreviation: nil, url: nil)
+    def initialize(name:, abbreviation: nil, url: nil, identifiers: [])
       super(url: url)
       @name = name.is_a?(Array) ? name.map { |n| hash2locstr(n) } : [hash2locstr(name)]
       @abbreviation = LocalizedString.new abbreviation
-      @identifiers  = []
+      @identifiers  = identifiers
     end
 
     # @param builder [Nokogiri::XML::Builder]

data/lib/iso_bib_item/person.rb

@@ -73,6 +73,10 @@ module IsoBibItem
       @type  = type
       @value = value
     end
+
+    def to_xml(builder)
+      builder.identifier value, type: type
+    end
   end
 
   # Person class.
@@ -88,11 +92,11 @@ module IsoBibItem
 
     # @param name [IsoBibItem::FullName]
     # @param affiliation [Array<IsoBibItem::Affiliation>]
-    def initialize(name:, affiliation: [], contacts:)
+    def initialize(name:, affiliation: [], contacts:, identifiers: [])
       super(contacts: contacts)
       @name        = name
-      @affiliation  = affiliation
-      @identifiers = []
+      @affiliation = affiliation
+      @identifiers = identifiers
     end
 
     # @param builder [Nokogiri::XML::Builder]
@@ -100,6 +104,7 @@ module IsoBibItem
       builder.person do
         name.to_xml builder
         affiliation.each { |a| a.to_xml builder }
+        identifiers.each { |id| id.to_xml builder }
         contacts.each { |contact| contact.to_xml builder }
       end
     end

data/lib/iso_bib_item/version.rb

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

data/lib/iso_bib_item/xml_parser.rb

@@ -49,8 +49,8 @@ module IsoBibItem
       end
 
       def fetch_titles(doc)
-        doc.xpath('/bibitem/title').map do |t|
-          titl = t.text.split ' -- '
+        doc.xpath("/bibitem/title").map do |t|
+          titl = t.text.sub("[ -- ]", "").split " -- "
           case titl.size
           when 0
             intro, main, part = nil, "", nil
@@ -95,49 +95,61 @@ module IsoBibItem
       end
 
       def get_org(org)
-        names = org.xpath('name').map do |n|
+        names = org.xpath("name").map do |n|
           { content: n.text, language: n[:language], script: n[:script] }
         end
+        identifiers = org.xpath("./identifier").map do |i|
+          IsoBibItem::OrgIdentifier.new(i[:type], i.text)
+        end
         IsoBibItem::Organization.new(name: names,
-                                     abbreviation: org.at('abbreviation')&.text,
-                                     url: org.at('uri')&.text)
+                                     abbreviation: org.at("abbreviation")&.text,
+                                     url: org.at("uri")&.text,
+                                     identifiers: identifiers)
       end
 
       def get_person(person)
-        name = person.at './name/completename'
-        affilations = person.xpath('./affiliation').map do |a|
-          org = a.at './organization'
+        name = person.at "./name/completename"
+        affilations = person.xpath("./affiliation").map do |a|
+          org = a.at "./organization"
           IsoBibItem::Affilation.new get_org(org)
         end
-        contacts = person.xpath('./contact').map do |c|
-          if (addr = c.at './address')
-            streets = addr.xpath('./street').map(&:text)
+
+        contacts = person.xpath("./address | ./phone | ./email | ./uri").map do |contact|
+          if contact.name == "address"
+            streets = contact.xpath("./street").map(&:text)
             IsoBibItem::Address.new(
               street: streets,
-              city: addr.at('./city').text,
-              state: addr.at('./state').text,
-              country: addr.at('./country').text,
-              postcode: addr.at('./postcode').text
+              city: contact.at("./city").text,
+              state: contact.at("./state").text,
+              country: contact.at("./country").text,
+              postcode: contact.at("./postcode").text,
             )
           else
-            contact = c.child
-            IsoBibItem::Contact.new(type: contact[:name], value: contact.text)
+            IsoBibItem::Contact.new(type: contact.name, value: contact.text)
           end
         end
+
+        identifiers = person.xpath("./identifier").map do |pi|
+          IsoBibItem::PersonIdentifier.new pi[:type], pi.text
+        end
+
         completename = IsoBibItem::LocalizedString.new(name.text, name[:language])
         IsoBibItem::Person.new(
           name: IsoBibItem::FullName.new(completename: completename),
           affiliation: affilations,
-          contacts: contacts
+          contacts: contacts,
+          identifiers: identifiers,
         )
       end
 
       def fetch_contributors(doc)
-        doc.xpath('/bibitem/contributor').map do |c|
-          entity = if (org = c.at './organization') then get_org(org)
-                   elsif (person = c.at './person') then get_person(person)
+        doc.xpath("/bibitem/contributor").map do |c|
+          entity = if (org = c.at "./organization") then get_org(org)
+                   elsif (person = c.at "./person") then get_person(person)
                    end
-          IsoBibItem::ContributionInfo.new entity: entity, role: [c.at('role')[:type]]
+          role_descr = c.xpath("./role/description").map &:text
+          IsoBibItem::ContributionInfo.new entity: entity,
+                                           role: [[c.at("role")[:type], role_descr]]
         end
       end
 
@@ -186,9 +198,20 @@ module IsoBibItem
       end
 
       def fetch_relations(doc)
-        doc.xpath('/bibitem/relation').map do |r|
-          DocumentRelation.new(type: r[:type],
-                               identifier: r&.at('./bibitem/formattedref | ./bibitem/docidentifier')&.text)
+        doc.xpath("/bibitem/relation").map do |r|
+          localities = r.xpath("./locality").map do |l|
+            ref_to = (rt = l.at("./referenceTo")) ? LocalizedString.new(rt.text) : nil
+            BibItemLocality.new(
+              l[:type],
+              LocalizedString.new(l.at("./referenceFrom").text),
+              ref_to
+            )
+          end
+          DocumentRelation.new(
+            type: r[:type],
+            identifier: r&.at("./bibitem/formattedref | ./bibitem/docidentifier")&.text,
+            bib_locality: localities,
+          )
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iso-bib-item
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-19 00:00:00.000000000 Z
+date: 2018-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler