relaton-bib 1.10.7 → 1.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97f3e3e14c073c18fac8b204483116de57d77338ed7de3ce6f03c75da41fd0c1
-  data.tar.gz: 713f4591e31ff1538b31f75bff7b6e1d4770a8f87fbd5e01445968cf8e6ffb8c
+  metadata.gz: d15360baaf96bbd8ba4bb079f5c1ed71b2d1a3c04a709b7b26122b10ea6e998d
+  data.tar.gz: ea64b85cfe56d2bac01881c246877f9ffb5329bf108dbffbe9e9ce789352a244
 SHA512:
-  metadata.gz: c75ffe32176bb63fa2d9ff7717312ac15dce830622cf8db699628f4a93f45e8f4907431120236d726d1cc9a5d1fcb91e1b5ca39772ac70429fec44cfb7dd198a
-  data.tar.gz: c4bad97d2b455e787e3e4e8eed11b8e7e466eb288655e2055b0d7fa38c236a7e02f59701cc7c693230879a5116c7872fa16bd70ada9827535894542841d9d716
+  metadata.gz: c94693cbcd3a935883d608a80af6d8660ebf08a079898a4658ed057fd5ce7f84e93631f33579f8fbc6696b80f1413fac49b2dd48af120d5c60c7e104ebbf1b01
+  data.tar.gz: e98dca1228dff147f05e7ea460a95ea909137fa49fdd38fdc9af3c9147e3030e0ef1c65906f79dac5f108b5d2d0107410c52bf8d584a75401f01fd112a8205cb

data/README.adoc

@@ -213,7 +213,11 @@ item = RelatonBib::BibliographicItem.new(
   ),
   place: [
     "bib place",
-    RelatonBib::Place.new(name: "Geneva", uri: "geneva.place", region: "Switzelznd")
+    RelatonBib::Place.new(
+      city: "Geneva",
+      region: [RelatonBib::Place::RegionType.new(name: "Region")],
+      country: [RelatonBib::Place::RegionType.new(name: "Switzeland", iso: "SH", recommended: true)],
+    )
   ],
   extent: [
     RelatonBib::BibItemLocality.new("section", "Reference from", "Reference to"),

data/grammars/biblio.rng

@@ -527,7 +527,7 @@
   </define>
   <define name="LocalityType">
     <data type="string">
-      <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|list|example|volume|issue|time|anchor|locality:[a-zA-Z0-9_]+</param>
+      <param name="pattern">section|clause|part|paragraph|chapter|page|title|line|whole|table|annex|figure|note|list|example|volume|issue|time|anchor|locality:[a-zA-Z0-9_]+</param>
     </data>
   </define>
   <define name="referenceFrom">
@@ -677,6 +677,9 @@
     <zeroOrMore>
       <ref name="extent"/>
     </zeroOrMore>
+    <optional>
+      <ref name="bibliographic_size"/>
+    </optional>
     <zeroOrMore>
       <ref name="accesslocation"/>
     </zeroOrMore>
@@ -848,17 +851,46 @@
   </define>
   <define name="bplace">
     <element name="place">
-      <optional>
-        <attribute name="uri">
-          <data type="anyURI"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="region"/>
-      </optional>
+      <choice>
+        <text/>
+        <group>
+          <ref name="bibliocity"/>
+          <zeroOrMore>
+            <ref name="biblioregion"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="bibliocountry"/>
+          </zeroOrMore>
+        </group>
+      </choice>
+    </element>
+  </define>
+  <define name="bibliocity">
+    <element name="city">
       <text/>
     </element>
   </define>
+  <define name="biblioregion">
+    <element name="region">
+      <ref name="RegionType"/>
+    </element>
+  </define>
+  <define name="bibliocountry">
+    <element name="country">
+      <ref name="RegionType"/>
+    </element>
+  </define>
+  <define name="RegionType">
+    <optional>
+      <attribute name="iso"/>
+    </optional>
+    <optional>
+      <attribute name="recommended">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <text/>
+  </define>
   <define name="bprice">
     <element name="price">
       <attribute name="currency"/>
@@ -922,9 +954,29 @@
       <text/>
     </element>
   </define>
+  <define name="sizevalue">
+    <element name="value">
+      <attribute name="type"/>
+      <text/>
+    </element>
+  </define>
+  <define name="bibliographic_size">
+    <element name="size">
+      <oneOrMore>
+        <ref name="sizevalue"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="extent">
     <element name="extent">
-      <ref name="BibItemLocality"/>
+      <choice>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="localityStack"/>
+        </zeroOrMore>
+      </choice>
     </element>
   </define>
   <define name="series">

data/grammars/isodoc.rng

@@ -152,9 +152,7 @@
             <data type="boolean"/>
           </attribute>
         </optional>
-        <oneOrMore>
-          <ref name="PureTextElement"/>
-        </oneOrMore>
+        <ref name="XrefBody"/>
       </element>
     </define>
     <define name="erefType">
@@ -188,6 +186,42 @@
         <ref name="PureTextElement"/>
       </oneOrMore>
     </define>
+    <define name="localityStack">
+      <element name="localityStack">
+        <optional>
+          <attribute name="connective">
+            <choice>
+              <value>and</value>
+              <value>or</value>
+              <value>from</value>
+              <value>to</value>
+              <value/>
+            </choice>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="sourceLocalityStack">
+      <element name="sourceLocalityStack">
+        <optional>
+          <attribute name="connective">
+            <choice>
+              <value>and</value>
+              <value>or</value>
+              <value>from</value>
+              <value>to</value>
+              <value/>
+            </choice>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="sourceLocality"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="ul">
       <element name="ul">
         <attribute name="id">
@@ -1098,6 +1132,16 @@
     </define>
   </include>
   <!-- end overrides -->
+  <define name="image" combine="choice">
+    <element name="svg">
+      <oneOrMore>
+        <choice>
+          <text/>
+          <ref name="AnyElement"/>
+        </choice>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="MultilingualRenderingType">
     <choice>
       <value>common</value>
@@ -2631,4 +2675,30 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="XrefBody">
+    <zeroOrMore>
+      <ref name="XrefTarget"/>
+    </zeroOrMore>
+    <oneOrMore>
+      <ref name="PureTextElement"/>
+    </oneOrMore>
+  </define>
+  <define name="XrefTarget">
+    <element name="location">
+      <attribute name="target">
+        <data type="string">
+          <param name="pattern">\i\c*|\c+#\c+</param>
+        </data>
+      </attribute>
+      <attribute name="connective">
+        <choice>
+          <value>and</value>
+          <value>or</value>
+          <value>from</value>
+          <value>to</value>
+          <value/>
+        </choice>
+      </attribute>
+    </element>
+  </define>
 </grammar>

data/lib/relaton_bib/bib_item_locality.rb

@@ -51,6 +51,22 @@ module RelatonBib
       out += "#{pref}reference_to:: #{reference_to}\n" if reference_to
       out
     end
+
+    #
+    # Render locality as BibTeX.
+    #
+    # @param [BibTeX::Entry] item BibTeX entry.
+    #
+    def to_bibtex(item)
+      case type
+      when "chapter" then item.chapter = reference_from
+      when "page"
+        value = reference_from
+        value += "-#{reference_to}" if reference_to
+        item.pages = value
+      when "volume" then item.volume = reference_from
+      end
+    end
   end
 
   class Locality < BibItemLocality
@@ -58,6 +74,28 @@ module RelatonBib
     def to_xml(builder)
       builder.locality { |b| super(b) }
     end
+
+    #
+    # Render locality as hash.
+    #
+    # @return [Hash] locality as hash.
+    #
+    def to_hash
+      { "locality" => super }
+    end
+
+    #
+    # Render locality as AsciiBib.
+    #
+    # @param [String] prefix prefix of locality
+    # @param [Integer] count number of localities
+    #
+    # @return [String] AsciiBib.
+    #
+    def to_asciibib(prefix = "", count = 1)
+      pref = prefix.empty? ? "locality" : "#{prefix}.locality"
+      super(pref, count)
+    end
   end
 
   class LocalityStack
@@ -82,6 +120,30 @@ module RelatonBib
     def to_hash
       { "locality_stack" => single_element_array(locality) }
     end
+
+    #
+    # Render locality stack as AsciiBib.
+    #
+    # @param [String] prefix <description>
+    # @param [Integer] size size of locality stack
+    #
+    # @return [String] AsciiBib.
+    #
+    def to_asciibib(prefix = "", size = 1)
+      pref = prefix.empty? ? "locality_stack" : "#{prefix}.locality_stack"
+      out = ""
+      out << "#{pref}::\n" if size > 1
+      out << locality.map { |l| l.to_asciibib(pref, locality.size) }.join
+    end
+
+    #
+    # Render locality stack as BibTeX.
+    #
+    # @param [BibTeX::Entry] item BibTeX entry.
+    #
+    def to_bibtex(item)
+      locality.each { |l| l.to_bibtex(item) }
+    end
   end
 
   class SourceLocality < BibItemLocality

data/lib/relaton_bib/bibliographic_item.rb

@@ -27,6 +27,7 @@ require "relaton_bib/place"
 require "relaton_bib/structured_identifier"
 require "relaton_bib/editorial_group"
 require "relaton_bib/ics"
+require "relaton_bib/bibliographic_size"
 
 module RelatonBib
   # Bibliographic item
@@ -95,7 +96,7 @@ module RelatonBib
     # @return [Array<RelatonBib::Place>]
     attr_reader :place
 
-    # @return [Array<RelatonBib::BibItemLocality>]
+    # @return [Array<RelatonBib::Locality, RelatonBib::LocalityStack>]
     attr_reader :extent
 
     # @return [Array<Strig>]
@@ -122,6 +123,9 @@ module RelatonBib
     # @return [RelatonBib::StructuredIdentifierCollection]
     attr_reader :structuredidentifier
 
+    # @return [RelatonBib::BibliographicSize, nil]
+    attr_reader :size
+
     # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
     # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
@@ -141,7 +145,7 @@ module RelatonBib
     # @param series [Array<RelatonBib::Series>]
     # @param medium [RelatonBib::Medium, NilClas]
     # @param place [Array<String, RelatonBib::Place>]
-    # @param extent [Array<Relaton::BibItemLocality>]
+    # @param extent [Array<Relaton::Locality, RelatonBib::LocalityStack>]
     # @param accesslocation [Array<String>]
     # @param classification [Array<RelatonBib::Classification>]
     # @param validity [RelatonBib:Validity, NilClass]
@@ -152,6 +156,7 @@ module RelatonBib
     # @param editorialgroup [RelatonBib::EditorialGroup, nil]
     # @param ics [Array<RelatonBib::ICS>]
     # @param structuredidentifier [RelatonBib::StructuredIdentifierCollection]
+    # @param size [RelatonBib::BibliographicSize, nil]
     #
     # @param copyright [Array<Hash, RelatonBib::CopyrightAssociation>]
     # @option copyright [Array<Hash, RelatonBib::ContributionInfo>] :owner
@@ -243,6 +248,7 @@ module RelatonBib
         pl.is_a?(String) ? Place.new(name: pl) : pl
       end
       @extent         = args[:extent] || []
+      @size           = args[:size]
       @accesslocation = args.fetch :accesslocation, []
       @classification = args.fetch :classification, []
       @validity       = args[:validity]
@@ -372,6 +378,7 @@ module RelatonBib
       hash["medium"] = medium.to_hash if medium
       hash["place"] = single_element_array(place) if place&.any?
       hash["extent"] = single_element_array(extent) if extent&.any?
+      hash["size"] = size.to_hash if size&.any?
       if accesslocation&.any?
         hash["accesslocation"] = single_element_array(accesslocation)
       end
@@ -525,6 +532,7 @@ module RelatonBib
       out += medium.to_asciibib prefix if medium
       place.each { |pl| out += pl.to_asciibib prefix, place.size }
       extent.each { |ex| out += ex.to_asciibib "#{pref}extent", extent.size }
+      out += size.to_asciibib pref if size
       accesslocation.each { |al| out += "#{pref}accesslocation:: #{al}\n" }
       classification.each do |cl|
         out += cl.to_asciibib prefix, classification.size
@@ -624,16 +632,7 @@ module RelatonBib
 
     # @param [BibTeX::Entry]
     def bibtex_extent(item)
-      extent.each do |e|
-        case e.type
-        when "chapter" then item.chapter = e.reference_from
-        when "page"
-          value = e.reference_from
-          value += "-#{e.reference_to}" if e.reference_to
-          item.pages = value
-        when "volume" then item.volume = e.reference_from
-        end
-      end
+      extent.each { |e| e.to_bibtex(item) }
     end
 
     # @param [BibTeX::Entry]
@@ -736,6 +735,7 @@ module RelatonBib
         medium&.to_xml builder
         place.each { |pl| pl.to_xml builder }
         extent.each { |e| builder.extent { e.to_xml builder } }
+        size&.to_xml builder
         accesslocation.each { |al| builder.accesslocation al }
         license.each { |l| builder.license l }
         classification.each { |cls| cls.to_xml builder }

data/lib/relaton_bib/bibliographic_size.rb

@@ -0,0 +1,103 @@
+module RelatonBib
+  class BibliographicSize
+    extend Forwardable
+
+    def_delegators :@size, :any?
+
+    # @return [Array<RelatonBib::BibliographicSize::Value>]
+    attr_reader :size
+
+    #
+    # Initialize a BibliographicSize object.
+    #
+    # @param [<Type>] size <description>
+    #
+    def initialize(size)
+      @size = size
+    end
+
+    #
+    # Render BibliographicSize object to XML.
+    #
+    # @param [Nokogiri::XML::Builder] builder the XML builder
+    #
+    def to_xml(builder)
+      return if size.empty?
+
+      builder.size do
+        size.each { |s| s.to_xml builder }
+      end
+    end
+
+    #
+    # Render BibliographicSize object to AsciiBib.
+    #
+    # @param [String] prefix prefix for the size
+    #
+    # @return [String] AsciiBib string
+    #
+    def to_asciibib(prefix = "")
+      pref = prefix.empty? ? "size" : "#{prefix}.size"
+      size.map { |s| s.to_asciibib pref, size.size }.join
+    end
+
+    #
+    # Render BibliographicSize object to hash.
+    #
+    # @return [<Type>] <description>
+    #
+    def to_hash
+      size.map &:to_hash
+    end
+
+    class Value
+      # @return [String]
+      attr_reader :type, :value
+
+      #
+      # Initialize a BibliographicSize::Value object.
+      #
+      # @param [String] type the type of the size
+      # @param [String] value size value
+      #
+      def initialize(type:, value:)
+        @type = type
+        @value = value
+      end
+
+      #
+      # Render BibliographicSize::Value object to XML.
+      #
+      # @param [Nokogiri::XML::Builder] builder the XML builder
+      #
+      def to_xml(builder)
+        builder.value value, type: type
+      end
+
+      #
+      # Render BibliographicSize::Value object to hash.
+      #
+      # @return [<Type>] <description>
+      #
+      def to_hash
+        { type: type, value: value }
+      end
+
+      #
+      # Render BibliographicSize::Value object to AsciiBib.
+      #
+      # @param [String] prefix prefix for the size
+      # @param [Integer] size size of the array
+      #
+      # @return [String] AsciiBib string
+      #
+      def to_asciibib(prefix, size)
+        pref = prefix.empty? ? "" : "#{prefix}."
+        out = ""
+        out << "#{prefix}::\n" if size.size > 1
+        out << "#{pref}type:: #{type}\n"
+        out << "#{pref}value:: #{value}\n"
+      end
+    end
+  end
+end

data/lib/relaton_bib/hash_converter.rb

@@ -29,6 +29,7 @@ module RelatonBib
         medium_hash_to_bib(ret)
         place_hash_to_bib(ret)
         extent_hash_to_bib(ret)
+        size_hash_to_bib(ret)
         accesslocation_hash_to_bib(ret)
         classification_hash_to_bib(ret)
         validity_hash_to_bib(ret)
@@ -48,13 +49,32 @@ module RelatonBib
       def extent_hash_to_bib(ret)
         return unless ret[:extent]
 
-        ret[:extent] = array(ret[:extent])
-        ret[:extent]&.each_with_index do |e, i|
-          ret[:extent][i] = BibItemLocality.new(e[:type], e[:reference_from],
-                                                e[:reference_to])
+        ret[:extent] = array(ret[:extent]).map do |e|
+          locality e
+          # ret[:extent][i] = Locality.new(e[:type], e[:reference_from],
+          #                                       e[:reference_to])
         end
       end
 
+      def locality(loc)
+        if loc[:locality_stack]
+          LocalityStack.new(loc[:locality_stack].map { |l| locality(l) })
+        else
+          l = loc[:locality]
+          Locality.new(l[:type], l[:reference_from], l[:reference_to])
+        end
+      end
+
+      def size_hash_to_bib(ret)
+        return unless ret[:size]
+
+        ret[:size] = array(ret[:size])
+        size = ret[:size]&.map do |val|
+          BibliographicSize::Value.new(**val)
+        end
+        ret[:size] = BibliographicSize.new(size)
+      end
+
       def title_hash_to_bib(ret)
         return unless ret[:title]
 
@@ -316,18 +336,19 @@ module RelatonBib
 
       # @param rel [Hash] relation
       # @return [RelatonBib::LocalityStack]
-      def relation_locality_hash_to_bib(rel) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      def relation_locality_hash_to_bib(rel)
         rel[:locality] = array(rel[:locality])&.map do |bl|
-          ls = if bl[:locality_stack]
-                 array(bl[:locality_stack]).map do |l|
-                   Locality.new(l[:type], l[:reference_from], l[:reference_to])
-                 end
-               else
-                 l = Locality.new(bl[:type], bl[:reference_from],
-                                  bl[:reference_to])
-                 [l]
-               end
-          LocalityStack.new ls
+          LocalityStack.new locality_locality_stack(bl)
+        end
+      end
+
+      def locality_locality_stack(lls)
+        if lls[:locality_stack]
+          array(lls[:locality_stack]).map do |l|
+            Locality.new(l[:type], l[:reference_from], l[:reference_to])
+          end
+        else
+          [Locality.new(lls[:type], lls[:reference_from], lls[:reference_to])]
         end
       end
 

data/lib/relaton_bib/medium.rb

@@ -1,41 +1,73 @@
 module RelatonBib
   class Medium
-    # @return [String, NilClass]
-    attr_reader :form, :size, :scale
+    # @return [String, nil]
+    attr_reader :content, :genre, :form, :carrier, :size, :scale
 
-    # @param form [String, NilClass]
-    # @param size [String, NilClass]
-    # @param scale [String, NilClass]
-    def initialize(form: nil, size: nil, scale: nil)
-      @form  = form
-      @size  = size
-      @scale = scale
+    #
+    # Initialize a Medium object.
+    #
+    # @param content [String, nil] content of the medium
+    # @param genre [String, nil] genre of the medium
+    # @param form [String, nil] form of the medium
+    # @param carrier [String, nil] carrier of the medium
+    # @param size [String, nil] size of the medium
+    # @param scale [String, nil] 
+    #
+    def initialize(**args)
+      @content = args[:content]
+      @genre   = args[:genre]
+      @form    = args[:form]
+      @carrier = args[:carrier]
+      @size    = args[:size]
+      @scale   = args[:scale]
     end
 
+    #
+    # Render Medium object to XML.
+    #
     # @param builder [Nokogiri::XML::Builder]
-    def to_xml(builder)
+    #
+    def to_xml(builder) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
       builder.medium do
+        builder.content content if content
+        builder.genre genre if genre
         builder.form form if form
+        builder.carrier carrier if carrier
         builder.size size if size
         builder.scale scale if scale
       end
     end
 
+    #
+    # Render Medium object to hash.
+    #
     # @return [Hash]
-    def to_hash
+    #
+    def to_hash # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
       hash = {}
+      hash["content"] = content if content
+      hash["genre"] = genre if genre
       hash["form"] = form if form
+      hash["carrier"] = carrier if carrier
       hash["size"] = size if size
       hash["scale"] = scale if scale
       hash
     end
 
+    #
+    # Render Medium object to AsciiBib.
+    #
     # @param prefix [String]
+    #
     # @return [String]
-    def to_asciibib(prefix = "")
-      pref = prefix.empty? ? "medium." : prefix + ".medium."
+    #
+    def to_asciibib(prefix = "") # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      pref = prefix.empty? ? "medium." : "#{prefix}.medium."
       out = ""
+      out += "#{pref}content:: #{content}\n" if content
+      out += "#{pref}genre:: #{genre}\n" if genre
       out += "#{pref}form:: #{form}\n" if form
+      out += "#{pref}carrier:: #{carrier}\n" if carrier
       out += "#{pref}size:: #{size}\n" if size
       out += "#{pref}scale:: #{scale}\n" if scale
       out

data/lib/relaton_bib/place.rb

@@ -1,49 +1,141 @@
 module RelatonBib
   class Place
-    # @return [String]
-    attr_reader :name
-
-    # @return [String, NilClass]
-    attr_reader :uri, :region
-
-    # @param name [String]
-    # @param uri [String, NilClass]
-    # @param region [String, NilClass]
-    def initialize(name:, uri: nil, region: nil)
-      @name   = name
-      @uri    = uri
-      @region = region
+    # @return [String, nil]
+    attr_reader :name, :city
+
+    # @return [Array<RelatonBib::Place::RegionType>]
+    attr_reader :region, :country
+
+    #
+    # Initialize place.
+    #
+    # @param name [String, nil] name of place, name or city should be provided
+    # @param city [String, nil] name of city, city or name should be provided
+    # @param region [Array<RelatonBib::Place::RegionType>] region of place
+    # @param country [Array<RelatonBib::Place::RegionType>] country of place
+    #
+    def initialize(name: nil, city: nil, region: [], country: []) # rubocop:disable Metrics/CyclomaticComplexity
+      if name.nil? && city.nil?
+        raise ArgumentError, "`name` or `city` should be provided"
+      end
+
+      @name    = name
+      @city    = city
+      @region  = region.map { |r| r.is_a?(Hash) ? RegionType.new(**r) : r }
+      @country = country.map { |c| c.is_a?(Hash) ? RegionType.new(**c) : c }
     end
 
+    #
+    # Render place as XML.
+    #
     # @param builder [Nologiri::XML::Builder]
+    #
     def to_xml(builder)
-      xml = builder.place name
-      xml[:uri] = uri if uri
-      xml[:region] = region if region
+      if name
+        builder.place name
+      else
+        builder.place do |b|
+          b.city city
+          region.each { |r| b.region { r.to_xml b } }
+          country.each { |c| b.country { c.to_xml b } }
+        end
+      end
     end
 
+    #
+    # Render place as Hash.
+    #
     # @return [Hash]
+    #
     def to_hash
-      if uri || region
-        hash = { "name" => name }
-        hash["uri"] = uri if uri
-        hash["region"] = region if region
-        hash
+      if name then name
       else
-        name
+        hash = { "city" => city }
+        hash["region"] = region.map(&:to_hash) if region.any?
+        hash["country"] = country.map(&:to_hash) if country.any?
+        hash
       end
     end
 
+    #
+    # Render place as AsciiBib.
+    #
     # @param prefix [String]
     # @param count [Integer] number of places
+    #
     # @return [Stirng]
-    def to_asciibib(prefix = "", count = 1)
-      pref = prefix.empty? ? "place" : prefix + ".place"
+    #
+    def to_asciibib(prefix = "", count = 1) # rubocop:disable Metrics/AbcSize
+      pref = prefix.empty? ? "place" : "#{prefix}.place"
       out = count > 1 ? "#{pref}::\n" : ""
-      out += "#{pref}.name:: #{name}\n"
-      out += "#{pref}.uri:: #{uri}\n" if uri
-      out += "#{pref}.region:: #{region}\n" if region
-      out
+      return "#{out}#{pref}.name:: #{name}\n" if name
+
+      out += "#{pref}.city:: #{city}\n"
+      out += region.map { |r| r.to_asciibib("#{pref}.region", region.size) }.join
+      out + country.map { |c| c.to_asciibib("#{pref}.country", country.size) }.join
+    end
+
+    class RegionType
+      # @return [Strign] name of region
+      attr_reader :name
+
+      # @return [Strign, nil] ISO code of region
+      attr_reader :iso
+
+      # @return [Boolean, nil] <description>
+      attr_reader :recommended
+
+      #
+      # Initialize region type.
+      #
+      # @param [String] name name of region
+      # @param [String, nil] iso ISO code of region
+      # @param [Boolean, nil] recommended recommended region
+      #
+      def initialize(name:, iso: nil, recommended: nil)
+        @name = name
+        @iso  = iso
+        @recommended = recommended
+      end
+
+      #
+      # Render region type as XML.
+      #
+      # @param [Nokogiri::XML::Builder] builder XML builder
+      #
+      def to_xml(builder)
+        builder.parent["iso"] = iso if iso
+        builder.parent["recommended"] = recommended.to_s unless recommended.nil?
+        builder.text name
+      end
+
+      #
+      # Render region type as Hash.
+      #
+      # @return [Hash] region type as Hash
+      #
+      def to_hash
+        hash = { "name" => name }
+        hash["iso"] = iso if iso
+        hash["recommended"] = recommended unless recommended.nil?
+        hash
+      end
+
+      #
+      # Render region type as AsciiBib.
+      #
+      # @param [String] pref prefix
+      # @param [Integer] count number of region types
+      #
+      # @return [String] region type as AsciiBib
+      #
+      def to_asciibib(pref, count = 1) # rubocop:disable Metrics/AbcSize
+        out = count > 1 ? "#{pref}::\n" : ""
+        out += "#{pref}.name:: #{name}\n"
+        out += "#{pref}.iso:: #{iso}\n" if iso
+        out += "#{pref}.recommended:: #{recommended}\n" if recommended
+        out
+      end
     end
   end
 end

data/lib/relaton_bib/series.rb

@@ -7,49 +7,35 @@ module RelatonBib
   class Series
     # TYPES = %w[main alt].freeze
 
-    # @return [String, NilClass] allowed values: "main" or "alt"
+    # @return [String, nil] allowed values: "main" or "alt"
     attr_reader :type
 
-    # @return [RelatonBib::FormattedRef, NilClass]
+    # @return [RelatonBib::FormattedRef, nil]
     attr_reader :formattedref
 
-    # @return [RelatonBib::TypedTitleString, NilClass] title
+    # @return [RelatonBib::TypedTitleString, nil] title
     attr_reader :title
 
-    # @return [String, NilClass]
-    attr_reader :place
+    # @return [String, nil]
+    attr_reader :place, :organization, :from, :to, :number, :partnumber, :run
 
-    # @return [String, NilClass]
-    attr_reader :organization
-
-    # @return [RelatonBib::LocalizedString, NilClass]
+    # @return [RelatonBib::LocalizedString, nil]
     attr_reader :abbreviation
 
-    # @return [String, NilClass] date or year
-    attr_reader :from
-
-    # @return [String, NilClass] date or year
-    attr_reader :to
-
-    # @return [String, NilClass]
-    attr_reader :number
-
-    # @return [String, NilClass]
-    attr_reader :partnumber
-
     # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
 
-    # @param type [String, NilClass]
-    # @param formattedref [RelatonBib::FormattedRef, NilClass]
-    # @param title [RelatonBib::TypedTitleString, NilClass] title or
+    # @param type [String, nil]
+    # @param formattedref [RelatonBib::FormattedRef, nil]
+    # @param title [RelatonBib::TypedTitleString, nil] title or
     #   formattedref argument should be passed
-    # @param place [String, NilClass]
-    # @param orgaization [String, NilClass]
-    # @param abbreviation [RelatonBib::LocalizedString, NilClass]
-    # @param from [String, NilClass]
-    # @param to [String, NilClass]
-    # @param number [String, NilClass]
-    # @param partnumber [String, NilClass]
+    # @param place [String, nil]
+    # @param orgaization [String, nil]
+    # @param abbreviation [RelatonBib::LocalizedString, nil]
+    # @param from [String, nil]
+    # @param to [String, nil]
+    # @param number [String, nil]
+    # @param partnumber [String, nil]
+    # @param run [String, nil]
     def initialize(**args)
       unless args[:title].is_a?(RelatonBib::TypedTitleString) ||
           args[:formattedref]
@@ -70,6 +56,7 @@ module RelatonBib
       @to           = args[:to]
       @number       = args[:number]
       @partnumber   = args[:partnumber]
+      @run          = args[:run]
     end
     # rubocop:enable Metrics/MethodLength
 
@@ -89,6 +76,7 @@ module RelatonBib
           builder.to to if to
           builder.number number if number
           builder.partnumber partnumber if partnumber
+          builder.run run if run
         end
       end
       xml[:type] = type if type
@@ -109,6 +97,7 @@ module RelatonBib
       hash["to"] = to if to
       hash["number"] = number if number
       hash["partnumber"] = partnumber if partnumber
+      hash["run"] = run if run
       hash
     end
 
@@ -128,6 +117,7 @@ module RelatonBib
       out += "#{pref}.to:: #{to}\n" if to
       out += "#{pref}.number:: #{number}\n" if number
       out += "#{pref}.partnumber:: #{partnumber}\n" if partnumber
+      out += "#{pref}.run:: #{run}\n" if run
       out
     end
   end

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.10.7".freeze
+  VERSION = "1.11.2".freeze
 end

data/lib/relaton_bib/xml_parser.rb

@@ -46,6 +46,7 @@ module RelatonBib
           medium: fetch_medium(bibitem),
           place: fetch_place(bibitem),
           extent: fetch_extent(bibitem),
+          size: fetch_size(bibitem),
           accesslocation: bibitem.xpath("./accesslocation").map(&:text),
           classification: fetch_classification(bibitem),
           keyword: bibitem.xpath("keyword").map(&:text),
@@ -71,7 +72,26 @@ module RelatonBib
 
       def fetch_place(item)
         item.xpath("./place").map do |pl|
-          Place.new(name: pl.text, uri: pl[:uri], region: pl[:region])
+          if (city = pl.at("./city"))
+            Place.new(city: city.text, region: create_region_country(pl),
+                      country: create_region_country(pl, "country"))
+          else
+            Place.new(name: pl.text)
+          end
+        end
+      end
+
+      #
+      # Create region or country from place element
+      #
+      # @param [Nokogiri::XML::Element] place place element
+      # @param [String] node name of the node to parse
+      #
+      # @return [Array<RelatonBib::Place::RegionType>] <description>
+      #
+      def create_region_country(place, node = "region")
+        place.xpath("./#{node}").map do |r|
+          Place::RegionType.new(name: r.text, iso: r[:iso], recommended: r[:recommended])
         end
       end
 
@@ -115,29 +135,38 @@ module RelatonBib
             organization: sr.at("organization")&.text,
             abbreviation: abbreviation, from: sr.at("from")&.text,
             to: sr.at("to")&.text, number: sr.at("number")&.text,
-            partnumber: sr.at("partnumber")&.text
+            partnumber: sr.at("partnumber")&.text, run: sr.at("run")&.text,
           )
         end
       end
 
-      def fetch_medium(item)
+      def fetch_medium(item) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/AbcSize,Metrics/PerceivedComplexity
         medium = item.at("./medium")
         return unless medium
 
         Medium.new(
-          form: medium.at("form")&.text, size: medium.at("size")&.text,
-          scale: medium.at("scale")&.text
+          content: medium.at("content")&.text, genre: medium.at("genre")&.text,
+          form: medium.at("form")&.text, carrier: medium.at("carrier")&.text,
+          size: medium.at("size")&.text, scale: medium.at("scale")&.text
         )
       end
 
       def fetch_extent(item)
-        item.xpath("./extent").map do |ex|
-          BibItemLocality.new(
-            ex[:type], ex.at("referenceFrom")&.text, ex.at("referenceTo")&.text
-          )
+        item.xpath("./extent").reduce([]) do |a, ex|
+          a + localities(ex)
+          # Locality.new(
+          #   ex[:type], ex.at("referenceFrom")&.text, ex.at("referenceTo")&.text
+          # )
         end
       end
 
+      def fetch_size(item)
+        size = item.xpath("./size/value").map do |sz|
+          BibliographicSize::Value.new type: sz[:type], value: sz.text
+        end
+        BibliographicSize.new size if size.any?
+      end
+
       def fetch_classification(item)
         item.xpath("classification").map do |cls|
           Classification.new type: cls[:type], value: cls.text
@@ -390,22 +419,26 @@ module RelatonBib
       # @return [Array<RelatonBib::Locality, RelatonBib::LocalityStack>]
       def localities(rel)
         rel.xpath("./locality|./localityStack").map do |lc|
-          if lc[:type]
-            LocalityStack.new [locality(lc)]
+          if lc.name == "locality"
+            locality lc
           else
             LocalityStack.new(lc.xpath("./locality").map { |l| locality l })
           end
         end
       end
 
+      #
+      # Create Locality object from Nokogiri::XML::Element
+      #
       # @param loc [Nokogiri::XML::Element]
+      # @param klass [RelatonBib::Locality.class, RelatonBib::LocalityStack.class]
+      #
       # @return [RelatonBib::Locality]
       def locality(loc, klass = Locality)
-        ref_to = (rt = loc.at("./referenceTo")) && LocalizedString.new(rt.text)
         klass.new(
           loc[:type],
-          LocalizedString.new(loc.at("./referenceFrom").text),
-          ref_to,
+          loc.at("./referenceFrom")&.text,
+          loc.at("./referenceTo")&.text,
         )
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.10.7
+  version: 1.11.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-06 00:00:00.000000000 Z
+date: 2022-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -223,6 +223,7 @@ files:
 - lib/relaton_bib/biblio_version.rb
 - lib/relaton_bib/bibliographic_date.rb
 - lib/relaton_bib/bibliographic_item.rb
+- lib/relaton_bib/bibliographic_size.rb
 - lib/relaton_bib/bibtex_parser.rb
 - lib/relaton_bib/bibxml_parser.rb
 - lib/relaton_bib/classification.rb