relaton-bib 1.11.1 → 1.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2a973e714b86a5a78367ea697af8ba3eaa2861e571e3b035ec6ff411febc121
-  data.tar.gz: dabc25e318c346add35e69e383fa00762c5589e684983d708785a00d48a5d60e
+  metadata.gz: d15360baaf96bbd8ba4bb079f5c1ed71b2d1a3c04a709b7b26122b10ea6e998d
+  data.tar.gz: ea64b85cfe56d2bac01881c246877f9ffb5329bf108dbffbe9e9ce789352a244
 SHA512:
-  metadata.gz: 6690ae53c5056fd830923eb85b5c04f1b652a5bb46c7024ae9f5ecf6f97cebd1d58d57a8069191b349dae9f50a050abdc8eb78375baa7e2f3e23ac1a8ec6290a
-  data.tar.gz: a8fa5e09f9630117c05e3594796f5eb04a8f54c7af344a709a264c8e9be45ce951ec1fc9f25b971193d64e824368babef489c29509bd2356a4c627d8ac384c47
+  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">
@@ -851,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"/>

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/version.rb

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

data/lib/relaton_bib/xml_parser.rb

@@ -72,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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.11.1
+  version: 1.11.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-11 00:00:00.000000000 Z
+date: 2022-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug