relaton-iec 1.7.4 → 1.8.0

data/lib/relaton_iec/statuses.yml

@@ -4,6 +4,9 @@ ACD:
 ACDV:
   status: Approved for CDV
   stage: '30.99'
+ADISSB:
+  status: Preparation of text subcontracted to CO
+  stage: '40.95'
 ADTR:
   status: Approved for DTR
   stage: '40.99'
@@ -13,30 +16,39 @@ ADTS:
 AFDIS:
   status: Approved for FDIS
   stage: '40.99'
+AMW:
+  status: Document under revision
+  stage: '92.20'
+ANW:
+  status: Registration of new project
+  stage: '20.00'
 APUB:
   status: Approved for publication
   stage: '50.99'
+APUBSB:
+  status: Preparation of text subcontracted to CO
+  stage: '50.95'
 BPUB:
   status: Being published
   stage: '60.00'
+BWG:
+  status: Return to drafting phase or redefine project
+  stage: '30.92'
 CAN:
   status: Draft cancelled
   stage: '20.98'
+CCDV:
+  status: Draft circulated as CDV
+  stage: '40.00'
 CD:
   status: Draft circulated as CD
   stage: '30.00'
+CDISH:
+  status: Draft circulated as DISH
+  stage: '50.20'
 CDM:
   status: CD to be discussed at meeting
   stage: '30.20'
-CCDV:
-  status: Draft circulated as CDV
-  stage: '40.00'
-CDVM:
-  status: Rejected CDV to be discussed at a meeting
-  stage: '40.93'
-CFDIS:
-  status: Draft circulated as FDIS
-  stage: '50.20'
 CDPAS:
   status: Draft circulated as DPAS
   stage: '50.20'
@@ -46,12 +58,15 @@ CDTR:
 CDTS:
   status: Draft circulated as DTS
   stage: '50.20'
-DTRM:
-  status: Rejected DTR to be discussed at meeting
-  stage: '50.92'
-DTSM:
-  status: Rejected DTS to be discussed at meeting
-  stage: '50.92'
+CDVM:
+  status: Rejected CDV to be discussed at a meeting
+  stage: '40.93'
+CFDIS:
+  status: Draft circulated as FDIS
+  stage: '50.20'
+DECDISH:
+  status: DISH at editing check
+  stage: '40.99'
 DECFDIS:
   status: FDIS at editing check
   stage: '50.60'
@@ -64,6 +79,21 @@ DEL:
 DELPUB:
   status: Deleted publication
   stage: '90.99'
+DREJ:
+  status: Abandon
+  stage: '30.98'
+DTRM:
+  status: Rejected DTR to be discussed at meeting
+  stage: '50.92'
+DTSM:
+  status: Rejected DTS to be discussed at meeting
+  stage: '50.92'
+MERGED:
+  status: Fragment merged
+  stage: '30.97'
+NADIS:
+  status: Repeat enquiry
+  stage: '40.93'
 NCDV:
   status: CDV rejected
   stage: '40.98'
@@ -84,13 +114,16 @@ PNW:
   stage: '10.00'
 PPUB:
   status: Publication issued
-  stage: '60.60' # ?
+  stage: '60.60'
 PRVC:
   status: Preparation of RVC
   stage: '40.92'
 PRVD:
   status: Preparation of RVD
   stage: '40.92'
+PRVDISH:
+  status: Preparation of RVDISH
+  stage: '40.92' # ?
 PRVDPAS:
   status: Preparation of RVDPAS
   stage: '40.92'
@@ -106,15 +139,34 @@ PRVN:
 PWI:
   status: Preliminary work item
   stage: '00.00'
+RDIS:
+  status: Registration for formal approval
+  stage: '50.00'
+RDISH:
+  status: DISH received and registered
+  stage: '50.00'
 RFDIS:
   status: FDIS received and registered
   stage: '50.00'
 RPUB:
   status: Publication received and registered
   stage: '60.60'
+SPE:
+  stage: SPE # ?
+SPLIT:
+  status: Project Fragmented
+  stage: SPLIT # ?
+SRP:
+  stage: SRP
+SUSPENDED:
+  status: Project Suspended
+  stage: SUSPENDED # ?
 TCDV:
   status: Translation of CDV
   stage: '50.00'
+TDISH:
+  status: Translation of DISH
+  stage: '50.00' # ?
 TDTR:
   status: Translation of DTR
   stage: '50.00'
@@ -129,4 +181,19 @@ TPUB:
   stage: '60.00'
 WPUB:
   status: Publication withdrawn
-  stage: '95.99'
+  stage: '95.99'
+preCD:
+  status: Preparation of CD document
+  stage: preCD
+preCDPAS:
+  status: Preparation of DPAS
+  stage: preCDPAS
+preDISH:
+  status: Preparation of DISH
+  stage: preDISH
+preDTR:
+  status: Preparation of DTR document
+  stage: preDTR
+prePNW:
+  status: Preparation of NP document
+  stage: prePNW

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.4".freeze
+  VERSION = "1.8.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

@@ -23,17 +23,17 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
-  spec.add_development_dependency "debase"
+  # 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-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.8.0"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iec
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.8.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-17 00:00:00.000000000 Z
+date: 2021-05-17 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.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.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"
@@ -197,6 +167,7 @@ files:
 - README.adoc
 - Rakefile
 - bin/console
+- bin/rspec
 - bin/setup
 - grammars/basicdoc.rng
 - grammars/biblio.rng
@@ -205,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
@@ -213,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
@@ -235,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !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

data/.github/workflows/macos.yml

@@ -1,34 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: macos
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ '**' ]
-
-jobs:
-  test-macos:
-    name: Test on Ruby ${{ matrix.ruby }} macOS
-    runs-on: macos-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
-      - name: Update gems
-        run: |
-          sudo gem install bundler --force
-          ruby -v | grep 2.5 && bundle config set build.debase --with-cflags="-Wno-error=implicit-function-declaration"
-          ruby -v | grep 2.5 && bundle config set build.ruby-debug-ide --with-cflags="-Wno-error=implicit-function-declaration"
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          bundle exec rake

data/.github/workflows/ubuntu.yml

@@ -1,33 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: ubuntu
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ '**' ]
-
-jobs:
-  test-linux:
-    name: Test on Ruby ${{ matrix.ruby }} Ubuntu
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
-      - name: Update gems
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          unset JAVA_TOOL_OPTIONS
-          bundle exec rake