relaton-cen 1.11.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2db8abca05c34c25fec74fa73946b825629b6e6dcc5f37817898cf26b34d04d
-  data.tar.gz: 113f18448ece3873bf307dad1768025ad5250ed89cf0396d939f2a263606ea6b
+  metadata.gz: 393deb797844179a0b7330a483211e0cc53f2634a2149f9c3a30ab9f11203d21
+  data.tar.gz: 2fe98d3c32dee65865570f8d767ebc2b2fa5ef00f38ac76de203102d164a738b
 SHA512:
-  metadata.gz: 3c875c090a73560abcd6f851f1573993f17f6f8630f4613747a4553aeaca1a0ff9988c3c11d6104b52e90cb73ea9426f077daccd20e133793e43e542f5d263eb
-  data.tar.gz: dfecf61b161dcee9c72d61febd49cda48b8ea90bc75df8c9dfd12e2f4ddf5672b7c0ff1d8f044793f2b557ace7ee8dc86dadd2112985f07ac189335422e70d66
+  metadata.gz: f49d0990ce8890b5ec18c2293697683b3bdd0ba23e384a3188276fa69b1a6246bcd1888400af4c676b1afc11472e3ebba6d14fd0d5a0830f77d03eaf0b05fc5a
+  data.tar.gz: f0964fba6d839133ba6b51717b777c342af965c272d3a1f478460651e58820a93db112f7f394fa03e04696af906a5518473d953397789663550d0c9abd0b58fc

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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-cen
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.11.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-10 00:00:00.000000000 Z
+date: 2022-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml