relaton-cen 1.10.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '085f9f31d68845bf7b059f2d72c37108f5c0961326c9180be37158c96c62b7e9'
-  data.tar.gz: 0eb930c6f94df2cc984c2eaccfccc2b8eeae44f9264436c0bd199a0b2fb3eac7
+  metadata.gz: 393deb797844179a0b7330a483211e0cc53f2634a2149f9c3a30ab9f11203d21
+  data.tar.gz: 2fe98d3c32dee65865570f8d767ebc2b2fa5ef00f38ac76de203102d164a738b
 SHA512:
-  metadata.gz: 1e6b4d320c12948e1286732c8130afedb09c261f1e3852110c8b8c7e706c6fdd0c17d8310e5e29d7e0605ebbfff24deeef36701731f3e270c3d017f0701fed6d
-  data.tar.gz: 4c625b64b79e94d97e06a7441c1a89c1ba9d6ee3d4c94855e6d468a8d318eb86f62650993c58c840a16790c79160b80a5274d936edf09aacd77eee144782da01
+  metadata.gz: f49d0990ce8890b5ec18c2293697683b3bdd0ba23e384a3188276fa69b1a6246bcd1888400af4c676b1afc11472e3ebba6d14fd0d5a0830f77d03eaf0b05fc5a
+  data.tar.gz: f0964fba6d839133ba6b51717b777c342af965c272d3a1f478460651e58820a93db112f7f394fa03e04696af906a5518473d953397789663550d0c9abd0b58fc

data/grammars/biblio.rng

@@ -209,9 +209,6 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="uri"/>
-      </zeroOrMore>
     </element>
   </define>
   <define name="fullname">
@@ -680,6 +677,9 @@
     <zeroOrMore>
       <ref name="extent"/>
     </zeroOrMore>
+    <optional>
+      <ref name="bibliographic_size"/>
+    </optional>
     <zeroOrMore>
       <ref name="accesslocation"/>
     </zeroOrMore>
@@ -828,6 +828,11 @@
       <optional>
         <attribute name="scope"/>
       </optional>
+      <optional>
+        <attribute name="primary">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <text/>
     </element>
   </define>
@@ -920,9 +925,29 @@
       <text/>
     </element>
   </define>
+  <define name="sizevalue">
+    <element name="value">
+      <attribute name="type"/>
+      <text/>
+    </element>
+  </define>
+  <define name="bibliographic_size">
+    <element name="size">
+      <oneOrMore>
+        <ref name="sizevalue"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="extent">
     <element name="extent">
-      <ref name="BibItemLocality"/>
+      <choice>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="localityStack"/>
+        </zeroOrMore>
+      </choice>
     </element>
   </define>
   <define name="series">

data/grammars/isodoc.rng

@@ -152,9 +152,7 @@
             <data type="boolean"/>
           </attribute>
         </optional>
-        <oneOrMore>
-          <ref name="PureTextElement"/>
-        </oneOrMore>
+        <ref name="XrefBody"/>
       </element>
     </define>
     <define name="erefType">
@@ -188,6 +186,42 @@
         <ref name="PureTextElement"/>
       </oneOrMore>
     </define>
+    <define name="localityStack">
+      <element name="localityStack">
+        <optional>
+          <attribute name="connective">
+            <choice>
+              <value>and</value>
+              <value>or</value>
+              <value>from</value>
+              <value>to</value>
+              <value/>
+            </choice>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="sourceLocalityStack">
+      <element name="sourceLocalityStack">
+        <optional>
+          <attribute name="connective">
+            <choice>
+              <value>and</value>
+              <value>or</value>
+              <value>from</value>
+              <value>to</value>
+              <value/>
+            </choice>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="sourceLocality"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="ul">
       <element name="ul">
         <attribute name="id">
@@ -1098,6 +1132,16 @@
     </define>
   </include>
   <!-- end overrides -->
+  <define name="image" combine="choice">
+    <element name="svg">
+      <oneOrMore>
+        <choice>
+          <text/>
+          <ref name="AnyElement"/>
+        </choice>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="MultilingualRenderingType">
     <choice>
       <value>common</value>
@@ -2631,4 +2675,30 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="XrefBody">
+    <zeroOrMore>
+      <ref name="XrefTarget"/>
+    </zeroOrMore>
+    <oneOrMore>
+      <ref name="PureTextElement"/>
+    </oneOrMore>
+  </define>
+  <define name="XrefTarget">
+    <element name="location">
+      <attribute name="target">
+        <data type="string">
+          <param name="pattern">\i\c*|\c+#\c+</param>
+        </data>
+      </attribute>
+      <attribute name="connective">
+        <choice>
+          <value>and</value>
+          <value>or</value>
+          <value>from</value>
+          <value>to</value>
+          <value/>
+        </choice>
+      </attribute>
+    </element>
+  </define>
 </grammar>

data/lib/relaton_cen/cen_bibliography.rb

@@ -14,8 +14,8 @@ module RelatonCen
       # @param text [String]
       # @return [RelatonCen::HitCollection]
       def search(text, year = nil)
-        /^C?EN\s(?<code>.+)/ =~ text
-        HitCollection.new code, year
+        # /^C?EN\s(?<code>.+)/ =~ text
+        HitCollection.new text, year
       rescue Mechanize::ResponseCodeError => e
         raise RelatonBib::RequestError, e.message
       end
@@ -25,12 +25,26 @@ module RelatonCen
       # @param opts [Hash] options; restricted to :all_parts if all-parts
       #   reference is required
       # @return [RelatonBib::BibliographicItem, nil]
-      def get(code, year = nil, opts = {}) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
-        code1, year1 = code.split ":"
-        code = code1
-        year ||= year1
+      def get(code, year = nil, opts = {})
+        code_parts = code_to_parts code
+        year ||= code_parts[:year] if code_parts
 
-        bib_get1(code, year, opts)
+        bib_get(code, year, opts)
+      end
+
+      #
+      # Decopmposes a CEN standard code into its parts.
+      #
+      # @param [String] code the CEN standard code to decompose
+      #
+      # @return [MatchData] the decomposition of the code
+      #
+      def code_to_parts(code)
+        %r{^
+          (?<code>[^:-]+)(?:-(?<part>\d+))?
+          (?::(?<year>\d{4}))?
+          (?:\+(?<amd>[A-Z]\d+)(?:(?<amy>\d{4}))?)?
+        }x.match code
       end
 
       private
@@ -38,10 +52,10 @@ module RelatonCen
       def fetch_ref_err(code, year, missed_years) # rubocop:disable Metrics/MethodLength
         id = year ? "#{code}:#{year}" : code
         warn "[relaton-cen] 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-cen] (There was no match for #{year}, though there "\
-            "were matches found for #{missed_years.join(', ')}.)"
+               "were matches found for #{missed_years.join(', ')}.)"
         end
         # if /\d-\d/.match? code
         #   warn "[relaton-cen] The provided document part may not exist, or "\
@@ -58,12 +72,15 @@ module RelatonCen
       # @param code [String]
       # @return [RelatonCen::HitCollection]
       def search_filter(code) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
-        %r{^C?EN\s(?<code1>[^-:]+)(?:-(?<part1>\d+))?} =~ code
+        parts = code_to_parts code
         warn "[relaton-cen] (\"#{code}\") fetching..."
         result = search(code)
         result.select do |i|
-          %r{^(?<code2>[^:-]+)(?:-(?<part2>\d+))?} =~ i.hit[:code]
-          code2.include?(code1) && (!part1 || part1 = part2)
+          pts = code_to_parts i.hit[:code]
+          parts[:code] == pts[:code] &&
+            (!parts[:part] || parts[:part] == pts[:part]) &&
+            (!parts[:year] || parts[:year] == pts[:year]) &&
+            parts[:amd] == pts[:amd] && (!parts[:amy] || parts[:amy] == pts[:amy])
         end
       end
 
@@ -87,7 +104,7 @@ module RelatonCen
         { years: missed_years }
       end
 
-      def bib_get1(code, year, _opts)
+      def bib_get(code, year, _opts)
         result = search_filter(code) || return
         ret = isobib_results_filter(result, year)
         if ret[:ret]

data/lib/relaton_cen/hit_collection.rb

@@ -29,10 +29,10 @@ module RelatonCen
 
         val = case f[:value]
               when "LANGUAGE_LIST" then 0
-              when "STAND_REF" then ref
+              when "STAND_REF" then CGI.escape(ref)
               else
                 case f[:name]
-                when "p_request" then "S1-S2-S3-S4-S5-S6-CEN-CLC-"
+                when "p_request" then "S1-S2-S3-S4-S5-S6-S7-CEN-CLC-"
                 when "f10" then ""
                 else f[:value]
                 end
@@ -44,10 +44,24 @@ module RelatonCen
       end.compact.join("&")
       resp = agent.post form[:action], req_body
       @array = hits resp
+      sort
     end
 
     private
 
+    def sort
+      @array.sort! do |a, b|
+        ap = CenBibliography.code_to_parts a.hit[:code]
+        bp = CenBibliography.code_to_parts b.hit[:code]
+        s = ap[:code] <=> bp[:code]
+        s = ap[:part].to_s <=> bp[:part].to_s if s.zero?
+        s = bp[:year].to_s <=> ap[:year].to_s if s.zero?
+        s = ap[:amd].to_s <=> bp[:amd].to_s if s.zero?
+        s = ap[:amy].to_s <=> bp[:amy].to_s if s.zero?
+        s
+      end
+    end
+
     # @param resp [Mechanize::Page]
     # @return [Array<RelatonCen::Hit>]
     def hits(resp)

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.

data/lib/relaton_cen/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RelatonCen
-  VERSION = "1.10.0"
+  VERSION = "1.11.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.10.0"
+  spec.add_dependency "relaton-iso-bib", "~> 1.11.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.10.0
+  version: 1.11.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-30 00:00:00.000000000 Z
+date: 2022-04-29 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.10.0
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0
 description: 'RelatonCen: retrieve Cenelec Standards for bibliographic use using the
   IsoBibliographicItem model'
 email: