relaton-bib 1.11.7 → 1.12.0

data/lib/relaton_bib/hash_converter.rb

@@ -6,11 +6,11 @@ module RelatonBib
       # @param args [Hash]
       # @param neated [TrueClas, FalseClass] default false
       # @return [Hash]
-      def hash_to_bib(args, nested = false)
+      def hash_to_bib(args)
         return nil unless args.is_a?(Hash)
 
         ret = Marshal.load(Marshal.dump(symbolize(args))) # deep copy
-        timestamp_hash(ret) unless nested
+        # timestamp_hash(ret) unless nested
         title_hash_to_bib(ret)
         link_hash_to_bib(ret)
         language_hash_to_bib(ret)
@@ -42,9 +42,9 @@ module RelatonBib
       end
       # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
-      def timestamp_hash(ret)
-        ret[:fetched] ||= Date.today.to_s
-      end
+      # def timestamp_hash(ret)
+      #   ret[:fetched] ||= Date.today.to_s
+      # end
 
       def extent_hash_to_bib(ret)
         return unless ret[:extent]
@@ -145,20 +145,17 @@ module RelatonBib
 
         ret[:docid] = array(ret[:docid])
         ret[:docid]&.each_with_index do |id, i|
-          type = id[:type] || id[:id].match(/^\w+(?=\s)/)&.to_s
-          ret[:docid][i] = DocumentIdentifier.new(
-            id: id[:id], type: type, scope: id[:scope], primary: id[:primary],
-          )
+          id[:type] ||= id[:id].match(/^\w+(?=\s)/)&.to_s
+          ret[:docid][i] = DocumentIdentifier.new(**id)
         end
       end
 
       def version_hash_to_bib(ret)
         return unless ret[:version]
 
-        ret[:version][:draft] = array(ret[:version][:draft])
-        ret[:version] && ret[:version] = BibliographicItem::Version.new(
-          ret[:version][:revision_date], ret[:version][:draft]
-        )
+        ret[:version] = array(ret[:version]).map do |v|
+          BibliographicItem::Version.new(v[:revision_date], v[:draft])
+        end
       end
 
       def biblionote_hash_to_bib(ret) # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
@@ -219,7 +216,7 @@ module RelatonBib
         end
       end
 
-      def org_hash_to_bib(org)
+      def org_hash_to_bib(org) # rubocop:disable Metrics/AbcSize
         return nil if org.nil?
 
         org[:identifier] = array(org[:identifier])&.map do |a|
@@ -321,7 +318,7 @@ module RelatonBib
       # @param rel [Hash] relation
       def relation_bibitem_hash_to_bib(rel)
         if rel[:bibitem]
-          rel[:bibitem] = bib_item hash_to_bib(rel[:bibitem], true)
+          rel[:bibitem] = bib_item hash_to_bib(rel[:bibitem])
         else
           warn "[relaton-bib] bibitem missing: #{rel}"
           rel[:bibitem] = nil
@@ -344,7 +341,8 @@ module RelatonBib
 
       def locality_locality_stack(lls)
         if lls[:locality_stack]
-          array(lls[:locality_stack]).map do |l|
+          array(lls[:locality_stack]).map do |lc|
+            l = lc[:locality] || lc
             Locality.new(l[:type], l[:reference_from], l[:reference_to])
           end
         else

data/lib/relaton_bib/series.rb

@@ -13,7 +13,7 @@ module RelatonBib
     # @return [RelatonBib::FormattedRef, nil]
     attr_reader :formattedref
 
-    # @return [RelatonBib::TypedTitleString, nil] title
+    # @return [RelatonBib::TypedTitleString] title
     attr_reader :title
 
     # @return [String, nil]
@@ -26,8 +26,7 @@ module RelatonBib
 
     # @param type [String, nil]
     # @param formattedref [RelatonBib::FormattedRef, nil]
-    # @param title [RelatonBib::TypedTitleString, nil] title or
-    #   formattedref argument should be passed
+    # @param title [RelatonBib::TypedTitleString] title
     # @param place [String, nil]
     # @param orgaization [String, nil]
     # @param abbreviation [RelatonBib::LocalizedString, nil]
@@ -37,9 +36,8 @@ module RelatonBib
     # @param partnumber [String, nil]
     # @param run [String, nil]
     def initialize(**args)
-      unless args[:title].is_a?(RelatonBib::TypedTitleString) ||
-          args[:formattedref]
-        raise ArgumentError, "argument `title` or `formattedref` should present"
+      unless args[:title].is_a?(RelatonBib::TypedTitleString)
+        raise ArgumentError, "argument `title` should present"
       end
 
       # if args[:type] && !TYPES.include?(args[:type])
@@ -65,19 +63,16 @@ module RelatonBib
     # @param builder [Nokogiri::XML::Builder]
     def to_xml(builder) # rubocop:disable Metrics/MethodLength
       xml = builder.series do
-        if formattedref
-          formattedref.to_xml builder
-        else
-          builder.title { title.to_xml builder }
-          builder.place place if place
-          builder.organization organization if organization
-          builder.abbreviation { abbreviation.to_xml builder } if abbreviation
-          builder.from from if from
-          builder.to to if to
-          builder.number number if number
-          builder.partnumber partnumber if partnumber
-          builder.run run if run
-        end
+        formattedref&.to_xml builder
+        builder.title { title.to_xml builder }
+        builder.place place if place
+        builder.organization organization if organization
+        builder.abbreviation { abbreviation.to_xml builder } if abbreviation
+        builder.from from if from
+        builder.to to if to
+        builder.number number if number
+        builder.partnumber partnumber if partnumber
+        builder.run run if run
       end
       xml[:type] = type if type
     end
@@ -89,7 +84,7 @@ module RelatonBib
       hash = {}
       hash["type"] = type if type
       hash["formattedref"] = formattedref.to_hash if formattedref
-      hash["title"] = title.to_hash if title
+      hash["title"] = title.to_hash
       hash["place"] = place if place
       hash["organization"] = organization if organization
       hash["abbreviation"] = abbreviation.to_hash if abbreviation
@@ -109,7 +104,7 @@ module RelatonBib
       out = count > 1 ? "#{pref}::\n" : ""
       out += "#{pref}.type:: #{type}\n" if type
       out += formattedref.to_asciibib pref if formattedref
-      out += title.to_asciibib pref if title
+      out += title.to_asciibib pref
       out += "#{pref}.place:: #{place}\n" if place
       out += "#{pref}.organization:: #{organization}\n" if organization
       out += abbreviation.to_asciibib "#{pref}.abbreviation" if abbreviation

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.11.7".freeze
+  VERSION = "1.12.0".freeze
 end

data/lib/relaton_bib/xml_parser.rb

@@ -33,7 +33,7 @@ module RelatonBib
           docnumber: bibitem.at("./docnumber")&.text,
           date: fetch_dates(bibitem),
           contributor: fetch_contributors(bibitem),
-          edition: bibitem.at("./edition")&.text,
+          edition: fetch_edition(bibitem),
           version: fetch_version(bibitem),
           biblionote: fetch_note(bibitem),
           language: fetch_language(bibitem),
@@ -62,12 +62,18 @@ module RelatonBib
       # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
       def fetch_version(item)
-        version = item.at "./version"
-        return unless version
+        item.xpath("./version").map do |v|
+          revision_date = v.at("revision-date")&.text
+          draft = v.at("draft")&.text
+          RelatonBib::BibliographicItem::Version.new revision_date, draft
+        end
+      end
+
+      def fetch_edition(item)
+        edt = item.at("./edition")
+        return unless edt
 
-        revision_date = version.at("revision-date")&.text
-        draft = version.xpath("draft").map &:text
-        RelatonBib::BibliographicItem::Version.new revision_date, draft
+        Edition.new content: edt.text, number: edt[:number]
       end
 
       def fetch_place(item)
@@ -189,10 +195,11 @@ module RelatonBib
       # @param item [Nokogiri::XML::Element]
       # @return [Array<RelatonBib::DocumentIdentifier>]
       def fetch_docid(item)
-        item.xpath("./docidentifier").map do |did|
-          primary = true if did[:primary] == "true"
-          DocumentIdentifier.new(id: did.text, type: did[:type],
-                                 scope: did[:scope], primary: primary)
+        item.xpath("./docidentifier").map do |id|
+          did = id.to_h.transform_keys(&:to_sym)
+          did[:id] = id.text
+          did[:primary] = id[:primary] == "true" ? true : nil
+          DocumentIdentifier.new(**did)
         end
       end
 

data/lib/relaton_bib.rb

@@ -36,6 +36,22 @@ module RelatonBib
         str ? $~[:date] : Date.strptime($~[:date], "%Y")
       end
     end
+
+    #
+    # Parse yaml content
+    #
+    # @param [String] yaml content
+    #
+    # @return [Hash] data
+    #
+    def parse_yaml(yaml, classes = [])
+      # Newer versions of Psych uses the `permitted_classes:` parameter
+      if YAML.method(:safe_load).parameters.map(&:last).include? :permitted_classes
+        YAML.safe_load(yaml, permitted_classes: classes)
+      else
+        YAML.safe_load(yaml, classes)
+      end
+    end
   end
 
   private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.11.7
+  version: 1.12.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-01 00:00:00.000000000 Z
+date: 2022-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -249,6 +249,7 @@ files:
 - lib/relaton_bib/document_relation.rb
 - lib/relaton_bib/document_relation_collection.rb
 - lib/relaton_bib/document_status.rb
+- lib/relaton_bib/edition.rb
 - lib/relaton_bib/editorial_group.rb
 - lib/relaton_bib/formatted_ref.rb
 - lib/relaton_bib/formatted_string.rb