relaton-iec 1.11.3 → 1.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b06795307ed2232e78986c9ff0bfcd0012a326c9938373842791492d558a344
-  data.tar.gz: f88a3d9ceed53b9b31974ac994479a2904c9be82e57a03728b7730c0991655fb
+  metadata.gz: 3693023d890f701035d9decbf0d0866909163bfaebd758e8e7c8e86072815731
+  data.tar.gz: 3aedcf623406e1e23311a7eaddd47b9497bd8f9c575e62904f03d4e7b3062224
 SHA512:
-  metadata.gz: 49e1c8c651adf7df75a9befc1b75bf82d1de7194707069e20e50997656e98ac121f3526dda355fbb95593beccdcd4ce6aa1d0a9dfd220b9186871fce62d4624b
-  data.tar.gz: ad92bc78b02e45959df21be7060777b4a60c7497e851a8218806c557d8bf0ccfd2bed6a95c672ebfb248ce38538cfa96119f58f59d645c57fa32a98525f44c90
+  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/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
@@ -44,20 +45,34 @@ module RelatonIec
     # @param year [String, nil]
     # @return [Array<RelatonIec::Hit>]
     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]
+      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
-      from, to = nil
-      if year
-        from = Date.strptime year, "%Y"
-        to   = from.next_year.prev_day
-      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_bibliography.rb

@@ -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+)*(?:\s[A-Z]+)?)
-          (?::(?<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+)+(?:\s[A-Z]+)?/, "")
         result.select do |i|
-          %r{
-            ^(?<code2>\S+[^\d]*\s\d+)(?:-\w+)*(?:\s[A-Z]+)?(?::\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>

data/lib/relaton_iec/scrapper.rb

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

data/lib/relaton_iec/version.rb

@@ -1,3 +1,3 @@
 module RelatonIec
-  VERSION = "1.11.3".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.3
+  version: 1.11.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-27 00:00:00.000000000 Z
+date: 2022-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -175,7 +175,6 @@ 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

data/lib/data/61360-4_DB.yaml

@@ -1,63 +0,0 @@
-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