relaton-calconnect 1.6.0 → 1.9.0

data/grammars/reqt.rng

@@ -30,15 +30,34 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="number"/>
+    </optional>
     <optional>
       <attribute name="subsequence"/>
     </optional>
+    <optional>
+      <attribute name="keep-with-next">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="keep-lines-together">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <attribute name="id">
       <data type="ID"/>
     </attribute>
     <optional>
       <attribute name="filename"/>
     </optional>
+    <optional>
+      <attribute name="model"/>
+    </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="reqtitle"/>
     </optional>
@@ -48,9 +67,9 @@
     <optional>
       <ref name="subject"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="reqinherit"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="classification"/>
     </zeroOrMore>
@@ -135,6 +154,16 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="keep-with-next">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="keep-lines-together">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <oneOrMore>
       <ref name="BasicBlock"/>
     </oneOrMore>

data/lib/relaton_calconnect/cc_bibliographic_item.rb

@@ -4,5 +4,12 @@ module RelatonCalconnect
       directive guide specification standard report administrative amendment
       technical\ corrigendum advisory
     ].freeze
+
+    # @param hash [Hash]
+    # @return [RelatonIsoBib::CcBibliographicItem]
+    def self.from_hash(hash)
+      item_hash = ::RelatonCalconnect::HashConverter.hash_to_bib(hash)
+      new(**item_hash)
+    end
   end
 end

data/lib/relaton_calconnect/cc_bibliography.rb

@@ -3,7 +3,7 @@ module RelatonCalconnect
     class << self
       # @param text [String]
       # @return [RelatonCalconnect::HitCollection]
-      def search(text, year = nil, opts = {})
+      def search(text, year = nil, _opts = {})
         HitCollection.new text, year
       rescue Faraday::ConnectionFailed
         raise RelatonBib::RequestError, "Could not access https://standards.calconnect.org"
@@ -18,11 +18,11 @@ module RelatonCalconnect
       # @option opts [TrueClass, FalseClass] :bibdata
       #
       # @return [RelatonCalconnect::CcBibliographicItem]
-      def get(ref, year = nil, opts = {})
+      def get(ref, year = nil, opts = {}) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
         code = ref
 
         if year.nil?
-          /^(?<code1>[^\s]+(\s\w+)?\s[\d-]+):?(?<year1>\d{4})?/ =~ ref
+          /^(?<code1>[^\s]+(?:\s\w+)?\s[\d-]+):?(?<year1>\d{4})?/ =~ ref
           unless code1.nil?
             code = code1
             year = year1
@@ -30,7 +30,7 @@ module RelatonCalconnect
         end
 
         warn "[relaton-calconnect] (\"#{ref}\") fetching..."
-        result = bib_search_filter(code, year, opts) || (return nil)
+        result = search(code, year, opts) || (return nil)
         ret = bib_results_filter(result, year)
         if ret[:ret]
           warn "[relaton-calconnect] (\"#{ref}\") found #{ret[:ret].docidentifier.first.id}"
@@ -42,10 +42,6 @@ module RelatonCalconnect
 
       private
 
-      def bib_search_filter(code, year, opts)
-        search(code, year, opts)
-      end
-
       # Sort through the results from RelatonNist, fetching them three at a time,
       # and return the first result that matches the code,
       # matches the year (if provided), and which # has a title (amendments do not).
@@ -80,8 +76,8 @@ module RelatonCalconnect
         warn "[relaton-calconnect] WARNING: no match found online for #{id}. "\
           "The code must be exactly like it is on the standards website."
         unless missed_years.empty?
-          warn "[relaton-calconnect] (There was no match for #{year}, though there were matches "\
-            "found for #{missed_years.join(', ')}.)"
+          warn "[relaton-calconnect] (There was no match for #{year}, though "\
+            "there were matches found for #{missed_years.join(', ')}.)"
         end
         nil
       end

data/lib/relaton_calconnect/hash_converter.rb

@@ -1,4 +1,15 @@
 module RelatonCalconnect
   class HashConverter < RelatonBib::HashConverter
+    class << self
+      # @param ret [Hash]
+      def editorialgroup_hash_to_bib(ret)
+        return unless ret[:editorialgroup]
+
+        technical_committee = array(ret[:editorialgroup]).map do |wg|
+          TechnicalCommittee.new RelatonBib::WorkGroup.new(**wg)
+        end
+        ret[:editorialgroup] = RelatonBib::EditorialGroup.new technical_committee
+      end
+    end
   end
 end

data/lib/relaton_calconnect/hit_collection.rb

@@ -23,7 +23,7 @@ module RelatonCalconnect
     private
 
     #
-    # Fetch data form yaml
+    # Fetch data from yaml
     #
     # @param docid [String]
     def from_yaml(docid, **_opts)
@@ -44,7 +44,7 @@ module RelatonCalconnect
     end
 
     #
-    # fetch data form server and save it to file.
+    # fetch data from server and save it to file.
     #
     def fetch_data
       resp = Faraday.new(ENDPOINT, headers: { "If-None-Match" => etag }).get
@@ -57,7 +57,7 @@ module RelatonCalconnect
     end
 
     #
-    # Read ETag form file
+    # Read ETag from file
     #
     # @return [String, NilClass]
     def etag

data/lib/relaton_calconnect/processor.rb

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

data/lib/relaton_calconnect/technical_committee.rb

@@ -0,0 +1,8 @@
+module RelatonCalconnect
+  class TechnicalCommittee < RelatonBib::TechnicalCommittee
+    # @param builder [Nokogiri::XML::Builder]
+    def to_xml(builder)
+      builder.committee { |b| workgroup.to_xml b }
+    end
+  end
+end

data/lib/relaton_calconnect/version.rb

@@ -1,3 +1,3 @@
 module RelatonCalconnect
-  VERSION = "1.6.0".freeze
+  VERSION = "1.9.0".freeze
 end

data/lib/relaton_calconnect/xml_parser.rb

@@ -5,7 +5,20 @@ module RelatonCalconnect
       # @param item_hash [Hash]
       # @return [RelatonIsoBib::IsoBibliographicItem]
       def bib_item(item_hash)
-        CcBibliographicItem.new item_hash
+        CcBibliographicItem.new(**item_hash)
+      end
+
+      # @param ext [Nokogiri::XML::Element]
+      # @return [RelatonBib::EditorialGroup, nil]
+      def fetch_editorialgroup(ext)
+        return unless ext && (eg = ext.at "editorialgroup")
+
+        eg = eg.xpath("committee", "technical-committee").map do |tc|
+          wg = RelatonBib::WorkGroup.new(name: tc.text, number: tc[:number]&.to_i,
+                                         type: tc[:type])
+          TechnicalCommittee.new wg
+        end
+        RelatonBib::EditorialGroup.new eg if eg.any?
       end
     end
   end

data/lib/relaton_calconnect.rb

@@ -4,6 +4,7 @@ require "relaton_calconnect/cc_bibliography"
 require "relaton_calconnect/hit_collection"
 require "relaton_calconnect/hit"
 require "relaton_calconnect/scrapper"
+require "relaton_calconnect/technical_committee"
 require "relaton_calconnect/cc_bibliographic_item"
 require "relaton_calconnect/xml_parser"
 require "relaton_calconnect/hash_converter"

data/relaton_calconnect.gemspec

@@ -24,18 +24,16 @@ 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 "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 "faraday"
-  spec.add_dependency "relaton-bib", "~> 1.6.0"
+  spec.add_dependency "relaton-bib", "~> 1.9.0"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: relaton-calconnect
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-13 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
@@ -66,20 +52,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
@@ -156,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.9.0
 description: 'RelatonIso: retrieve CC Standards for bibliographic use using the IsoBibliographicItem
   model'
 email:
@@ -172,9 +144,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"
@@ -198,6 +168,7 @@ files:
 - lib/relaton_calconnect/hit_collection.rb
 - lib/relaton_calconnect/processor.rb
 - lib/relaton_calconnect/scrapper.rb
+- lib/relaton_calconnect/technical_committee.rb
 - lib/relaton_calconnect/version.rb
 - lib/relaton_calconnect/xml_parser.rb
 - relaton_calconnect.gemspec
@@ -213,14 +184,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: 'RelatonIso: retrieve CC Standards for bibliographic use using the IsoBibliographicItem

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

data/.github/workflows/windows.yml

@@ -1,35 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: windows
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ '**' ]
-
-jobs:
-  test-windows:
-    name: Test on Ruby ${{ matrix.ruby }} Windows
-    runs-on: windows-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
-        shell: pwsh
-        run: |
-          gem install bundler
-          bundle config --local path vendor/bundle
-          bundle update
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          bundle exec rake