relaton-w3c 1.5.0 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da93038fdc3d0a5448818ddb7b32173f99e6552a54f2d19b7a88edbe20ac14d0
-  data.tar.gz: f9a0ccbbe5172ed6618a7d570f032feb8b8d16b915dc19b1533215134a18e66f
+  metadata.gz: 17f1426ebddbbdef5ead1fc40aa991c0bb849a09e4c0a0e59b717c5b96cc8c79
+  data.tar.gz: 3e3609d8557a1798be22ace1b9ad1cb72b0ec06165651ad5b18e244e6163f412
 SHA512:
-  metadata.gz: 806960b3a8ada23fa2015fb88c9d4e9095c790ada8a0ed758d58cf7d99f974c2c25b2e0453ecf3f9e10a518f1b5ed4bdc2a829e33821ef7f86ddb3ad2ef894cf
-  data.tar.gz: d546bf3674eef23bfc90484471dd9130cc849b74557145ae674cf5eba5b1a127938db7f65321846eb669e45e68dc1b921a2c0716a4f8a1f8ee7666a5d945fc62
+  metadata.gz: 66f0bb2a3905cd8eacccebc4369cf820d1990901cd0430120a03bfcd47011d5759225cd416e410fb2c89fb8836c752c4d3e4c52fa0d1b3c980d74e7b34acf493
+  data.tar.gz: 1e91d858454e8ebd059798bb1f87b1b35e66d37af7fc1912bccaa12e8f6078ce8c5b28fd3a42bac2fdab23f653b5c8e5dc99e3e42ae1ab4144c6eda51cf7c214

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/lib/relaton_w3c/hash_converter.rb

@@ -4,7 +4,7 @@ module RelatonW3c
       # @param item_hash [Hash]
       # @return [RelatonW3c::W3cBibliographicItem]
       def bib_item(item_hash)
-        W3cBibliographicItem.new item_hash
+        W3cBibliographicItem.new **item_hash
       end
     end
   end

data/lib/relaton_w3c/hit_collection.rb

@@ -17,7 +17,7 @@ module RelatonW3c
     }.freeze
     DOMAIN = "https://www.w3.org"
     DATADIR = File.expand_path(".relaton/w3c", Dir.home).freeze
-    DATAFILE = File.expand_path("bibliograhy.yml", DATADIR).freeze
+    DATAFILE = File.expand_path("bibliography.yml", DATADIR).freeze
 
     # @param ref [String] reference to search
     def initialize(ref)

data/lib/relaton_w3c/processor.rb

@@ -29,7 +29,7 @@ module RelatonW3c
     # @return [RelatonIsoBib::CcBibliographicItem]
     def hash_to_bib(hash)
       item_hash = ::RelatonW3c::HashConverter.hash_to_bib(hash)
-      ::RelatonW3c::W3cBibliographicItem.new item_hash
+      ::RelatonW3c::W3cBibliographicItem.new **item_hash
     end
 
     # Returns hash of XML grammar

data/lib/relaton_w3c/scrapper.rb

@@ -49,7 +49,9 @@ module RelatonW3c
         titles = []
         if doc
           title = doc.at("//*[contains(@id, 'title')]")&.text
-          titles << { content: title, type: "main" } if title && !title.empty?
+          if title && !title.empty?
+            titles << { content: title.gsub(/\n/, " "), type: "main" }
+          end
           subtitle = doc.at(
             "//h2[@id='subtitle']|//p[contains(@class, 'subline')]"
           )&.text
@@ -71,7 +73,8 @@ module RelatonW3c
       def fetch_abstract(doc)
         return [] unless doc
 
-        content = doc.at("//h2[.='Abstract']/following-sibling::p").text
+        content = doc.at("//h2[.='Abstract']/following-sibling::p",
+                         "//div[@class='abstract']/p").text
         [RelatonBib::FormattedString.new(content: content, language: "en",
                                          script: "Latn")]
       end
@@ -140,7 +143,7 @@ module RelatonW3c
             end
             mem
           end
-          contribs.map { |c| contrib_info c }
+          contribs.map { |c| contrib_info **c }
         else
           hit["editor"].map do |ed|
             contrib_info name: ed, role: [{ type: "editor" }]
@@ -184,7 +187,7 @@ module RelatonW3c
         name = RelatonBib::FullName.new completename: completename
         af = []
         if args[:org]
-          org = RelatonBib::Organization.new args[:org]
+          org = RelatonBib::Organization.new **args[:org]
           af << RelatonBib::Affiliation.new(organization: org)
         end
         en = RelatonBib::Person.new name: name, url: args[:url], affiliation: af

data/lib/relaton_w3c/version.rb

@@ -1,3 +1,3 @@
 module RelatonW3c
-  VERSION = "1.5.0".freeze
+  VERSION = "1.7.2".freeze
 end

data/lib/relaton_w3c/xml_parser.rb

@@ -18,7 +18,7 @@ module RelatonW3c
       # @param item_hash [Hash]
       # @return [RelatonBib::BibliographicItem]
       def bib_item(item_hash)
-        W3cBibliographicItem.new item_hash
+        W3cBibliographicItem.new **item_hash
       end
     end
   end

data/relaton_w3c.gemspec

@@ -31,13 +31,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "debase"
+  # spec.add_development_dependency "debase"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
-  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 "relaton-bib", ">= 1.5.0"
+  spec.add_dependency "relaton-bib", ">= 1.7.0"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: relaton-w3c
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.7.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-09 00:00:00.000000000 Z
+date: 2021-03-19 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
@@ -38,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-- !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
@@ -114,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.7.0
 description: 'RelatonIso: retrieve W3C Standards for bibliographic using the IsoBibliographicItem
   model'
 email:
@@ -130,9 +102,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/macos.yml"
-- ".github/workflows/ubuntu.yml"
-- ".github/workflows/windows.yml"
+- ".github/workflows/rake.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rspec"

data/.github/workflows/macos.yml

@@ -1,38 +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: Checkout submodules
-        shell: bash
-        run: |
-          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-          git submodule sync --recursive
-          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
-      - 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,39 +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: Checkout submodules
-        shell: bash
-        run: |
-          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-          git submodule sync --recursive
-          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
-      - 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,41 +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: Checkout submodules
-        shell: bash
-        run: |
-          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-          git submodule sync --recursive
-          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
-      - 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