relaton-cen 1.8.pre1 → 1.10.0

data/grammars/isostandard.rng

@@ -38,6 +38,9 @@
     </define>
     <define name="BibDataExtensionType">
       <ref name="doctype"/>
+      <optional>
+        <ref name="docsubtype"/>
+      </optional>
       <optional>
         <ref name="horizontal"/>
       </optional>
@@ -98,7 +101,11 @@
           <ref name="definitions"/>
         </optional>
         <oneOrMore>
-          <ref name="clause"/>
+          <choice>
+            <ref name="clause"/>
+            <ref name="term-clause"/>
+            <ref name="terms"/>
+          </choice>
         </oneOrMore>
       </element>
     </define>
@@ -133,22 +140,17 @@
       <optional>
         <ref name="section-title"/>
       </optional>
-      <group>
+      <choice>
         <choice>
-          <group>
-            <oneOrMore>
-              <ref name="BasicBlock"/>
-            </oneOrMore>
-            <zeroOrMore>
-              <ref name="note"/>
-            </zeroOrMore>
-          </group>
+          <oneOrMore>
+            <ref name="BasicBlock"/>
+          </oneOrMore>
           <ref name="amend"/>
         </choice>
         <oneOrMore>
           <ref name="clause-subsection"/>
         </oneOrMore>
-      </group>
+      </choice>
     </define>
     <define name="term">
       <element name="term">
@@ -157,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"/>
@@ -167,7 +183,7 @@
         <optional>
           <ref name="termdomain"/>
         </optional>
-        <ref name="definition"/>
+        <ref name="termdefinition"/>
         <zeroOrMore>
           <ref name="termnote"/>
         </zeroOrMore>
@@ -177,6 +193,9 @@
         <zeroOrMore>
           <ref name="termsource"/>
         </zeroOrMore>
+        <zeroOrMore>
+          <ref name="term"/>
+        </zeroOrMore>
       </element>
     </define>
     <define name="annex">
@@ -215,9 +234,6 @@
           -->
           <ref name="BasicBlock"/>
         </zeroOrMore>
-        <zeroOrMore>
-          <ref name="note"/>
-        </zeroOrMore>
         <zeroOrMore>
           <ref name="clause-hanging-paragraph-with-footnote"/>
         </zeroOrMore>
@@ -259,6 +275,14 @@
         <value>directive</value>
       </choice>
     </define>
+    <define name="DocumentSubtype">
+      <choice>
+        <value>specification</value>
+        <value>method-of-test</value>
+        <value>vocabulary</value>
+        <value>code-of-practice</value>
+      </choice>
+    </define>
     <define name="structuredidentifier">
       <element name="structuredidentifier">
         <optional>
@@ -333,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>
@@ -457,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

@@ -30,9 +30,22 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="number"/>
+    </optional>
     <optional>
       <attribute name="subsequence"/>
     </optional>
+    <optional>
+      <attribute name="keep-with-next">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="keep-lines-together">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <attribute name="id">
       <data type="ID"/>
     </attribute>
@@ -40,17 +53,31 @@
       <attribute name="filename"/>
     </optional>
     <optional>
-      <ref name="reqtitle"/>
+      <attribute name="model"/>
     </optional>
     <optional>
-      <ref name="label"/>
+      <attribute name="type"/>
     </optional>
     <optional>
-      <ref name="subject"/>
+      <attribute name="tag"/>
     </optional>
     <optional>
-      <ref name="reqinherit"/>
+      <attribute name="multilingual-rendering">
+        <ref name="MultilingualRenderingType"/>
+      </attribute>
     </optional>
+    <optional>
+      <ref name="reqtitle"/>
+    </optional>
+    <optional>
+      <ref name="label"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="subject"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="reqinherit"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="classification"/>
     </zeroOrMore>
@@ -61,6 +88,7 @@
         <ref name="verification"/>
         <ref name="import"/>
         <ref name="description"/>
+        <ref name="component"/>
       </choice>
     </zeroOrMore>
     <optional>
@@ -81,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">
@@ -119,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>
@@ -135,6 +175,24 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="keep-with-next">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="keep-lines-together">
+        <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

@@ -76,20 +76,20 @@ 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|
           next unless code.include? k
 
-          t, n = k.split " "
-          tc << RelatonIsoBib::IsoSubgroup.new(name: v, type: t, number: n)
+          t, n = k.split
+          tc << RelatonBib::WorkGroup.new(name: v, type: t, number: n)
         end
         sc = []
         if tc.any?
-          sc << RelatonIsoBib::IsoSubgroup.new(name: title, type: type, number: num)
+          sc << RelatonBib::WorkGroup.new(name: title, type: type, number: num)
         else
-          tc << RelatonIsoBib::IsoSubgroup.new(name: title, type: type, number: num)
+          tc << RelatonBib::WorkGroup.new(name: title, type: type, number: num)
         end
         RelatonIsoBib::EditorialGroup.new(technical_committee: tc,
                                           subcommittee: sc)

data/lib/relaton_cen/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RelatonCen
-  VERSION = "1.8.pre1"
+  VERSION = "1.10.0"
 end

data/relaton_cen.gemspec

@@ -8,13 +8,13 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Ribose Inc."]
   spec.email         = ["open.source@ribose.com"]
 
-  spec.summary       = "RelatonItu: retrieve Cenelec Standards for bibliographic use "\
-                       "using the BibliographicItem model"
-  spec.description   = "RelatonItu: retrieve Cenelec Standards for bibliographic use "\
-                       "using the BibliographicItem model"
+  spec.summary       = "RelatonCen: retrieve Cenelec Standards for "\
+                       "bibliographic use using the IsoBibliographicItem model"
+  spec.description   = "RelatonCen: retrieve Cenelec Standards for "\
+                       "bibliographic use using the IsoBibliographicItem model"
   spec.homepage      = "https://github.com/metanorma/relaton-cen"
   spec.license       = "BSD-2-Clause"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
 
@@ -33,13 +33,16 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "pry-byebug"
+  spec.add_development_dependency "rubocop", "~> 1.17.0"
+  spec.add_development_dependency "rubocop-performance", "~> 1.11.0"
+  spec.add_development_dependency "rubocop-rails", "~> 2.10.0"
   spec.add_development_dependency "ruby-jing"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "vcr", "~> 5.0.0"
   spec.add_development_dependency "webmock"
 
   spec.add_dependency "mechanize"
-  spec.add_dependency "relaton-iso-bib", "~> 1.8.0"
+  spec.add_dependency "relaton-iso-bib", "~> 1.10.0"
 
   # 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.8.pre1
+  version: 1.10.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-01 00:00:00.000000000 Z
+date: 2022-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -38,6 +38,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.17.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.17.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.11.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.11.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.10.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement
@@ -114,16 +156,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
-description: 'RelatonItu: retrieve Cenelec Standards for bibliographic use using the
-  BibliographicItem model'
+        version: 1.10.0
+description: 'RelatonCen: retrieve Cenelec Standards for bibliographic use using the
+  IsoBibliographicItem model'
 email:
 - open.source@ribose.com
 executables: []
@@ -170,16 +212,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
-summary: 'RelatonItu: retrieve Cenelec Standards for bibliographic use using the BibliographicItem
+summary: 'RelatonCen: retrieve Cenelec Standards for bibliographic use using the IsoBibliographicItem
   model'
 test_files: []