relaton-ietf 0.12.1 → 1.0.4

data/lib/relaton_ietf/scrapper.rb

@@ -192,7 +192,8 @@ module RelatonIetf
 
       # @return [Array<Hash{Symbol=>RelatonBib::Person,Symbol=>Array<String>}>]
       def persons(reference)
-        reference.xpath("./front/author").map do |author|
+        reference.xpath("./front/author[@surname]|./front/author[@fullname]").
+          map do |author|
           entity = RelatonBib::Person.new(
             name: full_name(author, reference),
             affiliation: [affiliation(author)],
@@ -204,29 +205,33 @@ module RelatonIetf
 
       # @return [Array<Hash{Symbol=>RelatonBib::Organization,Symbol=>Array<String>}>]
       def organizations(reference)
-        reference.xpath("./seriesinfo").map do |si|
-          next unless si[:stream]
+        publisher = { entity: new_org, role: [type: "publisher"] }
+        reference.xpath("./seriesinfo").reduce([publisher]) do |mem, si|
+          next mem unless si[:stream]
 
-          entity = RelatonBib::Organization.new name: si[:stream]
-          { entity: entity, role: [type: "author"] }
-        end.compact
+          mem << { entity: new_org(si[:stream]), role: [type: "author"] }
+        end
       end
 
       # @param author [Nokogiri::XML::Document]
       # @param ref [Nokogiri::XML::Document]
       # @return [RelatonBib::FullName]
       def full_name(author, ref)
+        lang = language ref
         RelatonBib::FullName.new(
-          completename: localized_string(author[:fullname], ref),
-          initial: [localized_string(author[:initials], ref)],
-          surname: [localized_string(author[:surname], ref)],
+          completename: localized_string(author[:fullname], lang),
+          initial: [localized_string(author[:initials], lang)].compact,
+          surname: localized_string(author[:surname], lang),
         )
       end
 
       # @param content [String]
+      # @param lang [String]
       # @return [RelatonBib::LocalizedString]
-      def localized_string(content, ref)
-        RelatonBib::LocalizedString.new(content, language(ref))
+      def localized_string(content, lang)
+        return unless content
+
+        RelatonBib::LocalizedString.new(content, lang)
       end
 
       # @param postal [Nokogiri::XML::Document]
@@ -267,13 +272,21 @@ module RelatonIetf
       # @return [RelatonBib::Affiliation]
       def affiliation(author)
         organization = author.at("./organization")
-        org = RelatonBib::Organization.new(
-          name: organization.nil? || organization.text.empty? ? "IETF" : organization.text,
-          abbreviation: organization.nil? ? "IETF" : (organization[:abbrev] || "IETF"),
-        )
+        org = if organization.nil? || organization&.text&.empty?
+                new_org
+              else
+                new_org organization.text, organization[:abbrev]
+              end
         RelatonBib::Affiliation.new organization: org
       end
 
+      # @param name [String]
+      # @param abbr [String]
+      # @return [RelatonBib::Organization]
+      def new_org(name = "Internet Engineering Task Force", abbr = "IETF")
+        RelatonBib::Organization.new name: name, abbreviation: abbr
+      end
+
       # @param author [Nokogiri::XML::Document]
       # @return [Hash]
       def contributor_role(author)
@@ -281,6 +294,7 @@ module RelatonIetf
       end
 
       def month(mon)
+        return 1 if !mon || mon.empty?
         return mon if /^\d+$/ =~ mon
 
         Date::MONTHNAMES.index(mon)
@@ -294,8 +308,8 @@ module RelatonIetf
       def dates(reference)
         return unless (date = reference.at "./front/date")
 
-        d = [date[:year], month(date[:month]) || "01",
-             (date[:day] || "01")].compact.join "-"
+        d = [date[:year], month(date[:month]),
+             (date[:day] || 1)].compact.join "-"
         date = Time.parse(d).strftime "%Y-%m-%d"
         [RelatonBib::BibliographicDate.new(type: "published", on: date)]
       end

data/lib/relaton_ietf/version.rb

@@ -1,3 +1,3 @@
 module RelatonIetf
-  VERSION = "0.12.1".freeze
+  VERSION = "1.0.4".freeze
 end

data/relaton_ietf.gemspec

@@ -40,5 +40,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "relaton-bib", "~> 0.9.0"
+  spec.add_dependency "relaton-bib", ">= 1.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ietf
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 1.0.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2020-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -154,16 +154,16 @@ dependencies:
   name: relaton-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.0.4
 description: "RelatonIetf: retrieve IETF Standards for bibliographic use \nusing the
   BibliographicItem model.\n\nFormerly known as rfcbib.\n"
 email: