relaton-iso 0.6.9 → 0.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f7708895d02ce29c36eca68bfd8d8f91f7259fa0ee60d1f26395fe88a651fde
-  data.tar.gz: 1c1a521df3375c790014c2fb089e290dc783a58188ef671c1c758678df466593
+  metadata.gz: 25c121931e586894fa45da9041d1e9d745a786c414a972841e20bffb65ca2a48
+  data.tar.gz: 9bccdfa26525a65d037d885ed888c8b7119fa4aed30be7381521cf3e721b3b7b
 SHA512:
-  metadata.gz: 2b328dc10023ac43ffd7e3dccdc686aae17b42d9e15c1c5158ba66477c0b61779c7d40cb066ac2eaf3040070a958f47fa738fbd8cfe85a1e9be629351c129e7b
-  data.tar.gz: a5decdbe0993ff219bd6be31321f8a4fa79e79f4e2b24d540cd1f7b4eee8631a1729b4a1e46f2b6296fac013f960e325d433270762ecd35d2110ea21e8f3db98
+  metadata.gz: 6a93ab39ba0f02dce79c20ccd4a5c61fe9e2a9a989b30d474d2b647c0f292b69df7a0f5d3af38a86474ee9366a535d45eada5c31f8195da0dc07116acc85b2e7
+  data.tar.gz: 8b7530c5bc8aedeb67ce78ce17741b1857b13afd567d66eedcf06f0b13a44272b1d4805177c876de5841b2cda6c4ea247e95c75439343808c523b7075fd9d6f1

data/.github/workflows/macos.yml

@@ -0,0 +1,29 @@
+# Auto-generated !!! Do not edit it manually
+# use ci-master https://github.com/metanorma/metanorma-build-scripts
+name: macos
+
+on: [push]
+
+jobs:
+  test-macos:
+    name: Test on Ruby ${{ matrix.ruby }} macOS
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        ruby: [ '2.6', '2.5', '2.4' ]
+    steps:
+      - uses: actions/checkout@master
+        with:
+          submodules: recursive
+      - name: Use Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          architecture: 'x64'
+      - name: Update gems
+        run: |
+          sudo gem install bundler -v "~> 2" --force
+          bundle install --jobs 4 --retry 3
+      - name: Run specs
+        run: |
+          bundle exec rake

data/.github/workflows/ubuntu.yml

@@ -0,0 +1,29 @@
+# Auto-generated !!! Do not edit it manually
+# use ci-master https://github.com/metanorma/metanorma-build-scripts
+name: ubuntu
+
+on: [push]
+
+jobs:
+  test-linux:
+    name: Test on Ruby ${{ matrix.ruby }} Ubuntu
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [ '2.6', '2.5', '2.4' ]
+    steps:
+      - uses: actions/checkout@master
+        with:
+          submodules: recursive
+      - name: Use Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          architecture: 'x64'
+      - name: Update gems
+        run: |
+          gem install bundler -v "~> 2"
+          bundle install --jobs 4 --retry 3
+      - name: Run specs
+        run: |
+          bundle exec rake

data/.github/workflows/windows.yml

@@ -0,0 +1,32 @@
+# Auto-generated !!! Do not edit it manually
+# use ci-master https://github.com/metanorma/metanorma-build-scripts
+name: windows
+
+on: [push]
+
+jobs:
+  test-windows:
+    name: Test on Ruby ${{ matrix.ruby }} Windows
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        ruby: [ '2.6', '2.5', '2.4' ]
+    steps:
+      - uses: actions/checkout@master
+        with:
+          submodules: recursive
+      - name: Use Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          architecture: 'x64'
+      - name: Update gems
+        shell: pwsh
+        run: |
+          gem install bundler -v "~> 2"
+          bundle config --local path vendor/bundle
+          bundle update
+          bundle install --jobs 4 --retry 3
+      - name: Run specs
+        run: |
+          bundle exec rake

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    relaton-iso (0.6.9)
+    relaton-iso (0.6.10)
       relaton-iec (~> 0.4.0)
       relaton-iso-bib (~> 0.3.0)
 
@@ -39,7 +39,7 @@ GEM
     relaton-bib (0.3.12)
       addressable
       nokogiri
-    relaton-iec (0.4.10)
+    relaton-iec (0.4.11)
       addressable
       relaton-iso-bib (~> 0.3.0)
     relaton-iso-bib (0.3.12)
@@ -92,4 +92,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.0.1
+   2.0.2

data/lib/relaton_iso/hit_collection.rb

@@ -23,7 +23,7 @@ module RelatonIso
     def initialize(text)
       @array = []
       @text = text
-      %r{(?<num>\d+)(-(?<part>\d+))?} =~ text
+      %r{\s(?<num>\d+)(-(?<part>\d+))?} =~ text
       http = Net::HTTP.new "www.iso.org", 443
       http.use_ssl = true
       search = ["status=ENT_ACTIVE,ENT_PROGRESS,ENT_INACTIVE,ENT_DELETED"]
@@ -71,10 +71,13 @@ module RelatonIso
     # end
 
     def to_all_parts
-      hit = @array.min_by { |h| h.hit["docPart"].to_i }
+      parts = @array.select { |h| !h.hit["docPart"].empty? }
+      hit = parts.min_by { |h| h.hit["docPart"].to_i }
+      return @array.first.fetch unless hit
+
       bibitem = hit.fetch
       bibitem.to_all_parts
-      @array.reject { |h| h.hit["docRef"] == hit.hit["docRef"] }.each do |hi|
+      parts.reject { |h| h.hit["docRef"] == hit.hit["docRef"] }.each do |hi|
         isobib = RelatonIsoBib::IsoBibliographicItem.new(
           formattedref: RelatonBib::FormattedRef.new(content: hi.hit["docRef"]),
         )

data/lib/relaton_iso/iso_bibliography.rb

@@ -40,21 +40,19 @@ module RelatonIso
         code = code1 if code1
 
         if year.nil?
-          /^(?<code1>[^\s]+(\s\w+)?\s[\d-]+):?(?<year1>\d{4})?/ =~ code
+          /^(?<code1>[^\s]+(\s\w+)?\s[\d-]+)(:(?<year1>\d{4}))?(?<code2>\s\w+)?/ =~ code
           unless code1.nil?
-            code = code1
+            code = code1 + code2.to_s
             year = year1
           end
         end
-        opts[:all_parts] ||= code !~ %r{^[^\s]+\s\d+-\d+} && opts[:all_parts].nil?
-        # code += "-1" if all_parts
+        opts[:all_parts] ||= code !~ %r{^[^\s]+\s\d+-\d+} && opts[:all_parts].nil? && code2.nil?
         return RelatonIec::IecBibliography.get(code, year, opts) if %r[^ISO/IEC DIR] =~ code
 
         ret = isobib_get1(code, year, corr, opts)
         return nil if ret.nil?
 
         ret.to_most_recent_reference unless year || opts[:keep_year] || opts[:all_parts]
-        # ret.to_all_parts if all_parts
         ret
       end
 
@@ -118,13 +116,14 @@ module RelatonIso
       end
 
       def try_stages(result, corr, opts)
+        res = nil
         %w[NP WD CD DIS FDIS PRF IS AWI].each do |st| # try stages
           warn "Attempting #{st} stage retrieval"
           c = yield st
           res = search_code result, c, corr, opts
           return res unless res.empty?
         end
-        result
+        res
       end
 
       def search_code(result, code, corr, opts)
@@ -145,9 +144,9 @@ module RelatonIso
       def isobib_results_filter(result, year, opts)
         missed_years = []
         hits = result.reduce!([]) do |hts, h|
-          if !year && h.hit["publicationStatus"] == "Withdrawn"
-            hts
-          elsif !year || %r{:(?<iyear>\d{4})} =~ h.hit["docRef"] && iyear == year
+          # if !year && h.hit["publicationStatus"] == "Withdrawn"
+          #   hts
+          if !year || %r{:(?<iyear>\d{4})} =~ h.hit["docRef"] && iyear == year
             hts << h
           else
             missed_years << iyear

data/lib/relaton_iso/processor.rb

@@ -7,7 +7,7 @@ module RelatonIso
     def initialize
       @short = :relaton_iso
       @prefix = "ISO"
-      @defaultprefix = %r{^(ISO)[ /]}
+      @defaultprefix = %r{^ISO(/IEC)?\s}
       @idtype = "ISO"
     end
 

data/lib/relaton_iso/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RelatonIso
-  VERSION = "0.6.9"
+  VERSION = "0.6.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iso
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.6.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-31 00:00:00.000000000 Z
+date: 2019-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -200,18 +200,19 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/macos.yml"
+- ".github/workflows/ubuntu.yml"
+- ".github/workflows/windows.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.adoc
 - Rakefile
-- appveyor.yml
 - bin/bundle
 - bin/byebug
 - bin/coderay

data/.travis.yml

@@ -1,18 +0,0 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
-language: ruby
-cache: bundler
-os:
-- linux
-- osx
-rvm:
-- 2.6
-- 2.5
-- 2.4
-- ruby-head
-before_install: 
-- gem install bundler -v "~> 2"
-- bundle update
-matrix:
-  allow_failures:
-    - rvm: ruby-head

data/appveyor.yml

@@ -1,37 +0,0 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
-version: '{build}'
-
-cache:
-  - vendor/bundle
-
-environment:
-  matrix:
-    - RUBY_VERSION: 26
-    - RUBY_VERSION: 25
-    - RUBY_VERSION: 24
-    - RUBY_VERSION: _trunk
-
-matrix:
-  allow_failures:
-    - RUBY_VERSION: _trunk
-
-install:
-  - ps: . { iwr -useb https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/appveyor.ps1 } | iex
-  - refreshenv
-
-build_script:
-  - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
-  - set GIT_TERMINAL_PROMPT=0
-  - gem install bundler -v "~> 2"
-  - bundle config --local path vendor/bundle
-  - bundle update
-  - bundle install
-
-before_test:
-  - ruby -v
-  - gem -v
-  - bundle -v
-
-test_script:
-  - bundle exec rake