relaton-iec 1.11.1 → 1.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26f4ed095f846982958565c16856f12c681fb06f6b4dcdf6d9d51da5e122fda3
-  data.tar.gz: 9d6d6de7f5ecc68aa0133460e80070e79cf4d58e167ac546dbeb2eb3e18ba537
+  metadata.gz: 3693023d890f701035d9decbf0d0866909163bfaebd758e8e7c8e86072815731
+  data.tar.gz: 3aedcf623406e1e23311a7eaddd47b9497bd8f9c575e62904f03d4e7b3062224
 SHA512:
-  metadata.gz: f9110c1ee9b89a7a31048cb3f57814f16ba0835135849db067e6f4970a63f5f9a3af18507d6a5b040fa4e4a239873264b34e85673abb0b034afc45ca78bbe9fe
-  data.tar.gz: c2384461bcfd0715d241e0e5cd91f1631158293a57e488acea984f1fbdb3033997fcface2580d04c07212bd1d6e548edfe332da369b21e41a132673848648d5e
+  metadata.gz: 9a9917fe56c8a33090ab809a13327cd754c238236e4c027fa0e1939bfb7fa9cb3c27c7708bf930df662bc1737ef36abfd4e00fe79bd56315d69d17073bc5d180
+  data.tar.gz: 4076a2815a8428db30e264ce3f2b6224103e4f93babd29913a1b363a1084c8196e8c77c328eb24aca62afd665274b451046e7424c7beda8803d38b921a97e5af

data/.github/workflows/rake.yml

@@ -10,27 +10,4 @@ on:
 
 jobs:
   rake:
-    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '3.0', '2.7', '2.6', '2.5' ]
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
-        experimental: [ false ]
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: true
-
-      # https://github.com/ruby-debug/debase/issues/89#issuecomment-686827382
-      - if: matrix.os == 'macos-latest' && matrix.ruby == '2.5'
-        run: echo BUNDLE_BUILD__DEBASE="--with-cflags=\"-Wno-error=implicit-function-declaration\"" >> $GITHUB_ENV
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-
-      - run: bundle exec rake
+    uses: relaton/support/.github/workflows/rake.yml@master

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_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

@@ -32,6 +32,7 @@ module RelatonIec
       parts.reject { |h| h.hit[:code] == hit.hit[:code] }.each do |hi|
         isobib = RelatonIec::IecBibliographicItem.new(
           formattedref: RelatonBib::FormattedRef.new(content: hi.hit[:code]),
+          docid: [RelatonBib::DocumentIdentifier.new(id: hi.hit[:code], type: "IEC", primary: true)],
         )
         all_parts_item.relation << RelatonBib::DocumentRelation.new(type: "partOf", bibitem: isobib)
       end
@@ -43,13 +44,35 @@ module RelatonIec
     # @param ref [String]
     # @param year [String, nil]
     # @return [Array<RelatonIec::Hit>]
-    def hits(ref, year)
-      from, to = nil
-      if year
-        from = Date.strptime year, "%Y"
-        to   = from.next_year.prev_day
+    def hits(ref, year) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+      if /61360-4\sDB|ISO[\s\/]IEC\sDIR/.match?(ref)
+        fetch_from_gh ref
+      else
+        from, to = nil
+        if year
+          from = Date.strptime year, "%Y"
+          to   = from.next_year.prev_day
+        end
+        get_results ref, from, to
       end
-      get_results ref, from, to
+      # file = "../data/#{ref.sub(/^IEC\s/, '').gsub(/[\s\/]/, '_').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
+    end
+
+    def fetch_from_gh(ref)
+      file = ref.sub(/^IEC\s/, "").gsub(/[\s\/]/, "_").upcase
+      url = "https://raw.githubusercontent.com/relaton/relaton-data-iec/main/data/#{file}.yaml"
+      resp = Net::HTTP.get URI(url)
+      hash = YAML.safe_load resp
+      hit = Hit.new({ code: ref }, self)
+      hit.fetch = IecBibliographicItem.from_hash hash
+      [hit]
     end
 
     # @param ref [String]

data/lib/relaton_iec/iec_bibliographic_item.rb

@@ -3,7 +3,7 @@ module RelatonIec
     TYPES = %w[
       international-standard technical-specification technical-report
       publicly-available-specification international-workshop-agreement
-      guide industry-technical-agreement
+      guide industry-technical-agreement system-reference-delivrabble
     ].freeze
 
     FUNCTION = %w[emc safety enviroment quality-assurance].freeze
@@ -25,9 +25,9 @@ module RelatonIec
       if args[:updates_document_type] &&
           !TYPES.include?(args[:updates_document_type])
         warn "[relaton-iec] WARNING: invalid updates_document_type "\
-          "\"#{args[:updates_document_type]}\""
+             "\"#{args[:updates_document_type]}\""
         warn "[relaton-iec] allowed updates_document_type values are: "\
-          "#{TYPES.join(', ')}"
+             "#{TYPES.join(', ')}"
       end
       @function = args.delete :function
       @updates_document_type = args.delete :updates_document_type
@@ -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
@@ -90,33 +90,43 @@ module RelatonIec
       # @param year [String, nil]
       # @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+)*)
-          (?::(?<year1>\d{4}))?
-          (?<bundle>\+[^\s/]+)?
-          (?:/(?<corr>AMD\s\d+))?
-        }x =~ ref.upcase
-        year ||= year1
-        corr&.sub! " ", ""
+        rp1 = ref_parts ref.upcase
+        year ||= rp1[:year]
+        corr = rp1[:corr]&.sub " ", ""
         warn "[relaton-iec] (\"#{ref}\") fetching..."
-        result = search(code, year)
-        if result.empty? && /(?<=-)(?<part>[\w-]+)/ =~ code
+        result = search(rp1[:code], year)
+        code = result.text.dup
+        if result.empty? && /(?<=\d-)(?<part>[\w-]+)/ =~ rp1[:code]
           # try to search packaged standard
-          result = search code, year, part
+          result = search rp1[:code], year, part
+          pkg_std = result.any?
+        end
+        result = search rp1[:code] if result.empty?
+        if pkg_std
+          code.sub!(/(?<=\d-)#{part}/, part[0])
+        else
+          code.sub!(/-[-\d]+/, "")
         end
-        result = search code if result.empty?
-        code = result.text.dup
-        code&.sub!(/((?:-\w+)+)/, "")
         result.select do |i|
-          %r{
-            ^(?<code2>\S+[^\d]*\s\d+)(?:-\w+)*(?::\d{4})?
-            (?<bundle2>\+[^\s/]+)?
-            (?:/(?<corr2>AMD\d+))?
-          }x =~ i.hit[:code]
-          code == code2 && bundle == bundle2 && corr == corr2
+          rp2 = ref_parts i.hit[:code]
+          code2 = if pkg_std
+                    rp2[:code].sub(/(?<=\d-\d)\d+/, "")
+                  else
+                    rp2[:code].sub(/-[-\d]+/, "")
+                  end
+          code == code2 && rp1[:bundle] == rp2[:bundle] && corr == rp2[:corr]
         end
       end
 
+      def ref_parts(ref)
+        %r{
+          ^(?<code>[^\d]+(?:\d+(?:-\w+)*)?(?:\s?[A-Z]+)?(?:\sSUP)?)
+          (?::(?<year>\d{4}))?
+          (?<bundle>\+[^\s/]+)?
+          (?:/(?<corr>AMD\s?\d+))?
+        }x.match ref
+      end
+
       def iev(code = "IEC 60050")
         RelatonIsoBib::XMLParser.from_xml(<<~"XML")
           <bibitem>
@@ -191,8 +201,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/scrapper.rb

@@ -17,17 +17,18 @@ module RelatonIec
 
     TYPES = {
       "ISO" => "international-standard",
-      "TS" => "technicalSpecification",
-      "TR" => "technicalReport",
-      "PAS" => "publiclyAvailableSpecification",
-      "AWI" => "appruvedWorkItem",
-      "CD" => "committeeDraft",
-      "FDIS" => "finalDraftInternationalStandard",
-      "NP" => "newProposal",
-      "DIS" => "draftInternationalStandard",
-      "WD" => "workingDraft",
+      "TS" => "technical-specification",
+      "TR" => "technical-report",
+      "PAS" => "publicly-available-specification",
+      "AWI" => "appruved-work-item",
+      "CD" => "committee-draft",
+      "FDIS" => "final-draft-international-standard",
+      "NP" => "new-proposal",
+      "DIS" => "draft-international-standard",
+      "WD" => "working-draft",
       "R" => "recommendation",
       "Guide" => "guide",
+      "SRD" => "system-reference-delivrabble",
     }.freeze
 
     class << self
@@ -194,10 +195,12 @@ module RelatonIec
                  when "withdrawn" then "obsoletes"
                  else r_type
                  end
-          fref = RelatonBib::FormattedRef.new(
-            content: r.at("FULL_NAME").text, format: "text/plain",
+          ref = r.at("FULL_NAME").text
+          fref = RelatonBib::FormattedRef.new content: ref, format: "text/plain"
+          bibitem = IecBibliographicItem.new(
+            formattedref: fref,
+            docid: [RelatonBib::DocumentIdentifier.new(id: ref, type: "IEC", primary: true)],
           )
-          bibitem = IecBibliographicItem.new(formattedref: fref)
           { type: type, bibitem: bibitem }
         end
       end
@@ -218,9 +221,10 @@ module RelatonIec
       # @param doc [Nokogiri::HTML::Document]
       # @return [String]
       def fetch_type(doc)
-        doc.at(
+        type = doc.at(
           '//th[contains(., "Publication type")]/following-sibling::td/span',
-        ).text.downcase.tr " ", "-"
+        ).text
+        TYPES[type] || type.downcase.tr(" ", "-")
       end
 
       # Fetch titles.

data/lib/relaton_iec/version.rb

@@ -1,3 +1,3 @@
 module RelatonIec
-  VERSION = "1.11.1".freeze
+  VERSION = "1.11.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iec
 version: !ruby/object:Gem::Version
-  version: 1.11.1
+  version: 1.11.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-23 00:00:00.000000000 Z
+date: 2022-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml