relaton-iec 1.11.2 → 1.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ac7a2b47a1a7b746f0a40a5ba93210ef38d6302e155d3b5c52d363e888de9c7
-  data.tar.gz: 18253a34039c3b99ad516f0260f7b34c61df0a4a8dd0ed5a32f5bafabc72b7ad
+  metadata.gz: 5b06795307ed2232e78986c9ff0bfcd0012a326c9938373842791492d558a344
+  data.tar.gz: f88a3d9ceed53b9b31974ac994479a2904c9be82e57a03728b7730c0991655fb
 SHA512:
-  metadata.gz: d7ade3ceccc427c5901b59fa90674d781430f9562ea4c64b6d575a538a58fb2c930eda46f790c2bbe9439e0e8c0dcfe92122bed97693560674dda66321778c50
-  data.tar.gz: d47eba43051be57244e1985b2311848db19eb5225cdada484b69c4af745eb364e40ab3c0cd745808b9c16378b448049323169844a290fd0710383d7df8bae033
+  metadata.gz: 49e1c8c651adf7df75a9befc1b75bf82d1de7194707069e20e50997656e98ac121f3526dda355fbb95593beccdcd4ce6aa1d0a9dfd220b9186871fce62d4624b
+  data.tar.gz: ad92bc78b02e45959df21be7060777b4a60c7497e851a8218806c557d8bf0ccfd2bed6a95c672ebfb248ce38538cfa96119f58f59d645c57fa32a98525f44c90

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/data/61360-4_DB.yaml

@@ -0,0 +1,63 @@
+id: IEC61360-4DB
+title:
+- type: title-intro
+  content: IEC/SC 3D
+  langage:
+  - en
+  script:
+  - Latn
+  format: text/plain
+- type: title-main
+  content: Common Data Dictionary (CDD - V2.0015.0001)
+  langage:
+  - en
+  script:
+  - Latn
+  format: text/plain
+- type: main
+  content: IEC/SC 3D - Common Data Dictionary (CDD - V2.0015.0001)
+  langage:
+  - en
+  script:
+  - Latn
+  format: text/plain
+link:
+- content: https://cdd.iec.ch
+  type: src
+type: standard
+docid:
+- id: IEC 61360-4 DB
+  type: IEC
+  primary: true
+contributor:
+- organization:
+    name:
+    - International Electrotechnical Commission
+    abbreviation: IEC
+    url: www.iec.ch
+  role:
+  - publisher
+edition: V2.0015.0001
+language:
+- en
+script:
+- Latn
+abstract:
+- content: |
+    Business processes in all domains and especially in electric/ electronic industries are increasingly being conducted electronically;
+    a situation which applies to internal processes as well as to the interaction with external partners.
+    To support the necessary information transfer the use of common concepts based on information/classification models is inevitable.
+
+    Concepts specified on a global basis support error-free information sharing. In addition, the dictionaries of concepts may be used as
+    reference collections for setting up master data repositories for product data that serve as company internal information backbones.
+    Thus, costly interpretation and conversion errors may be minimized.
+
+    From the market side, pressure is increasingly being exerted to supply product data in electronic form using commonly agreed concepts
+    and as this pressure grows, it will have a considerable impact on all business processes. For this reason, a seamless exchange of
+    product data, i.e., an exchange that is free from media discontinuities requires a unified, joint approach both for exchanging product
+    data internally within a company or for exchanging product data with suppliers or customers.
+  language:
+  - en
+  script:
+  - Latn
+  format: text/plain

data/lib/relaton_iec/hit.rb

@@ -3,6 +3,8 @@
 module RelatonIec
   # Hit.
   class Hit < RelatonBib::Hit
+    attr_writer :fetch
+
     # Parse page.
     # @return [RelatonIec::IecBibliographicItem]
     def fetch

data/lib/relaton_iec/hit_collection.rb

@@ -43,7 +43,15 @@ module RelatonIec
     # @param ref [String]
     # @param year [String, nil]
     # @return [Array<RelatonIec::Hit>]
-    def hits(ref, year)
+    def hits(ref, year) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+      file = "../data/#{ref.sub(/^IEC\s/, '').gsub(' ', '_').upcase}.yaml"
+      path = File.expand_path file, __dir__
+      if File.exist? path
+        hash = YAML.safe_load File.read(path, encoding: "utf-8")
+        hit = Hit.new({ code: ref }, self)
+        hit.fetch = IecBibliographicItem.from_hash hash
+        return [hit]
+      end
       from, to = nil
       if year
         from = Date.strptime year, "%Y"

data/lib/relaton_iec/iec_bibliographic_item.rb

@@ -43,7 +43,7 @@ module RelatonIec
     # @return [RelatonIsoBib::IecBibliographicItem]
     def self.from_hash(hash)
       item_hash = ::RelatonIec::HashConverter.hash_to_bib(hash)
-      new **item_hash
+      new(**item_hash)
     end
 
     # @param opts [Hash]
@@ -52,7 +52,7 @@ module RelatonIec
     # @option opts [String] :lang language
     # @return [String] XML
     def to_xml(**opts) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
-      super **opts do |b|
+      super(**opts) do |b|
         if opts[:bibdata]
           b.ext do
             b.doctype doctype if doctype
@@ -63,16 +63,16 @@ module RelatonIec
             structuredidentifier&.to_xml b
             b.stagename stagename if stagename
             if updates_document_type
-              b.send("updates-document-type", updates_document_type)
+              b.send(:"updates-document-type", updates_document_type)
             end
             unless accessibility_color_inside.nil?
-              b.send("accessibility-color-inside", accessibility_color_inside)
+              b.send(:"accessibility-color-inside", accessibility_color_inside)
             end
-            b.send("price-code", price_code) if price_code
-            b.send("cen-processing", cen_processing) unless cen_processing.nil?
+            b.send(:"price-code", price_code) if price_code
+            b.send(:"cen-processing", cen_processing) unless cen_processing.nil?
             b.secretary secretary if secretary
             if interest_to_committees
-              b.send("interest-to-committees", interest_to_committees)
+              b.send(:"interest-to-committees", interest_to_committees)
             end
           end
         end

data/lib/relaton_iec/iec_bibliography.rb

@@ -58,19 +58,19 @@ module RelatonIec
       def fetch_ref_err(code, year, missed_years) # rubocop:disable Metrics/MethodLength
         id = year ? "#{code}:#{year}" : code
         warn "[relaton-iec] WARNING: no match found online for #{id}. "\
-          "The code must be exactly like it is on the standards website."
+             "The code must be exactly like it is on the standards website."
         unless missed_years.empty?
           warn "[relaton-iec] (There was no match for #{year}, though there "\
-            "were matches found for #{missed_years.join(', ')}.)"
+               "were matches found for #{missed_years.join(', ')}.)"
         end
         if /\d-\d/.match? code
           warn "[relaton-iec] The provided document part may not exist, or "\
-            "the document may no longer be published in parts."
+               "the document may no longer be published in parts."
         else
           warn "[relaton-iec] If you wanted to cite all document parts for "\
-            "the reference, use \"#{code} (all parts)\".\nIf the document is "\
-            "not a standard, use its document type abbreviation (TS, TR, PAS, "\
-            "Guide)."
+               "the reference, use \"#{code} (all parts)\".\nIf the document "\
+               "is not a standard, use its document type abbreviation (TS, "\
+               "TR, PAS, Guide)."
         end
         nil
       end
@@ -91,7 +91,7 @@ module RelatonIec
       # @return [RelatonIec::HitCollection]
       def search_filter(ref, year) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
         %r{
-          ^(?<code>\S+[^\d]*\s\d+(?:-\w+)*)
+          ^(?<code>\S+[^\d]*\s\d+(?:-\w+)*(?:\s[A-Z]+)?)
           (?::(?<year1>\d{4}))?
           (?<bundle>\+[^\s/]+)?
           (?:/(?<corr>AMD\s\d+))?
@@ -106,10 +106,10 @@ module RelatonIec
         end
         result = search code if result.empty?
         code = result.text.dup
-        code&.sub!(/((?:-\w+)+)/, "")
+        code&.sub!(/(?:-\w+)+(?:\s[A-Z]+)?/, "")
         result.select do |i|
           %r{
-            ^(?<code2>\S+[^\d]*\s\d+)(?:-\w+)*(?::\d{4})?
+            ^(?<code2>\S+[^\d]*\s\d+)(?:-\w+)*(?:\s[A-Z]+)?(?::\d{4})?
             (?<bundle2>\+[^\s/]+)?
             (?:/(?<corr2>AMD\d+))?
           }x =~ i.hit[:code]
@@ -191,8 +191,8 @@ module RelatonIec
       # @return [Array<String, nil>]
       def code_year(ref, part)
         %r{
-          ^(?<code>\S+[^\d]*\s\d+((?:-\w+)+)?)
-          (:(?<year>\d{4}))?
+          ^(?<code>\S+[^\d]*\s\d+(?:-\w+)*)
+          (?::(?<year>\d{4}))?
         }x =~ ref
         code.sub!(/-\d+/, "") if part
         [code, year]

data/lib/relaton_iec/version.rb

@@ -1,3 +1,3 @@
 module RelatonIec
-  VERSION = "1.11.2".freeze
+  VERSION = "1.11.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iec
 version: !ruby/object:Gem::Version
-  version: 1.11.2
+  version: 1.11.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-25 00:00:00.000000000 Z
+date: 2022-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -175,6 +175,7 @@ files:
 - grammars/isodoc.rng
 - grammars/isostandard.rng
 - grammars/reqt.rng
+- lib/data/61360-4_DB.yaml
 - lib/relaton_iec.rb
 - lib/relaton_iec/basic_block/alignment.rb
 - lib/relaton_iec/basic_block/basic_block.rb