relaton-iso-bib 1.5.pre → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58423e5ad7c5cff215fc3012e90a83f4ac4aeefed297c5f37a3dd3f8afcc808c
-  data.tar.gz: 4e274610d1a54438a2c7338d11c8b8810db5ad04f0cb65402cbd135e7d79d041
+  metadata.gz: 8c9c23ffe34d6c88e2c4ad97f693507a6f5a19df868c2d3dffc7f4170ed1f245
+  data.tar.gz: b1e42d7f8c70e44aa7c8e9ea6a9e4dab84343a6a4b98d92bb12450ab0d97b2ea
 SHA512:
-  metadata.gz: '09df3e18a2a23625bcd273dccd2cbc4433e558615b0b377188c748083289a088a4b82a5d00ec5b3d77dd94ed136e849fa8bd3e430fb1e309db6556a8705fd3cb'
-  data.tar.gz: b819fc016915852535ac8cf85b064dae33c267154f811b51e982547ff2db587ffcadd6955662a2371b1eb2660edb65eef34e04ffdea09594e6f5797ca4ae987b
+  metadata.gz: 0b66cc94883fcc30a72eb92649d48fb1145ec7536bfbcf31c5c4339cf61617e49f64102a79e64350bf656b592db6874ac655ca9042bb6227ef88126ecc215ec4
+  data.tar.gz: 344ceb897089bc97ba601c9ab9aa009c419a9c218ff9331a7cebd5034cebdf1d9170280fcb6afab8f1dbb15d78ea7a307ffdc303cda6750a2c99a89ce6dbf285

data/.github/workflows/rake.yml

@@ -0,0 +1,46 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
+name: rake
+
+on:
+  push:
+    branches: [ master, main ]
+    tags: [ v* ]
+  pull_request:
+
+jobs:
+  rake:
+    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '2.7', '2.6', '2.5', '2.4' ]
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+        experimental: [ false ]
+        include:
+          - ruby: '3.0'
+            os: 'ubuntu-latest'
+            experimental: true
+          - ruby: '3.0'
+            os: 'windows-latest'
+            experimental: true
+          - ruby: '3.0'
+            os: 'macos-latest'
+            experimental: true
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+
+      # https://github.com/ruby-debug/debase/issues/89#issuecomment-686827382
+      - if: matrix.os == 'macos-latest' && matrix.ruby == '2.5'
+        run: echo BUNDLE_BUILD__DEBASE="--with-cflags=\"-Wno-error=implicit-function-declaration\"" >> $GITHUB_ENV
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - run: bundle exec rake

data/README.adoc

@@ -454,7 +454,7 @@ bib_hash = RelatonIsoBib::HashConverter.hash_to_bib hash
 => {:id=>"ISO/TC211",
 ...
 
-RelatonIsoBib::IsoBibliographicItem.new bib_hash
+RelatonIsoBib::IsoBibliographicItem.new **bib_hash
 => #<RelatonIsoBib::IsoBibliographicItem:0x007fdb95ba98e8
 ...
 ----

data/grammars/isodoc.rng

@@ -24,6 +24,14 @@
     <start>
       <ref name="standard-document"/>
     </start>
+    <define name="doctype">
+      <element name="doctype">
+        <optional>
+          <attribute name="abbreviation"/>
+        </optional>
+        <ref name="DocumentType"/>
+      </element>
+    </define>
     <define name="hyperlink">
       <element name="link">
         <attribute name="target">
@@ -42,7 +50,6 @@
     </define>
     <define name="xref">
       <element name="xref">
-        <!-- attribute target { xsd:IDREF }, -->
         <attribute name="target">
           <data type="string">
             <param name="pattern">\i\c*|\c+#\c+</param>
@@ -142,6 +149,11 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="key">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <oneOrMore>
           <ref name="dt"/>
           <ref name="dd"/>
@@ -864,6 +876,13 @@
   </define>
   <define name="standard-document">
     <element name="standard-document">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <optional>
         <ref name="boilerplate"/>
@@ -1158,49 +1177,7 @@
   </define>
   <define name="annex">
     <element name="annex">
-      <optional>
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="language"/>
-      </optional>
-      <optional>
-        <attribute name="script"/>
-      </optional>
-      <optional>
-        <attribute name="inline-header">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
-      <attribute name="obligation">
-        <choice>
-          <value>normative</value>
-          <value>informative</value>
-        </choice>
-      </attribute>
-      <optional>
-        <ref name="section-title"/>
-      </optional>
-      <group>
-        <group>
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-          <zeroOrMore>
-            <ref name="note"/>
-          </zeroOrMore>
-        </group>
-        <zeroOrMore>
-          <choice>
-            <ref name="annex-subsection"/>
-            <ref name="terms"/>
-            <ref name="definitions"/>
-            <ref name="references"/>
-          </choice>
-        </zeroOrMore>
-      </group>
+      <ref name="Annex-Section"/>
     </element>
   </define>
   <define name="terms">

data/grammars/isostandard.rng

@@ -405,6 +405,13 @@
   -->
   <define name="iso-standard">
     <element name="iso-standard">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <zeroOrMore>
         <ref name="termdocsource"/>

data/lib/relaton_iso_bib.rb

@@ -10,7 +10,7 @@ module RelatonIsoBib
   def self.grammar_hash
     gem_path = File.expand_path "..", __dir__
     grammars_path = File.join gem_path, "grammars", "*"
-    grammars = Dir[grammars_path].sort.map { |gp| File.read gp }.join
+    grammars = Dir[grammars_path].sort.map { |gp| File.read gp, encoding: "UTF-8" }.join
     Digest::MD5.hexdigest grammars
   end
 end

data/lib/relaton_iso_bib/editorial_group.rb

@@ -35,13 +35,13 @@ module RelatonIsoBib
     # @param secretariat [String, NilClass]
     def initialize(technical_committee:, **args) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/AbcSize
       @technical_committee = technical_committee.map do |tc|
-        tc.is_a?(Hash) ? IsoSubgroup.new(tc) : tc
+        tc.is_a?(Hash) ? IsoSubgroup.new(**tc) : tc
       end
       @subcommittee = args.fetch(:subcommittee, []).map do |sc|
-        sc.is_a?(Hash) ? IsoSubgroup.new(sc) : sc
+        sc.is_a?(Hash) ? IsoSubgroup.new(**sc) : sc
       end
       @workgroup = args.fetch(:workgroup, []).map do |wg|
-        wg.is_a?(Hash) ? IsoSubgroup.new(wg) : wg
+        wg.is_a?(Hash) ? IsoSubgroup.new(**wg) : wg
       end
       @secretariat = args[:secretariat]
     end

data/lib/relaton_iso_bib/hash_converter.rb

@@ -9,7 +9,7 @@ module RelatonIsoBib
       # @param item [Hash]
       # @retirn [RelatonIsoBib::IsoBibliographicItem]
       def bib_item(item)
-        IsoBibliographicItem.new(item)
+        IsoBibliographicItem.new(**item)
       end
 
       #
@@ -18,7 +18,7 @@ module RelatonIsoBib
       # @param title [Hash]
       # @return [RelatonBib::TypedTitleString]
       def typed_title_strig(title)
-        RelatonBib::TypedTitleString.new title
+        RelatonBib::TypedTitleString.new **title
       end
 
       # @param ret [Hash]
@@ -45,9 +45,7 @@ module RelatonIsoBib
       def structuredidentifier_hash_to_bib(ret)
         return unless ret[:structuredidentifier]
 
-        ret[:structuredidentifier] = RelatonIsoBib::StructuredIdentifier.new(
-          ret[:structuredidentifier],
-        )
+        ret[:structuredidentifier] = RelatonIsoBib::StructuredIdentifier.new(**ret[:structuredidentifier])
       end
     end
   end

data/lib/relaton_iso_bib/iso_bibliographic_item.rb

@@ -131,20 +131,20 @@ module RelatonIsoBib
            copyright link fetched docid formattedref extent accesslocation
            classification validity doctype keyword].include? k
       end
-      super super_args
+      super **super_args
 
       @type = args[:type] || "standard"
 
       if args[:editorialgroup]
         @editorialgroup = if args[:editorialgroup].is_a?(Hash)
-                            EditorialGroup.new(args[:editorialgroup])
+                            EditorialGroup.new(**args[:editorialgroup])
                           else args[:editorialgroup]
                           end
       end
 
       @structuredidentifier = args[:structuredidentifier]
       # @doctype = args[:doctype] || "international-standard"
-      @ics = args.fetch(:ics, []).map { |i| i.is_a?(Hash) ? Ics.new(i) : i }
+      @ics = args.fetch(:ics, []).map { |i| i.is_a?(Hash) ? Ics.new(**i) : i }
       @stagename = args[:stagename]
       @id_attribute = true
     end

data/lib/relaton_iso_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonIsoBib
-  VERSION = "1.5.pre".freeze
+  VERSION = "1.7.1".freeze
 end

data/lib/relaton_iso_bib/xml_parser.rb

@@ -24,7 +24,7 @@ module RelatonIsoBib
       # @param item_hash [Hash]
       # @return [RelatonIsoBib::IsoBibliographicItem]
       def bib_item(item_hash)
-        IsoBibliographicItem.new item_hash
+        IsoBibliographicItem.new **item_hash
       end
 
       # @param ext [Nokogiri::XML::Element]

data/relaton_iso_bib.gemspec

@@ -26,15 +26,15 @@ 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_dependency "isoics", "~> 0.1.6"
-  spec.add_dependency "relaton-bib", "~> 1.5.pre"
+  spec.add_dependency "relaton-bib", "~> 1.7.0"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iso-bib
 version: !ruby/object:Gem::Version
-  version: 1.5.pre
+  version: 1.7.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-06 00:00:00.000000000 Z
+date: 2021-03-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
@@ -142,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.pre
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.pre
+        version: 1.7.0
 description: 'RelatonIsoBib: Ruby ISOXMLDOC impementation.'
 email:
 - open.source@ribose.com
@@ -157,9 +129,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"
@@ -199,11 +169,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: 'RelatonIsoBib: Ruby ISOXMLDOC impementation.'

data/.github/workflows/macos.yml

@@ -1,32 +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
-          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