relaton-bib 1.3.1 → 1.5.0

data/lib/relaton_bib/place.rb

@@ -25,7 +25,7 @@ module RelatonBib
     # @return [Hash]
     def to_hash
       if uri || region
-        hash = { name: name }
+        hash = { "name" => name }
         hash["uri"] = uri if uri
         hash["region"] = region if region
         hash

data/lib/relaton_bib/typed_title_string.rb

@@ -1,4 +1,70 @@
 module RelatonBib
+  class TypedTitleStringCollection
+    extend Forwardable
+
+    def_delegators :@array, :[], :first, :last, :empty?, :any?, :size,
+                   :each, :detect, :map, :length
+
+    # @param title [Array<RelatonBib::TypedTitleString, Hash>]
+    def initialize(title = [])
+      @array = (title || []).map do |t|
+        t.is_a?(Hash) ? TypedTitleString.new(t) : t
+      end
+    end
+
+    # @param lang [String, nil] language code Iso639
+    # @return [RelatonIsoBib::TypedTitleStringCollection]
+    def lang(lang = nil)
+      if lang
+        TypedTitleStringCollection.new select_lang(lang)
+      else self
+      end
+    end
+
+    def delete_title_part!
+      titles.delete_if { |t| t.type == "title-part" }
+    end
+
+    # @return [RelatonBib::TypedTitleStringCollection]
+    def select
+      TypedTitleStringCollection.new(titles.select { |t| yield t })
+    end
+
+    # @param title [RelatonBib::TypedTitleString]
+    # @return [self]
+    def <<(title)
+      titles << title
+      self
+    end
+
+    # @param tcoll [RelatonBib::TypedTitleStringCollection]
+    # @return [RelatonBib::TypedTitleStringCollection]
+    def +(tcoll)
+      TypedTitleStringCollection.new titles + tcoll.titles
+    end
+
+    def titles
+      @array
+    end
+
+    # @param opts [Hash]
+    # @option opts [Nokogiri::XML::Builder] XML builder
+    # @option opts [String, Symbol] :lang language
+    def to_xml(**opts)
+      tl = select_lang(opts[:lang])
+      tl = titles unless tl.any?
+      tl.each { |t| opts[:builder].title { t.to_xml opts[:builder] } }
+    end
+
+    private
+
+    # @param lang [String]
+    # @return [Array<RelatonBib::TypedTitleString]
+    def select_lang(lang)
+      titles.select { |t| t.title.language&.include? lang }
+    end
+  end
+
   class TypedTitleString
     # @return [String]
     attr_reader :type
@@ -38,6 +104,7 @@ module RelatonBib
       end.compact
       tts << new(type: "main", content: ttls.compact.join(" - "),
                  language: lang, script: script)
+      TypedTitleStringCollection.new tts
     end
 
     # @param title [String]

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.3.1".freeze
+  VERSION = "1.5.0".freeze
 end

data/lib/relaton_bib/xml_parser.rb

@@ -20,7 +20,7 @@ module RelatonBib
       # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
 
       # @return [Hash]
-      def item_data(bibitem) # rubocop:disable Metrics/CyclomaticComplexity
+      def item_data(bibitem) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         ext = bibitem.at "//ext"
         {
           id: bibitem[:id]&.empty? ? nil : bibitem[:id],
@@ -75,7 +75,7 @@ module RelatonBib
       end
 
       def fetch_note(item)
-        item.xpath("./note").map do |n|
+        bnotes = item.xpath("./note").map do |n|
           BiblioNote.new(
             content: n.text,
             type: n[:type],
@@ -84,6 +84,7 @@ module RelatonBib
             script: n[:script]
           )
         end
+        BiblioNoteCollection.new bnotes
       end
 
       def fetch_language(item)
@@ -98,7 +99,7 @@ module RelatonBib
         end
       end
 
-      def fetch_series(item) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/MethodLength
+      def fetch_series(item) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/AbcSize,Metrics/MethodLength,Metrics/PerceivedComplexity
         item.xpath("./series").reduce([]) do |mem, sr|
           abbr = sr.at "abbreviation"
           abbreviation = abbr &&
@@ -164,10 +165,15 @@ module RelatonBib
         end
       end
 
+      # @param item [Nokogiri::XML::Element]
+      # @return [RelatonBib::TypedTitleStringCollection]
       def fetch_titles(item)
-        item.xpath("./title").map { |t| ttitle t }
+        ttl = item.xpath("./title").map { |t| ttitle t }
+        TypedTitleStringCollection.new ttl
       end
 
+      # @param title [Nokogiri::XML::Element]
+      # @return [RelatonBib::TypedTitleString]
       def ttitle(title)
         return unless title
 
@@ -202,7 +208,9 @@ module RelatonBib
                                   abbreviation: elm[:abbreviation])
       end
 
-      def fetch_dates(item) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+      # @param node [Nokogiri::XML::Elemen]
+      # @return [Array<RelatonBib::BibliographicDate>]
+      def fetch_dates(item) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
         item.xpath("./date").reduce([]) do |a, d|
           type = d[:type].to_s.empty? ? "published" : d[:type]
           if (on = d.at("on"))
@@ -222,14 +230,15 @@ module RelatonBib
         identifier = org.xpath("./identifier").map do |i|
           OrgIdentifier.new(i[:type], i.text)
         end
+        subdiv = org.xpath("subdivision").map &:text
         Organization.new(name: names,
                          abbreviation: org.at("abbreviation")&.text,
-                         subdivision: org.at("subdivision")&.text,
+                         subdivision: subdiv,
                          url: org.at("uri")&.text,
                          identifier: identifier)
       end
 
-      def get_person(person) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity
+      def get_person(person) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
         affiliations = person.xpath("./affiliation").map do |a|
           org = a.at "./organization"
           desc = a.xpath("./description").map do |e|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-27 00:00:00.000000000 Z
+date: 2020-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug