relaton-bsi 1.9.2 → 1.10.0

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_bsi/bsi_bibliography.rb

@@ -24,17 +24,21 @@ module RelatonBsi
         raise RelatonBib::RequestError, e.message
       end
 
+      #
       # @param code [String] the BSI standard Code to look up
       # @param year [String] the year the standard was published (optional)
-      # @param opts [Hash] options; restricted to :all_parts if all-parts reference is required
+      # @param opts [Hash] options
+      # @option opts [Boolean] :all_parts if all-parts reference is required
+      # @option opts [Boolean] :no_year if last published document is required
+      #
       # @return [String] Relaton XML serialisation of reference
-      def get(code, year = nil, opts = {}) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
-        c, y = code.split ':'
-        year ||= y
-        ret = bib_get1(c, year, opts)
+      def get(code, year = nil, opts = {})
+        # y = code.split(":")[1]
+        year ||= code_parts(code)[:year]
+        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_most_recent_reference unless year || opts[:keep_year]
         # ret = ret.to_all_parts if opts[:all_parts]
         ret
       end
@@ -44,35 +48,48 @@ module RelatonBsi
       def fetch_ref_err(code, year, missed_years) # rubocop:disable Metrics/MethodLength
         id = year ? "#{code}:#{year}" : code
         warn "[relaton-bsi] 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-bsi] (There was no match for #{year}, though there were matches "\
-            "found for #{missed_years.join(', ')}.)"
+          warn "[relaton-bsi] (There was no match for #{year}, though there "\
+               "were matches found for #{missed_years.join(', ')}.)"
         end
         # if /\d-\d/.match? code
-        #   warn "[relaton-bsi] The provided document part may not exist, or the document "\
-        #     "may no longer be published in parts."
+        #   warn "[relaton-bsi] The provided document part may not exist, or "\
+        #     "the document may no longer be published in parts."
         # else
-        #   warn "[relaton-bsi] 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)."
+        #   warn "[relaton-bsi] 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)."
         # end
         nil
       end
 
       def search_filter(code) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
-        # %r{^BSI\s(?<code1>[^:]+)} =~ code
-        code1 = code.sub(/^BSI\s/, "")
+        # %r{^(?:BSI\s)?(?<code1>[^:]+)} =~ code
+        # %r{^(?<code1>[^:]+)} =~ code.sub(/^BSI\s/, "")
+        cp1 = code_parts code
         warn "[relaton-bsi] (\"#{code}\") fetching..."
-        return [] unless code1
+        return [] unless cp1
 
         result = search(code)
         result.select do |i|
-          %r{^(?<code2>[^:]+)} =~ i.hit[:code]
-          code2.include?(code1)
+          # %r{^(?<code2>[^:]+)} =~ i.hit[:code]
+          cp2 = code_parts i.hit[:code]
+          cp2[:code] == cp1[:code] && (!cp1[:a] || cp2[:a] == cp1[:a]) &&
+            (!cp1[:y] || cp2[:y] == cp1[:y])
         end
       end
 
+      def code_parts(code)
+        %r{
+          ^(?:BSI\s)?(?<code>[^:]+)
+          (?::(?<year>\d{4}))?
+          (?:\+(?<a>[^:]+):)?
+          (?::(?<y>\d{4}))?
+        }x.match code
+      end
+
       # Sort through the results from Isobib, fetching them three at a time,
       # and return the first result that matches the code,
       # matches the year (if provided), and which # has a title (amendments do not).

data/lib/relaton_bsi/hit_collection.rb

@@ -8,16 +8,14 @@ module RelatonBsi
   class HitCollection < RelatonBib::HitCollection
     DOMAIN = "https://shop.bsigroup.com"
 
-    # @return [Mechanize]
-    # attr_reader :agent
-
     # @param ref [String]
     # @param year [String]
     def initialize(ref, year = nil)
       super ref, year
-      # @agent = Mechanize.new
-      # resp = agent.get "#{DOMAIN}/SearchResults/?q=#{ref}"
-      config = Algolia::Search::Config.new(application_id: "575YE157G9", api_key: "a057b4e74099445df2eddb7940828a10")
+      config = Algolia::Search::Config.new(
+        application_id: "575YE157G9",
+        api_key: "a057b4e74099445df2eddb7940828a10",
+      )
       client = Algolia::Search::Client.new config, logger: ::Logger.new($stderr)
       index = client.init_index "shopify_products"
       resp = index.search text # , facetFilters: "product_type:standard"
@@ -28,11 +26,13 @@ module RelatonBsi
 
     # @param hits [Array<Hash>]
     # @return [Array<RelatonBsi::Hit>]
-    def hits(hits) # rubocop:disable Metrics/MethodLength
+    def hits(hits) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       hits.map do |h|
+        code = h[:meta][:global][:primaryDesignator]
+          .sub(/\s(?:LOOSELEAF|\(A5 LAMINATED\)|-\sTC$)/, "")
         Hit.new(
           {
-            code: h[:meta][:global][:primaryDesignator],
+            code: code,
             title: h[:title],
             url: h[:handle],
             date: h[:meta][:global][:publishedDate],
@@ -42,7 +42,7 @@ module RelatonBsi
             doctype: h[:product_type],
           }, self
         )
-      end
+      end.sort_by { |h| h.hit[:date] }.reverse
     end
   end
 end

data/lib/relaton_bsi/scrapper.rb

@@ -118,7 +118,7 @@ module RelatonBsi
       # @param docid [String]
       # @param data [Hash]
       # @return [Array<RelatonBib::DocumentIdentifier>]
-      def fetch_docid(docid, data)
+      def fetch_docid(docid, data) # rubocop:disable Metrics/AbcSize
         ids = [{ type: "BSI", id: docid }]
         if data.any? && data["variants"]["edges"][0]["node"]["isbn"]
           isbn = data["variants"]["edges"][0]["node"]["isbn"]["value"]

data/lib/relaton_bsi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RelatonBsi
-  VERSION = "1.9.2"
+  VERSION = "1.10.0"
 end

data/relaton_bsi.gemspec

@@ -37,7 +37,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock"
 
   spec.add_dependency "algolia", "~> 2.1.1"
+  spec.add_dependency "graphql", "1.13.6"
   spec.add_dependency "graphql-client", "~> 0.16.0"
   # spec.add_dependency "mechanize", "~> 2.8.0"
-  spec.add_dependency "relaton-iso-bib", "~> 1.9.0"
+  spec.add_dependency "relaton-iso-bib", "~> 1.10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bsi
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.10.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-04 00:00:00.000000000 Z
+date: 2022-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.1
+- !ruby/object:Gem::Dependency
+  name: graphql
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.13.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.13.6
 - !ruby/object:Gem::Dependency
   name: graphql-client
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.10.0
 description: 'RelatonBsi: retrieve BSI Standards for bibliographic use using the BibliographicItem
   model'
 email: