relaton-iso-bib 0.9.2 → 1.2.0

data/lib/relaton_iso_bib/hash_converter.rb

@@ -1,75 +1,8 @@
 module RelatonIsoBib
   class HashConverter < RelatonBib::HashConverter
     class << self
-      # @override RelatonBib::HashConverter.hash_to_bib
-      # @param args [Hash]
-      # @param nested [TrueClass, FalseClass]
-      # @return [Hash]
-      def hash_to_bib(args, nested = false)
-        ret = super
-        return if ret.nil?
-
-        editorialgroup_hash_to_bib(ret)
-        ics_hash_to_bib(ret)
-        structuredidentifier_hash_to_bib(ret)
-        ret
-      end
-
-      def split_title(content, lang = "en", script = "Latn")
-        titles = content&.split(/ (?:--|—|–) /)
-        case titles&.size
-        when nil, 0
-          intro, main, part = nil, "", nil
-        when 1
-          intro, main, part = nil, titles[0], nil
-        when 2
-          if /^(Part|Partie) \d+:/ =~ titles[1]
-            intro, main, part = nil, titles[0], titles[1]
-          else
-            intro, main, part = titles[0], titles[1], nil
-          end
-        when 3
-          intro, main, part = titles[0], titles[1], titles[2]
-        else
-          intro, main, part = titles[0], titles[1], titles[2..-1]&.join(" -- ")
-        end
-        {
-          title_intro: intro,
-          title_main: main,
-          title_part: part,
-          language: lang,
-          script: script,
-        }
-      end
-
       private
 
-      #
-      # Ovverides superclass's method
-      #
-      # @param ret [Hash]
-      def title_hash_to_bib(ret)
-        return unless ret[:title]
-
-        ret[:title] = array(ret[:title])
-        ret[:title] = ret[:title].reduce([]) do |a, t|
-          if t.is_a?(String)
-            a << split_title(t)
-          elsif t.is_a?(Hash) && t[:type]
-            idx = a.index { |i| i[:language] == t[:language] }
-            title_key = t[:type].sub("-", "_").to_sym
-            if idx
-              a[idx][title_key] = t[:content]
-              a
-            else
-              a << { title_key => t[:content], language: t[:language], script: t[:script] }
-            end
-          elsif t.is_a?(Hash) && t[:content]
-            a << split_title(t[:content], t[:language], t[:script])
-          end
-        end
-      end
-
       #
       # Ovverides superclass's method
       #
@@ -83,9 +16,9 @@ module RelatonIsoBib
       # Ovverides superclass's method
       #
       # @param title [Hash]
-      # @return [RelatonIsoBib::TypedTitleString]
+      # @return [RelatonBib::TypedTitleString]
       def typed_title_strig(title)
-        TypedTitleString.new title
+        RelatonBib::TypedTitleString.new title
       end
 
       # @param ret [Hash]

data/lib/relaton_iso_bib/iso_bibliographic_item.rb

@@ -3,7 +3,7 @@
 require "nokogiri"
 require "isoics"
 require "relaton_bib"
-require "relaton_iso_bib/typed_title_string"
+# require "relaton_iso_bib/typed_title_string"
 require "relaton_iso_bib/editorial_group"
 require "relaton_iso_bib/xml_parser"
 require "relaton_iso_bib/structured_identifier"
@@ -23,19 +23,19 @@ module RelatonIsoBib
   # Bibliographic item.
   class IsoBibliographicItem < RelatonBib::BibliographicItem
     TYPES = %w[
-      standard
       international-standard technical-specification technical-report
       publicly-available-specification international-workshop-agreement guide
+      amendment technical-corrigendum
     ].freeze
 
     # @return [RelatonIsoBib::StructuredIdentifier]
     attr_reader :structuredidentifier
 
     # @!attribute [r] title
-    #   @return [Array<RelatonIsoBib::TypedTitleString>]
+    #   @return [Array<RelatonBib::TypedTitleString>]
 
     # @return [String, NilClass]
-    attr_reader :doctype
+    attr_reader :doctype, :stagename
 
     # @return [RelatonIsoBib::EditorialGroup]
     attr_reader :editorialgroup
@@ -43,9 +43,6 @@ module RelatonIsoBib
     # @return [Array<RelatonIsoBib::Ics>]
     attr_reader :ics
 
-    # @return [TrueClass, FalseClass, NilClass]
-    attr_accessor :all_parts
-
     # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
     # rubocop:disable Metrics/MethodLength, Metrics/PerceivedComplexity
 
@@ -67,6 +64,7 @@ module RelatonIsoBib
     # @param validity [RelatonBib:Validity, NilClass]
     # @param docid [Array<RelatonBib::DocumentIdentifier>]
     # @param structuredidentifier [RelatonIsoBib::StructuredIdentifier]
+    # @param stagename [String, NilClass]
     #
     # @param title [Array<Hash>]
     # @option title [String] :title_intro
@@ -75,7 +73,7 @@ module RelatonIsoBib
     # @option title [String] :language
     # @option title [String] :script
     #
-    # @param editorialgroup [Hash, RelatonIsoBib::EditorialGroup, RelatonItu::EditorialGroup]
+    # @param editorialgroup [Hash, RelatonIsoBib::EditorialGroup]
     # @option workgrpup [String] :name
     # @option workgrpup [String] :abbreviation
     # @option workgrpup [String] :url
@@ -127,24 +125,23 @@ module RelatonIsoBib
     # @raise [ArgumentError]
     def initialize(**args)
       check_doctype args[:doctype]
-      # check_language args.fetch(:language, [])
-      # check_script args.fetch(:script, [])
 
       super_args = args.select do |k|
         %i[id docnumber language script docstatus date abstract contributor
            edition version relation biblionote series medium place copyright
            link fetched docid formattedref extent accesslocation classification
-           validity keyword].include? k
+           validity doctype keyword].include? k
       end
       super super_args
 
       @type = args[:type] || "standard"
 
-      @title = args.fetch(:title, []).reduce([]) do |a, t|
+      @title = args.fetch(:title, []).map do |t|
         if t.is_a? Hash
-          a + typed_titles(t)
+          # a + typed_titles(t)
+          RelatonBib::TypedTitleString.new t
         else
-          a << t
+          t
         end
       end
 
@@ -156,81 +153,11 @@ module RelatonIsoBib
       end
 
       @structuredidentifier = args[:structuredidentifier]
-      @doctype ||= args[:doctype]
+      # @doctype = args[:doctype] || "international-standard"
       @ics = args.fetch(:ics, []).map { |i| i.is_a?(Hash) ? Ics.new(i) : i }
+      @stagename = args[:stagename]
       @id_attribute = true
     end
-    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
-    # rubocop:enable Metrics/MethodLength, Metrics/PerceivedComplexity
-
-    def disable_id_attribute
-      @id_attribute = false
-    end
-
-    # remove title part components and abstract
-    def to_all_parts
-      me = deep_clone
-      me.disable_id_attribute
-      me.relation << RelatonBib::DocumentRelation.new(
-        type: "instance", bibitem: self,
-      )
-      me.language.each do |l|
-        me.title.delete_if { |t| t.type == "title-part" }
-        ttl = me.title.select { |t| t.type != "main" && t.title.language.include?(l) }
-        tm_en = ttl.map { |t| t.title.content }.join " – "
-        me.title.detect { |t| t.type == "main" && t.title.language.include?(l) }&.title&.content = tm_en
-      end
-      me.abstract = []
-      me.docidentifier.each(&:remove_part)
-      me.docidentifier.each(&:all_parts)
-      me.structuredidentifier.remove_part
-      me.structuredidentifier.all_parts
-      me.docidentifier.each &:remove_date
-      me.structuredidentifier&.remove_date
-      me.all_parts = true
-      me
-    end
-
-    def abstract=(value)
-      @abstract = value
-    end
-
-    def deep_clone
-      dump = Marshal.dump self
-      Marshal.load dump
-    end
-
-    # convert ISO:yyyy reference to reference to most recent
-    # instance of reference, removing date-specific infomration:
-    # date of publication, abstracts. Make dated reference Instance relation
-    # of the redacated document
-    def to_most_recent_reference
-      me = deep_clone
-      self.disable_id_attribute
-      me.relation << RelatonBib::DocumentRelation.new(type: "instance", bibitem: self)
-      me.abstract = []
-      me.date = []
-      me.docidentifier.each &:remove_date
-      me.structuredidentifier&.remove_date
-      me.id&.sub! /-[12]\d\d\d/, ""
-      me
-    end
-
-    # @param lang [String] language code Iso639
-    # @return [Array<RelatonIsoBib::TypedTitleString>]
-    def title(lang: nil)
-      if lang
-        @title.select { |t| t.title.language.include? lang }
-      else
-        @title
-      end
-    end
-
-    # @param type [Symbol] type of url, can be :src/:obp/:rss
-    # @return [String]
-    def url(type = :src)
-      @link.detect { |s| s.type == type.to_s }.content.to_s
-    end
 
     # @return [String]
     def to_xml(builder = nil, **opts, &block)
@@ -243,7 +170,8 @@ module RelatonIsoBib
       end
       super builder, **opts do |b|
         if opts[:bibdata] && (doctype || respond_to?(:committee) && committee ||
-          editorialgroup || ics.any? || structuredidentifier || block_given?)
+          editorialgroup || ics.any? || structuredidentifier || stagename ||
+          block_given?)
           b.ext do
             b.doctype doctype if doctype
             b.docsubtype docsubtype if respond_to?(:docsubtype) && docsubtype
@@ -255,42 +183,27 @@ module RelatonIsoBib
             end
             ics.each { |i| i.to_xml b }
             structuredidentifier&.to_xml b
+            b.stagename stagename if stagename
             yield b if block_given?
           end
         end
       end
     end
 
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+
     # @return [Hash]
     def to_hash
       hash = super
       hash["editorialgroup"] = editorialgroup.to_hash if editorialgroup
       hash["ics"] = single_element_array(ics) if ics&.any?
-      hash["structuredidentifier"] = structuredidentifier.to_hash if structuredidentifier
-      hash["doctype"] = doctype if doctype
+      hash["stagename"] = stagename if stagename
       hash
     end
 
     private
 
-    # @param language [Array<String>]
-    # @raise ArgumentError
-    # def check_language(language)
-    #   language.each do |lang|
-    #     unless %w[en fr].include? lang
-    #       raise ArgumentError, "invalid language: #{lang}"
-    #     end
-    #   end
-    # end
-
-    # @param script [Array<String>]
-    # @raise ArgumentError
-    # def check_script(script)
-    #   script.each do |scr|
-    #     raise ArgumentError, "invalid script: #{scr}" unless scr == "Latn"
-    #   end
-    # end
-
     # @param doctype [String]
     # @raise ArgumentError
     def check_doctype(doctype)
@@ -299,64 +212,17 @@ module RelatonIsoBib
       end
     end
 
-    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-
-    # @param title [Hash]
-    # @option title [String] :title_intro
-    # @option title [String] :title_main
-    # @option title [String] :title_part
-    # @option title [String] :language
-    # @option title [String] :script
-    # @return [Array<RelatonIsoBib::TypedTitleStrig>]
-    def typed_titles(title)
-      titles = []
-      if title[:title_intro]
-        titles << TypedTitleString.new(
-          type: "title-intro", content: title[:title_intro],
-          language: title[:language], script: title[:script], format: "text/plain",
-        )
-      end
-
-      if title[:title_main]
-        titles << TypedTitleString.new(
-          type: "title-main", content: title[:title_main],
-          language: title[:language], script: title[:script], format: "text/plain",
-        )
-      end
-
-      if title[:title_part]
-        titles << TypedTitleString.new(
-          type: "title-part", content: title[:title_part],
-          language: title[:language], script: title[:script], format: "text/plain",
-        )
-      end
-
-      unless titles.empty?
-        titles << TypedTitleString.new(
-          type: "main", content: titles.map { |t| t.title.content }.join(" – "),
-          language: title[:language], script: title[:script], format: "text/plain",
-        )
-      end
-
-      titles
-    end
-
     def makeid(id, attribute, _delim = "")
       return nil if attribute && !@id_attribute
 
       id ||= @docidentifier.reject { |i| i&.type == "DOI" }[0]
-      # contribs = publishers.map { |p| p&.entity&.abbreviation }.join '/'
-      # idstr = "#{contribs}#{delim}#{id.project_number}"
-      # idstr = id.project_number.to_s
       if id
         idstr = id.id
         idstr = "IEV" if structuredidentifier&.project_number == "IEV"
       else
         idstr = formattedref&.content
       end
-      # if id.part_number&.size&.positive? then idstr += "-#{id.part_number}"
       idstr&.gsub(/:/, "-")&.gsub(/\s/, "")&.strip
     end
-    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
   end
 end

data/lib/relaton_iso_bib/structured_identifier.rb

@@ -26,7 +26,6 @@ module RelatonIsoBib
       @project_number = args[:project_number]
       @part = args[:part]
       @subpart = args[:subpart]
-      # @prefix = args[:prefix]
       @type = args[:type]
     end
 
@@ -42,10 +41,10 @@ module RelatonIsoBib
     end
 
     def remove_date
-      case @type
-      when "Chinese Standard" then @project_number = @project_number.sub(/-[12]\d\d\d/, "")
+      if @type == "Chinese Standard"
+        @project_number.sub!(/-[12]\d\d\d/, "")
       else
-        @project_number = @project_number.sub(/:[12]\d\d\d/, "")
+        @project_number.sub!(/:[12]\d\d\d/, "")
       end
     end
 
@@ -78,5 +77,9 @@ module RelatonIsoBib
       hash["type"] = type if type
       hash
     end
+
+    def presence?
+      true
+    end
   end
 end

data/lib/relaton_iso_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonIsoBib
-  VERSION = "0.9.2".freeze
+  VERSION = "1.2.0".freeze
 end

data/lib/relaton_iso_bib/xml_parser.rb

@@ -3,20 +3,6 @@ require "nokogiri"
 module RelatonIsoBib
   class XMLParser < RelatonBib::XMLParser
     class << self
-      # Override RelatonBib::XMLParser.form_xml method.
-      # @param xml [String]
-      # @return [RelatonIsoBib::IsoBibliographicItem]
-      def from_xml(xml)
-        doc = Nokogiri::XML(xml)
-        doc.remove_namespaces!
-        isoitem = doc.at "/bibitem|/bibdata"
-        if isoitem
-          IsoBibliographicItem.new item_data(isoitem)
-        else
-          warn "[relato-iso-bib] can't find bibitem or bibdata element in the XML"
-        end
-      end
-
       private
 
       # Override RelatonBib::XMLParser.item_data method.
@@ -29,15 +15,22 @@ module RelatonIsoBib
 
         data[:doctype] = ext.at("./doctype")&.text
         data[:editorialgroup] = fetch_editorialgroup ext
-        data[:ics] = fetch_ics ext
         data[:structuredidentifier] = fetch_structuredidentifier ext
+        data[:stagename] = ext.at("./stagename")&.text
         data
       end
 
+      # override RelatonBib::BibliographicItem.bib_item method
+      # @param item_hash [Hash]
+      # @return [RelatonIsoBib::IsoBibliographicItem]
+      def bib_item(item_hash)
+        IsoBibliographicItem.new item_hash
+      end
+
       # @param ext [Nokogiri::XML::Element]
       # @return [RelatonIsoBib::StructuredIdentifier]
       def fetch_structuredidentifier(ext)
-        sid = ext.at "./structuredidentifier"
+        sid = ext&.at "./structuredidentifier"
         return unless sid
 
         pn = sid.at "project-number"
@@ -50,36 +43,29 @@ module RelatonIsoBib
 
       # Override RelatonBib::XMLParser.ttitle method.
       # @param title [Nokogiri::XML::Element]
-      # @return [RelatonIsoBib::TypedTitleString]
+      # @return [RelatonBib::TypedTitleString]
       def ttitle(title)
         return unless title
 
-        TypedTitleString.new(
+        RelatonBib::TypedTitleString.new(
           type: title[:type], content: title.text, language: title[:language],
           script: title[:script], format: title[:format]
         )
       end
 
-      # @param item [Nokogiri::XML::Element]
-      # @return [Array<RelatonIsoBib::Ics>]
-      def fetch_ics(ext)
-        ext.xpath("./ics/code").map { |ics| Ics.new ics.text }
-      end
-
       # @TODO Organization doesn't recreated
       # @param ext [Nokogiri::XML::Element]
       # @return [RelatonIsoBib::EditorialGroup]
       def fetch_editorialgroup(ext)
-        eg = ext.at("./editorialgroup")
+        eg = ext&.at("./editorialgroup")
         return unless eg
 
         tc = eg&.xpath("technical-committee")&.map { |t| iso_subgroup(t) }
         sc = eg&.xpath("subcommittee")&.map { |s| iso_subgroup(s) }
         wg = eg&.xpath("workgroup")&.map { |w| iso_subgroup(w) }
         sr = eg&.at "secretariat"
-        EditorialGroup.new(
-          technical_committee: tc, subcommittee: sc, workgroup: wg, secretariat: sr&.text,
-        )
+        EditorialGroup.new(technical_committee: tc, subcommittee: sc,
+                           workgroup: wg, secretariat: sr&.text)
       end
 
       # @param com [Nokogiri::XML::Element]