relaton-iec 1.7.6 → 1.9.0

data/lib/relaton_iec/basic_block/text_element.rb

@@ -0,0 +1,27 @@
+module BasicBlock
+  class TextElement
+    TAGS = %w[em strong sub sup tt underline strike smallcap br hr keyword rp
+              rt ruby pagebreak bookmark].freeze
+
+    #
+    # @param [String] tag
+    # @param [Array<String, BasicBlock::TextElement, BasicBlock::Stem>,
+    #   String] content
+    #
+    def initialize(tag:, content:)
+      unless TAGS.include? tag
+        warn "[basic-block] WARNING: invalid tag \"#{tag}\""
+        warn "[basic-block] allowed tags are: #{TAGS.join ', '}"
+      end
+      @tag = tag
+      @content = content
+    end
+
+    # @param [Nokogiri::XML::Builder]
+    def to_xml(builder)
+      builder.send @tag do |b|
+        @content.each { |c| c.is_a?(String) ? c : c.to_xml(b) }
+      end
+    end
+  end
+end

data/lib/relaton_iec/hash_converter.rb

@@ -7,7 +7,7 @@ module RelatonIec
       # @param item [Hash]
       # @retirn [RelatonIec::IecBibliographicItem]
       def bib_item(item)
-        IecBibliographicItem.new(item)
+        IecBibliographicItem.new(**item)
       end
     end
   end

data/lib/relaton_iec/hit_collection.rb

@@ -25,7 +25,7 @@ module RelatonIec
     def to_all_parts # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Metrics/CyclomaticComplexity
       parts = @array.reject { |h| h.part.nil? }
       hit = parts.min_by &:part
-      return @array.first.fetch lang unless hit
+      return @array.first&.fetch unless hit
 
       bibitem = hit.fetch
       all_parts_item = bibitem.to_all_parts

data/lib/relaton_iec/iec_bibliographic_item.rb

@@ -3,7 +3,99 @@ module RelatonIec
     TYPES = %w[
       international-standard technical-specification technical-report
       publicly-available-specification international-workshop-agreement
-      guide
+      guide industry-technical-agreement
     ].freeze
+
+    FUNCTION = %w[emc safety enviroment quality-assurance].freeze
+
+    # @return [String, nil]
+    attr_reader :function, :updates_document_type, :price_code, :secretary,
+                :interest_to_committees
+
+    # @return [Boolean, nil]
+    attr_reader :accessibility_color_inside, :cen_processing
+
+    # attr_reader :tc_sc_officers_note
+
+    def initialize(**args) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      if args[:function] && !FUNCTION.include?(args[:function])
+        warn "[relaton-iec] WARNING: invalid function \"#{args[:function]}\""
+        warn "[relaton-iec] allowed function values are: #{FUNCTION.join(', ')}"
+      end
+      if args[:updates_document_type] &&
+          !TYPES.include?(args[:updates_document_type])
+        warn "[relaton-iec] WARNING: invalid updates_document_type "\
+          "\"#{args[:updates_document_type]}\""
+        warn "[relaton-iec] allowed updates_document_type values are: "\
+          "#{TYPES.join(', ')}"
+      end
+      @function = args.delete :function
+      @updates_document_type = args.delete :updates_document_type
+      @accessibility_color_inside = args.delete :accessibility_color_inside
+      @price_code = args.delete :price_code
+      @cen_processing = args.delete :cen_processing
+      @secretary = args.delete :secretary
+      @interest_to_committees = args.delete :interest_to_committees
+      super
+    end
+
+    # @param hash [Hash]
+    # @return [RelatonIsoBib::IecBibliographicItem]
+    def self.from_hash(hash)
+      item_hash = ::RelatonIec::HashConverter.hash_to_bib(hash)
+      new **item_hash
+    end
+
+    # @param opts [Hash]
+    # @option opts [Nokogiri::XML::Builder] :builder XML builder
+    # @option opts [Boolean] :bibdata
+    # @option opts [String] :lang language
+    # @return [String] XML
+    def to_xml(**opts) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+      super **opts do |b|
+        if opts[:bibdata]
+          b.ext do
+            b.doctype doctype if doctype
+            b.horizontal horizontal unless horizontal.nil?
+            b.function function if function
+            editorialgroup&.to_xml b
+            ics.each { |i| i.to_xml b }
+            structuredidentifier&.to_xml b
+            b.stagename stagename if stagename
+            if updates_document_type
+              b.send("updates-document-type", updates_document_type)
+            end
+            unless accessibility_color_inside.nil?
+              b.send("accessibility-color-inside", accessibility_color_inside)
+            end
+            b.send("price-code", price_code) if price_code
+            b.send("cen-processing", cen_processing) unless cen_processing.nil?
+            b.secretary secretary if secretary
+            if interest_to_committees
+              b.send("interest-to-committees", interest_to_committees)
+            end
+          end
+        end
+      end
+    end
+
+    # @return [Hash]
+    def to_hash # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
+      hash = super
+      hash["function"] = function if function
+      if updates_document_type
+        hash["updates_document_type"] = updates_document_type
+      end
+      unless accessibility_color_inside.nil?
+        hash["accessibility_color_inside"] = accessibility_color_inside
+      end
+      hash["price_code"] = price_code if price_code
+      hash["cen_processing"] = cen_processing unless cen_processing.nil?
+      hash["secretary"] = secretary if secretary
+      if interest_to_committees
+        hash["interest_to_committees"] = interest_to_committees
+      end
+      hash
+    end
   end
 end

data/lib/relaton_iec/iec_bibliography.rb

@@ -21,7 +21,7 @@ module RelatonIec
       # @param part [String, nil] search for packaged stndard if not nil
       # @return [RelatonIec::HitCollection]
       def search(text, year = nil, part = nil)
-        HitCollection.new text, year&.strip, part
+        HitCollection.new text.sub(/(^\w+)\//, '\1 '), year&.strip, part
       rescue SocketError, OpenURI::HTTPError, OpenSSL::SSL::SSLError
         raise RelatonBib::RequestError, "Could not access http://www.iec.ch"
       end
@@ -105,6 +105,7 @@ module RelatonIec
           result = search code, year, part
         end
         result = search code if result.empty?
+        code = result.text.dup
         code&.sub! /((?:-\w+)+)/, ""
         result.select do |i|
           %r{
@@ -158,8 +159,8 @@ module RelatonIec
       # Does not match corrigenda etc (e.g. ISO 3166-1:2006/Cor 1:2007)
       # If no match, returns any years which caused mismatch, for error
       # reporting
-      def results_filter(result, ref, year, opts) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
-        r_code, r_year = code_year ref, result.part
+      def results_filter(result, year, opts) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
+        r_code, r_year = code_year result.text, result.part
         r_year ||= year
         missed_years = []
         missed_parts = false
@@ -186,7 +187,7 @@ module RelatonIec
         { ret: ret, years: missed_years, missed_parts: missed_parts }
       end
 
-      # @param ref [string]
+      # @param ref [String]
       # @param part [String, nil]
       # @return [Array<String, nil>]
       def code_year(ref, part)
@@ -204,7 +205,7 @@ module RelatonIec
       # @return [RelatonIec::IecBibliographicItem, nil]
       def iecbib_get(code, year, opts) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
         result = search_filter(code, year) || return
-        ret = results_filter(result, code, year, opts)
+        ret = results_filter(result, year, opts)
         if ret[:ret]
           if ret[:missed_parts]
             warn "[relaton-iec] WARNING: #{code} found as #{ret[:ret].docidentifier.first.id} "\

data/lib/relaton_iec/processor.rb

@@ -26,8 +26,7 @@ module RelatonIec
     # @param hash [Hash]
     # @return [RelatonIsoBib::IecBibliographicItem]
     def hash_to_bib(hash)
-      item_hash = ::RelatonIec::HashConverter.hash_to_bib(hash)
-      ::RelatonIec::IecBibliographicItem.new item_hash
+      ::RelatonIec::IecBibliographicItem.from_hash hash
     end
 
     # Returns hash of XML grammar

data/lib/relaton_iec/scrapper.rb

@@ -241,14 +241,7 @@ module RelatonIec
 
       def fetch_contributors(code)
         code.sub(/\s.*/, "").split("/").map do |abbrev|
-          case abbrev
-          when "ISO"
-            name = "International Organization for Standardization"
-            url = "www.iso.org"
-          when "IEC"
-            name = "International Electrotechnical Commission"
-            url  = "www.iec.ch"
-          end
+          name, url = name_url abbrev
           { entity: { name: name, url: url, abbreviation: abbrev },
             role: [type: "publisher"] }
         end
@@ -285,11 +278,7 @@ module RelatonIec
       # @return [Array<Hash>]
       def fetch_copyright(code, doc)
         abbreviation = code.match(/.*?(?=\s)/).to_s
-        case abbreviation
-        when "IEC"
-          name = "International Electrotechnical Commission"
-          url = "www.iec.ch"
-        end
+        name, url = name_url abbreviation
         from = code.match(/(?<=:)\d{4}/).to_s
         if from.empty?
           from = doc.xpath("//span[@itemprop='releaseDate']").text
@@ -301,6 +290,14 @@ module RelatonIec
         }]
       end
       # rubocop:enable Metrics/MethodLength
+
+      def name_url(abbrev)
+        case abbrev
+        when "ISO" then ["International Organization for Standardization", "www.iso.org"]
+        when "IEC" then ["International Electrotechnical Commission", "www.iec.ch"]
+        when "CISPR" then ["International special committee on radio interference", "www.iec.ch"]
+        end
+      end
     end
   end
 end

data/lib/relaton_iec/tc_sc_officers_note.rb

@@ -0,0 +1,24 @@
+module RelatonIec
+  class TcScOfficersNote
+    # @return [Array<RelatonIec::BasicBlock>]
+    attr_reader :basic_blocks
+
+    #
+    # @param [Array<BasicBlock::ParagraphWithFootnote>] basic_blocks
+    #
+    def initialize(basic_blocks)
+      @basic_blocks = basic_blocks
+    end
+
+    #
+    # XML serialization
+    #
+    # @param [Nokogiri::XML::Builder] builder
+    #
+    def to_xml(builder)
+      builder.send "tc-sc-officers-note" do |b|
+        basic_blocks.each { |bb| bb.to_xml b }
+      end
+    end
+  end
+end

data/lib/relaton_iec/version.rb

@@ -1,3 +1,3 @@
 module RelatonIec
-  VERSION = "1.7.6".freeze
+  VERSION = "1.9.0".freeze
 end

data/lib/relaton_iec/xml_parser.rb

@@ -1,13 +1,33 @@
 module RelatonIec
   class XMLParser < RelatonIsoBib::XMLParser
     class << self
+      # Override RelatonIsoBib::XMLParser.item_data method.
+      # @param isoitem [Nokogiri::XML::Element]
+      # @returtn [Hash]
+      def item_data(isoitem) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
+        data = super
+        ext = isoitem.at "./ext"
+        return data unless ext
+
+        data[:function] = ext.at("./function")&.text
+        data[:updates_document_type] = ext.at("./updates-document-type")&.text
+        aci = ext.at("./accessibility-color-inside")
+        data[:accessibility_color_inside] = aci.text == "true" if aci
+        data[:price_code] = ext.at("./price-code")&.text
+        cp = ext.at("./cen-processing")
+        data[:cen_processing] = cp.text == "true" if cp
+        data[:secretary] = ext.at("./secretary")&.text
+        data[:interest_to_committees] = ext.at("./interest-to-committees")&.text
+        data
+      end
+
       private
 
       # override RelatonIsoBib::IsoBibliographicItem.bib_item method
       # @param item_hash [Hash]
       # @return [RelatonIec::IecBibliographicItem]
       def bib_item(item_hash)
-        IecBibliographicItem.new item_hash
+        IecBibliographicItem.new **item_hash
       end
     end
   end

data/relaton_iec.gemspec

@@ -21,19 +21,17 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.add_development_dependency "debase"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "ruby-debug-ide"
   spec.add_development_dependency "ruby-jing"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
 
   spec.add_dependency "addressable"
-  spec.add_dependency "relaton-iso-bib", "~> 1.7.0"
+  spec.add_dependency "relaton-iso-bib", "~> 1.9.0"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iec
 version: !ruby/object:Gem::Version
-  version: 1.7.6
+  version: 1.9.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-03 00:00:00.000000000 Z
+date: 2021-08-26 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: debase
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: ruby-debug-ide
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.9.0
 description: 'RelatonIec: retrieve IEC Standards for bibliographic use using the IecBibliographicItem
   model'
 email:
@@ -186,9 +158,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/macos.yml"
-- ".github/workflows/ubuntu.yml"
-- ".github/workflows/windows.yml"
+- ".github/workflows/rake.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -206,6 +176,23 @@ files:
 - grammars/isostandard.rng
 - grammars/reqt.rng
 - lib/relaton_iec.rb
+- lib/relaton_iec/basic_block/alignment.rb
+- lib/relaton_iec/basic_block/basic_block.rb
+- lib/relaton_iec/basic_block/citation_type.rb
+- lib/relaton_iec/basic_block/dl.rb
+- lib/relaton_iec/basic_block/eref.rb
+- lib/relaton_iec/basic_block/eref_type.rb
+- lib/relaton_iec/basic_block/formula.rb
+- lib/relaton_iec/basic_block/image.rb
+- lib/relaton_iec/basic_block/index.rb
+- lib/relaton_iec/basic_block/index_xref.rb
+- lib/relaton_iec/basic_block/note.rb
+- lib/relaton_iec/basic_block/paragraph.rb
+- lib/relaton_iec/basic_block/paragraph_with_footnote.rb
+- lib/relaton_iec/basic_block/reference_format.rb
+- lib/relaton_iec/basic_block/stem.rb
+- lib/relaton_iec/basic_block/table.rb
+- lib/relaton_iec/basic_block/text_element.rb
 - lib/relaton_iec/hash_converter.rb
 - lib/relaton_iec/hit.rb
 - lib/relaton_iec/hit_collection.rb
@@ -214,6 +201,7 @@ files:
 - lib/relaton_iec/processor.rb
 - lib/relaton_iec/scrapper.rb
 - lib/relaton_iec/statuses.yml
+- lib/relaton_iec/tc_sc_officers_note.rb
 - lib/relaton_iec/version.rb
 - lib/relaton_iec/xml_parser.rb
 - relaton_iec.gemspec
@@ -229,14 +217,14 @@ 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: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: 'RelatonIec: retrieve IEC Standards for bibliographic use using the IecBibliographicItem