relaton-iec 1.16.1 → 1.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22c30d32d348985a90f88d21872741162ebef459ccff4fc118597f196e53f4b9
-  data.tar.gz: 5a265ce8efceee119c822824eb347ace8aeedd9f695b23b7270a22d150da3678
+  metadata.gz: f56f331501e59dbf8da01e6444c93abf2bb7df8ec1dc2ed7ce12d2db4499ffbe
+  data.tar.gz: 6a2f4faf1ebddfa0c6909816eb6f4876fc57c2fdefec52e2a1fb9250706eebbd
 SHA512:
-  metadata.gz: f6f4575283e266b8f35c28b88ff70ec1653c35222e6283d62385c883c459a3a65b096b5ed7495b68a40f4b99760f2e741d59ce4c370556180d0e41bc3d04f529
-  data.tar.gz: 76d9702d3434cf7a7c3b1dfc4e03e9be53ca2e49c801c5dc2060b7574e3d3c023ade59074daeb628a00eb57e1792860d8d35073228594baf0e897917d2b3c9d1
+  metadata.gz: ada90e3aabddb40bc0e780d4959b7182f13b560741cf8058a000c1e372813d0023366f5835217a54afd4ef8149bf913e12c3084f2818031ca6eaa8fdf096f457
+  data.tar.gz: e1386d61a2525dee63591cb02abbcc728ad28d9d4f87758ec2f39aba6aedf37be1f05ecd9ab09af2c487481ca8025ae2d4d8b37a027bccad82a44f8017317435

data/README.adoc

@@ -31,6 +31,20 @@ Or install it yourself as:
 
 == Usage
 
+=== Configuration
+
+Configuration is optional. The available option is `logger` which is a `Logger` instance. By default, the logger is `Logger.new($stderr)` with `Logger::WARN` level. To change the logger level, use `RelatonIec.configure` block.
+
+[source,ruby]
+----
+require 'relaton_iec'
+=> true
+
+RelatonIec.configure do |config|
+  config.logger.level = Logger::DEBUG
+end
+----
+
 === Search for a standard using keywords
 
 `RelatonIec::IecBibliography.search(ref, year)` method returns hits collection. Each hit can be used to fetch a document.
@@ -40,9 +54,6 @@ Or install it yourself as:
 
 [source,ruby]
 ----
-require 'relaton_iec'
-=> true
-
 hit_collection = RelatonIec::IecBibliography.search("60050")
 => <RelatonIec::HitCollection:0x007fe0d7126f28 @ref=60050 @fetched=false>
 
@@ -78,14 +89,14 @@ item.docidentifier.detect { |di| di.type == "URN" }.id
 [source,ruby]
 ----
 item = RelatonIec::IecBibliography.get("IEC 60050-112:2010")
-[relaton-iec] ("IEC 60050-112:2010") fetching...
-[relaton-iec] ("IEC 60050-112:2010") found IEC 60050-112:2010
+[relaton-iec] (IEC 60050-112:2010) Fetching from Relaton repository ...
+[relaton-iec] (IEC 60050-112:2010) Found: `IEC 60050-112:2010`
 => #<RelatonIec::IecBibliographicItem:0x00007f876525e8d0
 ...
 
 item = RelatonIec::IecBibliography.get("IEC 60050-112", "2010", all_parts: true)
-[relaton-iec] ("IEC 60050-112") fetching...
-[relaton-iec] ("IEC 60050-112") found IEC 60050 (all parts)
+[relaton-iec] (IEC 60050-112) Fetching from Relaton repository ...
+[relaton-iec] (IEC 60050-112) Found: `IEC 60050 (all parts)`
 => #<RelatonIec::IecBibliographicItem:0x00007f87851888f0
 ...
 
@@ -93,8 +104,8 @@ item.docidentifier.first
 => #<RelatonBib::DocumentIdentifier:0x00007f878518eea8 @id="IEC 60050 (all parts)", @language=nil, @primary=true, @scope=nil, @script=nil, @type="IEC">
 
 item = RelatonIec::IecBibliography.get("IEC 60050-112", "2010")
-[relaton-iec] ("IEC 60050-112") fetching...
-[relaton-iec] ("IEC 60050-112") found IEC 60050-112:2010
+[relaton-iec] (IEC 60050-112) Fetching from Relaton repository ...
+[relaton-iec] (IEC 60050-112) Found: `IEC 60050-112:2010`
 => #<RelatonIec::IecBibliographicItem:0x007fa69f296da8
 
 item.docidentifier.first

data/lib/relaton_iec/basic_block/image.rb

@@ -13,12 +13,12 @@ module BasicBlock
       @mimetype = mimetype
       @filename = args[:filename]
       if args[:width] && !args[:width].is_a?(Integer) && args[:width] != "auto"
-        warn "[basic-block] WARNING: invalid image width attribute \"#{args[:width]}"
-        warn "[basic-block] image width should be integer or \"auto\""
+        warn "[basic-block] WARNING: Invalid image width attribute: \"#{args[:width]}"
+        warn "[basic-block] Image width should be integer or \"auto\""
       end
       if args[:height] && !args[:height].is_a?(Integer) && args[:height] != "auto"
-        warn "[basic-block] WARNING: invalid image height attribute \"#{args[:height]}"
-        warn "[basic-block] image height should be integer or \"auto\""
+        warn "[basic-block] WARNING: Invalid image height attribute: \"#{args[:height]}"
+        warn "[basic-block] Image height should be integer or \"auto\""
       end
       @width = args[:width]
       @height = args[:height]

data/lib/relaton_iec/basic_block/reference_format.rb

@@ -4,7 +4,7 @@ module RelatonIec
   end
 
   def self.method_missing(_method, *args)
-    ReferenceFormat.new *args
+    ReferenceFormat.new(*args)
   end
 
   class ReferenceFormat
@@ -15,8 +15,8 @@ module RelatonIec
     #
     def initialize(format)
       unless FORMATS.include? format
-        warn "[relaton-iec] WARNING: invalid reference format \"#{format}\""
-        warn "[relaton-iec] alloved reference formats are: #{FORMATS.join ', '}"
+        warn "[relaton-iec] WARNING: Invalid reference format: \"#{format}\""
+        warn "[relaton-iec] Alloved reference formats are: #{FORMATS.join ', '}"
       end
       @format = format
     end

data/lib/relaton_iec/basic_block/stem.rb

@@ -11,8 +11,8 @@ module BasicBlock
     #
     def initialize(type:, content: [])
       unless TYPES.include? type
-        warn "[relaton-iec] WARNING: invalud type \"#{type}\""
-        warn "[relaton-iec] allowed types are: #{TYPES.join ', '}"
+        warn "[relaton-iec] WARNING: Invalud type: \"#{type}\""
+        warn "[relaton-iec] Allowed types are: #{TYPES.join ', '}"
       end
       @type = type
       @content = content

data/lib/relaton_iec/iec_bibliographic_item.rb

@@ -34,13 +34,13 @@ module RelatonIec
     #
     def initialize(**args) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       if args[:function] && !FUNCTION.include?(args[:function])
-        Util.warn "WARNING: invalid function `#{args[:function]}`"
-        Util.warn "allowed function values are: `#{FUNCTION.join('`, `')}`"
+        Util.warn "WARNING: Invalid function: `#{args[:function]}`"
+        Util.warn "Allowed function values are: `#{FUNCTION.join('`, `')}`"
       end
       if args[:updates_document_type] &&
           !DOCTYPES.include?(args[:updates_document_type])
-        Util.warn "WARNING: invalid updates_document_type `#{args[:updates_document_type]}`"
-        Util.warn "allowed updates_document_type values are: `#{DOCTYPES.join('`, `')}`"
+        Util.warn "WARNING: Invalid updates_document_type: `#{args[:updates_document_type]}`"
+        Util.warn "Allowed updates_document_type values are: `#{DOCTYPES.join('`, `')}`"
       end
       @function = args.delete :function
       @updates_document_type = args.delete :updates_document_type

data/lib/relaton_iec/iec_bibliography.rb

@@ -56,7 +56,7 @@ module RelatonIec
       def fetch_ref_err(code, year, missed_years) # rubocop:disable Metrics/MethodLength
         id = ref_with_year(code, year)
 
-        Util.warn "(#{id}) Not found. The identifier must be exactly as shown on the IEC Webstore."
+        Util.warn "(#{id}) Not found."
 
         if year && missed_years.any?
           warn_missing_years(code, year, missed_years)
@@ -89,7 +89,7 @@ module RelatonIec
       # @param year [String]
       # @return [String]
       def ref_with_year(ref, year)
-        year ? [ref, year].join(":") : ref
+        year && !ref.match?(/:\d{4}/) ? [ref, year].join(":") : ref
       end
 
       # @param ref [String]
@@ -125,7 +125,7 @@ module RelatonIec
       # @return [RelatonIec::HitCollection]
       def search_filter(ref, year)
         code = ref.split(":").first
-        Util.warn "(#{ref_with_year(ref, year)}) Fetching from IEC..."
+        Util.warn "(#{ref_with_year(ref, year)}) Fetching from Relaton repsitory ..."
         search(code)
       end
 
@@ -250,9 +250,10 @@ module RelatonIec
         id = ref_with_year(code, year)
         docid = ret[:ret].docidentifier.first.id
 
-        if id == docid then Util.warn "(#{id}) Found exact match."
-        else Util.warn "(#{id}) Found `#{docid}`."
-        end
+        # if id == docid then Util.warn "(#{id}) Found exact match."
+        # else
+        Util.warn "(#{id}) Found: `#{docid}`"
+        # end
 
         if ret[:missed_parts]
           Util.warn "(#{id}) TIP: `#{code}` also contains other parts, " \

data/lib/relaton_iec/processor.rb

@@ -5,7 +5,7 @@ module RelatonIec
     def initialize
       @short = :relaton_iec
       @prefix = "IEC"
-      @defaultprefix = %r{^IEC\s|^IEV($|\s)}
+      @defaultprefix = %r{^(IEC\s|CISPR\s|IEV($|\s))}
       @idtype = "IEC"
       @datasets = %w[iec-harmonized-all iec-harmonized-latest]
     end

data/lib/relaton_iec/version.rb

@@ -1,3 +1,3 @@
 module RelatonIec
-  VERSION = "1.16.1".freeze
+  VERSION = "1.16.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iec
 version: !ruby/object:Gem::Version
-  version: 1.16.1
+  version: 1.16.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-21 00:00:00.000000000 Z
+date: 2023-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable