relaton-cen 1.9.0 → 1.10.1

data/grammars/isostandard.rng

@@ -142,14 +142,9 @@
       </optional>
       <choice>
         <choice>
-          <group>
-            <oneOrMore>
-              <ref name="BasicBlock"/>
-            </oneOrMore>
-            <zeroOrMore>
-              <ref name="note"/>
-            </zeroOrMore>
-          </group>
+          <oneOrMore>
+            <ref name="BasicBlock"/>
+          </oneOrMore>
           <ref name="amend"/>
         </choice>
         <oneOrMore>
@@ -164,6 +159,20 @@
             <data type="ID"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="language"/>
+        </optional>
+        <optional>
+          <attribute name="script"/>
+        </optional>
+        <optional>
+          <attribute name="tag"/>
+        </optional>
+        <optional>
+          <attribute name="multilingual-rendering">
+            <ref name="MultilingualRenderingType"/>
+          </attribute>
+        </optional>
         <ref name="preferred"/>
         <zeroOrMore>
           <ref name="admitted"/>
@@ -174,7 +183,7 @@
         <optional>
           <ref name="termdomain"/>
         </optional>
-        <ref name="definition"/>
+        <ref name="termdefinition"/>
         <zeroOrMore>
           <ref name="termnote"/>
         </zeroOrMore>
@@ -184,6 +193,9 @@
         <zeroOrMore>
           <ref name="termsource"/>
         </zeroOrMore>
+        <zeroOrMore>
+          <ref name="term"/>
+        </zeroOrMore>
       </element>
     </define>
     <define name="annex">
@@ -222,9 +234,6 @@
           -->
           <ref name="BasicBlock"/>
         </zeroOrMore>
-        <zeroOrMore>
-          <ref name="note"/>
-        </zeroOrMore>
         <zeroOrMore>
           <ref name="clause-hanging-paragraph-with-footnote"/>
         </zeroOrMore>
@@ -348,14 +357,9 @@
         <ref name="section-title"/>
       </optional>
       <choice>
-        <group>
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-          <zeroOrMore>
-            <ref name="note"/>
-          </zeroOrMore>
-        </group>
+        <zeroOrMore>
+          <ref name="BasicBlock"/>
+        </zeroOrMore>
         <oneOrMore>
           <ref name="content-subsection"/>
         </oneOrMore>
@@ -472,9 +476,6 @@
         <!-- allow hanging paragraphs in annexes: they introduce lists -->
         <ref name="BasicBlock"/>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="note"/>
-      </zeroOrMore>
       <zeroOrMore>
         <ref name="clause-hanging-paragraph-with-footnote"/>
       </zeroOrMore>

data/grammars/reqt.rng

@@ -58,15 +58,23 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="tag"/>
+    </optional>
+    <optional>
+      <attribute name="multilingual-rendering">
+        <ref name="MultilingualRenderingType"/>
+      </attribute>
+    </optional>
     <optional>
       <ref name="reqtitle"/>
     </optional>
     <optional>
       <ref name="label"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="subject"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="reqinherit"/>
     </zeroOrMore>
@@ -80,6 +88,7 @@
         <ref name="verification"/>
         <ref name="import"/>
         <ref name="description"/>
+        <ref name="component"/>
       </choice>
     </zeroOrMore>
     <optional>
@@ -100,17 +109,23 @@
   </define>
   <define name="label">
     <element name="label">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="subject">
     <element name="subject">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="reqinherit">
     <element name="inherit">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="measurementtarget">
@@ -138,6 +153,12 @@
       <ref name="RequirementSubpart"/>
     </element>
   </define>
+  <define name="component">
+    <element name="component">
+      <attribute name="class"/>
+      <ref name="RequirementSubpart"/>
+    </element>
+  </define>
   <define name="reqt_references">
     <element name="references">
       <oneOrMore>
@@ -164,6 +185,14 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="tag"/>
+    </optional>
+    <optional>
+      <attribute name="multilingual-rendering">
+        <ref name="MultilingualRenderingType"/>
+      </attribute>
+    </optional>
     <oneOrMore>
       <ref name="BasicBlock"/>
     </oneOrMore>

data/lib/relaton_cen/cen_bibliography.rb

@@ -14,7 +14,7 @@ module RelatonCen
       # @param text [String]
       # @return [RelatonCen::HitCollection]
       def search(text, year = nil)
-        /^CEN\s(?<code>.+)/ =~ text
+        /^C?EN\s(?<code>.+)/ =~ text
         HitCollection.new code, year
       rescue Mechanize::ResponseCodeError => e
         raise RelatonBib::RequestError, e.message
@@ -26,20 +26,11 @@ module RelatonCen
       #   reference is required
       # @return [RelatonBib::BibliographicItem, nil]
       def get(code, year = nil, opts = {}) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
-        # if year.nil?
         code1, year1 = code.split ":"
-        # unless code1.nil?
         code = code1
         year ||= year1
-        # end
-        # end
-
-        ret = bib_get1(code, year, opts)
-        return nil if ret.nil?
 
-        # ret = ret.to_most_recent_reference unless year || opts[:keep_year]
-        # ret = ret.to_all_parts if opts[:all_parts]
-        ret
+        bib_get1(code, year, opts)
       end
 
       private
@@ -67,7 +58,7 @@ module RelatonCen
       # @param code [String]
       # @return [RelatonCen::HitCollection]
       def search_filter(code) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
-        %r{^CEN\s(?<code1>[^-:]+)(?:-(?<part1>\d+))?} =~ code
+        %r{^C?EN\s(?<code1>[^-:]+)(?:-(?<part1>\d+))?} =~ code
         warn "[relaton-cen] (\"#{code}\") fetching..."
         result = search(code)
         result.select do |i|

data/lib/relaton_cen/hit_collection.rb

@@ -5,7 +5,7 @@ require "relaton_cen/hit"
 module RelatonCen
   # Page of hit collection.
   class HitCollection < RelatonBib::HitCollection
-    DOMAIN = "https://standards.cen.eu/dyn/www/"
+    DOMAIN = "https://standards.cencenelec.eu/dyn/www/"
 
     # @return [Mechanize]
     attr_reader :agent
@@ -21,23 +21,25 @@ module RelatonCen
         return
       end
 
-      search_page = agent.get "#{DOMAIN}f?p=204:105:0:::::"
-      form = search_page.at "//form"
-      req_body = form.xpath("//input").map do |f|
-        next if f[:name].empty? || f[:name] == "f11"
+      search_page = agent.get "#{DOMAIN}f?p=205:105:0:::::"
+      form = search_page.at "//form[@id='wwvFlowForm']"
+      skip_inputs = %w[f11 essentialCookies]
+      req_body = form.xpath(".//input").map do |f|
+        next if f[:name].empty? || skip_inputs.include?(f[:name])
 
         val = case f[:value]
               when "LANGUAGE_LIST" then 0
               when "STAND_REF" then ref
               else
                 case f[:name]
-                when "p_request" then "S1-S2-S3-S4-S5-S6"
+                when "p_request" then "S1-S2-S3-S4-S5-S6-CEN-CLC-"
                 when "f10" then ""
                 else f[:value]
                 end
               end
         if f[:name] == "f10" then "f10=#{f[:value]}&f11=#{val}"
-        else "#{f[:name]}=#{val}"
+        else
+          "#{f[:name]}=#{val}"
         end
       end.compact.join("&")
       resp = agent.post form[:action], req_body

data/lib/relaton_cen/processor.rb

@@ -2,10 +2,10 @@ require "relaton/processor"
 
 module RelatonCen
   class Processor < Relaton::Processor
-    def initialize
+    def initialize # rubocop:disable Lint/MissingSuper
       @short = :relaton_cen
       @prefix = "CEN"
-      @defaultprefix = %r{^CEN\s}
+      @defaultprefix = %r{^C?EN\s}
       @idtype = "CEN"
     end
 

data/lib/relaton_cen/scrapper.rb

@@ -58,7 +58,7 @@ module RelatonCen
       # @param ref [String]
       # @return [Array<RelatonBib::DocumentIdentifier>]
       def fetch_docid(ref)
-        [RelatonBib::DocumentIdentifier.new(type: "CEN", id: ref)]
+        [RelatonBib::DocumentIdentifier.new(type: "CEN", id: ref, primary: true)]
       end
 
       # Fetch status.
@@ -76,7 +76,7 @@ module RelatonCen
       # @return [RelatonIsoBib::EditorialGroup]
       def fetch_editorialgroup(doc) # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
         code = doc.at("//tr/td/h1/text()").text
-        title = doc.at("//tr/td/h1/span").text
+        title = doc.at("//tr/td[3]/h1").text
         %r{/(?<type>\w+)(?:\s(?<num>[^/]+))?$} =~ code
         tc = []
         COMMITTEES.each do |k, v|

data/lib/relaton_cen/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RelatonCen
-  VERSION = "1.9.0"
+  VERSION = "1.10.1"
 end

data/relaton_cen.gemspec

@@ -42,7 +42,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock"
 
   spec.add_dependency "mechanize"
-  spec.add_dependency "relaton-iso-bib", "~> 1.9.0"
+  spec.add_dependency "relaton-iso-bib", "~> 1.10.1"
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-cen
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-26 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.10.1
 description: 'RelatonCen: retrieve Cenelec Standards for bibliographic use using the
   IsoBibliographicItem model'
 email: