relaton-iec 1.5.pre → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd9ec230a9a65e92303338c7382f1e5d0f2ff05f4b8f6045df756608051442f7
-  data.tar.gz: dd2eca3bf6042280bc5ee3b1192ed409192e5db44f64b065a2c2bd3029b7216f
+  metadata.gz: 3989d41422ae3287109099dabba99ecc5c8a5657dd391fa6e069e7116df4fdac
+  data.tar.gz: 222dd6c957c83b1a6c4bdb0a79140bf33f64da6a1725a7ece785a1fcc797bf31
 SHA512:
-  metadata.gz: 89a6fc2e201e79481a4808ca9a5274ea95b5d2d00367852e3560be9babee955618e83cc3652e3600f6b9d008eb86c20763d691ca5c747a51b54fe6b1cb90fe38
-  data.tar.gz: 79ca4485f6cd1e438c4f3cc4d50690081691491b2e03303e7ac03cfaff49d5722fb050f9928f45c1f978202d715d8a35b4fc4a8b4bd05824836a65e62c72dd25
+  metadata.gz: 59b511e74a2315143c1ed8aa5a78e231d7b8fb7a09b568676443b39bd7d077e654fba28ff9c160000beb6ba9868684646ab546af4c26605aa2c06bac5849c827
+  data.tar.gz: a9530148a809cb3b898abb86a4b54c9c2c421bdd5a71a0f11ee6000ec93b45731b4bab70c088ee973a1538c42f925d2233f27fa1c71f72abacdb70fba8685584

data/.github/workflows/macos.yml

@@ -26,6 +26,8 @@ jobs:
       - name: Update gems
         run: |
           sudo gem install bundler --force
+          ruby -v | grep 2.5 && bundle config set build.debase --with-cflags="-Wno-error=implicit-function-declaration"
+          ruby -v | grep 2.5 && bundle config set build.ruby-debug-ide --with-cflags="-Wno-error=implicit-function-declaration"
           bundle install --jobs 4 --retry 3
       - name: Run specs
         run: |

data/README.adoc

@@ -18,7 +18,7 @@ Add this line to your application's Gemfile:
 
 [source,ruby]
 ----
-gem 'relaton_iec'
+gem 'relaton-iec'
 ----
 
 And then execute:
@@ -27,7 +27,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install relaton_iec
+    $ gem install relaton-iec
 
 == Usage
 

data/grammars/iec.rng

@@ -23,6 +23,13 @@
   -->
   <define name="iec-standard">
     <element name="iec-standard">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <zeroOrMore>
         <ref name="termdocsource"/>

data/grammars/isodoc.rng

@@ -24,6 +24,14 @@
     <start>
       <ref name="standard-document"/>
     </start>
+    <define name="doctype">
+      <element name="doctype">
+        <optional>
+          <attribute name="abbreviation"/>
+        </optional>
+        <ref name="DocumentType"/>
+      </element>
+    </define>
     <define name="hyperlink">
       <element name="link">
         <attribute name="target">
@@ -42,7 +50,6 @@
     </define>
     <define name="xref">
       <element name="xref">
-        <!-- attribute target { xsd:IDREF }, -->
         <attribute name="target">
           <data type="string">
             <param name="pattern">\i\c*|\c+#\c+</param>
@@ -142,6 +149,11 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="key">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <oneOrMore>
           <ref name="dt"/>
           <ref name="dd"/>
@@ -864,6 +876,13 @@
   </define>
   <define name="standard-document">
     <element name="standard-document">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <optional>
         <ref name="boilerplate"/>
@@ -1158,49 +1177,7 @@
   </define>
   <define name="annex">
     <element name="annex">
-      <optional>
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="language"/>
-      </optional>
-      <optional>
-        <attribute name="script"/>
-      </optional>
-      <optional>
-        <attribute name="inline-header">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
-      <attribute name="obligation">
-        <choice>
-          <value>normative</value>
-          <value>informative</value>
-        </choice>
-      </attribute>
-      <optional>
-        <ref name="section-title"/>
-      </optional>
-      <group>
-        <group>
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-          <zeroOrMore>
-            <ref name="note"/>
-          </zeroOrMore>
-        </group>
-        <zeroOrMore>
-          <choice>
-            <ref name="annex-subsection"/>
-            <ref name="terms"/>
-            <ref name="definitions"/>
-            <ref name="references"/>
-          </choice>
-        </zeroOrMore>
-      </group>
+      <ref name="Annex-Section"/>
     </element>
   </define>
   <define name="terms">

data/grammars/isostandard.rng

@@ -405,6 +405,13 @@
   -->
   <define name="iso-standard">
     <element name="iso-standard">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <zeroOrMore>
         <ref name="termdocsource"/>

data/lib/relaton_iec/hit_collection.rb

@@ -9,23 +9,62 @@ module RelatonIec
     DOMAIN = "https://webstore.iec.ch"
 
     # @param ref_nbr [String]
-    # @param year [String]
-    def initialize(ref_nbr, year = nil) #(text, hit_pages = nil)
-      super
+    # @param year [String, nil]
+    # @param part [String, nil]
+    def initialize(ref_nbr, year = nil, part = nil)
+      super ref_nbr, year
+      @array = hits ref_nbr, year, part
+    end
+
+    private
+
+    # @param ref [String]
+    # @param year [String, nil]
+    # @param part [String, nil]
+    # @return [Array<RelatonIec::Hit>]
+    def hits(ref, year, part)
       from, to = nil
       if year
         from = Date.strptime year, "%Y"
         to   = from.next_year.prev_day
       end
-      url  = "#{DOMAIN}/searchkey&RefNbr=#{ref_nbr}&From=#{from}&To=#{to}&start=1"
-      doc  = Nokogiri::HTML OpenURI.open_uri(::Addressable::URI.parse(url).normalize)
-      @array = doc.css("ul.search-results > li").map do |h|
-        link  = h.at('a[@href!="#"]')
-        code  = link.text.tr [194, 160].pack("c*").force_encoding("UTF-8"), ""
-        title = h.xpath("text()").text.gsub(/[\r\n]/, "")
-        url   = DOMAIN + link[:href]
-        Hit.new({ code: code, title: title, url: url }, self)
+      get_results ref, from, to, part
+    end
+
+    # @param ref [String]
+    # @param from [Date, nil]
+    # @param to [Date, nil]
+    # @param part [String, nil]
+    # @return [Array<RelatonIec::Hit>]
+    def get_results(ref, from, to, part = nil)
+      code = part ? ref.sub(/(?<=-\d)\d+/, "*") : ref
+      [nil, "trf", "wr"].reduce([]) do |m, t|
+        url = "#{DOMAIN}/searchkey"
+        url += "&type=#{t}" if t
+        url += "&RefNbr=#{code}&From=#{from}&To=#{to}&start=1"
+        m + results(Addressable::URI.parse(url).normalize, part)
       end
     end
+
+    # @param url [String]
+    # @param part [String, nil]
+    # @return [Array<RelatonIec::Hit>]
+    def results(uri, part)
+      contains = "[contains(.,'Part #{part}:')]" if part
+      Nokogiri::HTML(OpenURI.open_uri(uri)).xpath(
+        "//body/li#{contains}",
+        "//ul[contains(@class,'search-results')]/li#{contains}",
+        "//ul[contains(@class,'morethesame')]/li#{contains}"
+      ).map { |h| make_hit h }.compact
+    end
+
+    def make_hit(hit)
+      link = hit.at('a[@href!="#"]')
+      return unless link
+
+      code  = link.text.tr [194, 160].pack("c*").force_encoding("UTF-8"), ""
+      title = hit.xpath("text()").text.gsub(/[\r\n]/, "")
+      Hit.new({ code: code, title: title, url: DOMAIN + link[:href] }, self)
+    end
   end
 end

data/lib/relaton_iec/iec_bibliography.rb

@@ -9,10 +9,19 @@ module RelatonIec
   # Class methods for search ISO standards.
   class IecBibliography
     class << self
+      ##
+      # Search for standards entries. To seach packaged document it needs to
+      # pass part parametr.
+      #
+      # @example Search for packaged standard
+      #   RelatonIec::IecBibliography.search 'IEC 60050-311', nil, '311'
+      #
       # @param text [String]
+      # @param year [String, nil]
+      # @param part [String, nil] search for packaged stndard if not nil
       # @return [RelatonIec::HitCollection]
-      def search(text, year = nil)
-        HitCollection.new text, year
+      def search(text, year = nil, part = nil)
+        HitCollection.new text, year, part
       rescue SocketError, OpenURI::HTTPError, OpenSSL::SSL::SSLError
         raise RelatonBib::RequestError, "Could not access http://www.iec.ch"
       end
@@ -76,14 +85,20 @@ module RelatonIec
         workers.result.sort_by { |a| a[:i] }.map { |x| x[:hit] }
       end
 
-      def isobib_search_filter(code)
+      def isobib_search_filter(code, year) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
         docidrx = %r{^(ISO|IEC)[^0-9]*\s[0-9-]+}
         corrigrx = %r{^(ISO|IEC)[^0-9]*\s[0-9-]+:[0-9]+/}
         warn "[relaton-iec] (\"#{code}\") fetching..."
-        result = search(code)
+        result = search(code, year)
+        if result.empty? && /(?<=-)(?<part>\d+)/ =~ code
+          # try to search packaged standard
+          result = search code, year, part
+          ref = code.sub /(?<=-\d)\d+/, ""
+        else ref = code
+        end
         result.select do |i|
           i.hit[:code] &&
-            i.hit[:code].match(docidrx).to_s.include?(code) &&
+            i.hit[:code].match(docidrx).to_s.include?(ref) &&
             corrigrx !~ i.hit[:code]
         end
       end
@@ -136,9 +151,9 @@ module RelatonIec
             return { ret: r } if !year
 
             r.date.select { |d| d.type == "published" }.each do |d|
-              return { ret: r } if year.to_i == d.on.year
+              return { ret: r } if year.to_i == d.on(:year)
 
-              missed_years << d.on.year
+              missed_years << d.on(:year)
             end
           end
         end
@@ -148,7 +163,7 @@ module RelatonIec
       def iecbib_get1(code, year, _opts)
         return iev if code.casecmp("IEV").zero?
 
-        result = isobib_search_filter(code) || return
+        result = isobib_search_filter(code, year) || return
         ret = isobib_results_filter(result, year)
         if ret[:ret]
           warn "[relaton-iec] (\"#{code}\") found "\

data/lib/relaton_iec/scrapper.rb

@@ -223,8 +223,7 @@ module RelatonIec
       def fetch_status_relations(url)
         pubid = url.match(/\d+$/).to_s
         uri = URI DOMAIN + "/webstore/webstore.nsf/AjaxRequestXML?"\
-        "Openagent&url=http://www.iec.ch/dyn/www/f?"\
-        "p=103:390:::::P390_PUBLICATION_ID:" + pubid
+        "Openagent&url=" + pubid
         resp = Net::HTTP.get_response uri
         doc = Nokogiri::XML resp.body
         status = fetch_status doc

data/lib/relaton_iec/version.rb

@@ -1,3 +1,3 @@
 module RelatonIec
-  VERSION = "1.5.pre".freeze
+  VERSION = "1.7.1".freeze
 end

data/relaton_iec.gemspec

@@ -35,5 +35,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock"
 
   spec.add_dependency "addressable"
-  spec.add_dependency "relaton-iso-bib", "~> 1.5.pre"
+  spec.add_dependency "relaton-iso-bib", "~> 1.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iec
 version: !ruby/object:Gem::Version
-  version: 1.5.pre
+  version: 1.7.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-07 00:00:00.000000000 Z
+date: 2020-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.pre
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.pre
+        version: 1.7.0
 description: 'RelatonIec: retrieve IEC Standards for bibliographic use using the IecBibliographicItem
   model'
 email:
@@ -231,9 +231,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.6
 signing_key: